New version. New upstream maintainer. New Homepage. New dependencies.
New features (see the changelog included in the distfile).
Tested on i386 and amd64.
Tests and comments (and ok's) are welcome.
Oh, and I've a question about the patch for util.c: is this still
required? In my silly little world (no alpha, no sparc64), NULL has
always pointer size, so the cast to (void *) appears a little bit
strange to me. Of course, passing just 0 as the sentinel *was* wrong
in the old qiv-2.0.
Ciao,
Kili
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/qiv/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile 15 Sep 2007 20:09:43 -0000 1.12
+++ Makefile 14 Jul 2009 17:00:26 -0000
@@ -2,24 +2,31 @@
COMMENT= very small and pretty fast gdk/Imlib image viewer
-DISTNAME= qiv-2.0
+DISTNAME= qiv-2.2.2
CATEGORIES= graphics
-EXTRACT_SUFX= -src.tgz
+EXTRACT_SUFX= .tgz
-HOMEPAGE= http://www.klografx.net/qiv/
+HOMEPAGE= http://spiegl.de/qiv/
-MASTER_SITES= http://www.klografx.net/qiv/download/
+MASTER_SITES= ${HOMEPAGE}download/
-LIB_DEPENDS= gdk_imlib.>=19::graphics/imlib
+LIB_DEPENDS= magic::devel/libmagic \
+ Imlib2::graphics/imlib2 \
+ exif::graphics/libexif \
+ gdk-x11-2.0,gdk_pixbuf-2.0::x11/gtk+2
-# GPL
+# GPLv2
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB= X11 Xext Xi c gdk glib gmodule gtk iconv intl \
- jpeg m png tiff ungif z
+WANTLIB= X11 Xau Xcomposite Xcursor Xdamage Xdmcp \
+ Xext Xfixes Xi Xinerama Xrandr Xrender c \
+ cairo expat fontconfig freetype gio-2.0 \
+ glib-2.0 glitz gmodule-2.0 gobject-2.0 iconv \
+ intl m pango-1.0 pangocairo-1.0 pangoft2-1.0 \
+ pixman-1 png z
USE_GMAKE= Yes
USE_X11= Yes
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/qiv/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo 5 Apr 2007 16:19:58 -0000 1.5
+++ distinfo 14 Jul 2009 17:00:26 -0000
@@ -1,5 +1,5 @@
-MD5 (qiv-2.0-src.tgz) = Fl0MLyZHGIIflHMhlrf54Q==
-RMD160 (qiv-2.0-src.tgz) = grF8IEaCKCWPfB58YViMgOHEAQc=
-SHA1 (qiv-2.0-src.tgz) = Ru7wTEkrnwHXnqt8L+x4tO3RNVA=
-SHA256 (qiv-2.0-src.tgz) = LwwD7n55ySEPBgyH1RgR5FQPEm2MPXUbMaq2kWCz0JE=
-SIZE (qiv-2.0-src.tgz) = 76561
+MD5 (qiv-2.2.2.tgz) = 5BMQXJFTIu7qblgtm5tPLw==
+RMD160 (qiv-2.2.2.tgz) = uIdQBnq++XHCEKVcUHcwCHQCpKs=
+SHA1 (qiv-2.2.2.tgz) = SJdyMDuvhEaefbIND9Lbu1bvG9Y=
+SHA256 (qiv-2.2.2.tgz) = wyyMwqAMpazeARaDPnx3ZUVoehImbRVhf3vcixvaLe8=
+SIZE (qiv-2.2.2.tgz) = 99044
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/graphics/qiv/patches/patch-Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 patch-Makefile
--- patches/patch-Makefile 5 Feb 2005 16:40:29 -0000 1.4
+++ patches/patch-Makefile 14 Jul 2009 17:00:26 -0000
@@ -1,5 +1,5 @@
---- Makefile.orig Sat May 22 09:21:47 2004
-+++ Makefile Sat Feb 5 17:25:47 2005
+--- Makefile.orig Sun May 31 03:35:42 2009
++++ Makefile Tue Jul 14 18:44:12 2009
@@ -3,9 +3,6 @@
# User Options
#######################################################################
@@ -10,28 +10,35 @@
# Font to use for statusbar in fullscreen mode
STATUSBAR_FONT = "fixed"
-@@ -57,11 +54,6 @@ SS_RANDOMIZE = -r
+@@ -49,15 +46,6 @@ MAGIC = -DHAVE_MAGIC
# Do not edit below here!
######################################################################
-CC = gcc
--CFLAGS = -O2 -Wall -fomit-frame-pointer -finline-functions \
+-#CFLAGS = -O -g -Wall
+-CFLAGS = -O2 -Wall \
- -fcaller-saves -ffast-math -fno-strength-reduce \
- -fthread-jumps #-march=pentium #-DSTAT_MACROS_BROKEN
+-#CFLAGS = -O2 -Wall -fomit-frame-pointer -finline-functions \
+-# -fcaller-saves -ffast-math -fno-strength-reduce \
+-# -fthread-jumps #-march=pentium #-DSTAT_MACROS_BROKEN
-
- INCLUDES = `imlib-config --cflags-gdk`
- LIBS = `imlib-config --libs-gdk`
+ INCLUDES := $(shell pkg-config --cflags gdk-2.0 imlib2)
+ LIBS := $(shell pkg-config --libs gdk-2.0 imlib2)
-@@ -126,12 +118,6 @@ install: $(PROGRAM)
+@@ -136,13 +124,7 @@ distclean : clean
+
+ install: $(PROGRAM)
@echo "Installing QIV..."
- install -s -m 0755 $(PROGRAM) $(PREFIX)/bin
- install -m 0644 $(PROGRAM).1 $(PREFIX)/man/man1
+- install -s -m 0755 $(PROGRAM) $(PREFIX)/bin
+- install -m 0644 $(PROGRAM).1 $(PREFIX)/man/man1
- $(COMPRESS_PROG) $(PREFIX)/man/man1/$(PROGRAM).1
- @if ./qiv -f ./intro.jpg ; \
- then echo "-- Test Passed --" ; \
- else echo "-- Test Failed --" ; \
- fi
-- @echo -ne "\nDont forget to look into the \"qiv-command\" file and
install it!\n-> cp qiv-command.example /usr/local/bin/qiv-command\n\n"
+- @echo -ne "\nDont forget to look into the \"qiv-command\" file and
install it!\n-> cp qiv-command.example /usr/local/bin/qiv-command\n\n"
++ $(BSD_INSTALL_PROGRAM) $(PROGRAM) $(PREFIX)/bin
++ $(BSD_INSTALL_MAN) $(PROGRAM).1 $(PREFIX)/man/man1
- install-xscreensaver: install
- @echo "#!/bin/sh" > $(SS_PROG)
+ # the end... ;-)
Index: patches/patch-utils_c
===================================================================
RCS file: /cvs/ports/graphics/qiv/patches/patch-utils_c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-utils_c
--- patches/patch-utils_c 5 Feb 2005 16:40:29 -0000 1.2
+++ patches/patch-utils_c 14 Jul 2009 17:00:26 -0000
@@ -1,10 +1,10 @@
---- utils.c.orig Sat May 22 09:24:23 2004
-+++ utils.c Sat Feb 5 17:25:47 2005
-@@ -272,7 +272,7 @@ void run_command(qiv_image *q, int n, ch
+--- utils.c.orig Tue May 26 18:56:25 2009
++++ utils.c Tue Jul 14 18:31:22 2009
+@@ -276,7 +276,7 @@ void run_command(qiv_image *q, char *n, char *filename
dup2(pipe_stdout[1], 2);
close(pipe_stdout[1]);
-- execlp("qiv-command", "qiv-command", nr, filename, 0);
+- execlp("qiv-command", "qiv-command", nr, filename, NULL);
+ execlp("qiv-command", "qiv-command", nr, filename, (void *)NULL);
perror("Error calling qiv-command");
abort();
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/qiv/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST 15 Sep 2004 00:50:10 -0000 1.2
+++ pkg/PLIST 14 Jul 2009 17:00:26 -0000
@@ -1,3 +1,3 @@
@comment $OpenBSD: PLIST,v 1.2 2004/09/15 00:50:10 espie Exp $
-bin/qiv
+...@bin bin/qiv
@man man/man1/qiv.1
