summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornaddy <naddy@FreeBSD.org>2015-02-22 21:11:10 +0000
committernaddy <naddy@FreeBSD.org>2015-02-22 21:11:10 +0000
commit330f57b1d6d34872f8ddbdb60fc8297039290285 (patch)
tree02c4c895255dab825b8bc684980c25e73f17e0e9
parentf2a03af44a6814feb13e9a9cdfd189b97c0600c3 (diff)
downloadFreeBSD-ports-330f57b1d6d34872f8ddbdb60fc8297039290285.zip
FreeBSD-ports-330f57b1d6d34872f8ddbdb60fc8297039290285.tar.gz
Remove the bitrotted remains of the RusXMMS patches, commented out
for nine months and broken for longer. The RusXMMS modifications have turned into a partial rewrite of XMMS. They are too intrusive and outside the scope of an optional patch to XMMS. I urge anybody interested in this to revive the russian/xmms port as a full-fledged fork.
-rw-r--r--multimedia/xmms/Makefile44
-rw-r--r--multimedia/xmms/distinfo2
2 files changed, 2 insertions, 44 deletions
diff --git a/multimedia/xmms/Makefile b/multimedia/xmms/Makefile
index 0e06d23..8952216 100644
--- a/multimedia/xmms/Makefile
+++ b/multimedia/xmms/Makefile
@@ -33,7 +33,7 @@ INPUT_PLUGINS= cdaudio mpg123 tonegen wav
OUTPUT_PLUGINS= OSS disk_writer
VISUALIZATION_PLUGINS= blur_scope sanalyzer
-OPTIONS_DEFINE= ESOUND IPV6 MIKMOD NLS SPEC VFILEINFO VORBIS #RUSXMMS_PATCHES
+OPTIONS_DEFINE= ESOUND IPV6 MIKMOD NLS SPEC VFILEINFO VORBIS
OPTIONS_DEFAULT=MIKMOD VORBIS
OPTIONS_DEFINE_i386= SIMD
OPTIONS_DEFAULT_i386= SIMD
@@ -62,28 +62,12 @@ VFILEINFO_CPPFLAGS= -DALL_VORBIS_TAGS
VORBIS_CONFIGURE_ENABLE=vorbis
VORBIS_LIB_DEPENDS= libvorbis.so:${PORTSDIR}/audio/libvorbis
-#RUSXMMS_PATCHES_DESC= Patches to handle broken non-Unicode ID3 tags
-
.if !defined(WITH_DEBUG)
INSTALL_TARGET= install-strip
.endif
.include <bsd.port.options.mk>
-#.if ${PORT_OPTIONS:MRUSXMMS_PATCHES}
-#ENC_PATCHLEVEL= 41
-#DISTFILES+= RusXMMS2-csa${ENC_PATCHLEVEL}${EXTRACT_SUFX}:enc
-#MASTER_SITES+= SF/rusxmms/rusxmms2/csa41%20%28${PORTVERSION}%29:enc
-#MASTER_SITE_SUBDIR+= rusxmms/:enc
-#
-#LIB_DEPENDS+= librcc.so:${PORTSDIR}/devel/librcc \
-# librcd.so:${PORTSDIR}/devel/librcd
-#
-#USE_AUTOTOOLS= aclocal autoheader libtoolize autoconf automake
-#AUTOMAKE_ARGS= -a -c -f
-#USE_OPENSSL= yes
-#.endif
-
.if ${PORT_OPTIONS:MESOUND}
OUTPUT_PLUGINS+= esd
.endif
@@ -100,31 +84,7 @@ INPUT_PLUGINS+= vorbis
VISUALIZATION_PLUGINS+= opengl_spectrum
.endif
-.include <bsd.port.pre.mk>
-
post-patch:
-#.if ${PORT_OPTIONS:MRUSXMMS_PATCHES}
-# @${REINPLACE_CMD} -e 's/AM_PATH_ALSA.*/have_alsa=no/' \
-# ${WRKSRC}/configure.in
-# @${REINPLACE_CMD} -e '/libtool/,$$d' \
-# ${WRKSRC}/acinclude.m4 ${WRKSRC}/libxmms/acinclude.m4
-# @${CP} ${WRKDIR}/RusXMMS2/source/* ${WRKSRC}/libxmms/
-# @${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
-## If there is no esound installed, the autotools won't find a required macro
-#.if ${HAVE_GNOME:Mesound}==""
-# @${REINPLACE_CMD} -e '/AM_PATH_ESD/,/have_esd=no/d' \
-# ${WRKSRC}/configure.in
-#.endif
-#.endif
@${REINPLACE_CMD} -e 's/alsa_found=yes/alsa_found=no/' \
${WRKSRC}/configure
@${REINPLACE_CMD} -e 's,@mkdir_p@,${MKDIR},' \
@@ -138,4 +98,4 @@ post-install:
${MKDIR} ${STAGEDIR}${DESKTOPDIR}
${INSTALL_DATA} ${FILESDIR}/xmms.desktop ${STAGEDIR}${DESKTOPDIR}
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/multimedia/xmms/distinfo b/multimedia/xmms/distinfo
index c4f4be4..ad2c0e0 100644
--- a/multimedia/xmms/distinfo
+++ b/multimedia/xmms/distinfo
@@ -1,4 +1,2 @@
SHA256 (xmms-1.2.11.tar.bz2) = 7ec15c56632b6c82e61ccddeaefd372359af2f005708a58cdf3951c574b20390
SIZE (xmms-1.2.11.tar.bz2) = 2581032
-SHA256 (RusXMMS2-csa41.tar.bz2) = e64df1956502e48c09ca60262efb7f1953a76d82a70c801e4797ca81e130e8d0
-SIZE (RusXMMS2-csa41.tar.bz2) = 96642
OpenPOWER on IntegriCloud