Date: Mon, 21 Oct 2013 22:42:34 +0200 (CEST) From: Tijl Coosemans <tijl@coosemans.org> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/183165: [patch] multimedia/xmms: clang, stage, and lots more Message-ID: <201310212042.r9LKgY7o045394@kalimero.tijl.coosemans.org> Resent-Message-ID: <201310212050.r9LKo0xo049910@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 183165
>Category: ports
>Synopsis: [patch] multimedia/xmms: clang, stage, and lots more
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Oct 21 20:50:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Tijl Coosemans
>Release: FreeBSD 11.0-CURRENT i386
>Organization:
>Environment:
>Description:
Detailed list of changes in order of appearance in the attached patch:
- Add zh-xmms to CONFLICTS.
- Set GNU_CONFIGURE because USE_AUTOTOOLS is no longer set.
- 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.
- Move manpages to pkg-plist for staging support.
- 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.
- Reword RUSXMMS_PATCHES_DESC.
- 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.
- Silence esound patching.
- 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","",@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. Because xmms
can load media from URLs I think it's important to fix this.
- Convert post-install target to 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.
- Clean up chinese/xmms and russian/xmms a bit.
>How-To-Repeat:
>Fix:
--- xmms.patch begins here ---
Index: multimedia/xmms/Makefile
===================================================================
--- multimedia/xmms/Makefile (revision 330997)
+++ multimedia/xmms/Makefile (working copy)
@@ -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>
Index: multimedia/xmms/distinfo
===================================================================
--- multimedia/xmms/distinfo (revision 330997)
+++ multimedia/xmms/distinfo (working copy)
Property changes on: multimedia/xmms/distinfo
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: multimedia/xmms/files/extra-patch-Visualization_Makefile.am
===================================================================
--- multimedia/xmms/files/extra-patch-Visualization_Makefile.am (revision 330997)
+++ multimedia/xmms/files/extra-patch-Visualization_Makefile.am (working copy)
@@ -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@
Index: multimedia/xmms/files/patch-General-ir-ir.c
===================================================================
--- multimedia/xmms/files/patch-General-ir-ir.c (revision 0)
+++ multimedia/xmms/files/patch-General-ir-ir.c (working copy)
@@ -0,0 +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,7 +16,7 @@
+ #include "ir.h"
+
+ /* Important stuff to know */
+-static gboolean keepGoing = FALSE;
++static volatile gboolean keepGoing = FALSE;
+
+ /* The thread handle */
+ static pthread_t irapp_thread;
Property changes on: multimedia/xmms/files/patch-General-ir-ir.c
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: multimedia/xmms/files/patch-Output__OSS__mixer.c
===================================================================
--- multimedia/xmms/files/patch-Output__OSS__mixer.c (revision 330997)
+++ multimedia/xmms/files/patch-Output__OSS__mixer.c (working copy)
Property changes on: multimedia/xmms/files/patch-Output__OSS__mixer.c
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: multimedia/xmms/files/patch-Output__esd__mixer.c
===================================================================
--- multimedia/xmms/files/patch-Output__esd__mixer.c (revision 330997)
+++ multimedia/xmms/files/patch-Output__esd__mixer.c (working copy)
Property changes on: multimedia/xmms/files/patch-Output__esd__mixer.c
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: multimedia/xmms/files/patch-aclocal.m4
===================================================================
--- multimedia/xmms/files/patch-aclocal.m4 (revision 330997)
+++ multimedia/xmms/files/patch-aclocal.m4 (working copy)
@@ -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%%])])
-
Index: multimedia/xmms/files/patch-am64
===================================================================
--- multimedia/xmms/files/patch-am64 (revision 330997)
+++ multimedia/xmms/files/patch-am64 (working copy)
Property changes on: multimedia/xmms/files/patch-am64
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: multimedia/xmms/files/patch-configure.in
===================================================================
--- multimedia/xmms/files/patch-configure.in (revision 330997)
+++ multimedia/xmms/files/patch-configure.in (working copy)
@@ -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
Index: multimedia/xmms/files/patch-gcc41
===================================================================
--- multimedia/xmms/files/patch-gcc41 (revision 330997)
+++ multimedia/xmms/files/patch-gcc41 (working copy)
@@ -1,15 +0,0 @@
---- 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 @@
- #include "ir.h"
-
- /* Important stuff to know */
--static gboolean keepGoing = FALSE;
-+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);
Index: multimedia/xmms/files/patch-ltmain.sh
===================================================================
--- multimedia/xmms/files/patch-ltmain.sh (revision 330997)
+++ multimedia/xmms/files/patch-ltmain.sh (working copy)
@@ -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"
Index: multimedia/xmms/files/patch-oss
===================================================================
--- multimedia/xmms/files/patch-oss (revision 330997)
+++ multimedia/xmms/files/patch-oss (working copy)
Property changes on: multimedia/xmms/files/patch-oss
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: multimedia/xmms/files/patch-po-Makefile.in.in
===================================================================
--- multimedia/xmms/files/patch-po-Makefile.in.in (revision 330997)
+++ multimedia/xmms/files/patch-po-Makefile.in.in (working copy)
@@ -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@
-
Index: multimedia/xmms/files/patch-xmms-config.in
===================================================================
--- multimedia/xmms/files/patch-xmms-config.in (revision 330997)
+++ multimedia/xmms/files/patch-xmms-config.in (working copy)
@@ -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
Index: multimedia/xmms/files/patch-xmms-i18n.h.in
===================================================================
--- multimedia/xmms/files/patch-xmms-i18n.h.in (revision 0)
+++ multimedia/xmms/files/patch-xmms-i18n.h.in (working copy)
@@ -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
Property changes on: multimedia/xmms/files/patch-xmms-i18n.h.in
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: multimedia/xmms/files/patch-xmms_util.c
===================================================================
--- multimedia/xmms/files/patch-xmms_util.c (revision 330997)
+++ multimedia/xmms/files/patch-xmms_util.c (working copy)
Property changes on: multimedia/xmms/files/patch-xmms_util.c
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: multimedia/xmms/files/pkg-message.in
===================================================================
--- multimedia/xmms/files/pkg-message.in (revision 330997)
+++ multimedia/xmms/files/pkg-message.in (working copy)
@@ -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.
-
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
Index: multimedia/xmms/files/xmms.desktop
===================================================================
--- multimedia/xmms/files/xmms.desktop (revision 0)
+++ multimedia/xmms/files/xmms.desktop (working copy)
@@ -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;
Property changes on: multimedia/xmms/files/xmms.desktop
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: multimedia/xmms/files/xmms.desktop.in
===================================================================
--- multimedia/xmms/files/xmms.desktop.in (revision 330997)
+++ multimedia/xmms/files/xmms.desktop.in (working copy)
@@ -1,11 +0,0 @@
-[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;
Index: multimedia/xmms/pkg-descr
===================================================================
--- multimedia/xmms/pkg-descr (revision 330997)
+++ multimedia/xmms/pkg-descr (working copy)
Property changes on: multimedia/xmms/pkg-descr
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: multimedia/xmms/pkg-plist
===================================================================
--- multimedia/xmms/pkg-plist (revision 330997)
+++ multimedia/xmms/pkg-plist (working copy)
@@ -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
Property changes on: multimedia/xmms/pkg-plist
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: chinese/xmms/Makefile
===================================================================
--- chinese/xmms/Makefile (revision 330997)
+++ chinese/xmms/Makefile (working copy)
@@ -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"
Index: russian/xmms/Makefile
===================================================================
--- russian/xmms/Makefile (revision 330997)
+++ russian/xmms/Makefile (working copy)
@@ -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"
Index: russian/xmms/distinfo
===================================================================
--- russian/xmms/distinfo (revision 330997)
+++ russian/xmms/distinfo (working copy)
@@ -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
--- xmms.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310212042.r9LKgY7o045394>