aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--audio/gqmpeg-devel/Makefile19
-rw-r--r--audio/gqmpeg-devel/distinfo2
-rw-r--r--audio/gqmpeg-devel/files/patch-ad6
-rw-r--r--audio/gqmpeg-devel/pkg-plist2
-rw-r--r--audio/gqmpeg/Makefile19
-rw-r--r--audio/gqmpeg/distinfo2
-rw-r--r--audio/gqmpeg/files/patch-ad6
-rw-r--r--audio/gqmpeg/pkg-plist2
8 files changed, 48 insertions, 10 deletions
diff --git a/audio/gqmpeg-devel/Makefile b/audio/gqmpeg-devel/Makefile
index 8ba42fb375f6..e2e58a383d38 100644
--- a/audio/gqmpeg-devel/Makefile
+++ b/audio/gqmpeg-devel/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= gqmpeg
-PORTVERSION= 0.11.0
+PORTVERSION= 0.12.0
CATEGORIES+= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -14,7 +14,11 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER?= lyngbol@wheel.dk
LIB_DEPENDS= gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
+.if defined(WITH_MPG321)
+RUN_DEPENDS= mpg321:${PORTSDIR}/audio/mpg321
+.else
RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123
+.endif
USE_X_PREFIX= yes
USE_GTK= yes
@@ -34,8 +38,21 @@ MAN1= gqmpeg.1
USE_GNOME= yes
.endif
+.if !defined(WITH_MPG321)
+pre-everything::
+ @${ECHO_MSG}
+ @${ECHO_MSG} "If you want to use mpg321 instead of mpg123,"
+ @${ECHO_MSG} "hit Ctrl-C right now and execute \"make WITH_MPG321=yes\""
+ @${ECHO_MSG}
+.endif
+
post-patch:
@find ${WRKSRC} -name 'Makefile.in*' | xargs ${PERL} -pi.orig -e \
's|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
+.if defined(WITH_MPG321)
+ @${PERL} -pi.orig -e \
+ 's/^(#define MPG123_BINARY "mpg)123"/$${1}321"/' \
+ ${WRKSRC}/src/io_mpg123.c
+.endif
.include <bsd.port.post.mk>
diff --git a/audio/gqmpeg-devel/distinfo b/audio/gqmpeg-devel/distinfo
index 4c4aeac9edd2..6205dc1242ef 100644
--- a/audio/gqmpeg-devel/distinfo
+++ b/audio/gqmpeg-devel/distinfo
@@ -1 +1 @@
-MD5 (gqmpeg-0.11.0.tar.gz) = a6b1f35c47afc5e5c67ad801dffb93ae
+MD5 (gqmpeg-0.12.0.tar.gz) = 3d4eff0a862afea0eedd8e5c08a1ded6
diff --git a/audio/gqmpeg-devel/files/patch-ad b/audio/gqmpeg-devel/files/patch-ad
index 7ede7cab680c..8101a1baf14b 100644
--- a/audio/gqmpeg-devel/files/patch-ad
+++ b/audio/gqmpeg-devel/files/patch-ad
@@ -1,8 +1,8 @@
---- Makefile.in.orig Sat Nov 10 18:39:44 2001
-+++ Makefile.in Sat Nov 10 18:40:14 2001
+--- Makefile.in.orig Sun Jan 20 09:20:14 2002
++++ Makefile.in Sun Jan 20 09:20:32 2002
@@ -116,7 +116,7 @@
skindir = $(prefix)/share/gqmpeg/skins
- skin_DATA = SKIN-SPECS
+ skin_DATA = SKIN-SPECS README
-@HAVE_GNOME_TRUE@desktopdir = @HAVE_GNOME_TRUE@$(GNOME_DATADIR)/gnome/apps/Multimedia
+@HAVE_GNOME_TRUE@desktopdir = @HAVE_GNOME_TRUE@$(GNOME_DATADIR)/apps/Multimedia
diff --git a/audio/gqmpeg-devel/pkg-plist b/audio/gqmpeg-devel/pkg-plist
index c9fdd6bd53f9..8019c652747a 100644
--- a/audio/gqmpeg-devel/pkg-plist
+++ b/audio/gqmpeg-devel/pkg-plist
@@ -2,11 +2,13 @@ bin/gqmpeg
bin/gqmpeg-shoutcast-plugin.sh
%%GNOME:%%%%DATADIR%%/apps/Multimedia/gqmpeg.desktop
%%GNOME:%%%%DATADIR%%/pixmaps/gqmpeg.png
+share/gqmpeg/skins/README
share/gqmpeg/skins/SKIN-SPECS
share/locale/cs/LC_MESSAGES/gqmpeg.mo
share/locale/de/LC_MESSAGES/gqmpeg.mo
share/locale/fr/LC_MESSAGES/gqmpeg.mo
share/locale/ja/LC_MESSAGES/gqmpeg.mo
share/locale/pt_BR/LC_MESSAGES/gqmpeg.mo
+share/locale/zh_TW/LC_MESSAGES/gqmpeg.mo
@dirrm share/gqmpeg/skins
@dirrm share/gqmpeg
diff --git a/audio/gqmpeg/Makefile b/audio/gqmpeg/Makefile
index 8ba42fb375f6..e2e58a383d38 100644
--- a/audio/gqmpeg/Makefile
+++ b/audio/gqmpeg/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= gqmpeg
-PORTVERSION= 0.11.0
+PORTVERSION= 0.12.0
CATEGORIES+= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -14,7 +14,11 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER?= lyngbol@wheel.dk
LIB_DEPENDS= gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
+.if defined(WITH_MPG321)
+RUN_DEPENDS= mpg321:${PORTSDIR}/audio/mpg321
+.else
RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123
+.endif
USE_X_PREFIX= yes
USE_GTK= yes
@@ -34,8 +38,21 @@ MAN1= gqmpeg.1
USE_GNOME= yes
.endif
+.if !defined(WITH_MPG321)
+pre-everything::
+ @${ECHO_MSG}
+ @${ECHO_MSG} "If you want to use mpg321 instead of mpg123,"
+ @${ECHO_MSG} "hit Ctrl-C right now and execute \"make WITH_MPG321=yes\""
+ @${ECHO_MSG}
+.endif
+
post-patch:
@find ${WRKSRC} -name 'Makefile.in*' | xargs ${PERL} -pi.orig -e \
's|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
+.if defined(WITH_MPG321)
+ @${PERL} -pi.orig -e \
+ 's/^(#define MPG123_BINARY "mpg)123"/$${1}321"/' \
+ ${WRKSRC}/src/io_mpg123.c
+.endif
.include <bsd.port.post.mk>
diff --git a/audio/gqmpeg/distinfo b/audio/gqmpeg/distinfo
index 4c4aeac9edd2..6205dc1242ef 100644
--- a/audio/gqmpeg/distinfo
+++ b/audio/gqmpeg/distinfo
@@ -1 +1 @@
-MD5 (gqmpeg-0.11.0.tar.gz) = a6b1f35c47afc5e5c67ad801dffb93ae
+MD5 (gqmpeg-0.12.0.tar.gz) = 3d4eff0a862afea0eedd8e5c08a1ded6
diff --git a/audio/gqmpeg/files/patch-ad b/audio/gqmpeg/files/patch-ad
index 7ede7cab680c..8101a1baf14b 100644
--- a/audio/gqmpeg/files/patch-ad
+++ b/audio/gqmpeg/files/patch-ad
@@ -1,8 +1,8 @@
---- Makefile.in.orig Sat Nov 10 18:39:44 2001
-+++ Makefile.in Sat Nov 10 18:40:14 2001
+--- Makefile.in.orig Sun Jan 20 09:20:14 2002
++++ Makefile.in Sun Jan 20 09:20:32 2002
@@ -116,7 +116,7 @@
skindir = $(prefix)/share/gqmpeg/skins
- skin_DATA = SKIN-SPECS
+ skin_DATA = SKIN-SPECS README
-@HAVE_GNOME_TRUE@desktopdir = @HAVE_GNOME_TRUE@$(GNOME_DATADIR)/gnome/apps/Multimedia
+@HAVE_GNOME_TRUE@desktopdir = @HAVE_GNOME_TRUE@$(GNOME_DATADIR)/apps/Multimedia
diff --git a/audio/gqmpeg/pkg-plist b/audio/gqmpeg/pkg-plist
index c9fdd6bd53f9..8019c652747a 100644
--- a/audio/gqmpeg/pkg-plist
+++ b/audio/gqmpeg/pkg-plist
@@ -2,11 +2,13 @@ bin/gqmpeg
bin/gqmpeg-shoutcast-plugin.sh
%%GNOME:%%%%DATADIR%%/apps/Multimedia/gqmpeg.desktop
%%GNOME:%%%%DATADIR%%/pixmaps/gqmpeg.png
+share/gqmpeg/skins/README
share/gqmpeg/skins/SKIN-SPECS
share/locale/cs/LC_MESSAGES/gqmpeg.mo
share/locale/de/LC_MESSAGES/gqmpeg.mo
share/locale/fr/LC_MESSAGES/gqmpeg.mo
share/locale/ja/LC_MESSAGES/gqmpeg.mo
share/locale/pt_BR/LC_MESSAGES/gqmpeg.mo
+share/locale/zh_TW/LC_MESSAGES/gqmpeg.mo
@dirrm share/gqmpeg/skins
@dirrm share/gqmpeg