Fix the plist.

Reported by:	pointyhat-exp


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@9769 df743ca5-7f9a-e211-a948-0013205c9059

6 files changed, 25 insertions, 23 deletions

diff --git a/deskutils/gruler/Makefile b/deskutils/gruler/Makefile
index 298e144f9..afe4274aa 100644
--- a/deskutils/gruler/Makefile
+++ b/deskutils/gruler/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gruler
 PORTVERSION=	0.6
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	deskutils
 MASTER_SITES=	http://linuxadvocate.org/projects/gruler/downloads/
 
diff --git a/deskutils/gruler/pkg-plist b/deskutils/gruler/pkg-plist
index 67cf4fccb..bef182ee8 100644
--- a/deskutils/gruler/pkg-plist
+++ b/deskutils/gruler/pkg-plist
@@ -2,7 +2,8 @@ bin/gruler
 share/applications/gruler.desktop
 share/gruler/glade/gruler-icon.png
 share/gruler/glade/gruler.glade
-share/pixmaps/gruler-icon.png
+share/pixmaps/gruler/gruler-icon.png
+@dirrm share/pixmaps/gruler
 @dirrm share/gruler/glade
 @dirrm share/gruler
 @dirrmtry share/applications
diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index 98acf4435..7776d1703 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -3,12 +3,12 @@
 # Whom:                 erich@FreeBSD.org
 #
 # $FreeBSD$
-#   $MCom: ports/graphics/gimp-app/Makefile,v 1.14 2007/07/29 21:51:25 mezz Exp $
+#   $MCom: ports/graphics/gimp-app/Makefile,v 1.15 2007/09/19 01:55:23 mezz Exp $
 #
 
 PORTNAME=	gimp-app
 PORTVERSION=	2.2.17
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
@@ -40,7 +40,7 @@ USE_BZIP2=	yes
 USE_XPM=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_GNOME=	gnomehack intltool intlhack gtk20 libartlgpl2
+USE_GNOME=	gnomehack intltool intlhack gtk20 libartlgpl2 desktopfileutils
 WANT_GNOME=	yes
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
@@ -50,7 +50,8 @@ CONFIGURE_ARGS=	--disable-perl \
 		--docdir=${PREFIX}/share/doc/gimp \
 		--disable-gtk-doc \
 		--enable-static \
-		--disable-print
+		--disable-print \
+		--with-desktop-dir=${LOCALBASE}/share
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
@@ -95,8 +96,7 @@ CONFIGURE_ARGS+=	--enable-mp
 .endif
 
 .if ${HAVE_GNOME:Mgnomepanel}!=""
-USE_GNOME+=		gnomepanel desktopfileutils
-CONFIGURE_ARGS+=	--with-desktop-dir=${LOCALBASE}/share
+USE_GNOME+=		gnomepanel
 CONFIGURE_ENV+=		GIMP_THREAD_LIBS=${PTHREAD_LIBS}
 PLIST_SUB+=		GNOMEPANEL:=""
 GNOME_ENABLED=		yes
diff --git a/graphics/gimp-app/pkg-plist b/graphics/gimp-app/pkg-plist
index 1ba7e44b2..9842ece64 100644
--- a/graphics/gimp-app/pkg-plist
+++ b/graphics/gimp-app/pkg-plist
@@ -1213,10 +1213,10 @@ share/gimp/menus/vectors-menu.xml
 share/gimp/misc/gimp.applications
 share/gimp/misc/gimp.desktop
 share/gimp/misc/gimp.keys
-%%GNOMEPANEL:%%share/application-registry/gimp-2.2.applications
-%%GNOMEPANEL:%%share/applications/gimp-2.2.desktop
-%%GNOMEPANEL:%%@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-%%GNOMEPANEL:%%share/mime-info/gimp-2.2.keys
+share/application-registry/gimp-2.2.applications
+share/applications/gimp-2.2.desktop
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+share/mime-info/gimp-2.2.keys
 share/gimp/palettes/Bears.gpl
 share/gimp/palettes/Bgold.gpl
 share/gimp/palettes/Blues.gpl
@@ -1946,7 +1946,7 @@ share/locale/zh_TW/LC_MESSAGES/gimp20.mo
 @dirrm include/gimp-2.0
 @dirrm etc/gimp/2.2
 @dirrm etc/gimp
-%%GNOMEPANEL:%%@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @dirrmtry share/locale/yi/LC_MESSAGES
 @dirrmtry share/locale/yi
 @dirrmtry share/locale/oc/LC_MESSAGES
diff --git a/graphics/gimpshop/Makefile b/graphics/gimpshop/Makefile
index 2a9064ed3..9cb824377 100644
--- a/graphics/gimpshop/Makefile
+++ b/graphics/gimpshop/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gimpshop
 PORTVERSION=	2.2.11
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	graphics gnome
 MASTER_SITES=	http://www.plasticbugs.com/blogimg/ \
 		http://freebsd.powered.net/distfiles/
@@ -33,7 +33,8 @@ USE_XPM=	yes
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
-USE_GNOME=	gnomehack intltool intlhack gtk20 libartlgpl2 librsvg2
+USE_GNOME=	gnomehack intltool intlhack gtk20 libartlgpl2 librsvg2 \
+		desktopfileutils
 WANT_GNOME=	yes
 INSTALLS_SHLIB=	yes
 PLIST_SUB=	SHLIBVER="${SHLIBVER}"
@@ -41,7 +42,8 @@ CONFIGURE_ARGS=	--disable-perl \
 		--with-html-dir=${DOCSDIR} \
 		--disable-gtk-doc \
 		--enable-static \
-		--disable-print
+		--disable-print \
+		--with-desktop-dir=${LOCALBASE}/share
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 
@@ -79,8 +81,7 @@ CONFIGURE_ARGS+=	--enable-mp
 .endif
 
 .if ${HAVE_GNOME:Mgnomepanel}!=""
-USE_GNOME+=		gnomepanel desktopfileutils
-CONFIGURE_ARGS+=	--with-desktop-dir=${LOCALBASE}/share
+USE_GNOME+=		gnomepanel
 CONFIGURE_ENV+=		GIMP_THREAD_LIBS=${PTHREAD_LIBS}
 PLIST_SUB+=		GNOMEPANEL:=""
 GNOME_ENABLED=		yes
diff --git a/graphics/gimpshop/pkg-plist b/graphics/gimpshop/pkg-plist
index e191f1738..f5de9d7a8 100644
--- a/graphics/gimpshop/pkg-plist
+++ b/graphics/gimpshop/pkg-plist
@@ -1207,10 +1207,10 @@ share/gimp/menus/vectors-menu.xml
 share/gimp/misc/gimp.applications
 share/gimp/misc/gimp.desktop
 share/gimp/misc/gimp.keys
-%%GNOMEPANEL:%%share/application-registry/gimp-2.2.applications
-%%GNOMEPANEL:%%share/applications/gimp-2.2.desktop
-%%GNOMEPANEL:%%@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-%%GNOMEPANEL:%%share/mime-info/gimp-2.2.keys
+share/application-registry/gimp-2.2.applications
+share/applications/gimp-2.2.desktop
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+share/mime-info/gimp-2.2.keys
 share/gimp/palettes/Bears.gpl
 share/gimp/palettes/Bgold.gpl
 share/gimp/palettes/Blues.gpl
@@ -1936,7 +1936,7 @@ share/locale/zh_TW/LC_MESSAGES/gimp20.mo
 @dirrm include/gimp-2.0
 @dirrmtry etc/gimp/2.2
 @dirrmtry etc/gimp
-%%GNOMEPANEL:%%@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @dirrmtry share/locale/yi/LC_MESSAGES
 @dirrmtry share/locale/yi
 @dirrmtry share/applications