- Install desktop data stuff in ${PREFIX}/share instead of ${LOCALBASE}/share

- Re-add the desktop stuff to plist

Reported by:	marcus via sajd


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

4 files changed, 32 insertions, 6 deletions

diff --git a/graphics/gimp-app-devel/Makefile b/graphics/gimp-app-devel/Makefile
index 59546703c..3042e7627 100644
--- a/graphics/gimp-app-devel/Makefile
+++ b/graphics/gimp-app-devel/Makefile
@@ -3,11 +3,12 @@
 # Whom:                 erich@FreeBSD.org
 #
 # $FreeBSD: ports/graphics/gimp-devel/Makefile,v 1.161 2006/11/04 22:31:00 mezz Exp $
-#   $MCom: ports/graphics/gimp-app/Makefile,v 1.5 2007/01/01 21:26:51 ahze Exp $
+#   $MCom: ports/graphics/gimp-app/Makefile,v 1.6 2007/01/01 22:40:46 ahze Exp $
 #
 
 PORTNAME=	gimp
 PORTVERSION=	2.3.13
+PORTREVISION=	1
 PORTEPOCH?=	1
 CATEGORIES?=	graphics gnome
 MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
@@ -30,7 +31,8 @@ LIB_DEPENDS=	exif.12:${PORTSDIR}/graphics/libexif \
 		mng.1:${PORTSDIR}/graphics/libmng \
 		png.5:${PORTSDIR}/graphics/png \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
-		tiff.4:${PORTSDIR}/graphics/tiff
+		tiff.4:${PORTSDIR}/graphics/tiff \
+		lcms.1:${PORTSDIR}/graphics/lcms
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
@@ -48,7 +50,7 @@ CONFIGURE_ARGS?=--disable-perl \
 		--disable-gtk-doc \
 		--without-print \
 		--disable-python \
-		--with-desktop-dir=${LOCALBASE}/share
+		--with-desktop-dir=${PREFIX}/share
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
 		GIMP_THREAD_LIBS=${PTHREAD_LIBS}
diff --git a/graphics/gimp-app-devel/pkg-plist b/graphics/gimp-app-devel/pkg-plist
index b7764d885..c231a8e53 100644
--- a/graphics/gimp-app-devel/pkg-plist
+++ b/graphics/gimp-app-devel/pkg-plist
@@ -451,6 +451,7 @@ libexec/gimp/2.2/plug-ins/xpm
 libexec/gimp/2.2/plug-ins/xwd
 libexec/gimp/2.2/plug-ins/zealouscrop
 share/aclocal/gimp-2.0.m4
+share/applications/gimp.desktop
 %%DOCSDIR%%/libgimp/GimpAspectPreview.html
 %%DOCSDIR%%/libgimp/GimpBrushSelectButton.html
 %%DOCSDIR%%/libgimp/GimpDrawablePreview.html
@@ -1532,6 +1533,13 @@ share/aclocal/gimp-2.0.m4
 %%DATADIR%%/tips/gimp-tips.xml
 %%GNOME%%share/gnome/application-registry/gimp.applications
 %%GNOME%%share/gnome/mime-info/gimp.keys
+share/icons/hicolor/16x16/apps/gimp.png
+share/icons/hicolor/22x22/apps/gimp.png
+share/icons/hicolor/24x24/apps/gimp.png
+share/icons/hicolor/32x32/apps/gimp.png
+share/icons/hicolor/48x48/apps/gimp.png
+share/icons/hicolor/64x64/apps/gimp.png
+share/icons/hicolor/scalable/apps/gimp.svg
 share/locale/ar/LC_MESSAGES/gimp20-libgimp.mo
 share/locale/ar/LC_MESSAGES/gimp20-python.mo
 share/locale/ar/LC_MESSAGES/gimp20-script-fu.mo
@@ -1902,6 +1910,7 @@ share/locale/zh_TW/LC_MESSAGES/gimp20.mo
 @dirrm %%DOCSDIR%%/libgimpbase
 @dirrm %%DOCSDIR%%/libgimp
 @dirrm %%DOCSDIR%%
+@dirrmtry share/applications
 @dirrm libexec/gimp/2.2/plug-ins
 @dirrm libexec/gimp/2.2/modules
 @dirrm libexec/gimp/2.2/interpreters
@@ -1919,3 +1928,5 @@ share/locale/zh_TW/LC_MESSAGES/gimp20.mo
 @dirrm include/gimp-2.0
 @dirrm etc/gimp/2.2
 @dirrm etc/gimp
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index 59546703c..3042e7627 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -3,11 +3,12 @@
 # Whom:                 erich@FreeBSD.org
 #
 # $FreeBSD: ports/graphics/gimp-devel/Makefile,v 1.161 2006/11/04 22:31:00 mezz Exp $
-#   $MCom: ports/graphics/gimp-app/Makefile,v 1.5 2007/01/01 21:26:51 ahze Exp $
+#   $MCom: ports/graphics/gimp-app/Makefile,v 1.6 2007/01/01 22:40:46 ahze Exp $
 #
 
 PORTNAME=	gimp
 PORTVERSION=	2.3.13
+PORTREVISION=	1
 PORTEPOCH?=	1
 CATEGORIES?=	graphics gnome
 MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
@@ -30,7 +31,8 @@ LIB_DEPENDS=	exif.12:${PORTSDIR}/graphics/libexif \
 		mng.1:${PORTSDIR}/graphics/libmng \
 		png.5:${PORTSDIR}/graphics/png \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
-		tiff.4:${PORTSDIR}/graphics/tiff
+		tiff.4:${PORTSDIR}/graphics/tiff \
+		lcms.1:${PORTSDIR}/graphics/lcms
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
@@ -48,7 +50,7 @@ CONFIGURE_ARGS?=--disable-perl \
 		--disable-gtk-doc \
 		--without-print \
 		--disable-python \
-		--with-desktop-dir=${LOCALBASE}/share
+		--with-desktop-dir=${PREFIX}/share
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
 		GIMP_THREAD_LIBS=${PTHREAD_LIBS}
diff --git a/graphics/gimp-app/pkg-plist b/graphics/gimp-app/pkg-plist
index b7764d885..c231a8e53 100644
--- a/graphics/gimp-app/pkg-plist
+++ b/graphics/gimp-app/pkg-plist
@@ -451,6 +451,7 @@ libexec/gimp/2.2/plug-ins/xpm
 libexec/gimp/2.2/plug-ins/xwd
 libexec/gimp/2.2/plug-ins/zealouscrop
 share/aclocal/gimp-2.0.m4
+share/applications/gimp.desktop
 %%DOCSDIR%%/libgimp/GimpAspectPreview.html
 %%DOCSDIR%%/libgimp/GimpBrushSelectButton.html
 %%DOCSDIR%%/libgimp/GimpDrawablePreview.html
@@ -1532,6 +1533,13 @@ share/aclocal/gimp-2.0.m4
 %%DATADIR%%/tips/gimp-tips.xml
 %%GNOME%%share/gnome/application-registry/gimp.applications
 %%GNOME%%share/gnome/mime-info/gimp.keys
+share/icons/hicolor/16x16/apps/gimp.png
+share/icons/hicolor/22x22/apps/gimp.png
+share/icons/hicolor/24x24/apps/gimp.png
+share/icons/hicolor/32x32/apps/gimp.png
+share/icons/hicolor/48x48/apps/gimp.png
+share/icons/hicolor/64x64/apps/gimp.png
+share/icons/hicolor/scalable/apps/gimp.svg
 share/locale/ar/LC_MESSAGES/gimp20-libgimp.mo
 share/locale/ar/LC_MESSAGES/gimp20-python.mo
 share/locale/ar/LC_MESSAGES/gimp20-script-fu.mo
@@ -1902,6 +1910,7 @@ share/locale/zh_TW/LC_MESSAGES/gimp20.mo
 @dirrm %%DOCSDIR%%/libgimpbase
 @dirrm %%DOCSDIR%%/libgimp
 @dirrm %%DOCSDIR%%
+@dirrmtry share/applications
 @dirrm libexec/gimp/2.2/plug-ins
 @dirrm libexec/gimp/2.2/modules
 @dirrm libexec/gimp/2.2/interpreters
@@ -1919,3 +1928,5 @@ share/locale/zh_TW/LC_MESSAGES/gimp20.mo
 @dirrm include/gimp-2.0
 @dirrm etc/gimp/2.2
 @dirrm etc/gimp
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true