Index: head/multimedia/xmms/Makefile =================================================================== --- head/multimedia/xmms/Makefile (revision 350739) +++ head/multimedia/xmms/Makefile (revision 350740) @@ -1,152 +1,142 @@ # Created by: Espen Skoglund # $FreeBSD$ 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 CONFLICTS?= ru-xmms-[0-9]* zh-xmms-[0-9]* GNU_CONFIGURE= yes USES= desktop-file-utils pathfix gmake iconv tar:bzip2 USE_GNOME= gtk12 USE_LDCONFIG= yes USE_XORG= sm x11 xxf86vm CONFIGURE_ARGS= xmms_cv_newpcm_driver=yes --disable-static CONFIGURE_ENV= INPUT_PLUGINS="${INPUT_PLUGINS}" \ OUTPUT_PLUGINS="${OUTPUT_PLUGINS}" \ VISUALIZATION_PLUGINS="${VISUALIZATION_PLUGINS}" CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib INPUT_PLUGINS= cdaudio mpg123 tonegen wav 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 MIKMOD_LIB_DEPENDS= libmikmod.so:${PORTSDIR}/audio/libmikmod NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext SIMD_CONFIGURE_ENABLE= simd SPEC_DESC= Visualization opengl_spectrum SPEC_CONFIGURE_ENABLE= opengl SPEC_USE= GL=gl VFILEINFO_DESC= Enable Extended Vorbis Fileinfo 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 .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=--install --force AUTOMAKE_ARGS= --add-missing --force-missing USE_OPENSSL= yes .endif +.if ${PORT_OPTIONS:MESOUND} +OUTPUT_PLUGINS+= esd +.endif + .if ${PORT_OPTIONS:MMIKMOD} INPUT_PLUGINS+= mikmod .endif .if ${PORT_OPTIONS:MVORBIS} INPUT_PLUGINS+= vorbis .endif .if ${PORT_OPTIONS:MSPEC} VISUALIZATION_PLUGINS+= opengl_spectrum .endif .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/' \ ${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},' \ ${WRKSRC}/po/Makefile.in.in @${FIND} ${WRKSRC} -name '*.s' | ${XARGS} ${REINPLACE_CMD} \ -e 's,/.*,,' -e 's/fist /fists /' -e 's/fistp /fistps /' \ -e '$$s/$$/\${.newline} .section ".note.GNU-stack","",@progbits/' post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/share/xmms/Skins ${MKDIR} ${STAGEDIR}${DESKTOPDIR} ${INSTALL_DATA} ${FILESDIR}/xmms.desktop ${STAGEDIR}${DESKTOPDIR} .include Index: head/multimedia/xmms/pkg-plist =================================================================== --- head/multimedia/xmms/pkg-plist (revision 350739) +++ head/multimedia/xmms/pkg-plist (revision 350740) @@ -1,117 +1,119 @@ bin/wmxmms bin/xmms bin/xmms-config include/xmms/configfile.h include/xmms/dirbrowser.h include/xmms/formatter.h include/xmms/fullscreen.h 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 share/applications/xmms.desktop %%NLS%%share/locale/af/LC_MESSAGES/xmms.mo %%NLS%%share/locale/az/LC_MESSAGES/xmms.mo %%NLS%%share/locale/be/LC_MESSAGES/xmms.mo %%NLS%%share/locale/bg/LC_MESSAGES/xmms.mo %%NLS%%share/locale/bs/LC_MESSAGES/xmms.mo %%NLS%%share/locale/ca/LC_MESSAGES/xmms.mo %%NLS%%share/locale/cs/LC_MESSAGES/xmms.mo %%NLS%%share/locale/cy/LC_MESSAGES/xmms.mo %%NLS%%share/locale/da/LC_MESSAGES/xmms.mo %%NLS%%share/locale/de/LC_MESSAGES/xmms.mo %%NLS%%share/locale/el/LC_MESSAGES/xmms.mo %%NLS%%share/locale/en/LC_MESSAGES/xmms.mo %%NLS%%share/locale/en_GB/LC_MESSAGES/xmms.mo %%NLS%%share/locale/eo/LC_MESSAGES/xmms.mo %%NLS%%share/locale/es/LC_MESSAGES/xmms.mo %%NLS%%share/locale/et/LC_MESSAGES/xmms.mo %%NLS%%share/locale/eu/LC_MESSAGES/xmms.mo %%NLS%%share/locale/fi/LC_MESSAGES/xmms.mo %%NLS%%share/locale/fr/LC_MESSAGES/xmms.mo %%NLS%%share/locale/ga/LC_MESSAGES/xmms.mo %%NLS%%share/locale/gl/LC_MESSAGES/xmms.mo %%NLS%%share/locale/hr/LC_MESSAGES/xmms.mo %%NLS%%share/locale/hu/LC_MESSAGES/xmms.mo %%NLS%%share/locale/id/LC_MESSAGES/xmms.mo %%NLS%%share/locale/it/LC_MESSAGES/xmms.mo %%NLS%%share/locale/ja/LC_MESSAGES/xmms.mo %%NLS%%share/locale/ka/LC_MESSAGES/xmms.mo %%NLS%%share/locale/ko/LC_MESSAGES/xmms.mo %%NLS%%share/locale/lt/LC_MESSAGES/xmms.mo %%NLS%%share/locale/lv/LC_MESSAGES/xmms.mo %%NLS%%share/locale/mk/LC_MESSAGES/xmms.mo %%NLS%%share/locale/ms/LC_MESSAGES/xmms.mo %%NLS%%share/locale/nl/LC_MESSAGES/xmms.mo %%NLS%%share/locale/nn/LC_MESSAGES/xmms.mo %%NLS%%share/locale/no/LC_MESSAGES/xmms.mo %%NLS%%share/locale/pl/LC_MESSAGES/xmms.mo %%NLS%%share/locale/pt/LC_MESSAGES/xmms.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/xmms.mo %%NLS%%share/locale/ro/LC_MESSAGES/xmms.mo %%NLS%%share/locale/ru/LC_MESSAGES/xmms.mo %%NLS%%share/locale/sk/LC_MESSAGES/xmms.mo %%NLS%%share/locale/sl/LC_MESSAGES/xmms.mo %%NLS%%share/locale/sq/LC_MESSAGES/xmms.mo %%NLS%%share/locale/sr/LC_MESSAGES/xmms.mo %%NLS%%share/locale/sr@Latn/LC_MESSAGES/xmms.mo %%NLS%%share/locale/sv/LC_MESSAGES/xmms.mo %%NLS%%share/locale/tg/LC_MESSAGES/xmms.mo %%NLS%%share/locale/th/LC_MESSAGES/xmms.mo %%NLS%%share/locale/tr/LC_MESSAGES/xmms.mo %%NLS%%share/locale/uk/LC_MESSAGES/xmms.mo %%NLS%%share/locale/uz/LC_MESSAGES/xmms.mo %%NLS%%share/locale/vi/LC_MESSAGES/xmms.mo %%NLS%%share/locale/wa/LC_MESSAGES/xmms.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/xmms.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/xmms.mo %%DATADIR%%/wmxmms.xpm @dirrmtry %%DATADIR%%/Skins @dirrm %%DATADIR%% @dirrmtry lib/xmms/Visualization @dirrmtry lib/xmms/Output @dirrmtry lib/xmms/Input @dirrmtry lib/xmms/General @dirrmtry lib/xmms/Effect @dirrmtry lib/xmms @dirrm include/xmms @exec mkdir -p %D/share/xmms/Skins @unexec echo "If you are permanently removing xmms, do not forget to remove skin files left under %D/share/xmms/Skins. Use \`\`rm -Rf %D/share/xmms/Skins; rmdir %D/share/xmms''" | fmt