Put all hacks of hicolor icons and mime from ports to bsd.gnome.mk's gnomehack.

deskutils/drivel is the only port that has pkg-plist change, so bump the
PORTREVISION. The rest else should be no function change, but just remove the
patches to allow gnomehack takes care of it. Keep in mind, I only touch those
ports that already have gnomehack.

Reviewed by:	pav and marcus

6 files changed, 9 insertions, 61 deletions

diff --git a/deskutils/drivel/Makefile b/deskutils/drivel/Makefile
index 41070ae..eeb2506 100644
--- a/deskutils/drivel/Makefile
+++ b/deskutils/drivel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	drivel
 PORTVERSION=	1.2.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/deskutils/drivel/pkg-plist b/deskutils/drivel/pkg-plist
index 81fc60a..7c48a44 100644
--- a/deskutils/drivel/pkg-plist
+++ b/deskutils/drivel/pkg-plist
@@ -7,8 +7,6 @@ share/gnome/help/drivel/C/drivel.xml
 share/gnome/help/drivel/C/legal.xml
 share/gnome/mime-info/drivel.keys
 share/gnome/mime-info/drivel.mime
-share/gnome/mime/application/x-drivel.xml
-share/gnome/mime/packages/drivel.xml
 share/gnome/omf/drivel/drivel-C.omf
 share/gnome/pixmaps/drivel/checkbutton.xpm
 share/gnome/pixmaps/drivel/combobox.xpm
@@ -48,11 +46,14 @@ share/locale/sr/LC_MESSAGES/drivel.mo
 share/locale/sr@Latn/LC_MESSAGES/drivel.mo
 share/locale/sv/LC_MESSAGES/drivel.mo
 share/locale/zh_CN/LC_MESSAGES/drivel.mo
+share/mime/application/x-drivel.xml
+share/mime/packages/drivel.xml
 @dirrm share/gnome/pixmaps/drivel
-@dirrm share/gnome/mime 2>/dev/null || true
 @dirrm share/gnome/omf/drivel
 @dirrm share/gnome/help/drivel/C
 @dirrm share/gnome/help/drivel
 @dirrm share/gnome/drivel/languages
 @dirrm share/gnome/drivel/glade
 @dirrm share/gnome/drivel
+@exec update-mime-database %D/share/mime
+@unexec update-mime-database %D/share/mime
diff --git a/deskutils/gdesklets/files/patch-data::Makefile.in b/deskutils/gdesklets/files/patch-data::Makefile.in
index 06dc56b..a7af22e 100644
--- a/deskutils/gdesklets/files/patch-data::Makefile.in
+++ b/deskutils/gdesklets/files/patch-data::Makefile.in
@@ -1,12 +1,6 @@
---- data/Makefile.in.orig	Mon Nov 15 01:17:16 2004
-+++ data/Makefile.in	Mon Nov 15 01:18:12 2004
-@@ -165,12 +165,12 @@
- desktop_in_files = gdesklets.desktop.in
- desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
- 
--sharedmimedir = $(datadir)/mime
-+sharedmimedir = $(prefix)/share/mime
- sharedmimepackagedir = $(sharedmimedir)/packages
+--- data/Makefile.in.orig	Mon Dec 20 17:28:59 2004
++++ data/Makefile.in	Mon Dec 20 17:29:43 2004
+@@ -170,7 +170,7 @@
  sharedmimepackage_in_files = gdesklets.xml.in
  sharedmimepackage_DATA = $(sharedmimepackage_in_files:.xml.in=.xml)
  
diff --git a/deskutils/glabels/files/patch-data_mime_Makefile.in b/deskutils/glabels/files/patch-data_mime_Makefile.in
deleted file mode 100644
index 3182724..0000000
--- a/deskutils/glabels/files/patch-data_mime_Makefile.in
+++ /dev/null
@@ -1,25 +0,0 @@
---- data/mime/Makefile.in.orig	Tue Aug 10 20:59:17 2004
-+++ data/mime/Makefile.in	Tue Aug 10 21:10:15 2004
-@@ -151,7 +151,7 @@
- appdir = $(datadir)/application-registry
- app_DATA = glabels.applications
- 
--newmimedir = $(datadir)/mime/packages
-+newmimedir = $(prefix)/share/mime/packages
- newmime_DATA = $(xml_files)
- 
- EXTRA_DIST = \
-@@ -331,11 +331,11 @@
- @INTLTOOL_XML_RULE@
- 
- install-data-hook:
--@HAVE_NEW_MIME_TRUE@	$(UPDATE_MIME_DATABASE) "$(DESTDIR)$(datadir)/mime"
-+@HAVE_NEW_MIME_TRUE@	$(UPDATE_MIME_DATABASE) "$(DESTDIR)$(prefix)/share/mime"
- @HAVE_NEWER_MIME_TRUE@	$(UPDATE_DESKTOP_DATABASE) 
- 
- uninstall-hook:
--@HAVE_NEW_MIME_TRUE@	$(UPDATE_MIME_DATABASE) "$(DESTDIR)$(datadir)/mime"
-+@HAVE_NEW_MIME_TRUE@	$(UPDATE_MIME_DATABASE) "$(DESTDIR)$(prefix)/share/mime"
- @HAVE_NEWER_MIME_TRUE@	$(UPDATE_DESKTOP_DATABASE) 
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/deskutils/gnochm/files/patch-data-Makefile.in b/deskutils/gnochm/files/patch-data-Makefile.in
deleted file mode 100644
index 8b2ae59..0000000
--- a/deskutils/gnochm/files/patch-data-Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- data/Makefile.in.orig	Thu Dec  2 01:00:48 2004
-+++ data/Makefile.in	Thu Dec  2 01:02:50 2004
-@@ -199,7 +199,7 @@
- mime_DATA = gnochm.mime
- 
- # Should I use XDG_DATA_DIRS/mime/packages ????
--sharedmimedir = $(datadir)/mime/packages
-+sharedmimedir = $(prefix)/share/mime/packages
- sharedmime_in_files = gnochm.xml.in
- sharedmime_DATA = $(sharedmime_in_files:.xml.in=.xml)
- man_MANS = gnochm.1
-@@ -543,7 +543,7 @@
- 
- install-data-hook:
- 	if test "$(SHAREDMIME_TOOL)" != "no"; then \
--		$(SHAREDMIME_TOOL) $(datadir)/mime; \
-+		$(SHAREDMIME_TOOL) $(prefix)/share/mime; \
- 	fi
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/deskutils/planner/Makefile b/deskutils/planner/Makefile
index 1babdd8..0d972f9 100644
--- a/deskutils/planner/Makefile
+++ b/deskutils/planner/Makefile
@@ -43,8 +43,6 @@ PLIST_SUB+=	GDA="@comment "
 
 post-patch:
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|[(]datadir[)]/doc|(prefix)/share/doc|g ; \
-		 s|[(]datadir[)]/mime/|(prefix)/share/mime/|g ; \
-		 s|[(]datadir[)]/mime"|(prefix)/share/mime"|g'
+		's|[(]datadir[)]/doc|(prefix)/share/doc|g'
 
 .include <bsd.port.post.mk>