ports/119958: [UPDATE] graphics/qiv Update to 2.1pre12

[Martin Tournoij]

>Number:         119958
>Category:       ports
>Synopsis:       [UPDATE] graphics/qiv Update to 2.1pre12
>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:   Fri Jan 25 02:10:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Martin Tournoij
>Release:        FreeBSD 6.2-STABLE i386
>Organization:
>Environment:
FreeBSD phong.rwxrwxrwx.net 7.0-BETA3 FreeBSD 7.0-BETA3 #0: Mon Nov 19 15:02:36 UTC 2007 carpetsmoker at slash.rwxrwxrwx.net:/mnt/ad0s1a/usr/obj/mnt/ad0s1a/usr/src/sys/PHONG i386
>Description:
Update to 2.1pre12
Set maintainer to me

>How-To-Repeat:

>Fix:

--- qiv.diff begins here ---
diff -urN --exclude CVS /ports/graphics/qiv/Makefile qiv/Makefile
--- /ports/graphics/qiv/Makefile	2007-05-19 22:10:36.000000000 +0200
+++ qiv/Makefile	2008-01-25 02:17:28.000000000 +0100
@@ -2,26 +2,24 @@
 # Date created:		25 December 1998
 # Whom:			Bill Fumerola <billf at chc-chimes.com>
 #
+# $Carpetsmoker: ports/graphics/qiv/Makefile,v 1.1 2008/01/25 01:17:28 carpetsmoker Exp $
 # $FreeBSD: ports/graphics/qiv/Makefile,v 1.31 2007/05/19 20:10:36 flz Exp $
 #
 
 PORTNAME=	qiv
-PORTVERSION=	2.0
-PORTREVISION=	2
+PORTVERSION=	2.1pre12
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.klografx.net/qiv/download/
-DISTNAME=	${PORTNAME}-${PORTVERSION}-src
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/pre/-pre/}
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	carpetsmoker at xs4all.nl
 COMMENT=	Small, fast GDK/Imlib image viewer
 
 OPTIONS=	XINERAMA "use multiple monitors" off
 USE_GETOPT_LONG=yes
 USE_GMAKE=	yes
 USE_GNOME=	imlib
-USE_X_PREFIX=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 MAN1=		qiv.1
 PLIST_FILES=	bin/qiv
@@ -29,25 +27,19 @@
 .include <bsd.port.pre.mk>
 
 pre-configure:
-.if defined(WITH_XINERAMA)
-	@${ECHO_MSG} compiling with Xinerama support
-	@${MV} -v ${WRKSRC}/Makefile ${WRKSRC}/Makefile.orig
-	@${SED} -e 's/\# GTD_XINERAMA/GTD_XINERAMA/' \
-		< ${WRKSRC}/Makefile.orig > ${WRKSRC}/Makefile
+.if ! defined(WITH_XINERAMA)
 .else
-	@${ECHO_MSG} compiling without Xinerama support
+	@${REINPLACE_CMD} 's|GTD.*=|#|' ${WRKSRC}/Makefile
 .endif
 
 do-configure:
-	@ ${MV} ${WRKSRC}/qiv.1 ${WRKSRC}/qiv.1.pre_sed
-	@ ${SED} -e 's#\/usr\/bin#${PREFIX}/bin#g' \
-		${WRKSRC}/qiv.1.pre_sed > ${WRKSRC}/qiv.1
-	@ ${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.pre_sed
-	@ ${SED} -e 's#\/usr\/local#${PREFIX}#' \
-	         -e 's#gcc#${CC}#' \
-	         -e 's#-O2#${CPPFLAGS} ${CFLAGS}#' \
-	         -e 's#libs-gdk`#libs-gdk` ${LDFLAGS}#' \
-		${WRKSRC}/Makefile.pre_sed > ${WRKSRC}/Makefile
+	@${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
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/qiv ${PREFIX}/bin/
diff -urN --exclude CVS /ports/graphics/qiv/distinfo qiv/distinfo
--- /ports/graphics/qiv/distinfo	2006-01-07 21:00:03.000000000 +0100
+++ qiv/distinfo	2008-01-25 01:21:33.000000000 +0100
@@ -1,3 +1,3 @@
-MD5 (qiv-2.0-src.tgz) = 165d0c2f264718821f94732196b7f9e1
-SHA256 (qiv-2.0-src.tgz) = 2f0c03ee7e79c9210f060c87d51811e4540f126d8c3d751b31aab69160b3d091
-SIZE (qiv-2.0-src.tgz) = 76561
+MD5 (qiv-2.1-pre12.tgz) = 80ba1e2da5115a3cc3a6f7e19cb620d8
+SHA256 (qiv-2.1-pre12.tgz) = d54edb92ca91567e2a12b536acc14500efdbccc38718efba99cadaa161a1e70c
+SIZE (qiv-2.1-pre12.tgz) = 94059
--- qiv.diff ends here ---

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