aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chinese/xmms/Makefile11
-rw-r--r--multimedia/xmms/Makefile159
-rw-r--r--multimedia/xmms/files/extra-patch-Visualization_Makefile.am6
-rw-r--r--multimedia/xmms/files/patch-General-ir-ir.c (renamed from multimedia/xmms/files/patch-gcc41)10
-rw-r--r--multimedia/xmms/files/patch-aclocal.m412
-rw-r--r--multimedia/xmms/files/patch-configure.in33
-rw-r--r--multimedia/xmms/files/patch-ltmain.sh15
-rw-r--r--multimedia/xmms/files/patch-po-Makefile.in.in10
-rw-r--r--multimedia/xmms/files/patch-xmms-config.in14
-rw-r--r--multimedia/xmms/files/patch-xmms-i18n.h.in12
-rw-r--r--multimedia/xmms/files/pkg-message.in6
-rw-r--r--multimedia/xmms/files/xmms.desktop (renamed from multimedia/xmms/files/xmms.desktop.in)0
-rw-r--r--multimedia/xmms/pkg-plist118
-rw-r--r--russian/xmms/Makefile8
-rw-r--r--russian/xmms/distinfo4
15 files changed, 148 insertions, 270 deletions
diff --git a/chinese/xmms/Makefile b/chinese/xmms/Makefile
index 041fc736f0d..0335e48687c 100644
--- a/chinese/xmms/Makefile
+++ b/chinese/xmms/Makefile
@@ -1,17 +1,12 @@
# Created by: Espen Skoglund <esk@ira.uka.de>
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= chinese
-MASTERDIR= ${.CURDIR}/../../multimedia/xmms
-
-PATCH_SITES= ${MASTER_SITE_LOCAL}
-PATCH_SITE_SUBDIR= sobomax
+MAINTAINER= ports@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@FreeBSD.org
-
-NO_STAGE= yes
.include "${MASTERDIR}/Makefile"
diff --git a/multimedia/xmms/Makefile b/multimedia/xmms/Makefile
index 22234f47fab..2bc850cbdaa 100644
--- a/multimedia/xmms/Makefile
+++ b/multimedia/xmms/Makefile
@@ -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@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,@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:
- @${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>
diff --git a/multimedia/xmms/files/extra-patch-Visualization_Makefile.am b/multimedia/xmms/files/extra-patch-Visualization_Makefile.am
deleted file mode 100644
index bc16a87345d..00000000000
--- a/multimedia/xmms/files/extra-patch-Visualization_Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
---- Visualization/Makefile.am.orig 2001-01-19 07:37:43.000000000 -0900
-+++ Visualization/Makefile.am 2008-09-28 14:03:48.000000000 -0800
-@@ -1,2 +1,2 @@
--ALL_PLUGINS = blur_scope sanalyzer opengl_spectrum
-+ALL_PLUGINS = blur_scope sanalyzer
- SUBDIRS = @VISUALIZATION_PLUGINS@
diff --git a/multimedia/xmms/files/patch-gcc41 b/multimedia/xmms/files/patch-General-ir-ir.c
index 9e63778e2db..e929cd04e49 100644
--- a/multimedia/xmms/files/patch-gcc41
+++ b/multimedia/xmms/files/patch-General-ir-ir.c
@@ -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;
diff --git a/multimedia/xmms/files/patch-aclocal.m4 b/multimedia/xmms/files/patch-aclocal.m4
deleted file mode 100644
index 2466d0d246f..00000000000
--- a/multimedia/xmms/files/patch-aclocal.m4
+++ /dev/null
@@ -1,12 +0,0 @@
---- aclocal.m4.orig 2007-11-16 15:54:32.000000000 -0600
-+++ aclocal.m4 2010-09-28 00:40:44.000000000 -0500
-@@ -3872,3 +3872,3 @@
- # generated from the m4 files accompanying Automake X.Y.
--AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
-+AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="%%AUTOMAKE_VERSION%%"])
-
-@@ -3879,3 +3879,3 @@
- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-- [AM_AUTOMAKE_VERSION([1.9.6])])
-+ [AM_AUTOMAKE_VERSION([%%AUTOMAKE_APIVER%%])])
-
diff --git a/multimedia/xmms/files/patch-configure.in b/multimedia/xmms/files/patch-configure.in
deleted file mode 100644
index df5cba0e8ec..00000000000
--- a/multimedia/xmms/files/patch-configure.in
+++ /dev/null
@@ -1,33 +0,0 @@
---- configure.in.orig 2007-11-16 22:52:30.000000000 +0100
-+++ configure.in 2007-12-29 18:08:33.603961280 +0100
-@@ -115,7 +115,14 @@
- dnl ***
- dnl *** Check pthread linking
- dnl ***
-+AC_MSG_CHECKING([for PTHREAD_LIBS])
-+if test "x$PTHREAD_LIBS" = "x"; then
- PTHREAD_LIBS=error
-+else
-+AC_MSG_RESULT([$PTHREAD_LIBS])
-+fi
-+
-+if test "x$PTHREAD_LIBS" = "xerror"; then
- AC_MSG_CHECKING([for old style FreeBSD -pthread flag])
- AC_EGREP_CPP([yes],
- [#if (defined(__FreeBSD_cc_version) && __FreeBSD_cc_version <= 500001) || defined(__OpenBSD__)
-@@ -124,6 +131,7 @@
- ], AC_MSG_RESULT([yes])
- CFLAGS="$CFLAGS -D_THREAD_SAFE" PTHREAD_LIBS="-pthread",
- AC_MSG_RESULT([no]))
-+fi
- if test "x$PTHREAD_LIBS" = "xerror"; then
- AC_CHECK_LIB([pthread], [pthread_attr_init],
- PTHREAD_LIBS="-lpthread")
-@@ -423,7 +431,6 @@
- LIBS_save=$LIBS
- CFLAGS_save=$CFLAGS
- LDFLAGS_save=$LDFLAGS
--AM_PATH_ALSA([0.9.0], [have_alsa=yes], [have_alsa=no])
- AM_CONDITIONAL([HAVE_ALSA], [test "x${have_alsa}" = "xyes"])
- LIBS=$LIBS_save
- CFLAGS=$CFLAGS_save
diff --git a/multimedia/xmms/files/patch-ltmain.sh b/multimedia/xmms/files/patch-ltmain.sh
deleted file mode 100644
index dc7ec5c89f3..00000000000
--- a/multimedia/xmms/files/patch-ltmain.sh
+++ /dev/null
@@ -1,15 +0,0 @@
---- ltmain.sh.orig Fri Sep 5 13:18:43 2003
-+++ ltmain.sh Fri Sep 5 13:18:09 2003
-@@ -6038,10 +6038,12 @@
- fi
-
- # Install the pseudo-library for information purposes.
-+ if /usr/bin/false; then
- name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- instname="$dir/$name"i
- $show "$install_prog $instname $destdir/$name"
- $run eval "$install_prog $instname $destdir/$name" || exit $?
-+ fi
-
- # Maybe install the static library, too.
- test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/multimedia/xmms/files/patch-po-Makefile.in.in b/multimedia/xmms/files/patch-po-Makefile.in.in
deleted file mode 100644
index 134078c0155..00000000000
--- a/multimedia/xmms/files/patch-po-Makefile.in.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- po/Makefile.in.in.orig 2007-12-28 18:06:27.340155988 +0100
-+++ po/Makefile.in.in 2007-12-28 18:06:52.250680503 +0100
-@@ -30,6 +30,7 @@
-
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
-+install_sh = @install_sh@
- mkinstalldirs = $(SHELL) @install_sh@ -d
- mkdir_p = @mkdir_p@
-
diff --git a/multimedia/xmms/files/patch-xmms-config.in b/multimedia/xmms/files/patch-xmms-config.in
deleted file mode 100644
index e3d39c0d048..00000000000
--- a/multimedia/xmms/files/patch-xmms-config.in
+++ /dev/null
@@ -1,14 +0,0 @@
---- xmms-config.in.orig 2013-03-08 13:50:50.000000000 +0100
-+++ xmms-config.in 2013-03-08 13:51:04.000000000 +0100
-@@ -153,9 +153,9 @@
- fi
-
- if test "$lib_dir" != "/usr/lib"; then
-- libs="-L$lib_dir $gtk_libs -lxmms"
-+ libs="-L$lib_dir $gtk_libs -lxmms -lgettextlib"
- else
-- libs="$gtk_libs -lxmms"
-+ libs="$gtk_libs -lxmms -lgettextlib"
- fi
-
- if test "$echo_cflags" = "yes"; then
diff --git a/multimedia/xmms/files/patch-xmms-i18n.h.in b/multimedia/xmms/files/patch-xmms-i18n.h.in
new file mode 100644
index 00000000000..6c152f7bee3
--- /dev/null
+++ b/multimedia/xmms/files/patch-xmms-i18n.h.in
@@ -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
diff --git a/multimedia/xmms/files/pkg-message.in b/multimedia/xmms/files/pkg-message.in
deleted file mode 100644
index a11e67bb1a6..00000000000
--- a/multimedia/xmms/files/pkg-message.in
+++ /dev/null
@@ -1,6 +0,0 @@
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-
-Xmms supports Gzipped and uncompressed skins. If you would like to use
-Zip format skins you will need to ensure archivers/unzip is installed.
-
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
diff --git a/multimedia/xmms/files/xmms.desktop.in b/multimedia/xmms/files/xmms.desktop
index 24de67f531a..24de67f531a 100644
--- a/multimedia/xmms/files/xmms.desktop.in
+++ b/multimedia/xmms/files/xmms.desktop
diff --git a/multimedia/xmms/pkg-plist b/multimedia/xmms/pkg-plist
index 75ac6e9ab04..8e565d76e5d 100644
--- a/multimedia/xmms/pkg-plist
+++ b/multimedia/xmms/pkg-plist
@@ -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@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@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
-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
diff --git a/russian/xmms/Makefile b/russian/xmms/Makefile
index 4a8aefe3f88..db51057d609 100644
--- a/russian/xmms/Makefile
+++ b/russian/xmms/Makefile
@@ -1,17 +1,13 @@
# Created by: oleg dashevskii <be9-ml@be9.ru>
# $FreeBSD$
-PORTNAME= xmms
CATEGORIES= russian
MAINTAINER= ports@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"
diff --git a/russian/xmms/distinfo b/russian/xmms/distinfo
deleted file mode 100644
index c4f4be48b0c..00000000000
--- a/russian/xmms/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-SHA256 (xmms-1.2.11.tar.bz2) = 7ec15c56632b6c82e61ccddeaefd372359af2f005708a58cdf3951c574b20390
-SIZE (xmms-1.2.11.tar.bz2) = 2581032
-SHA256 (RusXMMS2-csa41.tar.bz2) = e64df1956502e48c09ca60262efb7f1953a76d82a70c801e4797ca81e130e8d0
-SIZE (RusXMMS2-csa41.tar.bz2) = 96642
generated by cgit (git 2.34.1) at 2025-01-31 15:36:34 +0800