aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--audio/festalon/Makefile2
-rw-r--r--audio/gbsplay/Makefile2
-rw-r--r--audio/gkrellmms/Makefile2
-rw-r--r--audio/gkrellmms2/Makefile2
-rw-r--r--audio/scrobbler/Makefile9
-rw-r--r--audio/scrobbler/files/patch-Makefile.in2
-rw-r--r--audio/wmalbum/Makefile2
-rw-r--r--audio/xmms-ahx/Makefile10
-rw-r--r--audio/xmms-bonk/Makefile2
-rw-r--r--audio/xmms-bonk/files/patch-Makefile2
-rw-r--r--audio/xmms-curses/Makefile2
-rw-r--r--audio/xmms-faad/Makefile.inc2
-rw-r--r--audio/xmms-flac/Makefile11
-rw-r--r--audio/xmms-flac/files/patch-configure3
-rw-r--r--audio/xmms-flac/files/patch-src_plugin__xmms_Makefile.in3
-rw-r--r--audio/xmms-flac/files/patch-src_plugin__xmms_plugin.c3
-rw-r--r--audio/xmms-mailnotify/Makefile2
-rw-r--r--audio/xmms-nas/Makefile15
-rw-r--r--audio/xmms-nsf/Makefile14
-rw-r--r--audio/xmms-openspc/Makefile15
-rw-r--r--audio/xmms-scrobbler/Makefile4
-rw-r--r--audio/xmms-shn/Makefile3
-rw-r--r--audio/xmms-timidity/Makefile9
-rw-r--r--audio/xmms-volnorm/Makefile10
-rw-r--r--audio/xmms-volnorm/pkg-plist3
-rw-r--r--audio/xmms-wavpack/Makefile4
-rw-r--r--audio/xmms-xf86audio/Makefile1
-rw-r--r--audio/xmms-xymms/Makefile19
-rw-r--r--audio/xmmsctrl/Makefile4
-rw-r--r--audio/xmmsctrl/files/patch-Makefile4
-rw-r--r--multimedia/xmms/Makefile8
-rw-r--r--multimedia/xmms/pkg-plist21
32 files changed, 65 insertions, 130 deletions
diff --git a/audio/festalon/Makefile b/audio/festalon/Makefile
index 581508f888e6..05c17ad84f9e 100644
--- a/audio/festalon/Makefile
+++ b/audio/festalon/Makefile
@@ -3,7 +3,7 @@
PORTNAME= festalon
PORTVERSION= 0.5.5
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= audio
MASTER_SITES= http://projects.raphnet.net/festalon/ \
CRITICAL
diff --git a/audio/gbsplay/Makefile b/audio/gbsplay/Makefile
index 11bca032fac8..5ed45b7870d0 100644
--- a/audio/gbsplay/Makefile
+++ b/audio/gbsplay/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gbsplay
PORTVERSION= 0.0.8
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= audio
MASTER_SITES= CRITICAL
PKGNAMEPREFIX?=
diff --git a/audio/gkrellmms/Makefile b/audio/gkrellmms/Makefile
index b29dda8423b1..3adfde0a250e 100644
--- a/audio/gkrellmms/Makefile
+++ b/audio/gkrellmms/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gkrellmms
PORTVERSION= 0.5.8
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= audio
MASTER_SITES= http://gkrellm.luon.net/files/
diff --git a/audio/gkrellmms2/Makefile b/audio/gkrellmms2/Makefile
index 1ff4c4f07367..55fab2e3282c 100644
--- a/audio/gkrellmms2/Makefile
+++ b/audio/gkrellmms2/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gkrellmms
PORTVERSION= 2.1.22
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= audio
MASTER_SITES= http://gkrellm.luon.net/files/
PKGNAMESUFFIX= 2
diff --git a/audio/scrobbler/Makefile b/audio/scrobbler/Makefile
index 3df2cf21921f..744cf0c0b8dd 100644
--- a/audio/scrobbler/Makefile
+++ b/audio/scrobbler/Makefile
@@ -3,7 +3,7 @@
PORTNAME?= scrobbler
PORTVERSION= 0.3.8.1
-PORTREVISION= 16
+PORTREVISION= 17
CATEGORIES= audio
MASTER_SITES= http://static.audioscrobbler.com/plugins/ \
http://www.pipian.com/stuffforchat/
@@ -16,9 +16,8 @@ LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl
CONFLICTS= xmms-scrobbler-[0-9]*
-USES= gmake pkgconfig
+USES= gmake libtool pkgconfig tar:bzip2
USE_CSTD= gnu89
-USE_BZIP2= yes
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
@@ -31,8 +30,7 @@ XMMS_DESC= Enable XMMS support
ENCODINGS_PATCH_DESC= Enable ID3 tags recoding support
XMMS_LIB_DEPENDS= libxmms.so:${PORTSDIR}/multimedia/xmms
-XMMS_PLIST_FILES= lib/xmms/General/libxmms_scrobbler.la \
- lib/xmms/General/libxmms_scrobbler.so
+XMMS_PLIST_FILES= lib/xmms/General/libxmms_scrobbler.so
XMMS_PLIST_DIRS= lib/xmms/General lib/xmms
XMMS_CONFIGURE_ENABLE= xmms-plugin
@@ -47,7 +45,6 @@ ENCODINGS_PATCH_USES= iconv
.include <bsd.port.options.mk>
post-patch::
- @${REINPLACE_CMD} -e 's|echo aout|echo elf|' ${WRKSRC}/configure
.if ${PORT_OPTIONS:MENCODINGS_PATCH}
@${PATCH} ${PATCH_ARGS} -p1 < ${FILESDIR}/extra-encodings-patch
.endif
diff --git a/audio/scrobbler/files/patch-Makefile.in b/audio/scrobbler/files/patch-Makefile.in
index 83d1ca4884df..139471d1fb5c 100644
--- a/audio/scrobbler/files/patch-Makefile.in
+++ b/audio/scrobbler/files/patch-Makefile.in
@@ -5,7 +5,7 @@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
-LIBS = `curl-config --libs` -lmusicbrainz -lm -lstdc++
-+LIBS = `curl-config --libs` -lm -lstdc++
++LIBS = `curl-config --libs` -lm
LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
diff --git a/audio/wmalbum/Makefile b/audio/wmalbum/Makefile
index b9e18c7d9596..f9dfc718f1f9 100644
--- a/audio/wmalbum/Makefile
+++ b/audio/wmalbum/Makefile
@@ -3,7 +3,7 @@
PORTNAME= wmalbum
PORTVERSION= 0.1.5
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= audio windowmaker
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/audio/xmms-ahx/Makefile b/audio/xmms-ahx/Makefile
index 67b07757712a..ca8eaf58ee80 100644
--- a/audio/xmms-ahx/Makefile
+++ b/audio/xmms-ahx/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xmms-ahx
PORTVERSION= 0.6
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= audio
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}.tar.gz
@@ -15,17 +15,13 @@ LICENSE= GPLv2
BUILD_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms
RUN_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms
-PLIST_FILES= lib/xmms/Input/libahx.la \
- lib/xmms/Input/libahx.so
+PLIST_FILES= lib/xmms/Input/libahx.so
GNU_CONFIGURE= yes
-USES= gmake
+USES= gmake libtool
USE_GNOME= gtk12
USE_LDCONFIG= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-post-patch:
- @${REINPLACE_CMD} -e 's|\(objformat=\).*|\1elf|' ${WRKSRC}/configure
-
.include <bsd.port.mk>
diff --git a/audio/xmms-bonk/Makefile b/audio/xmms-bonk/Makefile
index e1ce2c5624a0..398f8baafb60 100644
--- a/audio/xmms-bonk/Makefile
+++ b/audio/xmms-bonk/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xmms-bonk
PORTVERSION= 0.12
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= audio
MASTER_SITES= http://www.proustmedia.de/bonk-xmms/
DISTNAME= bonk-xmms-${PORTVERSION}
diff --git a/audio/xmms-bonk/files/patch-Makefile b/audio/xmms-bonk/files/patch-Makefile
index eee3e3dc3315..c251d9ec3d76 100644
--- a/audio/xmms-bonk/files/patch-Makefile
+++ b/audio/xmms-bonk/files/patch-Makefile
@@ -16,7 +16,7 @@ $FreeBSD$
libbonk.so : bonk-xmms.cc
- $(CPP) $(CFLAGS) -shared -o libbonk.so bonk-xmms.cc -lstdc++
-+ $(CXX) $(CXXFLAGS) -shared -o libbonk.so bonk-xmms.cc -lstdc++
++ $(CXX) $(CXXFLAGS) -shared -o libbonk.so bonk-xmms.cc
install : libbonk.so
cp libbonk.so $(INSTDIR)
diff --git a/audio/xmms-curses/Makefile b/audio/xmms-curses/Makefile
index 84952954d17f..79d1e6bc770e 100644
--- a/audio/xmms-curses/Makefile
+++ b/audio/xmms-curses/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xmms-curses
PORTVERSION= 0.2.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= audio
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/audio/xmms-faad/Makefile.inc b/audio/xmms-faad/Makefile.inc
index 25fab5a851ca..db9826d01b4d 100644
--- a/audio/xmms-faad/Makefile.inc
+++ b/audio/xmms-faad/Makefile.inc
@@ -2,7 +2,7 @@
PORTNAME= faad2
PORTVERSION= 2.7
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio
MASTER_SITES= SFE/faac
diff --git a/audio/xmms-flac/Makefile b/audio/xmms-flac/Makefile
index 0ba93e80ba7a..22df64246afb 100644
--- a/audio/xmms-flac/Makefile
+++ b/audio/xmms-flac/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xmms-flac
PORTVERSION= 1.3.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= http://downloads.xiph.org/releases/flac/
DISTNAME= flac-${PORTVERSION}
@@ -12,19 +12,14 @@ COMMENT= XMMS input plugin for playing FLAC files
LIB_DEPENDS= libxmms.so:${PORTSDIR}/multimedia/xmms \
libFLAC.so:${PORTSDIR}/audio/flac \
- libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs \
libogg.so:${PORTSDIR}/audio/libogg
-USES= gettext iconv tar:xz
-USE_AUTOTOOLS= libtool
-USE_GNOME= gtk12
-USE_XORG= x11 xau xcb xdmcp xext xi
-
+USES= iconv libtool tar:xz
+GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-silent-rules
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-MAKE_ARGS= LIBTOOL="${LIBTOOL} --tag=disable-static"
MAKEFILE= ${FILESDIR}/Makefile
PLIST_FILES= lib/xmms/Input/libxmms-flac.so
diff --git a/audio/xmms-flac/files/patch-configure b/audio/xmms-flac/files/patch-configure
index f4d604e92fac..21979e154d93 100644
--- a/audio/xmms-flac/files/patch-configure
+++ b/audio/xmms-flac/files/patch-configure
@@ -1,6 +1,3 @@
-
-$FreeBSD$
-
--- configure.orig 2013-05-27 10:11:54.740045000 +0200
+++ configure 2013-06-09 18:15:53.000000000 +0200
@@ -19807,7 +19807,7 @@ else
diff --git a/audio/xmms-flac/files/patch-src_plugin__xmms_Makefile.in b/audio/xmms-flac/files/patch-src_plugin__xmms_Makefile.in
index acdd7b0b88e4..1f9cb005994b 100644
--- a/audio/xmms-flac/files/patch-src_plugin__xmms_Makefile.in
+++ b/audio/xmms-flac/files/patch-src_plugin__xmms_Makefile.in
@@ -1,6 +1,3 @@
-
-$FreeBSD$
-
--- src/plugin_xmms/Makefile.in.orig 2013-05-27 10:11:57.951933000 +0200
+++ src/plugin_xmms/Makefile.in 2013-06-09 19:13:03.000000000 +0200
@@ -127,8 +127,7 @@ libxmms_flac_la_DEPENDENCIES = \
diff --git a/audio/xmms-flac/files/patch-src_plugin__xmms_plugin.c b/audio/xmms-flac/files/patch-src_plugin__xmms_plugin.c
index 6bb679e96229..0f07cd17c2ed 100644
--- a/audio/xmms-flac/files/patch-src_plugin__xmms_plugin.c
+++ b/audio/xmms-flac/files/patch-src_plugin__xmms_plugin.c
@@ -1,6 +1,3 @@
-
-$FreeBSD$
-
--- src/plugin_xmms/plugin.c.orig
+++ src/plugin_xmms/plugin.c
@@ -140,7 +140,7 @@
diff --git a/audio/xmms-mailnotify/Makefile b/audio/xmms-mailnotify/Makefile
index c058152bd292..8ec18cf449d0 100644
--- a/audio/xmms-mailnotify/Makefile
+++ b/audio/xmms-mailnotify/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xmms-mailnotify
PORTVERSION= 0.2.0
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= arved
diff --git a/audio/xmms-nas/Makefile b/audio/xmms-nas/Makefile
index 4ff061935b07..68d5cb88c48f 100644
--- a/audio/xmms-nas/Makefile
+++ b/audio/xmms-nas/Makefile
@@ -3,25 +3,22 @@
PORTNAME= xmms-nas
PORTVERSION= 0.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= audio
MASTER_SITES= ftp://ftp.stack.nl/pub/users/willem/
MAINTAINER= ports@FreeBSD.org
-COMMENT= A Network Audio System (NAS) output plugin for XMMS
+COMMENT= Network Audio System (NAS) output plugin for XMMS
LIB_DEPENDS= libxmms.so:${PORTSDIR}/multimedia/xmms \
libaudio.so:${PORTSDIR}/audio/nas
+USES= libtool
USE_GNOME= gtk12
-GNU_CONFIGURE= yes
USE_LDCONFIG= yes
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS= --disable-static
-PLIST_FILES= lib/xmms/Output/libnas.a \
- lib/xmms/Output/libnas.la \
- lib/xmms/Output/libnas.so
-
-post-patch:
- @${REINPLACE_CMD} -e '/objformat=/s|=.*|=elf|' ${WRKSRC}/ltconfig
+PLIST_FILES= lib/xmms/Output/libnas.so
.include <bsd.port.mk>
diff --git a/audio/xmms-nsf/Makefile b/audio/xmms-nsf/Makefile
index f3f5779a1344..9ecfa5c1dde1 100644
--- a/audio/xmms-nsf/Makefile
+++ b/audio/xmms-nsf/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xmms-nsf
PORTVERSION= 0.0.3
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= audio
MASTER_SITES= http://optronic.sourceforge.net/files/ \
CRITICAL
@@ -17,16 +17,14 @@ BUILD_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms
RUN_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms
GNU_CONFIGURE= yes
+USES= libtool
USE_LDCONFIG= yes
USE_CSTD= gnu89
+CONFIGURE_ARGS= --disable-static --with-pic
ONLY_FOR_ARCHS= i386 amd64
-CFLAGS+= -fPIC
-
-PLIST_FILES= lib/xmms/Input/libnsf.a \
- lib/xmms/Input/libnsf.la \
- lib/xmms/Input/libnsf.so
+PLIST_FILES= lib/xmms/Input/libnsf.so
SUB_FILES= pkg-message
SUB_LIST= VERSION=${PORTVERSION}
@@ -34,9 +32,5 @@ SUB_LIST= VERSION=${PORTVERSION}
post-patch:
@${REINPLACE_CMD} -e 's|<malloc\.h>|<stdlib.h>|' \
${WRKSRC}/src/nes/nestypes.h
- @${REINPLACE_CMD} -e '/objformat=/s|=.*|=elf|' ${WRKSRC}/ltconfig
-
-post-install:
- @${CAT} ${PKGMESSAGE}
.include <bsd.port.mk>
diff --git a/audio/xmms-openspc/Makefile b/audio/xmms-openspc/Makefile
index 6a24db7abb52..f1145f84e041 100644
--- a/audio/xmms-openspc/Makefile
+++ b/audio/xmms-openspc/Makefile
@@ -3,33 +3,30 @@
PORTNAME= openspc
PORTVERSION= 0.0.3
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= audio
MASTER_SITES= CRITICAL
PKGNAMEPREFIX= xmms-
DISTNAME= xmms-OpenSPC-${PORTVERSION}
MAINTAINER= ehaupt@FreeBSD.org
-COMMENT= An SPC player for XMMS using OpenSPC
+COMMENT= SPC player for XMMS using OpenSPC
BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm \
xmms:${PORTSDIR}/multimedia/xmms
RUN_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms
GNU_CONFIGURE= yes
+USES= libtool
-PLIST_FILES= lib/xmms/Input/openspc.la \
- lib/xmms/Input/openspc.so
+PLIST_FILES= lib/xmms/Input/openspc.so
ONLY_FOR_ARCHS= i386 # contains x86 assembler code
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
.if ${OSVERSION} >= 1000000
BROKEN= does not build on FreeBSD 10.x and later
.endif
-post-patch:
- @${REINPLACE_CMD} -e '/objformat=/s|=.*|=elf|' ${WRKSRC}/configure
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/xmms-scrobbler/Makefile b/audio/xmms-scrobbler/Makefile
index 28bbc4dfe9f3..b904a8fe196e 100644
--- a/audio/xmms-scrobbler/Makefile
+++ b/audio/xmms-scrobbler/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= xmms-scrobbler
-PORTREVISION= 6
+PORTREVISION= 7
MAINTAINER= novel@FreeBSD.org
COMMENT= XMMS plugin for Audioscrobbler.com
@@ -11,6 +11,6 @@ CONFLICTS= scrobbler-*
MASTERDIR= ${.CURDIR}/../scrobbler
-WITH_XMMS= yes
+OPTIONS_SLAVE= XMMS
.include "${MASTERDIR}/Makefile"
diff --git a/audio/xmms-shn/Makefile b/audio/xmms-shn/Makefile
index 73da5cfb3313..4b0ba9e770a8 100644
--- a/audio/xmms-shn/Makefile
+++ b/audio/xmms-shn/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xmms-shn
PORTVERSION= 2.4.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= audio
MASTER_SITES= http://www.etree.org/shnutils/xmms-shn/dist/src/
@@ -13,6 +13,7 @@ COMMENT= XMMS plugin to allow playing shorten-compressed audio
BUILD_DEPENDS= xmms-config:${PORTSDIR}/multimedia/xmms
RUN_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms
+USES= libtool
USE_GNOME= gtk12
GNU_CONFIGURE= yes
diff --git a/audio/xmms-timidity/Makefile b/audio/xmms-timidity/Makefile
index b5e71382fd32..8e8ff8c0d111 100644
--- a/audio/xmms-timidity/Makefile
+++ b/audio/xmms-timidity/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xmms-timidity
PORTVERSION= 0.0.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= http://www.shikadi.net/utils/files/
@@ -15,7 +15,7 @@ RUN_DEPENDS= timidity:${PORTSDIR}/audio/timidity
USE_LDCONFIG= ${PREFIX}/lib/xmms/Input
-USE_BZIP2= yes
+USES= tar:bzip2
USE_GNOME= gtk12
CXXFLAGS+= -I${LOCALBASE}/include `glib-config --cflags` -g -fPIC
@@ -23,11 +23,12 @@ FILES= xmms-timidity.cpp
PLIST_FILES= lib/xmms/Input/libxmms-timidity.so
do-build:
- cd ${WRKSRC} && ${CXX} ${CXXFLAGS} -c ${FILES} -o xmms-timidity.o
+ cd ${WRKSRC} && ${CXX} ${CXXFLAGS} ${FILES} -o libxmms-timidity.so \
+ -shared -pthread
do-install:
${MKDIR} ${STAGEDIR}${PREFIX}/lib/xmms/Input
- ${INSTALL_DATA} ${WRKSRC}/${FILES} \
+ ${INSTALL_DATA} ${WRKSRC}/libxmms-timidity.so \
${STAGEDIR}${PREFIX}/lib/xmms/Input/libxmms-timidity.so
.include <bsd.port.mk>
diff --git a/audio/xmms-volnorm/Makefile b/audio/xmms-volnorm/Makefile
index b73c27c92f05..e2c517c5f09b 100644
--- a/audio/xmms-volnorm/Makefile
+++ b/audio/xmms-volnorm/Makefile
@@ -3,7 +3,7 @@
PORTNAME= volnorm
PORTVERSION= 0.8.3
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= audio
MASTER_SITES= SF
PKGNAMEPREFIX= xmms-
@@ -15,18 +15,14 @@ LICENSE= GPLv2
LIB_DEPENDS= libxmms.so:${PORTSDIR}/multimedia/xmms
+USES= libtool
USE_GNOME= gtk12
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
+PLIST_FILES= lib/xmms/Effect/libnormvol.so
post-patch:
@${REINPLACE_CMD} -e '/^SUBDIRS/s|tests||g' ${WRKSRC}/Makefile.in
@${REINPLACE_CMD} -e '/^COMMON/s|-O2|@CFLAGS@|g' ${WRKSRC}/src/Makefile.in
- @${REINPLACE_CMD} -e '/objformat=/s|=.*|=elf|' ${WRKSRC}/configure
-
-do-install:
- @${MKDIR} ${STAGEDIR}${PREFIX}/lib/xmms/Effect
- ${INSTALL_DATA} ${WRKSRC}/src/.libs/libnormvol.so \
- ${STAGEDIR}${PREFIX}/lib/xmms/Effect
.include <bsd.port.mk>
diff --git a/audio/xmms-volnorm/pkg-plist b/audio/xmms-volnorm/pkg-plist
deleted file mode 100644
index 29921e2beeb2..000000000000
--- a/audio/xmms-volnorm/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-lib/xmms/Effect/libnormvol.so
-@dirrmtry lib/xmms/Effect
-@dirrmtry lib/xmms
diff --git a/audio/xmms-wavpack/Makefile b/audio/xmms-wavpack/Makefile
index deb0f9109d8a..00adb6a89a5f 100644
--- a/audio/xmms-wavpack/Makefile
+++ b/audio/xmms-wavpack/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xmms-wavpack
PORTVERSION= 1.0.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= http://www.wavpack.com/
@@ -12,7 +12,7 @@ COMMENT= XMMS input plugin to play WavPack files
LIB_DEPENDS= libwavpack.so:${PORTSDIR}/audio/wavpack \
libxmms.so:${PORTSDIR}/multimedia/xmms
-USES= pkgconfig tar:bzip2
+USES= libtool pkgconfig tar:bzip2
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/audio/xmms-xf86audio/Makefile b/audio/xmms-xf86audio/Makefile
index 5f2159d95091..cfa98452e913 100644
--- a/audio/xmms-xf86audio/Makefile
+++ b/audio/xmms-xf86audio/Makefile
@@ -2,6 +2,7 @@
PORTNAME= xmms-xf86audio
PORTVERSION= 0.4.4
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://www.devin.com/xmms-xf86audio/download/
diff --git a/audio/xmms-xymms/Makefile b/audio/xmms-xymms/Makefile
index ca64bcb68115..aee3d735e232 100644
--- a/audio/xmms-xymms/Makefile
+++ b/audio/xmms-xymms/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xymms
DISTVERSION= 0.9.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= audio
MASTER_SITES= SF
PKGNAMEPREFIX= xmms-
@@ -11,29 +11,20 @@ PKGNAMEPREFIX= xmms-
MAINTAINER= ehaupt@FreeBSD.org
COMMENT= Sega Genesis GYM plugin for XMMS
-BUILD_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms
-RUN_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms
+LIB_DEPENDS= libxmms.so:${PORTSDIR}/multimedia/xmms
GNU_CONFIGURE= yes
+USES= libtool
USE_GNOME= gtk12
USE_LDCONFIG= yes
+CONFIGURE_ARGS= --disable-static
-CPPFLAGS+= ${PTHREAD_CFLAGS}
-LDFLAGS+= ${PTHREAD_LIBS}
-
-PLIST_FILES= lib/xmms/Input/libxymms.a \
- lib/xmms/Input/libxymms.la \
- lib/xmms/Input/libxymms.so \
+PLIST_FILES= lib/xmms/Input/libxymms.so \
%%EXAMPLESDIR%%/sample.gym
PLIST_DIRS= %%EXAMPLESDIR%%
-post-patch:
- @${REINPLACE_CMD} -e 's|-D_REENTRANT||' ${WRKSRC}/src/Makefile.in
- @${REINPLACE_CMD} -e '/objformat=/s|=.*|=elf|' ${WRKSRC}/ltconfig
-
post-install:
@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
${INSTALL_DATA} ${WRKSRC}/samples/sample.gym ${STAGEDIR}${EXAMPLESDIR}
- @${CAT} ${PKGMESSAGE}
.include <bsd.port.mk>
diff --git a/audio/xmmsctrl/Makefile b/audio/xmmsctrl/Makefile
index 55d4b4f68333..952b7f35291b 100644
--- a/audio/xmmsctrl/Makefile
+++ b/audio/xmmsctrl/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xmmsctrl
PORTVERSION= 1.8
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= audio
MASTER_SITES= http://user.it.uu.se/~adavid/utils/ \
http://distro.ibiblio.org/pub/linux/distributions/pdaxrom/src/ \
@@ -19,8 +19,6 @@ RUN_DEPENDS= xmms:${PORTSDIR}/multimedia/xmms
USES= gmake
USE_CSTD= gnu89
-MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
- PTHREAD_LIBS="${PTHREAD_LIBS}"
PORTDOCS= Changelog README
diff --git a/audio/xmmsctrl/files/patch-Makefile b/audio/xmmsctrl/files/patch-Makefile
index 096d19a9cc47..46ad25e99605 100644
--- a/audio/xmmsctrl/files/patch-Makefile
+++ b/audio/xmmsctrl/files/patch-Makefile
@@ -9,8 +9,8 @@
DEFS := -DPRETTY_PRINT -D_GNU_SOURCE -DVERSION=\"$(VERSION)\"
-CFLAGS := $(WARN) -O2 $(shell xmms-config --cflags) $(DEFS)
-LDFLAGS := $(shell xmms-config --libs)
-+CFLAGS += $(WARN) $(shell xmms-config --cflags) $(DEFS) $(PTHREAD_CFLAGS)
-+LDFLAGS := $(shell xmms-config --libs) $(PTHREAD_LIBS)
++CFLAGS += $(WARN) $(shell xmms-config --cflags) $(DEFS)
++LDFLAGS := $(shell xmms-config --libs)
-all : $(TARGET) HELP
+all : $(TARGET)
diff --git a/multimedia/xmms/Makefile b/multimedia/xmms/Makefile
index 8008dabbdd8d..55859defc828 100644
--- a/multimedia/xmms/Makefile
+++ b/multimedia/xmms/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xmms
PORTVERSION= 1.2.11
-PORTREVISION= 23
+PORTREVISION= 24
CATEGORIES= multimedia audio ipv6
MASTER_SITES= http://www.xmms.org/files/1.2.x/ \
http://legacy.xmms2.org/ \
@@ -17,7 +17,7 @@ LICENSE= GPLv2
CONFLICTS?= ru-xmms-[0-9]* zh-xmms-[0-9]*
GNU_CONFIGURE= yes
-USES= desktop-file-utils pathfix gmake iconv tar:bzip2
+USES= desktop-file-utils gmake iconv libtool pathfix tar:bzip2
USE_GNOME= gtk12
USE_LDCONFIG= yes
USE_XORG= sm x11 xxf86vm
@@ -80,8 +80,8 @@ LIB_DEPENDS+= librcc.so:${PORTSDIR}/devel/librcc \
librcd.so:${PORTSDIR}/devel/librcd
USE_AUTOTOOLS= aclocal autoheader libtoolize autoconf automake
-LIBTOOLIZE_ARGS=--install --force
-AUTOMAKE_ARGS= --add-missing --force-missing
+LIBTOOLIZE_ARGS=-i -c -f
+AUTOMAKE_ARGS= -a -c -f
USE_OPENSSL= yes
.endif
diff --git a/multimedia/xmms/pkg-plist b/multimedia/xmms/pkg-plist
index ed9613bbc488..8fcb3f4b7ef7 100644
--- a/multimedia/xmms/pkg-plist
+++ b/multimedia/xmms/pkg-plist
@@ -9,42 +9,25 @@ include/xmms/plugin.h
include/xmms/titlestring.h
include/xmms/util.h
include/xmms/xmmsctrl.h
-lib/libxmms.la
lib/libxmms.so
-lib/libxmms.so.4
-lib/xmms/Effect/libecho.la
+lib/libxmms.so.1
+lib/libxmms.so.1.3.1
lib/xmms/Effect/libecho.so
-lib/xmms/Effect/libstereo.la
lib/xmms/Effect/libstereo.so
-lib/xmms/Effect/libvoice.la
lib/xmms/Effect/libvoice.so
lib/xmms/General/libir.so
-lib/xmms/General/libir.la
-lib/xmms/General/libsong_change.la
lib/xmms/General/libsong_change.so
-lib/xmms/Input/libcdaudio.la
lib/xmms/Input/libcdaudio.so
-%%MIKMOD%%lib/xmms/Input/libmikmod.la
%%MIKMOD%%lib/xmms/Input/libmikmod.so
-lib/xmms/Input/libmpg123.la
lib/xmms/Input/libmpg123.so
-lib/xmms/Input/libtonegen.la
lib/xmms/Input/libtonegen.so
-%%VORBIS%%lib/xmms/Input/libvorbis.la
%%VORBIS%%lib/xmms/Input/libvorbis.so
-lib/xmms/Input/libwav.la
lib/xmms/Input/libwav.so
-%%ESOUND%%lib/xmms/Output/libesdout.la
%%ESOUND%%lib/xmms/Output/libesdout.so
-lib/xmms/Output/libOSS.la
lib/xmms/Output/libOSS.so
-lib/xmms/Output/libdisk_writer.la
lib/xmms/Output/libdisk_writer.so
-%%SPEC%%lib/xmms/Visualization/libogl_spectrum.la
%%SPEC%%lib/xmms/Visualization/libogl_spectrum.so
-lib/xmms/Visualization/libbscope.la
lib/xmms/Visualization/libbscope.so
-lib/xmms/Visualization/libsanalyzer.la
lib/xmms/Visualization/libsanalyzer.so
man/man1/wmxmms.1.gz
man/man1/xmms.1.gz