- update qiv to 2.3.1, Changelog: http://spiegl.de/qiv/changes.shtml

- install qiv-command example and mention it in man.
2014-08-23 14:33:07 +00:00 · 2014-08-23 14:33:07 +00:00 · 54ab5e7194
commit 54ab5e7194
parent 1a9ffcca83
5 changed files with 53 additions and 39 deletions
--- a/graphics/qiv/Makefile
+++ b/graphics/qiv/Makefile
@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.26 2013/03/11 11:10:55 espie Exp $
+# $OpenBSD: Makefile,v 1.27 2014/08/23 14:33:07 kirby Exp $

 COMMENT=		very small and pretty fast gdk/Imlib image viewer

-DISTNAME=		qiv-2.2.4
+DISTNAME=		qiv-2.3.1
 CATEGORIES=		graphics

 EXTRACT_SUFX=		.tgz
@ -11,23 +11,32 @@ HOMEPAGE=		http://spiegl.de/qiv/

 MASTER_SITES=		${HOMEPAGE}/download/

-LIB_DEPENDS=		devel/libmagic \
-			graphics/imlib2 \
-			x11/gtk+2
-
 # GPLv2
 PERMIT_PACKAGE_CDROM=	Yes

-WANTLIB += GL Imlib2 X11 Xcomposite Xcursor Xdamage Xext Xfixes
-WANTLIB += Xi Xinerama Xrandr Xrender c cairo expat fontconfig
-WANTLIB += freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0
-WANTLIB += gobject-2.0 m magic pango-1.0 pangocairo-1.0 pangoft2-1.0
-WANTLIB += pixman-1 png pthread pthread-stubs xcb xcb-render xcb-shm
-WANTLIB += z
+WANTLIB += Imlib2 X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi
+WANTLIB += Xinerama Xrandr Xrender c cairo exif fontconfig freetype
+WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0
+WANTLIB += jpeg lcms2 m magic pango-1.0 pangocairo-1.0 pangoft2-1.0
+WANTLIB += pthread tiff z

 MODULES=		devel/gettext

+LIB_DEPENDS=		devel/libmagic \
+			graphics/imlib2 \
+			graphics/lcms2 \
+			graphics/libexif \
+			x11/gtk+2
+
 USE_GMAKE=		Yes
 NO_TEST=		Yes

+post-configure:
+	${SUBST_CMD} ${WRKSRC}/qiv.1
+	perl -pi -e 's,bash,sh,' ${WRKSRC}/contrib/qiv-command.example
+post-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/qiv/
+	${INSTALL_DATA} ${WRKSRC}/contrib/qiv-command.example \
+		${PREFIX}/share/examples/qiv/
+
 .include <bsd.port.mk>
--- a/graphics/qiv/distinfo
+++ b/graphics/qiv/distinfo
@ -1,5 +1,2 @@
-MD5 (qiv-2.2.4.tgz) = FCX4nJD5wEWFj8zyTYlMlw==
-RMD160 (qiv-2.2.4.tgz) = 7I+Z9+3rb2gdjHbl+5bhb2R2FnY=
-SHA1 (qiv-2.2.4.tgz) = ZQBSy3KCBwEwCyv+sJuWZiXuPbo=
-SHA256 (qiv-2.2.4.tgz) = 7WB43FUMHcL+NcHg9GRjwTWJokuD1PcQG3GnSF5Rq7c=
-SIZE (qiv-2.2.4.tgz) = 98874
+SHA256 (qiv-2.3.1.tgz) = Z1OWtTnmURE1/nPIZ/n91tkSwkx1Ynl8sEfCfQwsjuY=
+SIZE (qiv-2.3.1.tgz) = 130621
--- a/graphics/qiv/patches/patch-Makefile
+++ b/graphics/qiv/patches/patch-Makefile
@ -1,6 +1,6 @@
-$OpenBSD: patch-Makefile,v 1.7 2012/03/29 06:05:14 ajacoutot Exp $
--- Makefile.orig	Fri May 13 15:11:24 2011
-+++ Makefile	Thu Mar 29 08:01:31 2012
+$OpenBSD: patch-Makefile,v 1.8 2014/08/23 14:33:07 kirby Exp $
+--- Makefile.orig	Fri Dec 20 04:50:37 2013
+++ Makefile	Thu Aug 14 14:06:52 2014
@@ -4,7 +4,7 @@
 #######################################################################
 
@ -9,7 +9,7 @@ $OpenBSD: patch-Makefile,v 1.7 2012/03/29 06:05:14 ajacoutot Exp $
 +PREFIX ?= /usr/local
 
 # Font to use for statusbar in fullscreen mode
- STATUSBAR_FONT = "fixed"
+ STATUSBAR_FONT = "Monospace 9"
@@ -30,7 +30,7 @@ GETOPT_LONG = -DHAVE_GETOPT_LONG
 
 # This program will be run on the manual page after it is installed.
@ -17,15 +17,15 @@ $OpenBSD: patch-Makefile,v 1.7 2012/03/29 06:05:14 ajacoutot Exp $
 -COMPRESS_PROG = gzip -9f
 +COMPRESS_PROG = true
 
- # Comment this line out if your system doesn't have libXinerama
- # installed (for centering on dual-screen)
-@@ -45,11 +45,11 @@ MAGIC = -DHAVE_MAGIC
+ # Comment this line out if your system doesn't have lcms2 installed
+ # (for minimal Color Management support)
+@@ -49,11 +49,11 @@ EXIF = -DHAVE_EXIF
 # Do not edit below here!
 ######################################################################
 
 -CC        = gcc
 +CC        ?= gcc
- #CFLAGS    = -O -g -Wall
+ #CFLAGS    = -O0 -g -Wall
 -CFLAGS    = -O2 -Wall \
 -	    -fcaller-saves -ffast-math -fno-strength-reduce \
 -	    -fthread-jumps #-march=pentium #-DSTAT_MACROS_BROKEN
@ -35,23 +35,14 @@ $OpenBSD: patch-Makefile,v 1.7 2012/03/29 06:05:14 ajacoutot Exp $
 #CFLAGS    = -O2 -Wall -fomit-frame-pointer -finline-functions \
 #	    -fcaller-saves -ffast-math -fno-strength-reduce \
 #	    -fthread-jumps #-march=pentium #-DSTAT_MACROS_BROKEN
-@@ -83,7 +83,7 @@ OBJS_G   += lib/getopt.g lib/getopt1.g
- endif
- 
- ifdef GTD_XINERAMA
-LIBS     += -L/usr/X11R6/lib -lXinerama
-+LIBS     += -L${X11BASE}/lib -lXinerama
- endif
- 
- ifdef MAGIC
-@@ -138,10 +138,6 @@ install: $(PROGRAM)
+@@ -159,10 +159,6 @@ install: $(PROGRAM)
+ 	  install -d -m 0755 $(PREFIX)/share/applications; \
 	fi
- 	install -m 0644 $(PROGRAM).1 $(PREFIX)/man/man1
- 	$(COMPRESS_PROG) $(PREFIX)/man/man1/$(PROGRAM).1
+ 	install -m 0644 qiv.desktop $(PREFIX)/share/applications/qiv.desktop
 -	@if ./qiv -f ./intro.jpg ; \
 -	then echo "-- Test Passed --" ; \
 -	else echo "-- Test Failed --" ; \
 -	fi
- 	@echo "\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 "\nDont forget to look into the \"qiv-command\" file and install it!\n-> cp qiv-command.example $(PREFIX)/bin/qiv-command\n\n"
 
 # the end... ;-)
--- a/graphics/qiv/patches/patch-qiv_1
+++ b/graphics/qiv/patches/patch-qiv_1
@ -0,0 +1,11 @@
+$OpenBSD: patch-qiv_1,v 1.1 2014/08/23 14:33:07 kirby Exp $
+--- qiv.1.orig	Thu Aug 14 14:33:47 2014
+++ qiv.1	Thu Aug 14 14:37:26 2014
+@@ -307,6 +307,7 @@ changed to this new name and updates its internal file
+ This is very useful when using qiv-command to rename files.
+ .P
+ Please also see the example that came together with qiv.
+It could be found in ${PREFIX}/share/examples/qiv/
+ .EE
+ .SH AUTHORS
+ .EX
--- a/graphics/qiv/pkg/PLIST
+++ b/graphics/qiv/pkg/PLIST
@ -1,3 +1,9 @@
-@comment $OpenBSD: PLIST,v 1.3 2009/08/20 18:58:39 kili Exp $
+@comment $OpenBSD: PLIST,v 1.4 2014/08/23 14:33:07 kirby Exp $
@bin bin/qiv
@man man/man1/qiv.1
+@comment share/applications/
+@comment share/applications/qiv.desktop
+share/examples/qiv/
+share/examples/qiv/qiv-command.example
+@comment share/pixmaps/
+@comment share/pixmaps/qiv.png