8 files changed, 20 insertions, 38 deletions

diff --git a/audio/gqmpeg-devel/Makefile b/audio/gqmpeg-devel/Makefile
index 99e1aabe3417..e5b01ee67ce9 100644
--- a/audio/gqmpeg-devel/Makefile
+++ b/audio/gqmpeg-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gqmpeg
-PORTVERSION=	0.16.0
+PORTVERSION=	0.17.0
 CATEGORIES+=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -20,6 +20,7 @@ RUN_DEPENDS=	mpg321:${PORTSDIR}/audio/mpg321
 RUN_DEPENDS=	mpg123:${PORTSDIR}/audio/mpg123
 .endif
 
+USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 USE_GTK=	yes
 USE_LIBTOOL=	yes
@@ -47,11 +48,12 @@ pre-everything::
 .endif
 
 post-patch:
-	@find ${WRKSRC} -name 'Makefile.in*' | xargs ${PERL} -pi.orig -e \
-		's|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
+	@${FIND} ${WRKSRC} -name 'Makefile.in*' | ${XARGS} ${REINPLACE_CMD} \
+		-E -e 's|(SUBDIRS[[:space:]]+=.*)intl|\1| ; \
+		s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g ;'
 .if defined(WITH_MPG321)
-	@${PERL} -pi.orig -e \
-		's/^(#define MPG123_BINARY "mpg)123"/$${1}321"/' \
+	@${REINPLACE_CMD} -E -e \
+		's/^(#define MPG123_BINARY "mpg)123"/\1321"/' \
 		${WRKSRC}/src/io_mpg123.c
 .endif
 
diff --git a/audio/gqmpeg-devel/distinfo b/audio/gqmpeg-devel/distinfo
index 4c3b8a4c9f15..3a145efeb92d 100644
--- a/audio/gqmpeg-devel/distinfo
+++ b/audio/gqmpeg-devel/distinfo
@@ -1 +1 @@
-MD5 (gqmpeg-0.16.0.tar.gz) = de8068ec3e43d7dd72fa2009af6e874c
+MD5 (gqmpeg-0.17.0.tar.gz) = c9167f741aa1551e2be26aec0ee108b0
diff --git a/audio/gqmpeg-devel/files/patch-src::mixer.c b/audio/gqmpeg-devel/files/patch-src::mixer.c
deleted file mode 100644
index e41e68c40b86..000000000000
--- a/audio/gqmpeg-devel/files/patch-src::mixer.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/mixer.c.orig	Wed Jun 26 22:57:26 2002
-+++ src/mixer.c	Wed Jun 26 22:57:38 2002
-@@ -36,7 +36,7 @@
- #endif
- 
- #ifdef __FreeBSD__
--#include <machine/soundcard.h>
-+#include <sys/soundcard.h>
- #endif
- 
- #if defined(__NetBSD__) || defined(__OpenBSD__)
diff --git a/audio/gqmpeg-devel/pkg-plist b/audio/gqmpeg-devel/pkg-plist
index db02d2ee1ef0..91bfcf96c42c 100644
--- a/audio/gqmpeg-devel/pkg-plist
+++ b/audio/gqmpeg-devel/pkg-plist
@@ -49,6 +49,8 @@ share/gqmpeg/skins/mrclean/focus-rect-border-1.png
 share/gqmpeg/skins/mrclean/focus-rect-border-7b.png
 share/gqmpeg/skins/mrclean/item-ab-static.png
 share/gqmpeg/skins/mrclean/item-clear-load-aa.png
+share/gqmpeg/skins/mrclean/item-colon-15.png
+share/gqmpeg/skins/mrclean/item-colon-24.png
 share/gqmpeg/skins/mrclean/item-pda-minus.png
 share/gqmpeg/skins/mrclean/item-pda-random-static.png
 share/gqmpeg/skins/mrclean/item-pda-repeat-static.png
@@ -67,8 +69,6 @@ share/gqmpeg/skins/mrclean/skindata_flyby
 share/gqmpeg/skins/mrclean/skindata_menu
 share/gqmpeg/skins/mrclean/skindata_playlist
 share/gqmpeg/skins/mrclean/skindata_submenu
-share/gqmpeg/skins/mrclean/text-std-13.png
-share/gqmpeg/skins/mrclean/text-std-15-bold.png
 share/locale/cs/LC_MESSAGES/gqmpeg.mo
 share/locale/de/LC_MESSAGES/gqmpeg.mo
 share/locale/fi/LC_MESSAGES/gqmpeg.mo
diff --git a/audio/gqmpeg/Makefile b/audio/gqmpeg/Makefile
index 99e1aabe3417..e5b01ee67ce9 100644
--- a/audio/gqmpeg/Makefile
+++ b/audio/gqmpeg/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gqmpeg
-PORTVERSION=	0.16.0
+PORTVERSION=	0.17.0
 CATEGORIES+=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -20,6 +20,7 @@ RUN_DEPENDS=	mpg321:${PORTSDIR}/audio/mpg321
 RUN_DEPENDS=	mpg123:${PORTSDIR}/audio/mpg123
 .endif
 
+USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 USE_GTK=	yes
 USE_LIBTOOL=	yes
@@ -47,11 +48,12 @@ pre-everything::
 .endif
 
 post-patch:
-	@find ${WRKSRC} -name 'Makefile.in*' | xargs ${PERL} -pi.orig -e \
-		's|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
+	@${FIND} ${WRKSRC} -name 'Makefile.in*' | ${XARGS} ${REINPLACE_CMD} \
+		-E -e 's|(SUBDIRS[[:space:]]+=.*)intl|\1| ; \
+		s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g ;'
 .if defined(WITH_MPG321)
-	@${PERL} -pi.orig -e \
-		's/^(#define MPG123_BINARY "mpg)123"/$${1}321"/' \
+	@${REINPLACE_CMD} -E -e \
+		's/^(#define MPG123_BINARY "mpg)123"/\1321"/' \
 		${WRKSRC}/src/io_mpg123.c
 .endif
 
diff --git a/audio/gqmpeg/distinfo b/audio/gqmpeg/distinfo
index 4c3b8a4c9f15..3a145efeb92d 100644
--- a/audio/gqmpeg/distinfo
+++ b/audio/gqmpeg/distinfo
@@ -1 +1 @@
-MD5 (gqmpeg-0.16.0.tar.gz) = de8068ec3e43d7dd72fa2009af6e874c
+MD5 (gqmpeg-0.17.0.tar.gz) = c9167f741aa1551e2be26aec0ee108b0
diff --git a/audio/gqmpeg/files/patch-src::mixer.c b/audio/gqmpeg/files/patch-src::mixer.c
deleted file mode 100644
index e41e68c40b86..000000000000
--- a/audio/gqmpeg/files/patch-src::mixer.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/mixer.c.orig	Wed Jun 26 22:57:26 2002
-+++ src/mixer.c	Wed Jun 26 22:57:38 2002
-@@ -36,7 +36,7 @@
- #endif
- 
- #ifdef __FreeBSD__
--#include <machine/soundcard.h>
-+#include <sys/soundcard.h>
- #endif
- 
- #if defined(__NetBSD__) || defined(__OpenBSD__)
diff --git a/audio/gqmpeg/pkg-plist b/audio/gqmpeg/pkg-plist
index db02d2ee1ef0..91bfcf96c42c 100644
--- a/audio/gqmpeg/pkg-plist
+++ b/audio/gqmpeg/pkg-plist
@@ -49,6 +49,8 @@ share/gqmpeg/skins/mrclean/focus-rect-border-1.png
 share/gqmpeg/skins/mrclean/focus-rect-border-7b.png
 share/gqmpeg/skins/mrclean/item-ab-static.png
 share/gqmpeg/skins/mrclean/item-clear-load-aa.png
+share/gqmpeg/skins/mrclean/item-colon-15.png
+share/gqmpeg/skins/mrclean/item-colon-24.png
 share/gqmpeg/skins/mrclean/item-pda-minus.png
 share/gqmpeg/skins/mrclean/item-pda-random-static.png
 share/gqmpeg/skins/mrclean/item-pda-repeat-static.png
@@ -67,8 +69,6 @@ share/gqmpeg/skins/mrclean/skindata_flyby
 share/gqmpeg/skins/mrclean/skindata_menu
 share/gqmpeg/skins/mrclean/skindata_playlist
 share/gqmpeg/skins/mrclean/skindata_submenu
-share/gqmpeg/skins/mrclean/text-std-13.png
-share/gqmpeg/skins/mrclean/text-std-15-bold.png
 share/locale/cs/LC_MESSAGES/gqmpeg.mo
 share/locale/de/LC_MESSAGES/gqmpeg.mo
 share/locale/fi/LC_MESSAGES/gqmpeg.mo