svn commit: r331240 - in head: chinese/xmms chinese/xmms/files multimedia/xmms multimedia/xmms/files russian/xmms
Tijl Coosemans
tijl at FreeBSD.org
Tue Oct 22 08:30:49 UTC 2013
Author: tijl
Date: Tue Oct 22 08:30:47 2013
New Revision: 331240
URL: http://svnweb.freebsd.org/changeset/ports/331240
Log:
multimedia/xmms:
- Add zh-xmms to CONFLICTS.
- Convert USE_GNOME=desktopfileutils and USE_GMAKE to USES.
- Make USE_GL conditional on the SPEC option.
- Make gettext conditional on new NLS option.
- Only set USE_AUTOTOOLS for the RUSXMMS_PATCHES option.
- Remove LIBS from CONFIGURE_ENV. Set LDFLAGS instead.
- Add missing xorg dependencies.
- Add xmms_cv_newpcm_driver=yes to CONFIGURE_ARGS. The configure test
fails on recent version of FreeBSD but the code it enables is still
relevant. Without it you cannot select a different output device.
- Remove SUB_FILES. None of the files require substitutions.
- Remove IPV6 from OPTIONS_DEFAULT. It's implicit.
- Don't exclude SIMD option from amd64.
- Use option helpers like OPTIONS_SUB, opt_CONFIGURE_ENABLE, etc.
- Install stripped libraries when !defined(WITH_DEBUG).
- Use new style LIB_DEPENDS.
- Add aclocal, autoheader and libtoolize to USE_AUTOTOOLS to fully
regenerate the build infrastructure. This fixes a lot of warnings
and allows some patches to be removed.
- Add USE_OPENSSL for RUSXMMS_PATCHES option.
- Fix the SIMD option on all architectures by removing the post-extract
target.
- Remove the message about the RUSXMMS_PATCHES option. This is from
before there were option dialogs.
- Use the same cp command as in the script included with rusxmms instead
of INSTALL_DATA.
- Remove the ALSA test from configure with REINPLACE_CMD instead of a
patch (RUSXMMS_PATCHES case).
- Remove old libtool macros from acinclude.m4. Libtoolize adds new
macros.
- Remove MKDIR_P patching. No longer needed after running aclocal.
- Patch configure to disable ALSA (not RUSXMMS_PATCHES case).
- Fix po/Makefile.in.in with REINPLACE_CMD instead of a patch.
- Fix assembly source code files to support clang:
* Remove comments that begin with a single slash.
* Replace 'fist' instruction with 'fists' and 'fistp' with 'fistps'.
* Append '.section ".note.GNU-stack","", at progbits' to every file to
say they don't require an executable stack. These files are
compiled with -Wa,--noexecstack which clang supports but the ancient
binutils in FreeBSD base does not so without this change xmms runs
with an executable stack when compiled with base gcc.
- Support staging.
- Remove extra-patch-Visualization_Makefile.am. It's not needed when
passing VISUALIZATION_PLUGINS to configure.
- Rename patch-gcc41 to patch-General-ir-ir.c and modify it to keep the
variables static, but mark keepGoing volatile.
- Remove patch-aclocal.m4. Not needed when running aclocal.
- Remove patch-configure.in. The PTHREAD_LIBS related changes are no
longer needed and ALSA change is handled in the Makefile.
- Remove patch-ltmain.sh. Not needed with staging.
- Remove patch-po-Makefile.in.in. Handled in Makefile.
- Remove patch-xmms-config.in. Not 100% sure about this. It doesn't
affect xmms itself. Perhaps some plugins need it but I'd rather fix
those plugins then.
- Add patch-xmms-i18n.h.in. It's needed when NLS option is disabled.
- Remove pkg-message.in. All supported versions of FreeBSD have unzip
in base.
- Rename xmms.desktop.in to xmms.desktop to reflect that it doesn't
require substitutions.
- Adjust pkg-plist for OPTIONS_SUB, NLS option, staging and
USES=desktop-file-utils.
chinese/xmms, russian/xmms:
- Minor cleanups.
PR: ports/183165
Approved by: "Chris Petrik" <c.petrik.sosa at gmail.com> (maintainer)
Added:
head/multimedia/xmms/files/patch-General-ir-ir.c (contents, props changed)
- copied, changed from r331222, head/multimedia/xmms/files/patch-gcc41
head/multimedia/xmms/files/patch-xmms-i18n.h.in (contents, props changed)
- copied unchanged from r330997, head/multimedia/xmms/files/xmms.desktop.in
Directory Properties:
head/multimedia/xmms/files/xmms.desktop (props changed)
Deleted:
head/multimedia/xmms/files/extra-patch-Visualization_Makefile.am
head/multimedia/xmms/files/patch-aclocal.m4
head/multimedia/xmms/files/patch-configure.in
head/multimedia/xmms/files/patch-gcc41
head/multimedia/xmms/files/patch-ltmain.sh
head/multimedia/xmms/files/patch-po-Makefile.in.in
head/multimedia/xmms/files/patch-xmms-config.in
head/multimedia/xmms/files/pkg-message.in
head/multimedia/xmms/files/xmms.desktop.in
head/russian/xmms/distinfo
Modified:
head/chinese/xmms/Makefile (contents, props changed)
head/multimedia/xmms/Makefile
head/multimedia/xmms/pkg-plist (contents, props changed)
head/russian/xmms/Makefile (contents, props changed)
Directory Properties:
head/chinese/xmms/files/extra-patch-xmms-1.2.x-xfont (props changed)
head/multimedia/xmms/distinfo (props changed)
head/multimedia/xmms/files/patch-Output__OSS__mixer.c (props changed)
head/multimedia/xmms/files/patch-Output__esd__mixer.c (props changed)
head/multimedia/xmms/files/patch-am64 (props changed)
head/multimedia/xmms/files/patch-oss (props changed)
head/multimedia/xmms/files/patch-xmms_util.c (props changed)
head/multimedia/xmms/pkg-descr (props changed)
Modified: head/chinese/xmms/Makefile
==============================================================================
--- head/chinese/xmms/Makefile Tue Oct 22 08:21:15 2013 (r331239)
+++ head/chinese/xmms/Makefile Tue Oct 22 08:30:47 2013 (r331240)
@@ -1,17 +1,12 @@
# Created by: Espen Skoglund <esk at ira.uka.de>
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= chinese
-MASTERDIR= ${.CURDIR}/../../multimedia/xmms
-
-PATCH_SITES= ${MASTER_SITE_LOCAL}
-PATCH_SITE_SUBDIR= sobomax
+MAINTAINER= ports at FreeBSD.org
+CONFLICTS= ru-xmms-[0-9]* xmms-[0-9]*
EXTRA_PATCHES= ${.CURDIR}/files/extra-patch-xmms-1.2.x-xfont
+MASTERDIR= ${.CURDIR}/../../multimedia/xmms
-MAINTAINER= ports at FreeBSD.org
-
-NO_STAGE= yes
.include "${MASTERDIR}/Makefile"
Modified: head/multimedia/xmms/Makefile
==============================================================================
--- head/multimedia/xmms/Makefile Tue Oct 22 08:21:15 2013 (r331239)
+++ head/multimedia/xmms/Makefile Tue Oct 22 08:30:47 2013 (r331240)
@@ -3,7 +3,7 @@
PORTNAME= xmms
PORTVERSION= 1.2.11
-PORTREVISION= 18
+PORTREVISION?= 19 # Also chinese/xmms and russian/xmms
CATEGORIES+= multimedia audio ipv6
MASTER_SITES= http://www.xmms.org/files/1.2.x/ \
http://legacy.xmms2.org/ \
@@ -13,78 +13,86 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER?= c.petrik.sosa at gmail.com
COMMENT?= X Multimedia System -- An audio player with Winamp GUI
+CONFLICTS?= ru-xmms-[0-9]* zh-xmms[0-9]*
+GNU_CONFIGURE= yes
+USES= desktop-file-utils pathfix gmake iconv
USE_BZIP2= yes
-USE_GL= gl
-USE_GNOME= desktopfileutils gtk12
-USE_GMAKE= yes
-USES= pathfix gettext iconv
+USE_GNOME= gtk12
USE_LDCONFIG= yes
-USE_AUTOTOOLS= automake autoconf libtool
-AUTOTOOLSFILES= aclocal.m4
-AUTOMAKE_ARGS= --add-missing
-CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" \
- INPUT_PLUGINS="${INPUT_PLUGINS}" \
+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
-CONFIGURE_ARGS= --enable-static=no
-MAN1= wmxmms.1 xmms.1
-SUB_FILES= pkg-message xmms.desktop
-
-CONFLICTS= ru-xmms-[0-9]*
+LDFLAGS+= -L${LOCALBASE}/lib
INPUT_PLUGINS= cdaudio mpg123 tonegen wav
OUTPUT_PLUGINS= OSS disk_writer
VISUALIZATION_PLUGINS= blur_scope sanalyzer
-OPTIONS_DEFINE= IPV6 MIKMOD SIMD SPEC VFILEINFO VORBIS RUSXMMS_PATCHES
-OPTIONS_DEFAULT= IPV6 MIKMOD SIMD VORBIS
-OPTIONS_EXCLUDE_amd64= SIMD
-SPEC_DESC= Visualization opengl_spectrum
-VFILEINFO_DESC= Enable Extended Vorbis Fileinfo
-RUSXMMS_PATCHES_DESC= Custom IDv3 patches
+OPTIONS_DEFINE= IPV6 MIKMOD NLS SIMD SPEC VFILEINFO VORBIS RUSXMMS_PATCHES
+OPTIONS_DEFAULT=MIKMOD SIMD VORBIS
+OPTIONS_SUB= yes
-NO_STAGE= yes
-.include <bsd.port.pre.mk>
+IPV6_CONFIGURE_ENABLE= ipv6
-.if ${PORT_OPTIONS:MIPV6}
-CONFIGURE_ARGS+= --enable-ipv6
-.else
-CONFIGURE_ARGS+= --disable-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 <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+= rcc:${PORTSDIR}/devel/librcc
-LIB_DEPENDS+= rcd:${PORTSDIR}/devel/librcd
-.endif
+LIB_DEPENDS+= librcc.so:${PORTSDIR}/devel/librcc \
+ librcd.so:${PORTSDIR}/devel/librcd
-.if ${PORT_OPTIONS:MVFILEINFO}
-CFLAGS+= -DALL_VORBIS_TAGS
+USE_AUTOTOOLS= aclocal autoheader libtoolize autoconf automake
+LIBTOOLIZE_ARGS=--install --force
+AUTOMAKE_ARGS= --add-missing --force-missing
+USE_OPENSSL= yes
.endif
.if ${PORT_OPTIONS:MMIKMOD}
-LIB_DEPENDS+= mikmod:${PORTSDIR}/audio/libmikmod
INPUT_PLUGINS+= mikmod
-PLIST_SUB+= MIKMODPLUGIN:=""
-.else
-CONFIGURE_ARGS+= --disable-mikmod
-PLIST_SUB+= MIKMODPLUGIN:="@comment "
.endif
.if ${PORT_OPTIONS:MVORBIS}
-LIB_DEPENDS+= vorbis:${PORTSDIR}/audio/libvorbis
INPUT_PLUGINS+= vorbis
-PLIST_SUB+= VORBISPLUGIN:=""
-.else
-CONFIGURE_ARGS+= --disable-vorbis
-PLIST_SUB+= VORBISPLUGIN:="@comment "
.endif
+.if ${PORT_OPTIONS:MSPEC}
+VISUALIZATION_PLUGINS+= opengl_spectrum
+.endif
+
+.include <bsd.port.pre.mk>
+
.if ${HAVE_GNOME:Mesound}!=""
USE_GNOME+= esound
OUTPUT_PLUGINS+= esd
@@ -94,33 +102,7 @@ CONFIGURE_ARGS+= --disable-esd
PLIST_SUB+= ESDPLUGIN:="@comment "
.endif
-.if ${PORT_OPTIONS:MSIMD}
-CONFIGURE_ARGS+= --enable-simd
-.else
-.if ${ARCH} == "i386"
-BROKEN= must use option SIMD on ${ARCH} see pr ports/63456
-.endif
-.endif
-
-.if ${PORT_OPTIONS:MSPEC}
-PLIST_SUB+= SPEC=""
-VISUALIZATION_PLUGINS+= opengl_spectrum
-.else
-EXTRA_PATCHES= ${FILESDIR}/extra-patch-Visualization_Makefile.am
-PLIST_SUB+= SPEC="@comment "
-.endif
-
-post-extract:
-.if ! ${PORT_OPTIONS:MSIMD}
- (cd ${WRKSRC}/Input/mpg123 && ${MV} decode_i586.s decode_i586.S && \
- cd ${WRKSRC}/Visualization/blur_scope && ${MV} blur_8.s blur_8.S);
- ${REINPLACE_CMD} -e 's:\.s :.S :g' -e 's:\.s$$:.S:g' \
- -e 's:^\.s\.:.S.:g' ${WRKSRC}/Input/mpg123/Makefile.in
- ${REINPLACE_CMD} -e 's:\.s :.S :g' -e 's:\.s$$:.S:g' \
- -e 's:^\.s\.:.S.:g' ${WRKSRC}/Visualization/blur_scope/Makefile.in
-.endif
-
-pre-extract:
+pre-everything::
.if ${HAVE_GNOME:Mesound}!=""
@${ECHO_MSG} ""
@${ECHO_MSG} "You can disable support for esound by defining"
@@ -128,18 +110,13 @@ pre-extract:
@${ECHO_MSG} ""
.endif
-.if ! ${PORT_OPTIONS:MRUSXMMS_PATCHES}
- @${ECHO_MSG} ""
- @${ECHO_MSG} "You can enable support for ID3v2 tags and CP1251"
- @${ECHO_MSG} "encoding by setting the RUSXMMS_PATCHES option."
- @${ECHO_MSG} ""
-.endif
-
post-patch:
.if ${PORT_OPTIONS:MRUSXMMS_PATCHES}
-. for src in source/rcc.c source/rcc.h source/rcc_langs.h
- @${INSTALL_DATA} ${WRKDIR}/RusXMMS2/${src} ${WRKSRC}/libxmms
-. endfor
+ @${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
@@ -150,21 +127,23 @@ post-patch:
xmms-ds-vorbis-editor-keys.patch
@${PATCH} -s -p1 -d ${WRKSRC} < ${WRKDIR}/RusXMMS2/patches/plugins/${diff}
. endfor
-.endif
# 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
+ @${REINPLACE_CMD} -e '/AM_PATH_ESD/,/have_esd=no/d' \
+ ${WRKSRC}/configure.in
.endif
-
-post-configure:
- @${FIND} ${WRKSRC} -name Makefile | \
- ${XARGS} ${REINPLACE_CMD} -e 's|MKDIR_P|mkdir_p|g'
+.endif
+ @${REINPLACE_CMD} -e 's/alsa_found=yes/alsa_found=no/' \
+ ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e 's, at 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","", at progbits/'
post-install:
- @${INSTALL} -d ${PREFIX}/share/xmms/Skins
- @${INSTALL} -d ${PREFIX}/share/applications
- @${INSTALL_DATA} ${WRKDIR}/xmms.desktop ${PREFIX}/share/applications/
- -update-desktop-database
- @${CAT} ${PKGMESSAGE}
+ ${MKDIR} ${STAGEDIR}${PREFIX}/share/xmms/Skins
+ ${MKDIR} ${STAGEDIR}${DESKTOPDIR}
+ ${INSTALL_DATA} ${FILESDIR}/xmms.desktop ${STAGEDIR}${DESKTOPDIR}
.include <bsd.port.post.mk>
Copied and modified: head/multimedia/xmms/files/patch-General-ir-ir.c (from r331222, head/multimedia/xmms/files/patch-gcc41)
==============================================================================
--- head/multimedia/xmms/files/patch-gcc41 Tue Oct 22 06:04:54 2013 (r331222, copy source)
+++ head/multimedia/xmms/files/patch-General-ir-ir.c Tue Oct 22 08:30:47 2013 (r331240)
@@ -1,15 +1,11 @@
--- General/ir/ir.c.orig Mon Mar 5 14:17:44 2001
+++ General/ir/ir.c Sat Dec 16 15:41:23 2006
-@@ -16,10 +16,10 @@
+@@ -16,7 +16,7 @@
#include "ir.h"
/* Important stuff to know */
-static gboolean keepGoing = FALSE;
-+gboolean keepGoing = FALSE;
++static volatile gboolean keepGoing = FALSE;
/* The thread handle */
--static pthread_t irapp_thread;
-+pthread_t irapp_thread;
-
- /* Declarations for calls that we need to mention in the plugin struct */
- static void init(void);
+ static pthread_t irapp_thread;
Added: head/multimedia/xmms/files/patch-xmms-i18n.h.in
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/multimedia/xmms/files/patch-xmms-i18n.h.in Tue Oct 22 08:30:47 2013 (r331240)
@@ -0,0 +1,12 @@
+--- xmms/i18n.h.in.orig
++++ xmms/i18n.h.in
+@@ -1,7 +1,8 @@
+ #undef ENABLE_NLS
+
++#include <locale.h>
++
+ #ifdef ENABLE_NLS
+-# include <locale.h>
+ # include <libintl.h>
+ # define _(String) gettext (String)
+ # ifdef gettext_noop
Copied: head/multimedia/xmms/files/xmms.desktop (from r330997, head/multimedia/xmms/files/xmms.desktop.in)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/multimedia/xmms/files/xmms.desktop Tue Oct 22 08:30:47 2013 (r331240, copy of r330997, head/multimedia/xmms/files/xmms.desktop.in)
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Exec=xmms %U
+Icon=xmms
+GenericName=XMMS Player
+Comment=Audio Player
+Terminal=false
+Name=xmms
+MimeType=application/x-xmms;
+Categories=GTK;Application;AudioVideo;Audio;
Modified: head/multimedia/xmms/pkg-plist
==============================================================================
--- head/multimedia/xmms/pkg-plist Tue Oct 22 08:21:15 2013 (r331239)
+++ head/multimedia/xmms/pkg-plist Tue Oct 22 08:30:47 2013 (r331240)
@@ -17,10 +17,10 @@ lib/xmms/Effect/libvoice.so
lib/xmms/General/libir.so
lib/xmms/General/libsong_change.so
lib/xmms/Input/libcdaudio.so
-%%MIKMODPLUGIN:%%lib/xmms/Input/libmikmod.so
+%%MIKMOD%%lib/xmms/Input/libmikmod.so
lib/xmms/Input/libmpg123.so
lib/xmms/Input/libtonegen.so
-%%VORBISPLUGIN:%%lib/xmms/Input/libvorbis.so
+%%VORBIS%%lib/xmms/Input/libvorbis.so
lib/xmms/Input/libwav.so
%%ESDPLUGIN:%%lib/xmms/Output/libesdout.so
lib/xmms/Output/libOSS.so
@@ -28,63 +28,65 @@ lib/xmms/Output/libdisk_writer.so
%%SPEC%%lib/xmms/Visualization/libogl_spectrum.so
lib/xmms/Visualization/libbscope.so
lib/xmms/Visualization/libsanalyzer.so
+man/man1/wmxmms.1.gz
+man/man1/xmms.1.gz
share/aclocal/xmms.m4
share/applications/xmms.desktop
-share/locale/af/LC_MESSAGES/xmms.mo
-share/locale/az/LC_MESSAGES/xmms.mo
-share/locale/be/LC_MESSAGES/xmms.mo
-share/locale/bg/LC_MESSAGES/xmms.mo
-share/locale/bs/LC_MESSAGES/xmms.mo
-share/locale/ca/LC_MESSAGES/xmms.mo
-share/locale/cs/LC_MESSAGES/xmms.mo
-share/locale/cy/LC_MESSAGES/xmms.mo
-share/locale/da/LC_MESSAGES/xmms.mo
-share/locale/de/LC_MESSAGES/xmms.mo
-share/locale/el/LC_MESSAGES/xmms.mo
-share/locale/en/LC_MESSAGES/xmms.mo
-share/locale/en_GB/LC_MESSAGES/xmms.mo
-share/locale/eo/LC_MESSAGES/xmms.mo
-share/locale/es/LC_MESSAGES/xmms.mo
-share/locale/et/LC_MESSAGES/xmms.mo
-share/locale/eu/LC_MESSAGES/xmms.mo
-share/locale/fi/LC_MESSAGES/xmms.mo
-share/locale/fr/LC_MESSAGES/xmms.mo
-share/locale/ga/LC_MESSAGES/xmms.mo
-share/locale/gl/LC_MESSAGES/xmms.mo
-share/locale/hr/LC_MESSAGES/xmms.mo
-share/locale/hu/LC_MESSAGES/xmms.mo
-share/locale/id/LC_MESSAGES/xmms.mo
-share/locale/it/LC_MESSAGES/xmms.mo
-share/locale/ja/LC_MESSAGES/xmms.mo
-share/locale/ka/LC_MESSAGES/xmms.mo
-share/locale/ko/LC_MESSAGES/xmms.mo
-share/locale/lt/LC_MESSAGES/xmms.mo
-share/locale/lv/LC_MESSAGES/xmms.mo
-share/locale/mk/LC_MESSAGES/xmms.mo
-share/locale/ms/LC_MESSAGES/xmms.mo
-share/locale/nl/LC_MESSAGES/xmms.mo
-share/locale/nn/LC_MESSAGES/xmms.mo
-share/locale/no/LC_MESSAGES/xmms.mo
-share/locale/pl/LC_MESSAGES/xmms.mo
-share/locale/pt/LC_MESSAGES/xmms.mo
-share/locale/pt_BR/LC_MESSAGES/xmms.mo
-share/locale/ro/LC_MESSAGES/xmms.mo
-share/locale/ru/LC_MESSAGES/xmms.mo
-share/locale/sk/LC_MESSAGES/xmms.mo
-share/locale/sl/LC_MESSAGES/xmms.mo
-share/locale/sq/LC_MESSAGES/xmms.mo
-share/locale/sr/LC_MESSAGES/xmms.mo
-share/locale/sr at Latn/LC_MESSAGES/xmms.mo
-share/locale/sv/LC_MESSAGES/xmms.mo
-share/locale/tg/LC_MESSAGES/xmms.mo
-share/locale/th/LC_MESSAGES/xmms.mo
-share/locale/tr/LC_MESSAGES/xmms.mo
-share/locale/uk/LC_MESSAGES/xmms.mo
-share/locale/uz/LC_MESSAGES/xmms.mo
-share/locale/vi/LC_MESSAGES/xmms.mo
-share/locale/wa/LC_MESSAGES/xmms.mo
-share/locale/zh_CN/LC_MESSAGES/xmms.mo
-share/locale/zh_TW/LC_MESSAGES/xmms.mo
+%%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 at 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 share/applications
@dirrmtry %%DATADIR%%/Skins
@@ -98,5 +100,3 @@ share/locale/zh_TW/LC_MESSAGES/xmms.mo
@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
- at exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
- at unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
Modified: head/russian/xmms/Makefile
==============================================================================
--- head/russian/xmms/Makefile Tue Oct 22 08:21:15 2013 (r331239)
+++ head/russian/xmms/Makefile Tue Oct 22 08:30:47 2013 (r331240)
@@ -1,17 +1,13 @@
# Created by: oleg dashevskii <be9-ml at be9.ru>
# $FreeBSD$
-PORTNAME= xmms
CATEGORIES= russian
MAINTAINER= ports at FreeBSD.org
COMMENT= RusXMMS - X Multimedia System with Russian encoding patch
+CONFLICTS= xmms-[0-9]* zh-xmms-[0-9]*
MASTERDIR= ${.CURDIR}/../../multimedia/xmms
+OPTIONS_SLAVE= RUSXMMS_PATCHES
-CONFLICTS= xmms-[0-9]*
-
-WITH_RUSXMMS_PATCHES= yes
-
-NO_STAGE= yes
.include "${MASTERDIR}/Makefile"
More information about the svn-ports-head
mailing list