From owner-svn-ports-head@FreeBSD.ORG Mon May 12 21:44:45 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4AA74FE8; Mon, 12 May 2014 21:44:45 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2B51C2478; Mon, 12 May 2014 21:44:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4CLijGo072983; Mon, 12 May 2014 21:44:45 GMT (envelope-from naddy@svn.freebsd.org) Received: (from naddy@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4CLijXS072982; Mon, 12 May 2014 21:44:45 GMT (envelope-from naddy@svn.freebsd.org) Message-Id: <201405122144.s4CLijXS072982@svn.freebsd.org> From: Christian Weisgerber Date: Mon, 12 May 2014 21:44:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r353899 - head/multimedia/xmms X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 May 2014 21:44:45 -0000 Author: naddy Date: Mon May 12 21:44:44 2014 New Revision: 353899 URL: http://svnweb.freebsd.org/changeset/ports/353899 QAT: https://qat.redports.org/buildarchive/r353899/ Log: Comment out the RUSXMMS_PATCHES option, which is actually broken since the USES=libtool conversion. These patches are horribly intrusive, and if you need charset handling, a GTK1 application is the wrong tool. (Use audacious.) I really want to remove this hack, but let's see if somebody complains. Modified: head/multimedia/xmms/Makefile Modified: head/multimedia/xmms/Makefile ============================================================================== --- head/multimedia/xmms/Makefile Mon May 12 21:31:01 2014 (r353898) +++ head/multimedia/xmms/Makefile Mon May 12 21:44:44 2014 (r353899) @@ -33,7 +33,7 @@ INPUT_PLUGINS= cdaudio mpg123 tonegen wa 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 #RUSXMMS_PATCHES OPTIONS_DEFAULT=MIKMOD VORBIS OPTIONS_DEFINE_i386= SIMD OPTIONS_DEFAULT_i386= SIMD @@ -62,7 +62,7 @@ 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 +#RUSXMMS_PATCHES_DESC= Patches to handle broken non-Unicode ID3 tags .if !defined(WITH_DEBUG) INSTALL_TARGET= install-strip @@ -70,20 +70,20 @@ INSTALL_TARGET= install-strip .include -.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 -LIBTOOLIZE_ARGS=-i -c -f -AUTOMAKE_ARGS= -a -c -f -USE_OPENSSL= yes -.endif +#.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 +#LIBTOOLIZE_ARGS=-i -c -f +#AUTOMAKE_ARGS= -a -c -f +#USE_OPENSSL= yes +#.endif .if ${PORT_OPTIONS:MESOUND} OUTPUT_PLUGINS+= esd @@ -104,28 +104,28 @@ VISUALIZATION_PLUGINS+= opengl_spectrum .include 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 +#.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},' \