Attachment #11858 for bug #23160

View | Details | Raw Unified | Return to bug 23160
Collapse All | Expand All




#

PORTNAME=	xmms
PORTVERSION=	1.2.4
PORTREVISION=	1
CATEGORIES=	audio
MASTER_SITES=	ftp://ftp.xmms.org/xmms/1.2.x/ \
		ftp://ftp.uk.xmms.org/xmms/1.2.x/ \

		ftp://ftp.nl.xmms.org/xmms/1.2.x/ \
		ftp://ftp.de.xmms.org/xmms/1.2.x/

PATCH_SITES=	${MASTER_SITE_LOCAL}
PATCH_SITE_SUBDIR=	sobomax

MAINTAINER=	esk@ira.uka.de

LIB_DEPENDS=	xml.5:${PORTSDIR}/textproc/libxml

INSTALLS_SHLIB=	yes
CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
		LIBS="-L${LOCALBASE}/lib" \
		HAVE_MIKMOD="${HAVE_MIKMOD}" \
		HAVE_VORBIS="${HAVE_VORBIS}"

.include <bsd.port.pre.mk>


PLIST_SUB+=	MIKMODPLUGIN:="@comment "
.endif

.if !defined(WITHOUT_VORBIS)
LIB_DEPENDS+=	ogg.0:${PORTSDIR}/audio/libogg \
		vorbis.0:${PORTSDIR}/audio/libvorbis
HAVE_VORBIS=	yes
PLIST_SUB+=	VORBISPLUGIN:=""
.else
PLIST_SUB+=	VORBISPLUGIN:="@comment "
.endif

.if defined(HAVE_GNOME)
USE_GNOME=	yes
.else

.endif

.if !defined(WITHOUT_3DNOW) && ${OSVERSION} >= 400021
PATCHFILES=	xmms-${PORTVERSION}-3dnow.patch.gz
CONFIGURE_ARGS+=	--enable-3dnow
.endif


.endif

pre-extract:
.if !defined(WITHOUT_MIKMOD) || !defined(WITHOUT_VORBIS) || ( !defined(WITHOUT_3DNOW) && ${OSVERSION} >= 400021 )
	@${ECHO_MSG}
.if !defined(WITHOUT_MIKMOD)
	@${ECHO_MSG} "You can disable support for mikmod by defining WITHOUT_MIKMOD."
.endif
.if !defined(WITHOUT_VORBIS)
	@${ECHO_MSG} "You can disable support for vorbis by defining WITHOUT_VORBIS."
.endif
.if !defined(WITHOUT_3DNOW) && ${OSVERSION} >= 400021
	@${ECHO_MSG} "You can disable 3DNow! optimized decoding routines by defining WITHOUT_3DNOW."
.endif
	@${ECHO_MSG}
.endif

Lines 1-2 Link Here

(-)xmms/distinfo (-2 / +1 lines)
1	MD5 (xmms-1.2.3.tar.gz) = 5880503c9f51cd4cc14566eb1d8f54ff	1	MD5 (xmms-1.2.4.tar.gz) = df1081cc01628cd8b97cb5f3ca80e063
2	MD5 (xmms-1.2.3-3dnow.patch.gz) = 6dfabc4c460adb5062af86ca44303cd4




--- configure.orig	Tue Nov 28 16:12:16 2000
+++ configure	Tue Nov 28 16:12:52 2000
@@ -4033,6 +4033,9 @@
   echo "$ac_t""no" 1>&6
 fi
 
 
+if [ x"${HAVE_ESOUND}" != x"yes" ]; then
+  have_esd=no
+fi
 
 if test "x$have_esd" = xyes; then
   HAVE_ESD_TRUE=
@@ -4314,6 +4317,9 @@
   
   rm -f conf.mikmodtest
 
 
+if [ x"${HAVE_MIKMOD}" != x"yes" ]; then
+  have_mikmod=no
+fi
 
 if test "x$have_mikmod" = xyes; then
   HAVE_MIKMOD_TRUE=
@@ -4574,6 +4580,11 @@
   
   rm -f conf.vorbistest
 
+if [ x"${HAVE_VORBIS}" != x"yes" ]; then
+  have_ogg=no
+  have_vorbis=no
+fi
+
 have_oggvorbis=no
 if test "x$have_ogg" = xyes
 then
@@ -7551,14 +7562,14 @@
 
 if test -n "$GCC"
 then

 		ARCH_DEFINES="-DI386_ASSEM"
 		arch_type=ix86
 	;;
@@ -8315,10 +8326,6 @@
       *) # Relative path.
         ac_sub_cache_file="$ac_dots$cache_file" ;;
       esac




--- Makefile.in.orig	Tue Nov 28 14:55:51 2000
+++ Makefile.in	Tue Nov 28 14:57:22 2000
@@ -152,7 +152,10 @@
 sidplay_library = @sidplay_library@
 xmmsdir = @xmmsdir@
 

+SUBDIRS = intl libxmms xmms Output Input Effect General Visualization wmxmms po
+.ifdef HAVE_GNOME
+SUBDIRS += gnomexmms
+.endif
 
 bin_SCRIPTS = xmms-config
 
@@ -211,9 +214,9 @@
 		rm -f $(srcdir)/stamp-h.in; \
 		$(MAKE) $(srcdir)/stamp-h.in; \
 	else :; fi

Lines 1-6 Link Here

(-)xmms/files/patch-af (-4 / +4 lines)
1	--- Output/Makefile.in.orig Mon Jan 31 10:44:32 2000	1	--- Output/Makefile.in.orig Tue Nov 28 14:58:15 2000
2	+++ Output/Makefile.in Sun Feb 27 01:37:39 2000	2	+++ Output/Makefile.in Tue Nov 28 14:58:46 2000
3	@@ -125,7 +125,10 @@	3	@@ -152,7 +152,10 @@
4	sidplay_library = @sidplay_library@	4	sidplay_library = @sidplay_library@
5	xmmsdir = @xmmsdir@	5	xmmsdir = @xmmsdir@
6		6
Lines 8-14 Link Here
8	+SUBDIRS = OSS disk_writer	8	+SUBDIRS = OSS disk_writer
9	+.if defined(HAVE_ESOUND) \|\| defined(HAVE_GNOME)	9	+.if defined(HAVE_ESOUND) \|\| defined(HAVE_GNOME)
10	+SUBDIRS += esd	10	+SUBDIRS += esd
11	+.endif	11	+.endif
12	mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs	12	mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
13	CONFIG_HEADER = ../config.h	13	CONFIG_HEADER = ../config.h
14	CONFIG_CLEAN_FILES =	14	CONFIG_CLEAN_FILES =

Lines 1-7 Link Here

(-)xmms/pkg-descr (-3 / +7 lines)
1	XMMS --- X Multimedia System. XMMS is a multimedia player based on	1	XMMS --- X Multimedia System. XMMS is a multimedia player based on
2	the look of Winamp. Currently it plays mpeg layer 1/2/3, wav, au, and	2	the look of Winamp. Currently it plays mpeg layer 1/2/3, wav, au,
3	CD audio. Other formats are supported by different xmms plugins (e.g.	3	CD audio, etc.
4	xmms-mikmod).	4
		5	The Vorbis plugin included here (if you specify WITH_VORBIS) is the
		6	one that is included in the XMMS distribution. If you have the
		7	vorbis-xmms port installed, the plugin from that port will be
		8	overwritten by this one.
5		9
6	WWW: http://www.xmms.org/	10	WWW: http://www.xmms.org/
7		11




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
%%MIKMODPLUGIN:%%lib/xmms/Input/libmikmod.so
%%VORBISPLUGIN:%%lib/xmms/Input/libvorbis.so
lib/xmms/Output/libOSS.so
lib/xmms/Output/libdisk_writer.so
%%ESDPLUGIN:%%lib/xmms/Output/libesdout.so

share/aclocal/xmms.m4
%%DATADIR%%/xmms/wmxmms.xpm
share/locale/af/LC_MESSAGES/xmms.mo
share/locale/az/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/ga/LC_MESSAGES/xmms.mo
share/locale/hr/LC_MESSAGES/xmms.mo
share/locale/hu/LC_MESSAGES/xmms.mo
share/locale/it/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/ru/LC_MESSAGES/xmms.mo
share/locale/sk/LC_MESSAGES/xmms.mo
share/locale/sv/LC_MESSAGES/xmms.mo
share/locale/tr/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

Return to bug 23160

Lines 6-13 Link Here

(-)xmms/Makefile (-9 / +17 lines)
6	#	6	#
7		7
8	PORTNAME= xmms	8	PORTNAME= xmms
9	PORTVERSION= 1.2.3	9	PORTVERSION= 1.2.4
10	PORTREVISION= 1
11	CATEGORIES= audio	10	CATEGORIES= audio
12	MASTER_SITES= ftp://ftp.xmms.org/xmms/1.2.x/ \	11	MASTER_SITES= ftp://ftp.xmms.org/xmms/1.2.x/ \
13	ftp://ftp.uk.xmms.org/xmms/1.2.x/ \	12	ftp://ftp.uk.xmms.org/xmms/1.2.x/ \
Lines 17-25 Link Here
17	ftp://ftp.nl.xmms.org/xmms/1.2.x/ \	16	ftp://ftp.nl.xmms.org/xmms/1.2.x/ \
18	ftp://ftp.de.xmms.org/xmms/1.2.x/	17	ftp://ftp.de.xmms.org/xmms/1.2.x/
19		18
20	PATCH_SITES= ${MASTER_SITE_LOCAL}
21	PATCH_SITE_SUBDIR= sobomax
22
23	MAINTAINER= esk@ira.uka.de	19	MAINTAINER= esk@ira.uka.de
24		20
25	LIB_DEPENDS= xml.5:${PORTSDIR}/textproc/libxml	21	LIB_DEPENDS= xml.5:${PORTSDIR}/textproc/libxml
Lines 33-39 Link Here
33	INSTALLS_SHLIB= yes	29	INSTALLS_SHLIB= yes
34	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \	30	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
35	LIBS="-L${LOCALBASE}/lib" \	31	LIBS="-L${LOCALBASE}/lib" \
36	HAVE_MIKMOD=${HAVE_MIKMOD}	32	HAVE_MIKMOD="${HAVE_MIKMOD}" \
		33	HAVE_VORBIS="${HAVE_VORBIS}"
37		34
38	.include <bsd.port.pre.mk>	35	.include <bsd.port.pre.mk>
39		36
Lines 45-50 Link Here
45	PLIST_SUB+= MIKMODPLUGIN:="@comment "	42	PLIST_SUB+= MIKMODPLUGIN:="@comment "
46	.endif	43	.endif
47		44
		45	.if !defined(WITHOUT_VORBIS)
		46	LIB_DEPENDS+= ogg.0:${PORTSDIR}/audio/libogg \
		47	vorbis.0:${PORTSDIR}/audio/libvorbis
		48	HAVE_VORBIS= yes
		49	PLIST_SUB+= VORBISPLUGIN:=""
		50	.else
		51	PLIST_SUB+= VORBISPLUGIN:="@comment "
		52	.endif
		53
48	.if defined(HAVE_GNOME)	54	.if defined(HAVE_GNOME)
49	USE_GNOME= yes	55	USE_GNOME= yes
50	.else	56	.else
Lines 59-65 Link Here
59	.endif	65	.endif
60		66
61	.if !defined(WITHOUT_3DNOW) && ${OSVERSION} >= 400021	67	.if !defined(WITHOUT_3DNOW) && ${OSVERSION} >= 400021
62	PATCHFILES= xmms-${PORTVERSION}-3dnow.patch.gz
63	CONFIGURE_ARGS+= --enable-3dnow	68	CONFIGURE_ARGS+= --enable-3dnow
64	.endif	69	.endif
65		70
Lines 73-85 Link Here
73	.endif	78	.endif
74		79
75	pre-extract:	80	pre-extract:
76	.if !defined(WITHOUT_MIKMOD) \|\| ( !defined(WITHOUT_3DNOW) && ${OSVERSION} >= 400021 )	81	.if !defined(WITHOUT_MIKMOD) \|\| !defined(WITHOUT_VORBIS) \|\| ( !defined(WITHOUT_3DNOW) && ${OSVERSION} >= 400021 )
77	@${ECHO_MSG}	82	@${ECHO_MSG}
78	.if !defined(WITHOUT_MIKMOD)	83	.if !defined(WITHOUT_MIKMOD)
79	@${ECHO_MSG} "You can disable support for mikmod by defining WITHOUT_MIKMOD."	84	@${ECHO_MSG} "You can disable support for mikmod by defining WITHOUT_MIKMOD."
80	.endif	85	.endif
		86	.if !defined(WITHOUT_VORBIS)
		87	@${ECHO_MSG} "You can disable support for vorbis by defining WITHOUT_VORBIS."
		88	.endif
81	.if !defined(WITHOUT_3DNOW) && ${OSVERSION} >= 400021	89	.if !defined(WITHOUT_3DNOW) && ${OSVERSION} >= 400021
82	@${ECHO_MSG} "You can disable 3DNOW optimized decoding routines by defining WITHOUT_3DNOW."	90	@${ECHO_MSG} "You can disable 3DNow! optimized decoding routines by defining WITHOUT_3DNOW."
83	.endif	91	.endif
84	@${ECHO_MSG}	92	@${ECHO_MSG}
85	.endif	93	.endif

Lines 1-28 Link Here

(-)xmms/files/patch-ad (-10 / +20 lines)
1	--- configure.orig Wed Sep 20 00:30:29 2000	1	--- configure.orig Tue Nov 28 16:12:16 2000
2	+++ configure Wed Sep 27 12:22:43 2000	2	+++ configure Tue Nov 28 16:12:52 2000
3	@@ -4022,7 +4022,9 @@	3	@@ -4033,6 +4033,9 @@
4	echo "$ac_t""no" 1>&6
5	fi	4	fi
6		5
7	-	6
8	+if [ x"${HAVE_ESOUND}" != x"yes" ]; then	7	+if [ x"${HAVE_ESOUND}" != x"yes" ]; then
9	+ have_esd=no	8	+ have_esd=no
10	+fi	9	+fi
11		10
12	if test "x$have_esd" = xyes; then	11	if test "x$have_esd" = xyes; then
13	HAVE_ESD_TRUE=	12	HAVE_ESD_TRUE=
14	@@ -4303,7 +4305,9 @@	13	@@ -4314,6 +4317,9 @@
15
16	rm -f conf.mikmodtest	14	rm -f conf.mikmodtest
17		15
18	-	16
19	+if [ x"${HAVE_MIKMOD}" != x"yes" ]; then	17	+if [ x"${HAVE_MIKMOD}" != x"yes" ]; then
20	+ have_mikmod=no	18	+ have_mikmod=no
21	+fi	19	+fi
22		20
23	if test "x$have_mikmod" = xyes; then	21	if test "x$have_mikmod" = xyes; then
24	HAVE_MIKMOD_TRUE=	22	HAVE_MIKMOD_TRUE=
25	@@ -7171,14 +7175,14 @@	23	@@ -4574,6 +4580,11 @@
		24
		25	rm -f conf.vorbistest
		26
		27	+if [ x"${HAVE_VORBIS}" != x"yes" ]; then
		28	+ have_ogg=no
		29	+ have_vorbis=no
		30	+fi
		31	+
		32	have_oggvorbis=no
		33	if test "x$have_ogg" = xyes
		34	then
		35	@@ -7551,14 +7562,14 @@
26		36
27	if test -n "$GCC"	37	if test -n "$GCC"
28	then	38	then
Lines 39-45 Link Here
39	ARCH_DEFINES="-DI386_ASSEM"	49	ARCH_DEFINES="-DI386_ASSEM"
40	arch_type=ix86	50	arch_type=ix86
41	;;	51	;;
42	@@ -7885,10 +7889,6 @@	52	@@ -8315,10 +8326,6 @@
43	*) # Relative path.	53	*) # Relative path.
44	ac_sub_cache_file="$ac_dots$cache_file" ;;	54	ac_sub_cache_file="$ac_dots$cache_file" ;;
45	esac	55	esac

Lines 1-6 Link Here

(-)xmms/files/patch-ae (-5 / +5 lines)
1	--- Makefile.in.orig Mon Jul 31 10:27:32 2000	1	--- Makefile.in.orig Tue Nov 28 14:55:51 2000
2	+++ Makefile.in Mon Jul 31 10:27:49 2000	2	+++ Makefile.in Tue Nov 28 14:57:22 2000
3	@@ -147,7 +147,10 @@	3	@@ -152,7 +152,10 @@
4	sidplay_library = @sidplay_library@	4	sidplay_library = @sidplay_library@
5	xmmsdir = @xmmsdir@	5	xmmsdir = @xmmsdir@
6		6
Lines 8-18 Link Here
8	+SUBDIRS = intl libxmms xmms Output Input Effect General Visualization wmxmms po	8	+SUBDIRS = intl libxmms xmms Output Input Effect General Visualization wmxmms po
9	+.ifdef HAVE_GNOME	9	+.ifdef HAVE_GNOME
10	+SUBDIRS += gnomexmms	10	+SUBDIRS += gnomexmms
11	+.endif	11	+.endif
12		12
13	bin_SCRIPTS = xmms-config	13	bin_SCRIPTS = xmms-config
14		14
15	@@ -205,9 +205,9 @@	15	@@ -211,9 +214,9 @@
16	rm -f $(srcdir)/stamp-h.in; \	16	rm -f $(srcdir)/stamp-h.in; \
17	$(MAKE) $(srcdir)/stamp-h.in; \	17	$(MAKE) $(srcdir)/stamp-h.in; \
18	else :; fi	18	else :; fi

Lines 23-31 Link Here

(-)xmms/pkg-plist (-1 / +5 lines)
23	lib/xmms/Input/libcdaudio.so	23	lib/xmms/Input/libcdaudio.so
24	lib/xmms/Input/libidcin.so	24	lib/xmms/Input/libidcin.so
25	lib/xmms/Input/libmpg123.so	25	lib/xmms/Input/libmpg123.so
		26	lib/xmms/Input/libtonegen.so
26	lib/xmms/Input/libwav.so	27	lib/xmms/Input/libwav.so
27	%%MIKMODPLUGIN:%%lib/xmms/Input/libmikmod.so	28	%%MIKMODPLUGIN:%%lib/xmms/Input/libmikmod.so
28	lib/xmms/Input/libtonegen.so	29	%%VORBISPLUGIN:%%lib/xmms/Input/libvorbis.so
29	lib/xmms/Output/libOSS.so	30	lib/xmms/Output/libOSS.so
30	lib/xmms/Output/libdisk_writer.so	31	lib/xmms/Output/libdisk_writer.so
31	%%ESDPLUGIN:%%lib/xmms/Output/libesdout.so	32	%%ESDPLUGIN:%%lib/xmms/Output/libesdout.so
Lines 34-39 Link Here
34	share/aclocal/xmms.m4	35	share/aclocal/xmms.m4
35	%%DATADIR%%/xmms/wmxmms.xpm	36	%%DATADIR%%/xmms/wmxmms.xpm
36	share/locale/af/LC_MESSAGES/xmms.mo	37	share/locale/af/LC_MESSAGES/xmms.mo
		38	share/locale/az/LC_MESSAGES/xmms.mo
37	share/locale/bg/LC_MESSAGES/xmms.mo	39	share/locale/bg/LC_MESSAGES/xmms.mo
38	share/locale/ca/LC_MESSAGES/xmms.mo	40	share/locale/ca/LC_MESSAGES/xmms.mo
39	share/locale/cs/LC_MESSAGES/xmms.mo	41	share/locale/cs/LC_MESSAGES/xmms.mo
Lines 46-51 Link Here
46	share/locale/ga/LC_MESSAGES/xmms.mo	48	share/locale/ga/LC_MESSAGES/xmms.mo
47	share/locale/hr/LC_MESSAGES/xmms.mo	49	share/locale/hr/LC_MESSAGES/xmms.mo
48	share/locale/hu/LC_MESSAGES/xmms.mo	50	share/locale/hu/LC_MESSAGES/xmms.mo
		51	share/locale/it/LC_MESSAGES/xmms.mo
49	share/locale/ja/LC_MESSAGES/xmms.mo	52	share/locale/ja/LC_MESSAGES/xmms.mo
50	share/locale/ko/LC_MESSAGES/xmms.mo	53	share/locale/ko/LC_MESSAGES/xmms.mo
51	share/locale/lt/LC_MESSAGES/xmms.mo	54	share/locale/lt/LC_MESSAGES/xmms.mo
Lines 58-63 Link Here
58	share/locale/ru/LC_MESSAGES/xmms.mo	61	share/locale/ru/LC_MESSAGES/xmms.mo
59	share/locale/sk/LC_MESSAGES/xmms.mo	62	share/locale/sk/LC_MESSAGES/xmms.mo
60	share/locale/sv/LC_MESSAGES/xmms.mo	63	share/locale/sv/LC_MESSAGES/xmms.mo
		64	share/locale/tr/LC_MESSAGES/xmms.mo
61	share/locale/uk/LC_MESSAGES/xmms.mo	65	share/locale/uk/LC_MESSAGES/xmms.mo
62	share/locale/wa/LC_MESSAGES/xmms.mo	66	share/locale/wa/LC_MESSAGES/xmms.mo
63	share/locale/zh_CN.GB2312/LC_MESSAGES/xmms.mo	67	share/locale/zh_CN.GB2312/LC_MESSAGES/xmms.mo