Date: Wed, 9 Apr 2014 22:19:14 +0200 From: Baptiste Daroussin <bapt@FreeBSD.org> To: Christian Weisgerber <naddy@FreeBSD.org> Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org Subject: Re: svn commit: r350740 - head/multimedia/xmms Message-ID: <20140409201914.GD66352@ivaldir.etoilebsd.net> In-Reply-To: <201404092010.s39KAe7N014380@svn.freebsd.org> References: <201404092010.s39KAe7N014380@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--JwB53PgKC5A7+0Ej Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Apr 09, 2014 at 08:10:40PM +0000, Christian Weisgerber wrote: > 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/ >=20 > 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 <leres@ee.lbl.gov>. >=20 > Modified: > head/multimedia/xmms/Makefile > head/multimedia/xmms/pkg-plist >=20 > Modified: head/multimedia/xmms/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- 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 @@ > =20 > PORTNAME=3D xmms > PORTVERSION=3D 1.2.11 > -PORTREVISION?=3D 21 # Also chinese/xmms and russian/xmms > -CATEGORIES+=3D multimedia audio ipv6 > +PORTREVISION=3D 22 > +CATEGORIES=3D multimedia audio ipv6 > MASTER_SITES=3D http://www.xmms.org/files/1.2.x/ \ > http://legacy.xmms2.org/ \ > LOCAL/beech > DISTFILES=3D ${DISTNAME}${EXTRACT_SUFX} > =20 > -MAINTAINER?=3D naddy@FreeBSD.org > -COMMENT?=3D X Multimedia System -- An audio player with Winamp GUI > +MAINTAINER=3D naddy@FreeBSD.org > +COMMENT=3D X Multimedia System -- audio player with Winamp GUI > =20 > LICENSE=3D GPLv2 > =20 > @@ -33,12 +33,15 @@ INPUT_PLUGINS=3D cdaudio mpg123 tonegen wa > OUTPUT_PLUGINS=3D OSS disk_writer > VISUALIZATION_PLUGINS=3D blur_scope sanalyzer > =20 > -OPTIONS_DEFINE=3D IPV6 MIKMOD NLS SPEC VFILEINFO VORBIS RUSXMMS_PATCHES > +OPTIONS_DEFINE=3D ESOUND IPV6 MIKMOD NLS SPEC VFILEINFO VORBIS RUSXMMS_P= ATCHES > OPTIONS_DEFAULT=3DMIKMOD VORBIS > OPTIONS_DEFINE_i386=3D SIMD > OPTIONS_DEFAULT_i386=3D SIMD > OPTIONS_SUB=3D yes > =20 > +ESOUND_CONFIGURE_ENABLE=3Desd > +ESOUND_USE=3D GNOME=3Desound > + > IPV6_CONFIGURE_ENABLE=3D ipv6 > =20 > MIKMOD_CONFIGURE_ENABLE=3Dmikmod > @@ -82,6 +85,10 @@ AUTOMAKE_ARGS=3D --add-missing --force-mis > USE_OPENSSL=3D yes > .endif > =20 > +.if ${PORT_OPTIONS:MESOUND} > +OUTPUT_PLUGINS+=3D esd > +.endif > + > .if ${PORT_OPTIONS:MMIKMOD} > INPUT_PLUGINS+=3D mikmod > .endif > @@ -96,23 +103,6 @@ VISUALIZATION_PLUGINS+=3D opengl_spectrum > =20 > .include <bsd.port.pre.mk> > =20 > -.if ${HAVE_GNOME:Mesound}!=3D"" > -USE_GNOME+=3D esound > -OUTPUT_PLUGINS+=3D esd > -PLIST_SUB+=3D ESDPLUGIN:=3D"" > -.else > -CONFIGURE_ARGS+=3D --disable-esd > -PLIST_SUB+=3D ESDPLUGIN:=3D"@comment " > -.endif > - > -pre-everything:: > -.if ${HAVE_GNOME:Mesound}!=3D"" > - @${ECHO_MSG} "" > - @${ECHO_MSG} "You can disable support for esound by defining" > - @${ECHO_MSG} "WITHOUT_GNOME=3Desound." > - @${ECHO_MSG} "" > -.endif > - > post-patch: > .if ${PORT_OPTIONS:MRUSXMMS_PATCHES} > @${REINPLACE_CMD} -e 's/AM_PATH_ALSA.*/have_alsa=3Dno/' \ >=20 > Modified: head/multimedia/xmms/pkg-plist > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- 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 >=20 you may not know but want uses=3Dlibtool ;) bapt --JwB53PgKC5A7+0Ej Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iEYEARECAAYFAlNFq0IACgkQ8kTtMUmk6Ez07gCgwmWvMCAB0yrGfsEZO7u2Il5Q cGkAn3k6yPdfDI242P5GbOqTIB8wibqW =nT6h -----END PGP SIGNATURE----- --JwB53PgKC5A7+0Ej--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140409201914.GD66352>