Update to 1.2.2.

PR:		ports/51357
Submitted by:	Ports Fury
Approved by:	maintainer timeout (3 months ago)

4 files changed, 40 insertions, 24 deletions

diff --git a/graphics/gqview/Makefile b/graphics/gqview/Makefile
index 17191fde61de..c3eb05a7d6eb 100644
--- a/graphics/gqview/Makefile
+++ b/graphics/gqview/Makefile
@@ -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_X_PREFIX=	yes
 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>
diff --git a/graphics/gqview/distinfo b/graphics/gqview/distinfo
index 2d51ec28641f..fb05bf0a61d5 100644
--- a/graphics/gqview/distinfo
+++ b/graphics/gqview/distinfo
@@ -1 +1 @@
-MD5 (gqview-1.1.1.tar.gz) = 777c3ed6905673dd50310ec80b4b0de5
+MD5 (gqview-1.2.2.tar.gz) = 3273d2f39d4383a6b0812afeaccc5606
diff --git a/graphics/gqview/files/patch-configure.in b/graphics/gqview/files/patch-configure.in
new file mode 100644
index 000000000000..bc1cb967a916
--- /dev/null
+++ b/graphics/gqview/files/patch-configure.in
@@ -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)
diff --git a/graphics/gqview/pkg-plist b/graphics/gqview/pkg-plist
index 42c3f2f28380..7f8af7910d96 100644
--- a/graphics/gqview/pkg-plist
+++ b/graphics/gqview/pkg-plist
@@ -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/nl/LC_MESSAGES/gqview.mo
 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
+@unexec rmdir %D/share/gnome/pixmaps 2>/dev/null || true
+@unexec rmdir %D/share/gnome/apps/Graphics 2>/dev/null || true
+@unexec rmdir %D/share/gnome/apps 2>/dev/null || true
+@unexec rmdir %D/share/gnome 2>/dev/null || true