aboutsummaryrefslogtreecommitdiff
path: root/multimedia/xmms
diff options
context:
space:
mode:
Diffstat (limited to 'multimedia/xmms')
-rw-r--r--multimedia/xmms/Makefile13
-rw-r--r--multimedia/xmms/distinfo2
-rw-r--r--multimedia/xmms/files/patch-configure (renamed from multimedia/xmms/files/patch-ad)18
-rw-r--r--multimedia/xmms/files/patch-libxmms::util.c10
-rw-r--r--multimedia/xmms/files/patch-ltmain.sh16
-rw-r--r--multimedia/xmms/files/patch-po::Makefile.in.in16
-rw-r--r--multimedia/xmms/pkg-plist19
7 files changed, 39 insertions, 55 deletions
diff --git a/multimedia/xmms/Makefile b/multimedia/xmms/Makefile
index 60497c72642c..3df3a0189e35 100644
--- a/multimedia/xmms/Makefile
+++ b/multimedia/xmms/Makefile
@@ -6,16 +6,17 @@
#
PORTNAME= xmms
-PORTVERSION= 1.2.7
-PORTREVISION= 3
+PORTVERSION= 1.2.8
CATEGORIES+= multimedia audio
-MASTER_SITES= ftp://ftp.xmms.org/xmms/1.2.x/ \
+MASTER_SITES= ftp://ftp.xmms.org/pub/xmms/1.2.x/ \
http://www.xmms.org/files/1.2.x/ \
ftp://ftp.sunet.se/pub/multimedia/xmms/1.2.x/
MAINTAINER?= esk@ira.uka.de
COMMENT?= X Multimedia System --- An audio player with a Winamp GUI
+LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
+
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GNOME= gtk12 gnomehack libxml
@@ -31,7 +32,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
VISUALIZATION_PLUGINS="${VISUALIZATION_PLUGINS}"
MAN1= gnomexmms.1 wmxmms.1 xmms.1
-INPUT_PLUGINS= cdaudio,idcin,mpg123,tonegen,wav
+INPUT_PLUGINS= cdaudio,mpg123,tonegen,wav
OUTPUT_PLUGINS= OSS,disk_writer
VISUALIZATION_PLUGINS= blur_scope,sanalyzer
@@ -109,6 +110,10 @@ pre-extract:
post-patch:
@find ${WRKSRC} -name "Makefile.in*" | xargs ${REINPLACE_CMD} -e \
's|\(datadir\)/aclocal|(prefix)/share/aclocal|g'
+ @${REINPLACE_CMD} -e 's|{datadir}/locale|{prefix}/share/locale|g' \
+ ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e 's,-pthread,${PTHREAD_LIBS},g' \
+ ${WRKSRC}/configure
post-install:
@${MKDIR} ${PREFIX}/share/xmms/Skins
diff --git a/multimedia/xmms/distinfo b/multimedia/xmms/distinfo
index 1c73d6140407..7cd886a2f951 100644
--- a/multimedia/xmms/distinfo
+++ b/multimedia/xmms/distinfo
@@ -1 +1 @@
-MD5 (xmms-1.2.7.tar.bz2) = 9bec488842920df359516b7d062d15dc
+MD5 (xmms-1.2.8.tar.bz2) = d523735b59232f0eedd45dc2b7a4f5ad
diff --git a/multimedia/xmms/files/patch-ad b/multimedia/xmms/files/patch-configure
index d99ef6ded3a6..6e9e556ad37c 100644
--- a/multimedia/xmms/files/patch-ad
+++ b/multimedia/xmms/files/patch-configure
@@ -1,18 +1,6 @@
-
-$FreeBSD$
-
---- configure.orig Mon Mar 4 23:57:01 2002
-+++ configure Tue May 14 09:06:50 2002
-@@ -10576,7 +10576,7 @@
- GMSGFMT="OLD_PO_FILE_INPUT=yes $GMSGFMT"
- MSGFMT="OLD_PO_FILE_INPUT=yes $MSGFMT"
-
--localedir=${datadir}/locale
-+localedir=${prefix}/share/locale
-
-
-
-@@ -12673,10 +12673,6 @@
+--- configure.orig Fri Sep 5 20:28:38 2003
++++ configure Fri Sep 5 20:28:51 2003
+@@ -13928,10 +13928,6 @@
*) # Relative path.
ac_sub_cache_file="$ac_dots$cache_file" ;;
esac
diff --git a/multimedia/xmms/files/patch-libxmms::util.c b/multimedia/xmms/files/patch-libxmms::util.c
deleted file mode 100644
index e0f118f8f1ed..000000000000
--- a/multimedia/xmms/files/patch-libxmms::util.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- libxmms/util.c.orig Fri Jun 1 15:07:49 2001
-+++ libxmms/util.c Sun Oct 6 18:40:25 2002
-@@ -11,6 +11,7 @@
- #endif
-
- #ifdef __FreeBSD__
-+#include <sys/types.h>
- #include <sys/sysctl.h>
- #endif
-
diff --git a/multimedia/xmms/files/patch-ltmain.sh b/multimedia/xmms/files/patch-ltmain.sh
index 3513c55b8eb9..928f8aedeb85 100644
--- a/multimedia/xmms/files/patch-ltmain.sh
+++ b/multimedia/xmms/files/patch-ltmain.sh
@@ -1,19 +1,9 @@
$FreeBSD$
---- ltmain.sh.orig Mon Sep 24 14:12:50 2001
-+++ ltmain.sh Tue Mar 5 11:16:25 2002
-@@ -2444,6 +2444,9 @@
- *-*-openbsd*)
- # Do not include libc due to us having libc/libc_r.
- ;;
-+ *-*-freebsd*)
-+ # FreeBSD doesn't need this...
-+ ;;
- *)
- # Add libc to deplibs on all other systems if necessary.
- if test $build_libtool_need_lc = "yes"; then
-@@ -4210,10 +4213,12 @@
+--- ltmain.sh.orig Fri Sep 5 13:18:43 2003
++++ ltmain.sh Fri Sep 5 13:18:09 2003
+@@ -4333,10 +4333,12 @@
fi
# Install the pseudo-library for information purposes.
diff --git a/multimedia/xmms/files/patch-po::Makefile.in.in b/multimedia/xmms/files/patch-po::Makefile.in.in
index 7859a10fc0e4..ff7b31878f9b 100644
--- a/multimedia/xmms/files/patch-po::Makefile.in.in
+++ b/multimedia/xmms/files/patch-po::Makefile.in.in
@@ -1,10 +1,10 @@
---- po/Makefile.in.in.orig Mon Mar 4 22:56:47 2002
-+++ po/Makefile.in.in Fri Aug 22 16:50:02 2003
-@@ -88,6 +88,7 @@
- $(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \
- --add-comments --keyword=_ --keyword=N_ \
+--- po/Makefile.in.in.orig Fri Sep 5 20:26:50 2003
++++ po/Makefile.in.in Fri Sep 5 20:27:10 2003
+@@ -85,6 +85,7 @@
+ $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
+ --add-comments=I18N: $(XGETTEXT_OPTIONS) \
--files-from=$(srcdir)/POTFILES.in \
+ --from-code=ISO-8859-1 \
- && test ! -f $(PACKAGE).po \
- || ( rm -f $(srcdir)/$(PACKAGE).pot \
- && mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot )
+ --copyright-holder='$(COPYRIGHT_HOLDER)'
+ test ! -f $(DOMAIN).po || { \
+ if test -f $(srcdir)/$(DOMAIN).pot; then \
diff --git a/multimedia/xmms/pkg-plist b/multimedia/xmms/pkg-plist
index e31e57065614..f291af176b33 100644
--- a/multimedia/xmms/pkg-plist
+++ b/multimedia/xmms/pkg-plist
@@ -10,15 +10,13 @@ include/xmms/titlestring.h
include/xmms/util.h
include/xmms/xmmsctrl.h
lib/libxmms.a
-lib/libxmms.so
-lib/libxmms.so.3
+lib/libxmms.so.4
lib/xmms/Effect/libecho.so
lib/xmms/Effect/libstereo.so
lib/xmms/Effect/libvoice.so
lib/xmms/General/libir.so
lib/xmms/General/libsong_change.so
lib/xmms/Input/libcdaudio.so
-lib/xmms/Input/libidcin.so
lib/xmms/Input/libmpg123.so
lib/xmms/Input/libtonegen.so
lib/xmms/Input/libwav.so
@@ -33,15 +31,21 @@ share/aclocal/xmms.m4
%%DATADIR%%/xmms/wmxmms.xpm
share/locale/af/LC_MESSAGES/xmms.mo
share/locale/az/LC_MESSAGES/xmms.mo
+share/locale/be/LC_MESSAGES/xmms.mo
share/locale/bg/LC_MESSAGES/xmms.mo
+share/locale/bs/LC_MESSAGES/xmms.mo
share/locale/ca/LC_MESSAGES/xmms.mo
share/locale/cs/LC_MESSAGES/xmms.mo
+share/locale/cy/LC_MESSAGES/xmms.mo
share/locale/da/LC_MESSAGES/xmms.mo
share/locale/de/LC_MESSAGES/xmms.mo
share/locale/el/LC_MESSAGES/xmms.mo
+share/locale/en/LC_MESSAGES/xmms.mo
share/locale/eo/LC_MESSAGES/xmms.mo
share/locale/es/LC_MESSAGES/xmms.mo
+share/locale/et/LC_MESSAGES/xmms.mo
share/locale/eu/LC_MESSAGES/xmms.mo
+share/locale/fi/LC_MESSAGES/xmms.mo
share/locale/fr/LC_MESSAGES/xmms.mo
share/locale/ga/LC_MESSAGES/xmms.mo
share/locale/gl/LC_MESSAGES/xmms.mo
@@ -50,9 +54,11 @@ share/locale/hu/LC_MESSAGES/xmms.mo
share/locale/id/LC_MESSAGES/xmms.mo
share/locale/it/LC_MESSAGES/xmms.mo
share/locale/ja/LC_MESSAGES/xmms.mo
+share/locale/ka/LC_MESSAGES/xmms.mo
share/locale/ko/LC_MESSAGES/xmms.mo
share/locale/lt/LC_MESSAGES/xmms.mo
share/locale/lv/LC_MESSAGES/xmms.mo
+share/locale/mk/LC_MESSAGES/xmms.mo
share/locale/nl/LC_MESSAGES/xmms.mo
share/locale/nn/LC_MESSAGES/xmms.mo
share/locale/no/LC_MESSAGES/xmms.mo
@@ -62,15 +68,20 @@ share/locale/pt_BR/LC_MESSAGES/xmms.mo
share/locale/ro/LC_MESSAGES/xmms.mo
share/locale/ru/LC_MESSAGES/xmms.mo
share/locale/sk/LC_MESSAGES/xmms.mo
+share/locale/sl/LC_MESSAGES/xmms.mo
+share/locale/sq/LC_MESSAGES/xmms.mo
share/locale/sr/LC_MESSAGES/xmms.mo
+share/locale/sr@Latn/LC_MESSAGES/xmms.mo
share/locale/sv/LC_MESSAGES/xmms.mo
share/locale/tg/LC_MESSAGES/xmms.mo
share/locale/th/LC_MESSAGES/xmms.mo
share/locale/tr/LC_MESSAGES/xmms.mo
share/locale/uk/LC_MESSAGES/xmms.mo
+share/locale/uz/LC_MESSAGES/xmms.mo
+share/locale/uz@Cyrl/LC_MESSAGES/xmms.mo
share/locale/vi/LC_MESSAGES/xmms.mo
share/locale/wa/LC_MESSAGES/xmms.mo
-share/locale/zh_CN.GB2312/LC_MESSAGES/xmms.mo
+share/locale/zh_CN/LC_MESSAGES/xmms.mo
share/locale/zh_TW/LC_MESSAGES/xmms.mo
@dirrm %%DATADIR%%/xmms
@dirrm lib/xmms/Visualization