Update to 0.31.

Submitted by:	maintainer

8 files changed, 30 insertions, 74 deletions

diff --git a/audio/easytag-devel/Makefile b/audio/easytag-devel/Makefile
index 8afae41a8949..785041f3ecd6 100644
--- a/audio/easytag-devel/Makefile
+++ b/audio/easytag-devel/Makefile
@@ -7,19 +7,12 @@
 #
 
 PORTNAME=	easytag
-PORTVERSION=	0.30d
-PORTREVISION=	1
+PORTVERSION=	0.31
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	easytag-${PORTVERSION:S/d$//}
 
-PATCHFILES=	patch_easytag_030_030a.diff patch_easytag_030a_030b.diff \
-		patch_easytag_030b_030c.diff patch_easytag_030c_030d.diff
-PATCH_SITES=	${MASTER_SITE_SOURCEFORGE}
-PATCH_SITE_SUBDIR=	${PORTNAME}
-PATCH_DIST_STRIP=	-p1
-
 MAINTAINER=	roddie@krweb.net
 COMMENT=	Tag editor for MP3 and OGG files
 
diff --git a/audio/easytag-devel/distinfo b/audio/easytag-devel/distinfo
index 1ba865ef159f..45d51f3e7b16 100644
--- a/audio/easytag-devel/distinfo
+++ b/audio/easytag-devel/distinfo
@@ -1,10 +1,2 @@
-MD5 (easytag-0.30.tar.bz2) = 9f0dfde219c0422676f21afc49cc44bf
-SIZE (easytag-0.30.tar.bz2) = 1094337
-MD5 (patch_easytag_030_030a.diff) = 210c0e49ad524181420a481b214a5917
-SIZE (patch_easytag_030_030a.diff) = 4382
-MD5 (patch_easytag_030a_030b.diff) = d38d94d319471c8b051f76df71de66e9
-SIZE (patch_easytag_030a_030b.diff) = 9160
-MD5 (patch_easytag_030b_030c.diff) = f48e07056ebd5d4b7b960d8f787c4f12
-SIZE (patch_easytag_030b_030c.diff) = 6036
-MD5 (patch_easytag_030c_030d.diff) = f6219b66a073743429e8385af8bb56ac
-SIZE (patch_easytag_030c_030d.diff) = 4673
+MD5 (easytag-0.31.tar.bz2) = 9cfb29a81f251891ec4dbae4cd39821d
+SIZE (easytag-0.31.tar.bz2) = 1054585
diff --git a/audio/easytag-devel/files/patch-Makefile.in b/audio/easytag-devel/files/patch-Makefile.in
index 82fc3fadbc17..570912e3038d 100644
--- a/audio/easytag-devel/files/patch-Makefile.in
+++ b/audio/easytag-devel/files/patch-Makefile.in
@@ -1,10 +1,13 @@
---- 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
+$FreeBSD$
+
+--- Makefile.in.orig	Tue Jun  8 13:21:43 2004
++++ Makefile.in	Tue Jun  8 13:22:32 2004
+@@ -110,7 +110,7 @@
  
--dnl 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:
+ SUBDIRS = src intl po pixmaps doc
+ 
+-gnome_menudir = $(datadir)/applications
++gnome_menudir = $(prefix)/share/gnome/apps/Multimedia
+ gnome_menu_DATA = easytag.desktop
+ 
+ textdir = $(datadir)/$(PACKAGE)
diff --git a/audio/easytag-devel/files/patch-src_cddb.c b/audio/easytag-devel/files/patch-src_cddb.c
deleted file mode 100644
index 006a9b2a38f0..000000000000
--- a/audio/easytag-devel/files/patch-src_cddb.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/cddb.c.orig	Wed Jan  1 22:29:03 2003
-+++ src/cddb.c	Wed Jan  1 22:29:17 2003
-@@ -29,6 +29,7 @@
- #include <sys/socket.h>
- #include <netdb.h>
- #include <errno.h>
-+#include <netinet/in.h>
- 
- #include "cddb.h"
- #include "easytag.h"
diff --git a/audio/easytag/Makefile b/audio/easytag/Makefile
index 8afae41a8949..785041f3ecd6 100644
--- a/audio/easytag/Makefile
+++ b/audio/easytag/Makefile
@@ -7,19 +7,12 @@
 #
 
 PORTNAME=	easytag
-PORTVERSION=	0.30d
-PORTREVISION=	1
+PORTVERSION=	0.31
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	easytag-${PORTVERSION:S/d$//}
 
-PATCHFILES=	patch_easytag_030_030a.diff patch_easytag_030a_030b.diff \
-		patch_easytag_030b_030c.diff patch_easytag_030c_030d.diff
-PATCH_SITES=	${MASTER_SITE_SOURCEFORGE}
-PATCH_SITE_SUBDIR=	${PORTNAME}
-PATCH_DIST_STRIP=	-p1
-
 MAINTAINER=	roddie@krweb.net
 COMMENT=	Tag editor for MP3 and OGG files
 
diff --git a/audio/easytag/distinfo b/audio/easytag/distinfo
index 1ba865ef159f..45d51f3e7b16 100644
--- a/audio/easytag/distinfo
+++ b/audio/easytag/distinfo
@@ -1,10 +1,2 @@
-MD5 (easytag-0.30.tar.bz2) = 9f0dfde219c0422676f21afc49cc44bf
-SIZE (easytag-0.30.tar.bz2) = 1094337
-MD5 (patch_easytag_030_030a.diff) = 210c0e49ad524181420a481b214a5917
-SIZE (patch_easytag_030_030a.diff) = 4382
-MD5 (patch_easytag_030a_030b.diff) = d38d94d319471c8b051f76df71de66e9
-SIZE (patch_easytag_030a_030b.diff) = 9160
-MD5 (patch_easytag_030b_030c.diff) = f48e07056ebd5d4b7b960d8f787c4f12
-SIZE (patch_easytag_030b_030c.diff) = 6036
-MD5 (patch_easytag_030c_030d.diff) = f6219b66a073743429e8385af8bb56ac
-SIZE (patch_easytag_030c_030d.diff) = 4673
+MD5 (easytag-0.31.tar.bz2) = 9cfb29a81f251891ec4dbae4cd39821d
+SIZE (easytag-0.31.tar.bz2) = 1054585
diff --git a/audio/easytag/files/patch-Makefile.in b/audio/easytag/files/patch-Makefile.in
index 82fc3fadbc17..570912e3038d 100644
--- a/audio/easytag/files/patch-Makefile.in
+++ b/audio/easytag/files/patch-Makefile.in
@@ -1,10 +1,13 @@
---- 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
+$FreeBSD$
+
+--- Makefile.in.orig	Tue Jun  8 13:21:43 2004
++++ Makefile.in	Tue Jun  8 13:22:32 2004
+@@ -110,7 +110,7 @@
  
--dnl 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:
+ SUBDIRS = src intl po pixmaps doc
+ 
+-gnome_menudir = $(datadir)/applications
++gnome_menudir = $(prefix)/share/gnome/apps/Multimedia
+ gnome_menu_DATA = easytag.desktop
+ 
+ textdir = $(datadir)/$(PACKAGE)
diff --git a/audio/easytag/files/patch-src_cddb.c b/audio/easytag/files/patch-src_cddb.c
deleted file mode 100644
index 006a9b2a38f0..000000000000
--- a/audio/easytag/files/patch-src_cddb.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/cddb.c.orig	Wed Jan  1 22:29:03 2003
-+++ src/cddb.c	Wed Jan  1 22:29:17 2003
-@@ -29,6 +29,7 @@
- #include <sys/socket.h>
- #include <netdb.h>
- #include <errno.h>
-+#include <netinet/in.h>
- 
- #include "cddb.h"
- #include "easytag.h"