9 files changed, 43 insertions, 76 deletions

diff --git a/graphics/gqview/Makefile b/graphics/gqview/Makefile
index 2fea0f7f33cb..ae28aefe4ed5 100644
--- a/graphics/gqview/Makefile
+++ b/graphics/gqview/Makefile
@@ -6,37 +6,32 @@
 #
 
 PORTNAME=	gqview
-PORTVERSION=	1.2.2
-PORTREVISION=	2
+PORTVERSION=	1.4.0
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Another gtk-based graphic file viewer
+MAINTAINER=	ale@FreeBSD.org
+COMMENT=	Another gtk2-based graphic file viewer
+
+LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv \
+		png.5:${PORTSDIR}/graphics/png
 
 USE_X_PREFIX=	yes
-USE_GNOME=	gdkpixbuf
-WANT_GNOME=	yes
+USE_GNOME=	gtk20
+USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
-USE_REINPLACE=	yes
-USE_AUTOCONF_VER=	213
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--disable-gnome
+		LIBS="-L${LOCALBASE}/lib"
 
 CONFLICTS=	gqview-devel-1.3.*
 
 MAN1=		gqview.1
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|INCLUDED_LIBINTL=yes|INCLUDED_LIBINTL=no|g' \
-		${WRKSRC}/aclocal.m4
-
+.if !defined(NOPORTDOCS)
 post-install:
-	${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
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+.endif
 
 .include <bsd.port.mk>
diff --git a/graphics/gqview/distinfo b/graphics/gqview/distinfo
index 5daddd90566d..f196969ea551 100644
--- a/graphics/gqview/distinfo
+++ b/graphics/gqview/distinfo
@@ -1,2 +1,2 @@
-MD5 (gqview-1.2.2.tar.gz) = 3273d2f39d4383a6b0812afeaccc5606
-SIZE (gqview-1.2.2.tar.gz) = 864300
+MD5 (gqview-1.4.0.tar.gz) = b872d55a83695ebb3a63153a59d0bf62
+SIZE (gqview-1.4.0.tar.gz) = 1205127
diff --git a/graphics/gqview/files/patch-Makefile.in b/graphics/gqview/files/patch-Makefile.in
new file mode 100644
index 000000000000..66ae71a523f3
--- /dev/null
+++ b/graphics/gqview/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Fri Jan 23 18:33:39 2004
++++ Makefile.in	Fri Jan 23 18:37:29 2004
+@@ -547,7 +547,7 @@
+ 
+ info-am:
+ 
+-install-data-am: install-desktopDATA install-helpDATA install-iconDATA \
++install-data-am: install-desktopDATA install-iconDATA \
+ 	install-man
+ 
+ install-exec-am:
diff --git a/graphics/gqview/files/patch-ae b/graphics/gqview/files/patch-ae
deleted file mode 100644
index 69c5cbde291a..000000000000
--- a/graphics/gqview/files/patch-ae
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/main.c.orig	Wed Apr  5 23:24:00 2000
-+++ src/main.c	Thu Apr 13 04:09:49 2000
-@@ -370,7 +370,7 @@
- 	editor_command[0] = g_strdup("gimp");
- 
- 	editor_name[1] = g_strdup(_("Electric Eyes"));
--	editor_command[1] = g_strdup("ee");
-+	editor_command[1] = g_strdup("ElectricEyes");
- 
- 	editor_name[2] = g_strdup(_("XV"));
- 	editor_command[2] = g_strdup("xv");
diff --git a/graphics/gqview/files/patch-configure b/graphics/gqview/files/patch-configure
new file mode 100644
index 000000000000..5da76bcdc267
--- /dev/null
+++ b/graphics/gqview/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.old	Fri Feb  6 09:23:28 2004
++++ configure	Fri Feb  6 09:23:50 2004
+@@ -5844,7 +5844,7 @@
+ 
+ 
+ cat >>confdefs.h <<_ACEOF
+-#define GQVIEW_HELPDIR "$prefix/share/gqview"
++#define GQVIEW_HELPDIR "$prefix/share/doc/gqview"
+ _ACEOF
+ 
+ 
diff --git a/graphics/gqview/files/patch-configure.in b/graphics/gqview/files/patch-configure.in
deleted file mode 100644
index bc1cb967a916..000000000000
--- a/graphics/gqview/files/patch-configure.in
+++ /dev/null
@@ -1,17 +0,0 @@
---- 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/files/patch-src_main_c b/graphics/gqview/files/patch-src_main_c
deleted file mode 100644
index 4eca3da4f350..000000000000
--- a/graphics/gqview/files/patch-src_main_c
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/main.c.orig	Thu Jun 26 21:27:18 2003
-+++ src/main.c	Thu Jun 26 21:28:56 2003
-@@ -10,6 +10,7 @@
-  */
- 
- 
-+#include <sys/param.h>
- #include "gqview.h"
- 
- #include "collect.h"
-@@ -159,7 +160,7 @@
- 
- void start_editor_from_path_list(gint n, GList *list)
- {
--	gchar current_path[512];
-+	gchar current_path[MAXPATHLEN];
- 	gchar *success;
- 	gchar *cmd;
- 	gchar *buf;
diff --git a/graphics/gqview/pkg-descr b/graphics/gqview/pkg-descr
index 86d34e08b478..50961072f562 100644
--- a/graphics/gqview/pkg-descr
+++ b/graphics/gqview/pkg-descr
@@ -1,4 +1,4 @@
-Another gtk-based graphic file viewer.
+Another gtk2-based graphic file viewer.
 
 WWW: http://gqview.sourceforge.net/
 
diff --git a/graphics/gqview/pkg-plist b/graphics/gqview/pkg-plist
index 7f8af7910d96..39207d96b080 100644
--- a/graphics/gqview/pkg-plist
+++ b/graphics/gqview/pkg-plist
@@ -1,7 +1,6 @@
 bin/gqview
-share/gnome/pixmaps/gqview.png
-share/gnome/apps/Graphics/gqview.desktop
-share/gqview/README
+%%PORTDOCS%%%%DOCSDIR%%/README
+share/locale/bg/LC_MESSAGES/gqview.mo
 share/locale/cs/LC_MESSAGES/gqview.mo
 share/locale/da/LC_MESSAGES/gqview.mo
 share/locale/de/LC_MESSAGES/gqview.mo
@@ -10,6 +9,7 @@ share/locale/et/LC_MESSAGES/gqview.mo
 share/locale/fi/LC_MESSAGES/gqview.mo
 share/locale/fr/LC_MESSAGES/gqview.mo
 share/locale/hu/LC_MESSAGES/gqview.mo
+share/locale/id/LC_MESSAGES/gqview.mo
 share/locale/it/LC_MESSAGES/gqview.mo
 share/locale/ja/LC_MESSAGES/gqview.mo
 share/locale/nl/LC_MESSAGES/gqview.mo
@@ -20,14 +20,11 @@ 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/sv/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
-@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
+%%PORTDOCS%%@dirrm %%DOCSDIR%%