- Fix handling GNOME menu stuff

PR:		ports/63593
Submitted by:	Ports Fury

3 files changed, 29 insertions, 10 deletions

diff --git a/graphics/gqview/Makefile b/graphics/gqview/Makefile
index 0cbedd672b9d..546a282be194 100644
--- a/graphics/gqview/Makefile
+++ b/graphics/gqview/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gqview
 PORTVERSION=	1.4.0
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,20 +17,20 @@ COMMENT=	Another gtk2-based graphic file viewer
 
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
 
+CONFLICTS=	gqview-devel-*
+
 USE_X_PREFIX=	yes
-USE_GNOME=	gtk20
-USE_GETTEXT=	yes
-USE_ICONV=	yes
+USE_GNOME=	gnomehier gtk20
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
-
-CONFLICTS=	gqview-devel-1.3.*
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 MAN1=		gqview.1
 
-.if !defined(NOPORTDOCS)
 post-install:
+	${INSTALL_DATA} ${WRKSRC}/gqview.desktop ${PREFIX}/share/gnome/apps/Graphics
+	${INSTALL_DATA} ${WRKSRC}/gqview.png ${PREFIX}/share/gnome/pixmaps
+.if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .endif
diff --git a/graphics/gqview/files/patch-Makefile.in b/graphics/gqview/files/patch-Makefile.in
index 66ae71a523f3..0e06c87658ea 100644
--- a/graphics/gqview/files/patch-Makefile.in
+++ b/graphics/gqview/files/patch-Makefile.in
@@ -1,6 +1,22 @@
---- Makefile.in.orig	Fri Jan 23 18:33:39 2004
-+++ Makefile.in	Fri Jan 23 18:37:29 2004
-@@ -547,7 +547,7 @@
+--- Makefile.in.orig	Sat Feb 21 08:23:27 2004
++++ Makefile.in	Sun Feb 29 17:45:24 2004
+@@ -172,11 +172,11 @@
+ helpdir = $(prefix)/share/gqview
+ help_DATA = README
+ 
+-@HAVE_GNOME_TRUE@desktopdir = $(GNOME_DATADIR)/gnome/apps/Graphics
+-@HAVE_GNOME_TRUE@desktop_DATA = gqview.desktop
++#desktopdir = $(GNOME_DATADIR)/gnome/apps/Graphics
++#desktop_DATA = gqview.desktop
+ 
+-@HAVE_GNOME_TRUE@icondir = $(GNOME_DATADIR)/pixmaps
+-@HAVE_GNOME_TRUE@icon_DATA = gqview.png
++#icondir = $(GNOME_DATADIR)/pixmaps
++#icon_DATA = gqview.png
+ 
+ ACLOCAL_AMFLAGS = -I m4
+ subdir = .
+@@ -646,7 +646,7 @@
  
  info-am:
  
diff --git a/graphics/gqview/pkg-plist b/graphics/gqview/pkg-plist
index 39207d96b080..b3b690d1cdd1 100644
--- a/graphics/gqview/pkg-plist
+++ b/graphics/gqview/pkg-plist
@@ -27,4 +27,6 @@ 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
+share/gnome/apps/Graphics/gqview.desktop
+share/gnome/pixmaps/gqview.png
 %%PORTDOCS%%@dirrm %%DOCSDIR%%