ports/139541: [patch] graphics/qiv: update to 2.2.2, take maintainership

[Rob Farmer]

>Number:         139541
>Category:       ports
>Synopsis:       [patch] graphics/qiv: update to 2.2.2, take maintainership
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Oct 12 06:00:08 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Rob Farmer
>Release:        9.0-CURRENT
>Organization:
>Environment:
FreeBSD amethyst.predatorlabs.net 9.0-CURRENT FreeBSD 9.0-CURRENT #0: Sat Oct 10 17:48:26 PDT 2009     robert at amethyst.predatorlabs.net:/usr/obj/usr/src/sys/AMETHYST  i386
>Description:
* update to 2.2.2
* take maintainership
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN qiv.orig/Makefile qiv/Makefile
--- qiv.orig/Makefile	2009-10-11 22:01:55.000000000 -0700
+++ qiv/Makefile	2009-10-11 22:42:23.000000000 -0700
@@ -7,42 +7,39 @@
 #
 
 PORTNAME=	qiv
-PORTVERSION=	2.1.p12
-PORTREVISION=	3
+PORTVERSION=	2.2.2
 CATEGORIES=	graphics
-MASTER_SITES=	http://www.klografx.net/qiv/download/
-DISTNAME=	${PORTNAME}-${PORTVERSION:C/.p12/-pre12/}
+MASTER_SITES=	http://spiegl.de/qiv/download/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	ports at FreeBSD.org
-COMMENT=	Small, fast GDK/Imlib image viewer
+MAINTAINER=	rfarmer at predatorlabs.net
+COMMENT=	Small, fast GDK/Imlib2 image viewer
 
 OPTIONS=	XINERAMA "use multiple monitors" off
 USE_GMAKE=	yes
-USE_GNOME=	imlib
+USE_GNOME=	gtk20
+LIB_DEPENDS=	Imlib2.5:${PORTSDIR}/graphics/imlib2 \
+		exif.12:${PORTSDIR}/graphics/libexif
 
 MAN1=		qiv.1
 PLIST_FILES=	bin/qiv
-USE_XORG+=	x11 xinerama
+USE_XORG+=	x11
 
 .include <bsd.port.pre.mk>
 
 pre-configure:
 .if ! defined(WITH_XINERAMA)
-.else
 	@${REINPLACE_CMD} 's|GTD.*=|#|' ${WRKSRC}/Makefile
+.else
+USE_XORG+=	xinerama
 .endif
 
 do-configure:
-	@${REINPLACE_CMD} 's|/usr/bin|${PREFIX}/bin|g' \
-		${WRKSRC}/qiv.1
 	@${REINPLACE_CMD} 's|/usr/local|${PREFIX}|; \
 		s|gcc|${CC}|; \
 		s|-O2|${CFLAGS}|; \
 		s|libs-gdk`|libs-gdk` ${LDFLAGS}|;' \
 		${WRKSRC}/Makefile
-	@${REINPLACE_CMD} 's|\|GDK_WA_WMCLASS||' \
-		${WRKSRC}/image.c
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/qiv ${PREFIX}/bin/
diff -ruN qiv.orig/distinfo qiv/distinfo
--- qiv.orig/distinfo	2009-10-11 22:01:55.000000000 -0700
+++ qiv/distinfo	2009-10-11 22:03:49.000000000 -0700
@@ -1,3 +1,3 @@
-MD5 (qiv-2.1-pre12.tgz) = 80ba1e2da5115a3cc3a6f7e19cb620d8
-SHA256 (qiv-2.1-pre12.tgz) = d54edb92ca91567e2a12b536acc14500efdbccc38718efba99cadaa161a1e70c
-SIZE (qiv-2.1-pre12.tgz) = 94059
+MD5 (qiv-2.2.2.tgz) = e413105c915322eeea6e582d9b9b4f2f
+SHA256 (qiv-2.2.2.tgz) = c32c8cc2a00ca5acde0116833e7c776545687a12266d15617f7bdc8b1bda2def
+SIZE (qiv-2.2.2.tgz) = 99044
diff -ruN qiv.orig/pkg-descr qiv/pkg-descr
--- qiv.orig/pkg-descr	2009-10-11 22:01:55.000000000 -0700
+++ qiv/pkg-descr	2009-10-11 22:44:15.000000000 -0700
@@ -1,6 +1,6 @@
-Quick Image Viewer (qiv) is a very small and pretty fast GDK/Imlib image
+Quick Image Viewer (qiv) is a very small and pretty fast GDK/Imlib2 image
 viewer. It has such nifty features as: zoom, maxpect, scaledown,
 screensaver, flip, delete, brightness / contrast / gamma correction, and
 can also be used to set your X11 background. All from a commandline.
 
-WWW: http://www.klografx.net/qiv/
+WWW: http://spiegl.de/qiv/


>Release-Note:
>Audit-Trail:
>Unformatted: