5 files changed, 25 insertions, 35 deletions

diff --git a/graphics/gqview/Makefile b/graphics/gqview/Makefile
index eac91839cf03..15294eb50140 100644
--- a/graphics/gqview/Makefile
+++ b/graphics/gqview/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gqview
-PORTVERSION=	1.4.5
-PORTREVISION=	1
+PORTVERSION=	2.0.0
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -19,12 +18,15 @@ LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehier gtk20
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 MAN1=		gqview.1
 
+CONFLICTS=	gqview-devel-[0-9]*
+
 .if defined(WITHOUT_NLS)
 CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
@@ -33,6 +35,17 @@ USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
 .endif
 
+.if !defined(NOPORTDOCS)
+PORTDOCS=	README html
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|$$prefix/share/doc/gqview-$$VERSION|${DOCSDIR}|g' \
+		${WRKSRC}/configure
+	@${REINPLACE_CMD} -e \
+		's|$$(datadir)/doc/gqview-$$(VERSION)/html|${DOCSDIR}/html|g' \
+		${WRKSRC}/doc/Makefile.in
+
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/gqview.desktop ${PREFIX}/share/gnome/apps/Graphics
 	${INSTALL_DATA} ${WRKSRC}/gqview.png ${PREFIX}/share/gnome/pixmaps
diff --git a/graphics/gqview/distinfo b/graphics/gqview/distinfo
index ee1d81950c7f..217967893c86 100644
--- a/graphics/gqview/distinfo
+++ b/graphics/gqview/distinfo
@@ -1,2 +1,2 @@
-MD5 (gqview-1.4.5.tar.gz) = b196935767c2d3dc61243d9ed0801c2e
-SIZE (gqview-1.4.5.tar.gz) = 1222801
+MD5 (gqview-2.0.0.tar.gz) = 421c9a79827e91e394bdfc924071d66f
+SIZE (gqview-2.0.0.tar.gz) = 1317383
diff --git a/graphics/gqview/files/patch-Makefile.in b/graphics/gqview/files/patch-Makefile.in
index 0bf07a1025f8..d7ecd3d0daf0 100644
--- a/graphics/gqview/files/patch-Makefile.in
+++ b/graphics/gqview/files/patch-Makefile.in
@@ -1,23 +1,12 @@
---- Makefile.in.orig	Sat Sep 18 19:39:47 2004
-+++ Makefile.in	Tue Sep 21 23:34:26 2004
-@@ -163,11 +163,7 @@
- helpdir = $(prefix)/share/gqview
- help_DATA = README
- 
--desktopdir = $(datadir)/applications
--desktop_DATA = gqview.desktop
- 
--icondir = $(datadir)/pixmaps
--icon_DATA = gqview.png
- 
- ACLOCAL_AMFLAGS = -I m4
- subdir = .
-@@ -637,7 +633,7 @@
+--- Makefile.in.orig	Sun Feb 27 00:36:49 2005
++++ Makefile.in	Sun Feb 27 00:37:19 2005
+@@ -664,8 +664,7 @@
  
  info-am:
  
--install-data-am: install-desktopDATA install-helpDATA install-iconDATA \
-+install-data-am: install-desktopDATA install-iconDATA \
- 	install-man
+-install-data-am: install-desktopDATA install-iconDATA install-man \
+-	install-readmeDATA
++install-data-am: install-man
  
  install-exec-am:
+ 
diff --git a/graphics/gqview/files/patch-configure b/graphics/gqview/files/patch-configure
deleted file mode 100644
index 5da76bcdc267..000000000000
--- a/graphics/gqview/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/pkg-plist b/graphics/gqview/pkg-plist
index e8490d2b498c..102d5d7f8a20 100644
--- a/graphics/gqview/pkg-plist
+++ b/graphics/gqview/pkg-plist
@@ -1,5 +1,5 @@
 bin/gqview
-%%PORTDOCS%%%%DOCSDIR%%/README
+%%NLS%%share/locale/ar/LC_MESSAGES/gqview.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/gqview.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/gqview.mo
 %%NLS%%share/locale/da/LC_MESSAGES/gqview.mo
@@ -29,4 +29,3 @@ bin/gqview
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/gqview.mo
 share/gnome/apps/Graphics/gqview.desktop
 share/gnome/pixmaps/gqview.png
-%%PORTDOCS%%@dirrm %%DOCSDIR%%