- update to 0.30d

- unbreak: don't install gnome desktop into /gnome

Submitted by:	maintainer

8 files changed, 26 insertions, 22 deletions

diff --git a/audio/easytag-devel/Makefile b/audio/easytag-devel/Makefile
index 68edae3c68b1..8afae41a8949 100644
--- a/audio/easytag-devel/Makefile
+++ b/audio/easytag-devel/Makefile
@@ -7,15 +7,15 @@
 #
 
 PORTNAME=	easytag
-PORTVERSION=	0.30c
+PORTVERSION=	0.30d
 PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	easytag-${PORTVERSION:S/c$//}
+DISTNAME=	easytag-${PORTVERSION:S/d$//}
 
 PATCHFILES=	patch_easytag_030_030a.diff patch_easytag_030a_030b.diff \
-		patch_easytag_030b_030c.diff
+		patch_easytag_030b_030c.diff patch_easytag_030c_030d.diff
 PATCH_SITES=	${MASTER_SITE_SOURCEFORGE}
 PATCH_SITE_SUBDIR=	${PORTNAME}
 PATCH_DIST_STRIP=	-p1
@@ -23,8 +23,6 @@ PATCH_DIST_STRIP=	-p1
 MAINTAINER=	roddie@krweb.net
 COMMENT=	Tag editor for MP3 and OGG files
 
-BROKEN=		"Creates /gnome in root directory"
-
 LIB_DEPENDS=	id3-3.8.3:${PORTSDIR}/audio/id3lib \
 		vorbis.3:${PORTSDIR}/audio/libvorbis \
 		FLAC.5:${PORTSDIR}/audio/flac
diff --git a/audio/easytag-devel/distinfo b/audio/easytag-devel/distinfo
index 906bc2d7da66..2f40de854c13 100644
--- a/audio/easytag-devel/distinfo
+++ b/audio/easytag-devel/distinfo
@@ -2,3 +2,4 @@ MD5 (easytag-0.30.tar.bz2) = 9f0dfde219c0422676f21afc49cc44bf
 MD5 (patch_easytag_030_030a.diff) = 210c0e49ad524181420a481b214a5917
 MD5 (patch_easytag_030a_030b.diff) = d38d94d319471c8b051f76df71de66e9
 MD5 (patch_easytag_030b_030c.diff) = f48e07056ebd5d4b7b960d8f787c4f12
+MD5 (patch_easytag_030c_030d.diff) = f6219b66a073743429e8385af8bb56ac
diff --git a/audio/easytag-devel/files/patch-Makefile.in b/audio/easytag-devel/files/patch-Makefile.in
index 635a79402cc6..82fc3fadbc17 100644
--- a/audio/easytag-devel/files/patch-Makefile.in
+++ b/audio/easytag-devel/files/patch-Makefile.in
@@ -1,11 +1,10 @@
---- Makefile.in.orig   Wed Sep 24 10:54:31 2003
-+++ Makefile.in        Wed Sep 24 10:54:42 2003
-@@ -518,7 +518,7 @@
-       uninstall-info-am uninstall-info-recursive uninstall-recursive \
-       uninstall-textDATA
+--- Makefile.orig	Sun Feb  8 13:00:52 2004
++++ Makefile.in	Sun Feb  8 13:00:58 2004
+@@ -518,7 +518,6 @@
+ 	uninstall-info-am uninstall-info-recursive uninstall-recursive \
+ 	uninstall-textDATA
  
 -dnl gnome_menudir=$(shell gnome-config --datadir)/gnome/apps/Multimedia
-+gnome_menudir=$(shell gnome-config --datadir)/gnome/apps/Multimedia
  # 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.
  .NOEXPORT:
diff --git a/audio/easytag-devel/pkg-plist b/audio/easytag-devel/pkg-plist
index 2d72da94a76f..36370f7bda57 100644
--- a/audio/easytag-devel/pkg-plist
+++ b/audio/easytag-devel/pkg-plist
@@ -1,6 +1,7 @@
 bin/easytag
 share/easytag/ChangeLog
 share/easytag/EasyTAG_logo.xpm
+share/gnome/apps/Multimedia/easytag.desktop
 share/locale/cs/LC_MESSAGES/easytag.mo
 share/locale/de/LC_MESSAGES/easytag.mo
 share/locale/es/LC_MESSAGES/easytag.mo
@@ -15,4 +16,7 @@ share/locale/ru/LC_MESSAGES/easytag.mo
 share/locale/sv/LC_MESSAGES/easytag.mo
 share/locale/uk/LC_MESSAGES/easytag.mo
 share/pixmaps/EasyTAG.xpm
+@unexec rmdir %D/share/gnome/apps/Multimedia 2>/dev/null || true
+@unexec rmdir %D/share/gnome/apps 2>/dev/null || true
+@unexec rmdir %D/share/gnome 2>/dev/null || true
 @dirrm share/easytag
diff --git a/audio/easytag/Makefile b/audio/easytag/Makefile
index 68edae3c68b1..8afae41a8949 100644
--- a/audio/easytag/Makefile
+++ b/audio/easytag/Makefile
@@ -7,15 +7,15 @@
 #
 
 PORTNAME=	easytag
-PORTVERSION=	0.30c
+PORTVERSION=	0.30d
 PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	easytag-${PORTVERSION:S/c$//}
+DISTNAME=	easytag-${PORTVERSION:S/d$//}
 
 PATCHFILES=	patch_easytag_030_030a.diff patch_easytag_030a_030b.diff \
-		patch_easytag_030b_030c.diff
+		patch_easytag_030b_030c.diff patch_easytag_030c_030d.diff
 PATCH_SITES=	${MASTER_SITE_SOURCEFORGE}
 PATCH_SITE_SUBDIR=	${PORTNAME}
 PATCH_DIST_STRIP=	-p1
@@ -23,8 +23,6 @@ PATCH_DIST_STRIP=	-p1
 MAINTAINER=	roddie@krweb.net
 COMMENT=	Tag editor for MP3 and OGG files
 
-BROKEN=		"Creates /gnome in root directory"
-
 LIB_DEPENDS=	id3-3.8.3:${PORTSDIR}/audio/id3lib \
 		vorbis.3:${PORTSDIR}/audio/libvorbis \
 		FLAC.5:${PORTSDIR}/audio/flac
diff --git a/audio/easytag/distinfo b/audio/easytag/distinfo
index 906bc2d7da66..2f40de854c13 100644
--- a/audio/easytag/distinfo
+++ b/audio/easytag/distinfo
@@ -2,3 +2,4 @@ MD5 (easytag-0.30.tar.bz2) = 9f0dfde219c0422676f21afc49cc44bf
 MD5 (patch_easytag_030_030a.diff) = 210c0e49ad524181420a481b214a5917
 MD5 (patch_easytag_030a_030b.diff) = d38d94d319471c8b051f76df71de66e9
 MD5 (patch_easytag_030b_030c.diff) = f48e07056ebd5d4b7b960d8f787c4f12
+MD5 (patch_easytag_030c_030d.diff) = f6219b66a073743429e8385af8bb56ac
diff --git a/audio/easytag/files/patch-Makefile.in b/audio/easytag/files/patch-Makefile.in
index 635a79402cc6..82fc3fadbc17 100644
--- a/audio/easytag/files/patch-Makefile.in
+++ b/audio/easytag/files/patch-Makefile.in
@@ -1,11 +1,10 @@
---- Makefile.in.orig   Wed Sep 24 10:54:31 2003
-+++ Makefile.in        Wed Sep 24 10:54:42 2003
-@@ -518,7 +518,7 @@
-       uninstall-info-am uninstall-info-recursive uninstall-recursive \
-       uninstall-textDATA
+--- Makefile.orig	Sun Feb  8 13:00:52 2004
++++ Makefile.in	Sun Feb  8 13:00:58 2004
+@@ -518,7 +518,6 @@
+ 	uninstall-info-am uninstall-info-recursive uninstall-recursive \
+ 	uninstall-textDATA
  
 -dnl gnome_menudir=$(shell gnome-config --datadir)/gnome/apps/Multimedia
-+gnome_menudir=$(shell gnome-config --datadir)/gnome/apps/Multimedia
  # 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.
  .NOEXPORT:
diff --git a/audio/easytag/pkg-plist b/audio/easytag/pkg-plist
index 2d72da94a76f..36370f7bda57 100644
--- a/audio/easytag/pkg-plist
+++ b/audio/easytag/pkg-plist
@@ -1,6 +1,7 @@
 bin/easytag
 share/easytag/ChangeLog
 share/easytag/EasyTAG_logo.xpm
+share/gnome/apps/Multimedia/easytag.desktop
 share/locale/cs/LC_MESSAGES/easytag.mo
 share/locale/de/LC_MESSAGES/easytag.mo
 share/locale/es/LC_MESSAGES/easytag.mo
@@ -15,4 +16,7 @@ share/locale/ru/LC_MESSAGES/easytag.mo
 share/locale/sv/LC_MESSAGES/easytag.mo
 share/locale/uk/LC_MESSAGES/easytag.mo
 share/pixmaps/EasyTAG.xpm
+@unexec rmdir %D/share/gnome/apps/Multimedia 2>/dev/null || true
+@unexec rmdir %D/share/gnome/apps 2>/dev/null || true
+@unexec rmdir %D/share/gnome 2>/dev/null || true
 @dirrm share/easytag