From owner-svn-ports-head@FreeBSD.ORG Wed Apr 9 20:10:41 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3923A5E1; Wed, 9 Apr 2014 20:10:41 +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 263FC18E0; Wed, 9 Apr 2014 20:10:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s39KAfId014382; Wed, 9 Apr 2014 20:10:41 GMT (envelope-from naddy@svn.freebsd.org) Received: (from naddy@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s39KAe7N014380; Wed, 9 Apr 2014 20:10:40 GMT (envelope-from naddy@svn.freebsd.org) Message-Id: <201404092010.s39KAe7N014380@svn.freebsd.org> From: Christian Weisgerber Date: Wed, 9 Apr 2014 20:10:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r350740 - 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.17 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: Wed, 09 Apr 2014 20:10:41 -0000 Author: naddy Date: Wed Apr 9 20:10:40 2014 New Revision: 350740 URL: http://svnweb.freebsd.org/changeset/ports/350740 QAT: https://qat.redports.org/buildarchive/r350740/ Log: * Drop provisions for long-dead slave ports. * Turn esound into a proper option. * Handle .la files that depend on options; partially from Craig Leres . Modified: head/multimedia/xmms/Makefile head/multimedia/xmms/pkg-plist Modified: head/multimedia/xmms/Makefile ============================================================================== --- head/multimedia/xmms/Makefile Wed Apr 9 20:05:31 2014 (r350739) +++ head/multimedia/xmms/Makefile Wed Apr 9 20:10:40 2014 (r350740) @@ -3,15 +3,15 @@ PORTNAME= xmms PORTVERSION= 1.2.11 -PORTREVISION?= 21 # Also chinese/xmms and russian/xmms -CATEGORIES+= multimedia audio ipv6 +PORTREVISION= 22 +CATEGORIES= multimedia audio ipv6 MASTER_SITES= http://www.xmms.org/files/1.2.x/ \ http://legacy.xmms2.org/ \ LOCAL/beech DISTFILES= ${DISTNAME}${EXTRACT_SUFX} -MAINTAINER?= naddy@FreeBSD.org -COMMENT?= X Multimedia System -- An audio player with Winamp GUI +MAINTAINER= naddy@FreeBSD.org +COMMENT= X Multimedia System -- audio player with Winamp GUI LICENSE= GPLv2 @@ -33,12 +33,15 @@ INPUT_PLUGINS= cdaudio mpg123 tonegen wa OUTPUT_PLUGINS= OSS disk_writer VISUALIZATION_PLUGINS= blur_scope sanalyzer -OPTIONS_DEFINE= 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 OPTIONS_SUB= yes +ESOUND_CONFIGURE_ENABLE=esd +ESOUND_USE= GNOME=esound + IPV6_CONFIGURE_ENABLE= ipv6 MIKMOD_CONFIGURE_ENABLE=mikmod @@ -82,6 +85,10 @@ AUTOMAKE_ARGS= --add-missing --force-mis USE_OPENSSL= yes .endif +.if ${PORT_OPTIONS:MESOUND} +OUTPUT_PLUGINS+= esd +.endif + .if ${PORT_OPTIONS:MMIKMOD} INPUT_PLUGINS+= mikmod .endif @@ -96,23 +103,6 @@ VISUALIZATION_PLUGINS+= opengl_spectrum .include -.if ${HAVE_GNOME:Mesound}!="" -USE_GNOME+= esound -OUTPUT_PLUGINS+= esd -PLIST_SUB+= ESDPLUGIN:="" -.else -CONFIGURE_ARGS+= --disable-esd -PLIST_SUB+= ESDPLUGIN:="@comment " -.endif - -pre-everything:: -.if ${HAVE_GNOME:Mesound}!="" - @${ECHO_MSG} "" - @${ECHO_MSG} "You can disable support for esound by defining" - @${ECHO_MSG} "WITHOUT_GNOME=esound." - @${ECHO_MSG} "" -.endif - post-patch: .if ${PORT_OPTIONS:MRUSXMMS_PATCHES} @${REINPLACE_CMD} -e 's/AM_PATH_ALSA.*/have_alsa=no/' \ Modified: head/multimedia/xmms/pkg-plist ============================================================================== --- head/multimedia/xmms/pkg-plist Wed Apr 9 20:05:31 2014 (r350739) +++ head/multimedia/xmms/pkg-plist Wed Apr 9 20:10:40 2014 (r350740) @@ -9,41 +9,43 @@ include/xmms/plugin.h include/xmms/titlestring.h include/xmms/util.h include/xmms/xmmsctrl.h +lib/libxmms.la lib/libxmms.so lib/libxmms.so.4 -lib/libxmms.la lib/xmms/Effect/libecho.la -lib/xmms/Effect/libstereo.la -lib/xmms/Effect/libvoice.la lib/xmms/Effect/libecho.so +lib/xmms/Effect/libstereo.la lib/xmms/Effect/libstereo.so +lib/xmms/Effect/libvoice.la lib/xmms/Effect/libvoice.so lib/xmms/General/libir.so -lib/xmms/General/libsong_change.so lib/xmms/General/libir.la lib/xmms/General/libsong_change.la -lib/xmms/Input/libcdaudio.so +lib/xmms/General/libsong_change.so lib/xmms/Input/libcdaudio.la -lib/xmms/Input/libmikmod.la -lib/xmms/Input/libmpg123.la -lib/xmms/Input/libtonegen.la -lib/xmms/Input/libvorbis.la -lib/xmms/Input/libwav.la +lib/xmms/Input/libcdaudio.so +%%MIKMOD%%lib/xmms/Input/libmikmod.la %%MIKMOD%%lib/xmms/Input/libmikmod.so +lib/xmms/Input/libmpg123.la lib/xmms/Input/libmpg123.so +lib/xmms/Input/libtonegen.la lib/xmms/Input/libtonegen.so +%%VORBIS%%lib/xmms/Input/libvorbis.la %%VORBIS%%lib/xmms/Input/libvorbis.so +lib/xmms/Input/libwav.la lib/xmms/Input/libwav.so -%%ESDPLUGIN:%%lib/xmms/Output/libesdout.so +%%ESOUND%%lib/xmms/Output/libesdout.la +%%ESOUND%%lib/xmms/Output/libesdout.so lib/xmms/Output/libOSS.la -lib/xmms/Output/libdisk_writer.la lib/xmms/Output/libOSS.so +lib/xmms/Output/libdisk_writer.la lib/xmms/Output/libdisk_writer.so +%%SPEC%%lib/xmms/Visualization/libogl_spectrum.la %%SPEC%%lib/xmms/Visualization/libogl_spectrum.so -lib/xmms/Visualization/libbscope.so -lib/xmms/Visualization/libsanalyzer.so lib/xmms/Visualization/libbscope.la +lib/xmms/Visualization/libbscope.so lib/xmms/Visualization/libsanalyzer.la +lib/xmms/Visualization/libsanalyzer.so man/man1/wmxmms.1.gz man/man1/xmms.1.gz share/aclocal/xmms.m4