aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--audio/xmms/Makefile18
-rw-r--r--audio/xmms/distinfo2
-rw-r--r--audio/xmms/files/patch-ab90
-rw-r--r--audio/xmms/pkg-descr3
-rw-r--r--audio/xmms/pkg-plist40
-rw-r--r--multimedia/xmms/Makefile18
-rw-r--r--multimedia/xmms/distinfo2
-rw-r--r--multimedia/xmms/files/patch-ab90
-rw-r--r--multimedia/xmms/pkg-descr3
-rw-r--r--multimedia/xmms/pkg-plist40
10 files changed, 228 insertions, 78 deletions
diff --git a/audio/xmms/Makefile b/audio/xmms/Makefile
index d324ea907652..15792aaed6a1 100644
--- a/audio/xmms/Makefile
+++ b/audio/xmms/Makefile
@@ -1,21 +1,26 @@
# New ports collection makefile for: xmms
-# Version required: 0.9.5.1
+# Version required: 1.0.1
# Date created: 3 July 1999
# Whom: Espen Skoglund <esk@ira.uka.de>
#
# $FreeBSD$
#
-DISTNAME= xmms-0.9.5.1
+DISTNAME= xmms-1.0.1
CATEGORIES= audio
-MASTER_SITES= ftp://ftp.xmms.org/xmms/0.9/
+MASTER_SITES= ftp://ftp.xmms.org/xmms/1.0/ \
+ ftp://ftp.uk.xmms.org/xmms/1.0/ \
+ ftp://ftp.us.xmms.org/xmms/1.0/ \
+ ftp://ftp.ca.us.xmms.org/xmms/1.0/ \
+ ftp://ftp.md.us.xmms.org/xmms/1.0/ \
+ ftp://ftp.nl.xmms.org/xmms/1.0/ \
+ ftp://ftp.de.xmms.org/xmms/1.0/
MAINTAINER= esk@ira.uka.de
LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
glib12.3:${PORTSDIR}/devel/glib12 \
- mikmod.2:${PORTSDIR}/audio/libmikmod \
- esd.2:${PORTSDIR}/audio/esound
+ xml.5:${PORTSDIR}/textproc/libxml
USE_LIBTOOL= yes
CONFIGURE_ARGS= --without-gnome
@@ -26,4 +31,7 @@ GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" \
GLIB_CONFIG="${GLIB_CONFIG}"
+post-install:
+ ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
+
.include <bsd.port.mk>
diff --git a/audio/xmms/distinfo b/audio/xmms/distinfo
index a8f6c954d0f0..21f7fe998d98 100644
--- a/audio/xmms/distinfo
+++ b/audio/xmms/distinfo
@@ -1 +1 @@
-MD5 (xmms-0.9.5.1.tar.gz) = 96390c8e664d5e1a237ce066283f79d5
+MD5 (xmms-1.0.1.tar.gz) = 2d34665f32006ed83892de1d057176fd
diff --git a/audio/xmms/files/patch-ab b/audio/xmms/files/patch-ab
index e79bff12547d..6737dede0961 100644
--- a/audio/xmms/files/patch-ab
+++ b/audio/xmms/files/patch-ab
@@ -1,14 +1,76 @@
---- Output/OSS/audio.c.orig Thu Oct 14 09:26:06 1999
-+++ Output/OSS/audio.c Tue Sep 28 16:36:45 1999
-@@ -146,10 +146,7 @@
- audio_buf_info buf_info;
- int bytes;
-
-- if (!ioctl(fd, SNDCTL_DSP_GETOSPACE, &buf_info))
-- bytes = ((buf_info.fragstotal - buf_info.fragments - 3) * buf_info.fragsize);
-- else
-- bytes = 0;
-+ bytes = 0;
-
- if (!oss_used() && bytes <= 0)
- return FALSE;
+*** Makefile.in.org Wed Feb 2 13:36:47 2000
+--- Makefile.in Wed Feb 2 13:37:01 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 ****
+ sidplay_library = @sidplay_library@
+ xmmsdir = @xmmsdir@
+
+! SUBDIRS = blur_scope sanalyzer opengl_spectrum
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
+ CONFIG_CLEAN_FILES =
+--- 125,131 ----
+ sidplay_library = @sidplay_library@
+ xmmsdir = @xmmsdir@
+
+! SUBDIRS = blur_scope sanalyzer
+ 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/audio/xmms/pkg-descr b/audio/xmms/pkg-descr
index 60b5491e9d7b..d3ab702dbc68 100644
--- a/audio/xmms/pkg-descr
+++ b/audio/xmms/pkg-descr
@@ -1,6 +1,7 @@
XMMS --- X Multimedia System. XMMS is a multimedia player based on
the look of Winamp. Currently it plays mpeg layer 1/2/3, wav, au, and
-all formats supported by libmikmod. It also plays CD audio.
+CD audio. Other formats are supported by different xmms plugins (e.g.
+xmms-mikmod).
WWW: http://www.xmms.org/
diff --git a/audio/xmms/pkg-plist b/audio/xmms/pkg-plist
index eab14e473849..dd1ed4bc9c93 100644
--- a/audio/xmms/pkg-plist
+++ b/audio/xmms/pkg-plist
@@ -1,37 +1,41 @@
-bin/wmxmms
bin/xmms
+bin/wmxmms
+bin/xmms-config
include/xmms/configfile.h
+include/xmms/xmmsctrl.h
include/xmms/dirbrowser.h
-include/xmms/plugin.h
include/xmms/util.h
-include/xmms/xmmsctrl.h
-lib/libxmms.a
-lib/libxmms.la
-lib/libxmms.so.9
+include/xmms/fullscreen.h
+include/xmms/dga.h
+include/xmms/plugin.h
+lib/libxmms.so.1
@exec ln -fs %D/%F %B/libxmms.so
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib
@unexec rm -f %B/libxmms.so
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
+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/libsrndecho.so
lib/xmms/Effect/libstereo.so
-lib/xmms/Effect/libvoice.so
+lib/xmms/Effect/libsrndecho.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/libmikmod.so
-lib/xmms/Input/libmpg123.so
-lib/xmms/Input/libwav.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/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
diff --git a/multimedia/xmms/Makefile b/multimedia/xmms/Makefile
index d324ea907652..15792aaed6a1 100644
--- a/multimedia/xmms/Makefile
+++ b/multimedia/xmms/Makefile
@@ -1,21 +1,26 @@
# New ports collection makefile for: xmms
-# Version required: 0.9.5.1
+# Version required: 1.0.1
# Date created: 3 July 1999
# Whom: Espen Skoglund <esk@ira.uka.de>
#
# $FreeBSD$
#
-DISTNAME= xmms-0.9.5.1
+DISTNAME= xmms-1.0.1
CATEGORIES= audio
-MASTER_SITES= ftp://ftp.xmms.org/xmms/0.9/
+MASTER_SITES= ftp://ftp.xmms.org/xmms/1.0/ \
+ ftp://ftp.uk.xmms.org/xmms/1.0/ \
+ ftp://ftp.us.xmms.org/xmms/1.0/ \
+ ftp://ftp.ca.us.xmms.org/xmms/1.0/ \
+ ftp://ftp.md.us.xmms.org/xmms/1.0/ \
+ ftp://ftp.nl.xmms.org/xmms/1.0/ \
+ ftp://ftp.de.xmms.org/xmms/1.0/
MAINTAINER= esk@ira.uka.de
LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
glib12.3:${PORTSDIR}/devel/glib12 \
- mikmod.2:${PORTSDIR}/audio/libmikmod \
- esd.2:${PORTSDIR}/audio/esound
+ xml.5:${PORTSDIR}/textproc/libxml
USE_LIBTOOL= yes
CONFIGURE_ARGS= --without-gnome
@@ -26,4 +31,7 @@ GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" \
GLIB_CONFIG="${GLIB_CONFIG}"
+post-install:
+ ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
+
.include <bsd.port.mk>
diff --git a/multimedia/xmms/distinfo b/multimedia/xmms/distinfo
index a8f6c954d0f0..21f7fe998d98 100644
--- a/multimedia/xmms/distinfo
+++ b/multimedia/xmms/distinfo
@@ -1 +1 @@
-MD5 (xmms-0.9.5.1.tar.gz) = 96390c8e664d5e1a237ce066283f79d5
+MD5 (xmms-1.0.1.tar.gz) = 2d34665f32006ed83892de1d057176fd
diff --git a/multimedia/xmms/files/patch-ab b/multimedia/xmms/files/patch-ab
index e79bff12547d..6737dede0961 100644
--- a/multimedia/xmms/files/patch-ab
+++ b/multimedia/xmms/files/patch-ab
@@ -1,14 +1,76 @@
---- Output/OSS/audio.c.orig Thu Oct 14 09:26:06 1999
-+++ Output/OSS/audio.c Tue Sep 28 16:36:45 1999
-@@ -146,10 +146,7 @@
- audio_buf_info buf_info;
- int bytes;
-
-- if (!ioctl(fd, SNDCTL_DSP_GETOSPACE, &buf_info))
-- bytes = ((buf_info.fragstotal - buf_info.fragments - 3) * buf_info.fragsize);
-- else
-- bytes = 0;
-+ bytes = 0;
-
- if (!oss_used() && bytes <= 0)
- return FALSE;
+*** Makefile.in.org Wed Feb 2 13:36:47 2000
+--- Makefile.in Wed Feb 2 13:37:01 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 ****
+ sidplay_library = @sidplay_library@
+ xmmsdir = @xmmsdir@
+
+! SUBDIRS = blur_scope sanalyzer opengl_spectrum
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
+ CONFIG_CLEAN_FILES =
+--- 125,131 ----
+ sidplay_library = @sidplay_library@
+ xmmsdir = @xmmsdir@
+
+! SUBDIRS = blur_scope sanalyzer
+ 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/pkg-descr b/multimedia/xmms/pkg-descr
index 60b5491e9d7b..d3ab702dbc68 100644
--- a/multimedia/xmms/pkg-descr
+++ b/multimedia/xmms/pkg-descr
@@ -1,6 +1,7 @@
XMMS --- X Multimedia System. XMMS is a multimedia player based on
the look of Winamp. Currently it plays mpeg layer 1/2/3, wav, au, and
-all formats supported by libmikmod. It also plays CD audio.
+CD audio. Other formats are supported by different xmms plugins (e.g.
+xmms-mikmod).
WWW: http://www.xmms.org/
diff --git a/multimedia/xmms/pkg-plist b/multimedia/xmms/pkg-plist
index eab14e473849..dd1ed4bc9c93 100644
--- a/multimedia/xmms/pkg-plist
+++ b/multimedia/xmms/pkg-plist
@@ -1,37 +1,41 @@
-bin/wmxmms
bin/xmms
+bin/wmxmms
+bin/xmms-config
include/xmms/configfile.h
+include/xmms/xmmsctrl.h
include/xmms/dirbrowser.h
-include/xmms/plugin.h
include/xmms/util.h
-include/xmms/xmmsctrl.h
-lib/libxmms.a
-lib/libxmms.la
-lib/libxmms.so.9
+include/xmms/fullscreen.h
+include/xmms/dga.h
+include/xmms/plugin.h
+lib/libxmms.so.1
@exec ln -fs %D/%F %B/libxmms.so
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib
@unexec rm -f %B/libxmms.so
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
+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/libsrndecho.so
lib/xmms/Effect/libstereo.so
-lib/xmms/Effect/libvoice.so
+lib/xmms/Effect/libsrndecho.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/libmikmod.so
-lib/xmms/Input/libmpg123.so
-lib/xmms/Input/libwav.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/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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 23:22:12 +0000