Update to 0.23.

PR:		41561
Submitted by:	Dominic Marks <dominic_marks@btinternet.com>

10 files changed, 66 insertions, 44 deletions

diff --git a/audio/easytag-devel/Makefile b/audio/easytag-devel/Makefile
index ea0d3072ed69..dc3b3e51a485 100644
--- a/audio/easytag-devel/Makefile
+++ b/audio/easytag-devel/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	easytag
-PORTVERSION=	0.21
-PORTREVISION=	1
+PORTVERSION=	0.23
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -19,15 +18,9 @@ LIB_DEPENDS=	id3-3.7.13:${PORTSDIR}/audio/id3lib \
 		vorbis.2:${PORTSDIR}/audio/libvorbis
 
 USE_GTK=	yes
-USE_LIBTOOL=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CONFIG_SHELL="${SH}" \
+		CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-post-patch:
-	@${PERL} -pi -e 's|`gtk-config |`\$$GTK_CONFIG |g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${PERL} -pi -e \
-		's|^gnome_menu|#gnome_menu|g ; \
-		 s|^icon|#icon|g'
-
 .include <bsd.port.mk>
diff --git a/audio/easytag-devel/distinfo b/audio/easytag-devel/distinfo
index 1651101c665b..6d87f4047c03 100644
--- a/audio/easytag-devel/distinfo
+++ b/audio/easytag-devel/distinfo
@@ -1 +1 @@
-MD5 (easytag-0.21.tar.gz) = 8bd773ec88c56867dacae5d10cc985e1
+MD5 (easytag-0.23.tar.gz) = 1c3b4f5197e4e3f6995724f3c269d1b8
diff --git a/audio/easytag-devel/files/patch-Makefile.in b/audio/easytag-devel/files/patch-Makefile.in
new file mode 100644
index 000000000000..ee1dde9727c9
--- /dev/null
+++ b/audio/easytag-devel/files/patch-Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- Makefile.in.orig	Thu Aug 15 00:38:25 2002
++++ Makefile.in	Thu Aug 15 00:38:54 2002
+@@ -442,7 +442,7 @@
+ 
+ info-am:
+ 
+-install-data-am: install-gnome_menuDATA
++install-data-am: # install-gnome_menuDATA
+ 
+ install-exec-am:
+ 
diff --git a/audio/easytag-devel/files/patch-configure b/audio/easytag-devel/files/patch-configure
deleted file mode 100644
index b7df7145b2f1..000000000000
--- a/audio/easytag-devel/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	Tue Apr 23 01:10:34 2002
-+++ configure	Sun Apr 28 17:39:02 2002
-@@ -5195,6 +5195,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/audio/easytag-devel/files/patch-pixmaps_Makefile.in b/audio/easytag-devel/files/patch-pixmaps_Makefile.in
new file mode 100644
index 000000000000..0aac33a266b0
--- /dev/null
+++ b/audio/easytag-devel/files/patch-pixmaps_Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- pixmaps/Makefile.in.orig	Thu Aug 15 00:39:17 2002
++++ pixmaps/Makefile.in	Thu Aug 15 00:39:43 2002
+@@ -301,7 +301,7 @@
+ 
+ info-am:
+ 
+-install-data-am: install-iconDATA install-pixmapDATA
++install-data-am: install-pixmapDATA # install-iconDATA
+ 
+ install-exec-am:
+ 
diff --git a/audio/easytag/Makefile b/audio/easytag/Makefile
index ea0d3072ed69..dc3b3e51a485 100644
--- a/audio/easytag/Makefile
+++ b/audio/easytag/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	easytag
-PORTVERSION=	0.21
-PORTREVISION=	1
+PORTVERSION=	0.23
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -19,15 +18,9 @@ LIB_DEPENDS=	id3-3.7.13:${PORTSDIR}/audio/id3lib \
 		vorbis.2:${PORTSDIR}/audio/libvorbis
 
 USE_GTK=	yes
-USE_LIBTOOL=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CONFIG_SHELL="${SH}" \
+		CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-post-patch:
-	@${PERL} -pi -e 's|`gtk-config |`\$$GTK_CONFIG |g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${PERL} -pi -e \
-		's|^gnome_menu|#gnome_menu|g ; \
-		 s|^icon|#icon|g'
-
 .include <bsd.port.mk>
diff --git a/audio/easytag/distinfo b/audio/easytag/distinfo
index 1651101c665b..6d87f4047c03 100644
--- a/audio/easytag/distinfo
+++ b/audio/easytag/distinfo
@@ -1 +1 @@
-MD5 (easytag-0.21.tar.gz) = 8bd773ec88c56867dacae5d10cc985e1
+MD5 (easytag-0.23.tar.gz) = 1c3b4f5197e4e3f6995724f3c269d1b8
diff --git a/audio/easytag/files/patch-Makefile.in b/audio/easytag/files/patch-Makefile.in
new file mode 100644
index 000000000000..ee1dde9727c9
--- /dev/null
+++ b/audio/easytag/files/patch-Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- Makefile.in.orig	Thu Aug 15 00:38:25 2002
++++ Makefile.in	Thu Aug 15 00:38:54 2002
+@@ -442,7 +442,7 @@
+ 
+ info-am:
+ 
+-install-data-am: install-gnome_menuDATA
++install-data-am: # install-gnome_menuDATA
+ 
+ install-exec-am:
+ 
diff --git a/audio/easytag/files/patch-configure b/audio/easytag/files/patch-configure
deleted file mode 100644
index b7df7145b2f1..000000000000
--- a/audio/easytag/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	Tue Apr 23 01:10:34 2002
-+++ configure	Sun Apr 28 17:39:02 2002
-@@ -5195,6 +5195,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/audio/easytag/files/patch-pixmaps_Makefile.in b/audio/easytag/files/patch-pixmaps_Makefile.in
new file mode 100644
index 000000000000..0aac33a266b0
--- /dev/null
+++ b/audio/easytag/files/patch-pixmaps_Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- pixmaps/Makefile.in.orig	Thu Aug 15 00:39:17 2002
++++ pixmaps/Makefile.in	Thu Aug 15 00:39:43 2002
+@@ -301,7 +301,7 @@
+ 
+ info-am:
+ 
+-install-data-am: install-iconDATA install-pixmapDATA
++install-data-am: install-pixmapDATA # install-iconDATA
+ 
+ install-exec-am:
+