Attachment #83443 for bug #119187

Lines 6-11 You should get into the habit of checkin Link Here

(-)UPDATING (+7 lines)
6	time you update your ports collection, before attempting any port	6	time you update your ports collection, before attempting any port
7	upgrades.	7	upgrades.
8		8
		9	20071230:
		10	AFFECTS: users of audio/xmms and russian/xmms
		11	AUTHOR: uspoerlein@gmail.com
		12
		13	With the update to 1.2.11 the WITH_ENCODING_PATCH and WITH_ID3V2_PATCH
		14	are now subsumed by the WITH_RUSXMMS_PATCHES flag.
		15
9	20071225:	16	20071225:
10	AFFECTS: users of www/amphetadesk	17	AFFECTS: users of www/amphetadesk
11	AUTHOR: lioux@FreeBSD.org	18	AUTHOR: lioux@FreeBSD.org

Lines 636-641 Link Here

(-)devel/Makefile (+2 lines)
636	SUBDIR += libphish	636	SUBDIR += libphish
637	SUBDIR += libpperl	637	SUBDIR += libpperl
638	SUBDIR += libpthread-stubs	638	SUBDIR += libpthread-stubs
		639	SUBDIR += librcc
		640	SUBDIR += librcd
639	SUBDIR += libredblack	641	SUBDIR += libredblack
640	SUBDIR += libruin	642	SUBDIR += libruin
641	SUBDIR += libs11n	643	SUBDIR += libs11n





PORTNAME=	xmms
PORTVERSION=	1.2.11
PORTREVISION=	1
CATEGORIES+=	multimedia audio ipv6
MASTER_SITES=	http://www.xmms.org/files/1.2.x/
DISTFILES=	${DISTNAME}${EXTRACT_SUFX}

USE_BZIP2=	yes
USE_GL=		gl
USE_GNOME=	gtk12 gnomehack
WANT_GNOME=	yes
USE_GMAKE=	yes
USE_GETTEXT=	yes
USE_ICONV=	yes
USE_LDCONFIG=	yes
USE_AUTOTOOLS=  aclocal:19 automake:19 autoheader:261 autoconf:261
ACLOCAL_ARGS=	--force
CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
		LIBS="-L${LOCALBASE}/lib" \
		PTHREAD_LIBS="${PTHREAD_LIBS}" \
		INPUT_PLUGINS="${INPUT_PLUGINS}" \
		OUTPUT_PLUGINS="${OUTPUT_PLUGINS}" \
		VISUALIZATION_PLUGINS="${VISUALIZATION_PLUGINS}"


CONFIGURE_ARGS+=	--enable-ipv6

.if defined(WITH_RUSXMMS_PATCHES)
ENC_PATCHLEVEL=	41
DISTFILES+=	RusXMMS2-csa${ENC_PATCHLEVEL}${EXTRACT_SUFX}:enc
MASTER_SITES+=	${MASTER_SITE_SOURCEFORGE:S/$/:enc/}
MASTER_SITE_SUBDIR+=	rusxmms/:enc

LIB_DEPENDS+=	rcc.2:${PORTSDIR}/devel/librcc
LIB_DEPENDS+=	rcd.1:${PORTSDIR}/devel/librcd
.endif

.if defined(WITH_EXTENDED_VORBIS_FILEINFO)
CFLAGS+=	-DALL_VORBIS_TAGS
.endif

.endif

pre-extract:
.if !defined(WITHOUT_MIKMOD) || !defined(WITHOUT_VORBIS) || !defined(WITHOUT_SIMD) \
  || ${HAVE_GNOME:Mesound}!="" || !defined(WITH_RUSXMMS_PATCHES)
	@${ECHO_MSG}
.if !defined(WITH_RUSXMMS_PATCHES)
	@${ECHO_MSG} "You can enable support for ID3v2 tags and CP1251 encoding by defining WITH_RUSXMMS_PATCHES."
.endif
.if !defined(WITHOUT_MIKMOD)
	@${ECHO_MSG} "You can disable support for mikmod by defining WITHOUT_MIKMOD."
.endif

.endif

post-patch:
.if defined(WITH_RUSXMMS_PATCHES)
.  for src in source/rcc.c source/rcc.h source/rcc_langs.h
	@${INSTALL_DATA} ${WRKDIR}/RusXMMS2/${src} ${WRKSRC}/libxmms
.  endfor
	@${CAT} ${WRKDIR}/RusXMMS2/3rdparty/mpg123/*.patch | ${PATCH} -s -p1 -d ${WRKSRC}
.  for diff in xmms-ds-rusxmms.patch xmms-ds-rusxmms-charset.patch \
       xmms-ds-playlist.patch xmms-ds-shade.patch xmms-ds-textbox.patch
	@${PATCH} -s -p1 -d ${WRKSRC} < ${WRKDIR}/RusXMMS2/patches/${diff}
.  endfor
.  for diff in xmms-ds-mpg123.patch xmms-ds-mpg123-editor.patch \
       xmms-ds-mpg123-editor-keys.patch xmms-ds-vorbis-editor.patch \
       xmms-ds-vorbis-editor-keys.patch
	@${PATCH} -s -p1 -d ${WRKSRC} < ${WRKDIR}/RusXMMS2/patches/plugins/${diff}
.  endfor
.endif

# There are patches to configure.in and Makefile.in, recreate configure
# scripts
run-autotools:
	@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL} \
		${ACLOCAL_ARGS})
	@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOHEADER} \
		${AUTOHEADER_ARGS})
	@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOCONF} \
		${AUTOCONF_ARGS})
	@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOMAKE} \
		${AUTOMAKE_ARGS})
	@(cd ${CONFIGURE_WRKSRC}/libxmms && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL} \
		${ACLOCAL_ARGS})
	@(cd ${CONFIGURE_WRKSRC}/libxmms && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOHEADER} \
		${AUTOHEADER_ARGS})
	@(cd ${CONFIGURE_WRKSRC}/libxmms && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOCONF} \
		${AUTOCONF_ARGS})
	@(cd ${CONFIGURE_WRKSRC}/libxmms && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOMAKE} \
		${AUTOMAKE_ARGS})

post-install:
	@${MKDIR} ${PREFIX}/share/xmms/Skins

Lines 1-3 Link Here

(-)multimedia/xmms/distinfo (+3 lines)
1	MD5 (xmms-1.2.11.tar.bz2) = f3e6dbaf0b3f571a532ab575656be506	1	MD5 (xmms-1.2.11.tar.bz2) = f3e6dbaf0b3f571a532ab575656be506
2	SHA256 (xmms-1.2.11.tar.bz2) = 7ec15c56632b6c82e61ccddeaefd372359af2f005708a58cdf3951c574b20390	2	SHA256 (xmms-1.2.11.tar.bz2) = 7ec15c56632b6c82e61ccddeaefd372359af2f005708a58cdf3951c574b20390
3	SIZE (xmms-1.2.11.tar.bz2) = 2581032	3	SIZE (xmms-1.2.11.tar.bz2) = 2581032
		4	MD5 (RusXMMS2-csa41.tar.bz2) = 7d89f35c80849dae89b81cbb57026e57
		5	SHA256 (RusXMMS2-csa41.tar.bz2) = e64df1956502e48c09ca60262efb7f1953a76d82a70c801e4797ca81e130e8d0
		6	SIZE (RusXMMS2-csa41.tar.bz2) = 96642




--- configure.in.orig	2007-11-16 22:52:30.000000000 +0100
+++ configure.in	2007-12-29 18:08:33.603961280 +0100
@@ -115,7 +115,14 @@
 dnl ***
 dnl *** Check pthread linking
 dnl ***
+AC_MSG_CHECKING([for PTHREAD_LIBS])
+if test "x$PTHREAD_LIBS" = "x"; then
 PTHREAD_LIBS=error
+else
+AC_MSG_RESULT([$PTHREAD_LIBS])
+fi
+
+if test "x$PTHREAD_LIBS" = "xerror"; then
 AC_MSG_CHECKING([for old style FreeBSD -pthread flag])
 AC_EGREP_CPP([yes],
 	[#if (defined(__FreeBSD_cc_version) && __FreeBSD_cc_version <= 500001) || defined(__OpenBSD__)
@@ -124,6 +131,7 @@
 	], AC_MSG_RESULT([yes])
 	CFLAGS="$CFLAGS -D_THREAD_SAFE" PTHREAD_LIBS="-pthread",
 	AC_MSG_RESULT([no]))
+fi
 if test "x$PTHREAD_LIBS" = "xerror"; then
 	AC_CHECK_LIB([pthread], [pthread_attr_init],
 		PTHREAD_LIBS="-lpthread")
@@ -423,7 +431,6 @@
 LIBS_save=$LIBS
 CFLAGS_save=$CFLAGS
 LDFLAGS_save=$LDFLAGS
-AM_PATH_ALSA([0.9.0], [have_alsa=yes], [have_alsa=no])
 AM_CONDITIONAL([HAVE_ALSA], [test "x${have_alsa}" = "xyes"])
 LIBS=$LIBS_save
 CFLAGS=$CFLAGS_save

Added Link Here

(-)multimedia/xmms/files/patch-po-Makefile.in.in (+10 lines)
1	--- po/Makefile.in.in.orig 2007-12-28 18:06:27.340155988 +0100
2	+++ po/Makefile.in.in 2007-12-28 18:06:52.250680503 +0100
3	@@ -30,6 +30,7 @@
4
5	INSTALL = @INSTALL@
6	INSTALL_DATA = @INSTALL_DATA@
7	+install_sh = @install_sh@
8	mkinstalldirs = $(SHELL) @install_sh@ -d
9	mkdir_p = @mkdir_p@
10

Lines 15-20 MASTERDIR= ${.CURDIR}/../../multimedia/x Link Here

(-)russian/xmms/Makefile (-1 / +1 lines)
15		15
16	CONFLICTS= xmms-[0-9]*	16	CONFLICTS= xmms-[0-9]*
17		17
18	WITH_ENCODING_PATCH= yes	18	WITH_RUSXMMS_PATCHES= yes
19		19
20	.include "${MASTERDIR}/Makefile"	20	.include "${MASTERDIR}/Makefile"

Return to bug 119187

Lines 7-12 Link Here

(-)multimedia/xmms/Makefile (-11 / +54 lines)
7		7
8	PORTNAME= xmms	8	PORTNAME= xmms
9	PORTVERSION= 1.2.11	9	PORTVERSION= 1.2.11
		10	PORTREVISION= 1
10	CATEGORIES+= multimedia audio ipv6	11	CATEGORIES+= multimedia audio ipv6
11	MASTER_SITES= http://www.xmms.org/files/1.2.x/	12	MASTER_SITES= http://www.xmms.org/files/1.2.x/
12	DISTFILES= ${DISTNAME}${EXTRACT_SUFX}	13	DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
Lines 17-30 COMMENT?= X Multimedia System -- An audi Link Here
17	USE_BZIP2= yes	18	USE_BZIP2= yes
18	USE_GL= gl	19	USE_GL= gl
19	USE_GNOME= gtk12 gnomehack	20	USE_GNOME= gtk12 gnomehack
20	WANT_GNOME= yes
21	USE_GMAKE= yes	21	USE_GMAKE= yes
22	USE_GETTEXT= yes	22	USE_GETTEXT= yes
23	USE_ICONV= yes	23	USE_ICONV= yes
24	USE_LDCONFIG= yes	24	USE_LDCONFIG= yes
25	GNU_CONFIGURE= yes	25	USE_AUTOTOOLS= aclocal:19 automake:19 autoheader:261 autoconf:261
		26	ACLOCAL_ARGS= --force
26	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \	27	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
27	LIBS="-L${LOCALBASE}/lib" \	28	LIBS="-L${LOCALBASE}/lib" \
		29	PTHREAD_LIBS="${PTHREAD_LIBS}" \
28	INPUT_PLUGINS="${INPUT_PLUGINS}" \	30	INPUT_PLUGINS="${INPUT_PLUGINS}" \
29	OUTPUT_PLUGINS="${OUTPUT_PLUGINS}" \	31	OUTPUT_PLUGINS="${OUTPUT_PLUGINS}" \
30	VISUALIZATION_PLUGINS="${VISUALIZATION_PLUGINS}"	32	VISUALIZATION_PLUGINS="${VISUALIZATION_PLUGINS}"
Lines 42-47 PLIST_SUB= DATADIR="share" Link Here
42		44
43	CONFIGURE_ARGS+= --enable-ipv6	45	CONFIGURE_ARGS+= --enable-ipv6
44		46
		47	.if defined(WITH_RUSXMMS_PATCHES)
		48	ENC_PATCHLEVEL= 41
		49	DISTFILES+= RusXMMS2-csa${ENC_PATCHLEVEL}${EXTRACT_SUFX}:enc
		50	MASTER_SITES+= ${MASTER_SITE_SOURCEFORGE:S/$/:enc/}
		51	MASTER_SITE_SUBDIR+= rusxmms/:enc
		52
		53	LIB_DEPENDS+= rcc.2:${PORTSDIR}/devel/librcc
		54	LIB_DEPENDS+= rcd.1:${PORTSDIR}/devel/librcd
		55	.endif
		56
45	.if defined(WITH_EXTENDED_VORBIS_FILEINFO)	57	.if defined(WITH_EXTENDED_VORBIS_FILEINFO)
46	CFLAGS+= -DALL_VORBIS_TAGS	58	CFLAGS+= -DALL_VORBIS_TAGS
47	.endif	59	.endif
Lines 92-99 post-extract: Link Here
92	.endif	104	.endif
93		105
94	pre-extract:	106	pre-extract:
95	.if !defined(WITHOUT_MIKMOD) \|\| !defined(WITHOUT_VORBIS) \|\| ( !defined(WITHOUT_SIMD) ) \|\| ${HAVE_GNOME:Mesound}!=""	107	.if !defined(WITHOUT_MIKMOD) \|\| !defined(WITHOUT_VORBIS) \|\| !defined(WITHOUT_SIMD) \
		108	\|\| ${HAVE_GNOME:Mesound}!="" \|\| !defined(WITH_RUSXMMS_PATCHES)
96	@${ECHO_MSG}	109	@${ECHO_MSG}
		110	.if !defined(WITH_RUSXMMS_PATCHES)
		111	@${ECHO_MSG} "You can enable support for ID3v2 tags and CP1251 encoding by defining WITH_RUSXMMS_PATCHES."
		112	.endif
97	.if !defined(WITHOUT_MIKMOD)	113	.if !defined(WITHOUT_MIKMOD)
98	@${ECHO_MSG} "You can disable support for mikmod by defining WITHOUT_MIKMOD."	114	@${ECHO_MSG} "You can disable support for mikmod by defining WITHOUT_MIKMOD."
99	.endif	115	.endif
Lines 110-123 pre-extract: Link Here
110	.endif	126	.endif
111		127
112	post-patch:	128	post-patch:
113	@${FIND} ${WRKSRC} -name "Makefile.in*" \| ${XARGS} ${REINPLACE_CMD} -e \	129	.if defined(WITH_RUSXMMS_PATCHES)
114	's\|\(datadir\)/aclocal\|(prefix)/share/aclocal\|g'	130	. for src in source/rcc.c source/rcc.h source/rcc_langs.h
115	@${REINPLACE_CMD} -e 's\|{datadir}/locale\|{prefix}/share/locale\|g' \	131	@${INSTALL_DATA} ${WRKDIR}/RusXMMS2/${src} ${WRKSRC}/libxmms
116	${WRKSRC}/configure	132	. endfor
117	@${REINPLACE_CMD} -e 's,-pthread,${PTHREAD_LIBS},g' \	133	@${CAT} ${WRKDIR}/RusXMMS2/3rdparty/mpg123/*.patch \| ${PATCH} -s -p1 -d ${WRKSRC}
118	${WRKSRC}/configure	134	. for diff in xmms-ds-rusxmms.patch xmms-ds-rusxmms-charset.patch \
119	@${REINPLACE_CMD} -e '/objformat/s\|echo aout\|echo elf\|' \	135	xmms-ds-playlist.patch xmms-ds-shade.patch xmms-ds-textbox.patch
120	${WRKSRC}/configure ${WRKSRC}/libxmms/configure	136	@${PATCH} -s -p1 -d ${WRKSRC} < ${WRKDIR}/RusXMMS2/patches/${diff}
		137	. endfor
		138	. for diff in xmms-ds-mpg123.patch xmms-ds-mpg123-editor.patch \
		139	xmms-ds-mpg123-editor-keys.patch xmms-ds-vorbis-editor.patch \
		140	xmms-ds-vorbis-editor-keys.patch
		141	@${PATCH} -s -p1 -d ${WRKSRC} < ${WRKDIR}/RusXMMS2/patches/plugins/${diff}
		142	. endfor
		143	.endif
		144
		145	# There are patches to configure.in and Makefile.in, recreate configure
		146	# scripts
		147	run-autotools:
		148	@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL} \
		149	${ACLOCAL_ARGS})
		150	@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOHEADER} \
		151	${AUTOHEADER_ARGS})
		152	@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOCONF} \
		153	${AUTOCONF_ARGS})
		154	@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOMAKE} \
		155	${AUTOMAKE_ARGS})
		156	@(cd ${CONFIGURE_WRKSRC}/libxmms && ${SETENV} ${AUTOTOOLS_ENV} ${ACLOCAL} \
		157	${ACLOCAL_ARGS})
		158	@(cd ${CONFIGURE_WRKSRC}/libxmms && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOHEADER} \
		159	${AUTOHEADER_ARGS})
		160	@(cd ${CONFIGURE_WRKSRC}/libxmms && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOCONF} \
		161	${AUTOCONF_ARGS})
		162	@(cd ${CONFIGURE_WRKSRC}/libxmms && ${SETENV} ${AUTOTOOLS_ENV} ${AUTOMAKE} \
		163	${AUTOMAKE_ARGS})
121		164
122	post-install:	165	post-install:
123	@${MKDIR} ${PREFIX}/share/xmms/Skins	166	@${MKDIR} ${PREFIX}/share/xmms/Skins

Added Link Here

(-)multimedia/xmms/files/patch-configure.in (+33 lines)
1	--- configure.in.orig 2007-11-16 22:52:30.000000000 +0100
2	+++ configure.in 2007-12-29 18:08:33.603961280 +0100
3	@@ -115,7 +115,14 @@
4	dnl ***
5	dnl *** Check pthread linking
6	dnl ***
7	+AC_MSG_CHECKING([for PTHREAD_LIBS])
8	+if test "x$PTHREAD_LIBS" = "x"; then
9	PTHREAD_LIBS=error
10	+else
11	+AC_MSG_RESULT([$PTHREAD_LIBS])
12	+fi
13	+
14	+if test "x$PTHREAD_LIBS" = "xerror"; then
15	AC_MSG_CHECKING([for old style FreeBSD -pthread flag])
16	AC_EGREP_CPP([yes],
17	[#if (defined(__FreeBSD_cc_version) && __FreeBSD_cc_version <= 500001) \|\| defined(__OpenBSD__)
18	@@ -124,6 +131,7 @@
19	], AC_MSG_RESULT([yes])
20	CFLAGS="$CFLAGS -D_THREAD_SAFE" PTHREAD_LIBS="-pthread",
21	AC_MSG_RESULT([no]))
22	+fi
23	if test "x$PTHREAD_LIBS" = "xerror"; then
24	AC_CHECK_LIB([pthread], [pthread_attr_init],
25	PTHREAD_LIBS="-lpthread")
26	@@ -423,7 +431,6 @@
27	LIBS_save=$LIBS
28	CFLAGS_save=$CFLAGS
29	LDFLAGS_save=$LDFLAGS
30	-AM_PATH_ALSA([0.9.0], [have_alsa=yes], [have_alsa=no])
31	AM_CONDITIONAL([HAVE_ALSA], [test "x${have_alsa}" = "xyes"])
32	LIBS=$LIBS_save
33	CFLAGS=$CFLAGS_save