ports/51357: Update port: graphics/gqview to 1.2.2

[Simon L.Nielsen]

>Number:         51357
>Category:       ports
>Synopsis:       Update port: graphics/gqview to 1.2.2
>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:   Thu Apr 24 08:40:04 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Simon L. Nielsen
>Release:        FreeBSD 4.8-RC i386
>Organization:
>Environment:
>Description:
Update to gqview 1.2.2.

This PR supersedes
o [2003/01/25] ports/47481  nakai       Update port: graphics/gqview to 1.2.1 (fix ports/46297)

Note: This update is based on ports/47481 by KATO Tsuguru <tkato at prontomail.com>.

>How-To-Repeat:
>Fix:
Note files/patch-configure.in is added.

--- port-gqview-1.2.2.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/graphics/gqview/Makefile,v
retrieving revision 1.37
diff -u -d -r1.37 Makefile
--- Makefile	20 Apr 2003 19:21:54 -0000	1.37
+++ Makefile	24 Apr 2003 14:12:41 -0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gqview
-PORTVERSION=	1.1.1
+PORTVERSION=	1.2.2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -18,28 +18,22 @@
 USE_GNOME=	gdkpixbuf
 WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
+USE_REINPLACE=	yes
+USE_AUTOCONF_VER=	213
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
-
-.include <bsd.port.pre.mk>
-
-.if ${HAVE_GNOME:Mlibcapplet}!=""
-USE_GNOME+=	libcapplet
-PKGNAMESUFFIX=	-gnome
-.endif
+		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS=	--disable-gnome
 
 MAN1=		gqview.1
 
-pre-patch:
-	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
-		's|GNOME_DATADIR\)/gnome/|GNOME_DATADIR\)/|g'
+post-patch:
+	@${REINPLACE_CMD} -e 's|INCLUDED_LIBINTL=yes|INCLUDED_LIBINTL=no|g' \
+		${WRKSRC}/aclocal.m4
 
 post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/gqview
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/gqview
-.endif
+	${MKDIR} ${PREFIX}/share/gnome/pixmaps
+	${MKDIR} ${PREFIX}/share/gnome/apps/Graphics
+	${INSTALL_DATA} ${WRKSRC}/gqview.png ${PREFIX}/share/gnome/pixmaps
+	${INSTALL_DATA} ${WRKSRC}/gqview.desktop ${PREFIX}/share/gnome/apps/Graphics
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/graphics/gqview/distinfo,v
retrieving revision 1.15
diff -u -d -r1.15 distinfo
--- distinfo	20 Feb 2002 12:32:45 -0000	1.15
+++ distinfo	24 Apr 2003 13:58:43 -0000
@@ -1 +1 @@
-MD5 (gqview-1.1.1.tar.gz) = 777c3ed6905673dd50310ec80b4b0de5
+MD5 (gqview-1.2.2.tar.gz) = 3273d2f39d4383a6b0812afeaccc5606
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/graphics/gqview/pkg-plist,v
retrieving revision 1.10
diff -u -d -r1.10 pkg-plist
--- pkg-plist	20 Feb 2002 12:32:45 -0000	1.10
+++ pkg-plist	24 Apr 2003 14:31:36 -0000
@@ -1,7 +1,6 @@
 bin/gqview
-%%PORTDOCS%%share/doc/gqview/README
-%%GNOME:%%share/gnome/apps/Graphics/gqview.desktop
-%%GNOME:%%share/gnome/pixmaps/gqview.png
+share/gnome/pixmaps/gqview.png
+share/gnome/apps/Graphics/gqview.desktop
 share/gqview/README
 share/locale/cs/LC_MESSAGES/gqview.mo
 share/locale/da/LC_MESSAGES/gqview.mo
@@ -17,12 +16,18 @@
 share/locale/no/LC_MESSAGES/gqview.mo
 share/locale/pl/LC_MESSAGES/gqview.mo
 share/locale/pt_BR/LC_MESSAGES/gqview.mo
+share/locale/ro/LC_MESSAGES/gqview.mo
 share/locale/ru/LC_MESSAGES/gqview.mo
 share/locale/sk/LC_MESSAGES/gqview.mo
 share/locale/sl/LC_MESSAGES/gqview.mo
+share/locale/th/LC_MESSAGES/gqview.mo
 share/locale/tr/LC_MESSAGES/gqview.mo
 share/locale/uk/LC_MESSAGES/gqview.mo
+share/locale/vi/LC_MESSAGES/gqview.mo
 share/locale/zh_CN.GB2312/LC_MESSAGES/gqview.mo
 share/locale/zh_TW/LC_MESSAGES/gqview.mo
-%%PORTDOCS%%@dirrm share/doc/gqview
 @dirrm share/gqview
+ at unexec rmdir %D/share/gnome/pixmaps 2>/dev/null || true
+ at unexec rmdir %D/share/gnome/apps/Graphics 2>/dev/null || true
+ at unexec rmdir %D/share/gnome/apps 2>/dev/null || true
+ at unexec rmdir %D/share/gnome 2>/dev/null || true
Index: files/patch-configure.in
===================================================================
RCS file: files/patch-configure.in
diff -N files/patch-configure.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-configure.in	24 Apr 2003 14:41:13 -0000
@@ -0,0 +1,17 @@
+--- configure.in.orig	Fri Dec 13 11:27:07 2002
++++ configure.in	Fri Dec 13 23:17:43 2002
+@@ -59,7 +59,14 @@
+ AC_DEFINE_UNQUOTED(GQVIEW_HELPDIR, "$prefix/share/gqview")
+ 
+ dnl CHECK_GNOME
++AC_ARG_ENABLE(gnome,
++[  --disable-gnome         disable use of gnome],
++    gnome=$enableval, gnome=yes)
++if test "$gnome" = yes; then
+   AC_PATH_PROG(GNOME_CONFIG,gnome-config,no)
++else
++  GNOME_CONFIG=no
++fi
+   AM_CONDITIONAL(HAVE_GNOME, test $GNOME_CONFIG != no)
+   if test "$GNOME_CONFIG" = no; then
+     AC_MSG_RESULT(GNOME icon and menu entry will NOT be installed)
--- port-gqview-1.2.2.patch ends here ---


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