summaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authorMaxim Sobolev <sobomax@FreeBSD.org>2000-06-16 07:45:29 +0000
committerMaxim Sobolev <sobomax@FreeBSD.org>2000-06-16 07:45:29 +0000
commit8ffe38bb00b8c6b6eeac7e75f27fe935277be537 (patch)
treebdb4e151d61f572bbfa1d2280044edd80f4c2fba /multimedia
parentMake this actually work. Fix MASTER_SITES while I'm here. (diff)
Upgrade of XMMS from 1.0.1 to 1.2.0. The port may also be compiled with
WITH_GNOME (thanks to Ade Lovett), the PLIST is now sorted alphabetically. PR: 19293 Submitted by: Espen Skoglund <esk@ira.uka.de>
Notes
Notes: svn path=/head/; revision=29626
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/xmms/Makefile38
-rw-r--r--multimedia/xmms/distinfo2
-rw-r--r--multimedia/xmms/files/patch-ab65
-rw-r--r--multimedia/xmms/files/patch-ad47
-rw-r--r--multimedia/xmms/pkg-plist56
5 files changed, 119 insertions, 89 deletions
diff --git a/multimedia/xmms/Makefile b/multimedia/xmms/Makefile
index 60a6646fc87f..7e79560ddafb 100644
--- a/multimedia/xmms/Makefile
+++ b/multimedia/xmms/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= xmms
-PORTVERSION= 1.0.1
+PORTVERSION= 1.2.0
CATEGORIES= audio
MASTER_SITES= ftp://ftp.xmms.org/xmms/1.0/ \
ftp://ftp.uk.xmms.org/xmms/1.0/ \
@@ -20,24 +20,38 @@ MAINTAINER= esk@ira.uka.de
LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
glib12.3:${PORTSDIR}/devel/glib12 \
- xml.5:${PORTSDIR}/textproc/libxml
+ xml.5:${PORTSDIR}/textproc/libxml \
+ mikmod.2:${PORTSDIR}/audio/libmikmod \
+ esd.2:${PORTSDIR}/audio/esound
+USE_X_PREFIX= yes
USE_LIBTOOL= yes
-INSTALL_SHLIBS= yes
+INSTALLS_SHLIBS= yes
+
+.if defined(WITH_GNOME)
+CONFIGURE_ARGS= --with-gnome
+.else
CONFIGURE_ARGS= --without-gnome
+.endif
GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" \
- GLIB_CONFIG="${GLIB_CONFIG}"
-
-post-extract:
- @(cd ${WRKSRC}/Input/mpg123 && ${MV} decode_i586.s decode_i586.S && \
- ${MV} getbits.s getbits.S && cd ${WRKSRC}/Visualization/blur_scope && \
- ${MV} blur_8.s blur_8.S);
- @${PERL} -pi.bak -e 's:\.s :\.S :g' ${WRKSRC}/Input/mpg123/Makefile.in
- @${PERL} -pi.bak -e 's:blur_8.s:blur_8.S:g' \
- ${WRKSRC}/Visualization/blur_scope/Makefile.in
+ GLIB_CONFIG="${GLIB_CONFIG}" \
+ CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
+
+.if !defined(WITH_GNOME)
+pre-extract:
+ @${ECHO} "You can add support for GNOME by defining WITH_GNOME"
+.endif
+
+.if defined(WITH_GNOME)
+post-install:
+ @${ECHO} bin/gnomexmms >> ${TMPPLIST}
+ @${ECHO} etc/CORBA/servers/gnomexmms.gnorba >> ${TMPPLIST}
+ @${ECHO} share/gnome/applets/Multimedia/gnomexmms.desktop >> ${TMPPLIST}
+.endif
.include <bsd.port.mk>
diff --git a/multimedia/xmms/distinfo b/multimedia/xmms/distinfo
index 21f7fe998d98..20051697628d 100644
--- a/multimedia/xmms/distinfo
+++ b/multimedia/xmms/distinfo
@@ -1 +1 @@
-MD5 (xmms-1.0.1.tar.gz) = 2d34665f32006ed83892de1d057176fd
+MD5 (xmms-1.2.0.tar.gz) = 3f6be4d02ecb58c44ade0785f388eada
diff --git a/multimedia/xmms/files/patch-ab b/multimedia/xmms/files/patch-ab
index 6737dede0961..a9842709cd22 100644
--- a/multimedia/xmms/files/patch-ab
+++ b/multimedia/xmms/files/patch-ab
@@ -1,26 +1,7 @@
-*** Makefile.in.org Wed Feb 2 13:36:47 2000
---- Makefile.in Wed Feb 2 13:37:01 2000
+*** Visualization/Makefile.in.org Wed Jun 14 13:21:50 2000
+--- Visualization/Makefile.in Wed Jun 14 13:22:09 2000
***************
-*** 125,131 ****
- sidplay_library = @sidplay_library@
- xmmsdir = @xmmsdir@
-
-! SUBDIRS = libxmms xmms Output Input Effect General Visualization wmxmms gnomexmms
-
- bin_SCRIPTS = xmms-config
-
---- 125,131 ----
- sidplay_library = @sidplay_library@
- xmmsdir = @xmmsdir@
-
-! SUBDIRS = libxmms xmms Output Input Effect General Visualization wmxmms
-
- bin_SCRIPTS = xmms-config
-
-*** Visualization/Makefile.in.org Wed Feb 2 13:37:14 2000
---- Visualization/Makefile.in Wed Feb 2 13:37:26 2000
-***************
-*** 125,131 ****
+*** 148,154 ****
sidplay_library = @sidplay_library@
xmmsdir = @xmmsdir@
@@ -28,7 +9,7 @@
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../config.h
CONFIG_CLEAN_FILES =
---- 125,131 ----
+--- 148,154 ----
sidplay_library = @sidplay_library@
xmmsdir = @xmmsdir@
@@ -36,41 +17,3 @@
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../config.h
CONFIG_CLEAN_FILES =
-*** Input/Makefile.in.org Wed Feb 2 13:38:23 2000
---- Input/Makefile.in Wed Feb 2 13:38:40 2000
-***************
-*** 125,131 ****
- sidplay_library = @sidplay_library@
- xmmsdir = @xmmsdir@
-
-! SUBDIRS = wav mpg123 mikmod cdaudio idcin
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
- CONFIG_CLEAN_FILES =
---- 125,131 ----
- sidplay_library = @sidplay_library@
- xmmsdir = @xmmsdir@
-
-! SUBDIRS = wav mpg123 cdaudio idcin
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
- CONFIG_CLEAN_FILES =
-*** Output/Makefile.in.org Wed Feb 2 13:39:06 2000
---- Output/Makefile.in Wed Feb 2 13:39:17 2000
-***************
-*** 125,131 ****
- sidplay_library = @sidplay_library@
- xmmsdir = @xmmsdir@
-
-! SUBDIRS = OSS esd disk_writer
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
- CONFIG_CLEAN_FILES =
---- 125,131 ----
- sidplay_library = @sidplay_library@
- xmmsdir = @xmmsdir@
-
-! SUBDIRS = OSS disk_writer
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
- CONFIG_CLEAN_FILES =
diff --git a/multimedia/xmms/files/patch-ad b/multimedia/xmms/files/patch-ad
new file mode 100644
index 000000000000..3e8d4ddc49b3
--- /dev/null
+++ b/multimedia/xmms/files/patch-ad
@@ -0,0 +1,47 @@
+--- configure.orig Mon Jun 12 17:06:00 2000
++++ configure Fri Jun 16 07:01:32 2000
+@@ -3287,14 +3287,14 @@
+
+ fi
+ if test "x$PTHREAD_LIBS" = xerror; then
+- echo $ac_n "checking for pthread_attr_init in -lc_r""... $ac_c" 1>&6
+-echo "configure:3292: checking for pthread_attr_init in -lc_r" >&5
++ echo $ac_n "checking for pthread_attr_init in -pthread""... $ac_c" 1>&6
++echo "configure:3292: checking for pthread_attr_init in -pthread" >&5
+ ac_lib_var=`echo c_r'_'pthread_attr_init | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ ac_save_LIBS="$LIBS"
+-LIBS="-lc_r $LIBS"
++LIBS="-pthread $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 3300 "configure"
+ #include "confdefs.h"
+@@ -3322,7 +3322,7 @@
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+- PTHREAD_LIBS="-lc_r"
++ PTHREAD_LIBS="-pthread"
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+@@ -5472,7 +5472,7 @@
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ CATOBJEXT=.mo
+- DATADIRNAME=lib
++ DATADIRNAME=share
+ fi
+ rm -f conftest*
+ INSTOBJEXT=.mo
+@@ -7117,7 +7117,7 @@
+ ARCH_DEFINES=""
+ case "$host" in
+ i386-*-* | i486-*-* | i586-*-* | i686-*-* | i86pc-*-*)
+- CFLAGS="$CFLAGS -m486"
++ CFLAGS="$CFLAGS"
+ ARCH_DEFINES="-DI386_ASSEM"
+ arch_type=ix86
+ ;;
diff --git a/multimedia/xmms/pkg-plist b/multimedia/xmms/pkg-plist
index 803f756d7a6c..eb988578d785 100644
--- a/multimedia/xmms/pkg-plist
+++ b/multimedia/xmms/pkg-plist
@@ -1,39 +1,65 @@
-bin/xmms
bin/wmxmms
+bin/xmms
bin/xmms-config
include/xmms/configfile.h
-include/xmms/xmmsctrl.h
+include/xmms/dga.h
include/xmms/dirbrowser.h
-include/xmms/util.h
include/xmms/fullscreen.h
-include/xmms/dga.h
include/xmms/plugin.h
+include/xmms/util.h
+include/xmms/xmmsctrl.h
+lib/libxmms.a
+lib/libxmms.la
lib/libxmms.so.1
@exec ln -fs %D/%F %B/libxmms.so
@unexec rm -f %B/libxmms.so
-lib/xmms/Output/libOSS.so
-lib/xmms/Output/libdisk_writer.so
-lib/xmms/Input/libwav.so
-lib/xmms/Input/libmpg123.so
-lib/xmms/Input/libcdaudio.so
-lib/xmms/Input/libidcin.so
lib/xmms/Effect/libvoice.so
lib/xmms/Effect/libecho.so
lib/xmms/Effect/libstereo.so
-lib/xmms/Effect/libsrndecho.so
lib/xmms/General/libir.so
lib/xmms/General/libsong_change.so
+lib/xmms/Input/libwav.so
+lib/xmms/Input/libmpg123.so
+lib/xmms/Input/libcdaudio.so
+lib/xmms/Input/libidcin.so
+lib/xmms/Input/libmikmod.so
+lib/xmms/Input/libtonegen.so
+lib/xmms/Output/libOSS.so
+lib/xmms/Output/libdisk_writer.so
+lib/xmms/Output/libesdout.so
lib/xmms/Visualization/libbscope.so
lib/xmms/Visualization/libsanalyzer.so
-lib/libxmms.la
-lib/libxmms.a
share/aclocal/xmms.m4
+share/locale/af/LC_MESSAGES/xmms.mo
+share/locale/bg/LC_MESSAGES/xmms.mo
+share/locale/ca/LC_MESSAGES/xmms.mo
+share/locale/cs/LC_MESSAGES/xmms.mo
+share/locale/da/LC_MESSAGES/xmms.mo
+share/locale/de/LC_MESSAGES/xmms.mo
+share/locale/es/LC_MESSAGES/xmms.mo
+share/locale/fr/LC_MESSAGES/xmms.mo
+share/locale/hr/LC_MESSAGES/xmms.mo
+share/locale/hu/LC_MESSAGES/xmms.mo
+share/locale/ja/LC_MESSAGES/xmms.mo
+share/locale/ko/LC_MESSAGES/xmms.mo
+share/locale/lt/LC_MESSAGES/xmms.mo
+share/locale/nl/LC_MESSAGES/xmms.mo
+share/locale/no/LC_MESSAGES/xmms.mo
+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/sv/LC_MESSAGES/xmms.mo
+share/locale/uk/LC_MESSAGES/xmms.mo
+share/locale/wa/LC_MESSAGES/xmms.mo
+share/locale/zh_CN.GB2312/LC_MESSAGES/xmms.mo
+share/locale/zh_TW.Big5/LC_MESSAGES/xmms.mo
share/xmms/wmxmms.xpm
@dirrm include/xmms
-@dirrm lib/xmms/Output
-@dirrm lib/xmms/Input
@dirrm lib/xmms/Effect
@dirrm lib/xmms/General
+@dirrm lib/xmms/Input
+@dirrm lib/xmms/Output
@dirrm lib/xmms/Visualization
@dirrm lib/xmms
@dirrm share/xmms