Subject: xmms Solaris fixes
To: None <tech-pkg@netbsd.org>
From: Jonathan Perkin <sketch@rd.bbc.co.uk>
List: tech-pkg
Date: 11/26/2002 18:15:27
--X1bOJ3K7DJ5YkBrT
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Attached is a patch to clean up xmms build on Solaris. If people want
to test it out (especially on real SunOS machines) I'll send-pr, or
someone can just commit as-is.
o Don't apply the iconv_open-in-libc bits on Solaris, as it happens to
have iconv_open() in -lc :) (Future work could fix this somewhere in
*.mk)
o Install locale into $PKGLOCALEDIR, to fix architectures which don't
have this set to "share"
o Create a separate PLIST.SunOS as Solaris doesn't have libOSS and
other bits, and has different shared library numbers.
Sorry for lumping them all into one patch.
--
Jonathan Perkin - Internet Operations Engineer - BBC Internet Services
24x7 Hotline: +44 (0)1628 407 777 (x37777) - http://support.bbc.co.uk/
--X1bOJ3K7DJ5YkBrT
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="xmms.patch"
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/audio/xmms/Makefile,v
retrieving revision 1.38
diff -u -r1.38 Makefile
--- Makefile 2002/11/03 23:05:26 1.38
+++ Makefile 2002/11/26 17:52:56
@@ -18,19 +18,26 @@
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --without-gnome
+MAKE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}"
LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} != "SunOS"
# Broken configure script assumes that iconv_open lives in libc; work around.
CPPFLAGS+= -DHAVE_ICONV_OPEN=1
CONFIGURE_ENV+= ac_cv_func_iconv_open=yes
LIBS+= -liconv
+.endif
-.include "../../mk/bsd.prefs.mk"
-
PTHREAD_OPTS+= require
.if defined(USE_INET6) && ${USE_INET6} == YES
CONFIGURE_ARGS+= --enable-ipv6
+.endif
+
+.if ${OPSYS} == "SunOS"
+PLIST_SRC= ${PKGDIR}/PLIST.SunOS
.endif
.if (${OPSYS} == NetBSD)
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/audio/xmms/distinfo,v
retrieving revision 1.11
diff -u -r1.11 distinfo
--- distinfo 2002/10/25 08:59:04 1.11
+++ distinfo 2002/11/26 17:52:56
@@ -16,7 +16,7 @@
SHA1 (patch-am) = eb86d881c229b73e37efc1e6fec7d806699fc2c2
SHA1 (patch-an) = e4169817fbdd978dd8c97cafa3447df277e53ecf
SHA1 (patch-ao) = 666eeb2d55c3ee6881a4d482f33bc1284d7f3455
-SHA1 (patch-ap) = 493a4d81960b4d11548b8f277c00b8315339ac02
+SHA1 (patch-ap) = 71dc8358887eee7aa8bd5e1538e9fb908afe7eff
SHA1 (patch-aq) = 3eb19fbebfc0ea68cd6703b6b3d1a706406b1aee
SHA1 (patch-ar) = ef35ce733dceac323119b5bbb3065164fac87c74
SHA1 (patch-as) = 1f62167c7901e8d2211f39a25e6f902935a413b1
Index: patches/patch-ap
===================================================================
RCS file: /cvsroot/pkgsrc/audio/xmms/patches/patch-ap,v
retrieving revision 1.1
diff -u -r1.1 patch-ap
--- patches/patch-ap 2001/05/20 20:52:25 1.1
+++ patches/patch-ap 2002/11/26 17:52:56
@@ -1,13 +1,19 @@
$NetBSD: patch-ap,v 1.1 2001/05/20 20:52:25 rh Exp $
---- po/Makefile.in.in.orig Sun May 20 18:00:16 2001
+--- po/Makefile.in.in.orig Mon Mar 4 21:56:47 2002
+++ po/Makefile.in.in
-@@ -18,7 +18,7 @@
+@@ -18,10 +18,10 @@ VPATH = @srcdir@
prefix = @prefix@
exec_prefix = @exec_prefix@
-datadir = $(prefix)/@DATADIRNAME@
+-localedir = $(datadir)/locale
+-gnulocaledir = $(prefix)/share/locale
+-gettextsrcdir = $(prefix)/share/gettext/po
+datadir = @datadir@
- localedir = $(datadir)/locale
- gnulocaledir = $(prefix)/share/locale
- gettextsrcdir = $(prefix)/share/gettext/po
++localedir = $(prefix)/$(PKGLOCALEDIR)/locale
++gnulocaledir = $(prefix)/$(PKGLOCALEDIR)/locale
++gettextsrcdir = $(prefix)/$(PKGLOCALEDIR)/gettext/po
+ subdir = po
+
+ DESTDIR =
--- /dev/null Tue Nov 26 17:52:20 2002
+++ PLIST.SunOS Tue Nov 26 16:18:41 2002
@@ -0,0 +1,125 @@
+@comment $NetBSD$
+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.a
+lib/libxmms.la
+lib/libxmms.so
+lib/libxmms.so.1
+lib/libxmms.so.1.2.1
+lib/xmms/Effect/libecho.la
+lib/xmms/Effect/libecho.a
+lib/xmms/Effect/libecho.so
+lib/xmms/Effect/libstereo.la
+lib/xmms/Effect/libstereo.a
+lib/xmms/Effect/libstereo.so
+lib/xmms/Effect/libvoice.la
+lib/xmms/Effect/libvoice.a
+lib/xmms/Effect/libvoice.so
+lib/xmms/General/libir.la
+lib/xmms/General/libir.a
+lib/xmms/General/libir.so
+lib/xmms/General/libsong_change.la
+lib/xmms/General/libsong_change.a
+lib/xmms/General/libsong_change.so
+lib/xmms/Input/libcdaudio.la
+lib/xmms/Input/libcdaudio.a
+lib/xmms/Input/libcdaudio.so
+lib/xmms/Input/libidcin.la
+lib/xmms/Input/libidcin.a
+lib/xmms/Input/libidcin.so
+lib/xmms/Input/libmikmod.la
+lib/xmms/Input/libmikmod.a
+lib/xmms/Input/libmikmod.so
+lib/xmms/Input/libmpg123.la
+lib/xmms/Input/libmpg123.a
+lib/xmms/Input/libmpg123.so
+lib/xmms/Input/libtonegen.a
+lib/xmms/Input/libtonegen.la
+lib/xmms/Input/libtonegen.so
+lib/xmms/Input/libvorbis.a
+lib/xmms/Input/libvorbis.la
+lib/xmms/Input/libvorbis.so
+lib/xmms/Input/libwav.la
+lib/xmms/Input/libwav.a
+lib/xmms/Input/libwav.so
+lib/xmms/Output/libSolaris.la
+lib/xmms/Output/libSolaris.a
+lib/xmms/Output/libSolaris.so
+lib/xmms/Output/libdisk_writer.la
+lib/xmms/Output/libdisk_writer.a
+lib/xmms/Output/libdisk_writer.so
+lib/xmms/Output/libesdout.a
+lib/xmms/Output/libesdout.la
+lib/xmms/Output/libesdout.so
+lib/xmms/Visualization/libbscope.la
+lib/xmms/Visualization/libbscope.a
+lib/xmms/Visualization/libbscope.so
+lib/xmms/Visualization/libogl_spectrum.a
+lib/xmms/Visualization/libogl_spectrum.la
+lib/xmms/Visualization/libogl_spectrum.so
+lib/xmms/Visualization/libsanalyzer.la
+lib/xmms/Visualization/libsanalyzer.a
+lib/xmms/Visualization/libsanalyzer.so
+man/man1/gnomexmms.1
+man/man1/wmxmms.1
+man/man1/xmms.1
+${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/xmms.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/xmms.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/xmms.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/xmms.mo
+${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/xmms.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/xmms.mo
+${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/xmms.mo
+${PKGLOCALEDIR}/locale/id/LC_MESSAGES/xmms.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/xmms.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/xmms.mo
+${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/xmms.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/xmms.mo
+${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/xmms.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/xmms.mo
+${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/xmms.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/xmms.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/xmms.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/xmms.mo
+${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/xmms.mo
+${PKGLOCALEDIR}/locale/af/LC_MESSAGES/xmms.mo
+${PKGLOCALEDIR}/locale/az/LC_MESSAGES/xmms.mo
+${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/xmms.mo
+${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/xmms.mo
+${PKGLOCALEDIR}/locale/el/LC_MESSAGES/xmms.mo
+${PKGLOCALEDIR}/locale/eo/LC_MESSAGES/xmms.mo
+${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/xmms.mo
+${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/xmms.mo
+${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/xmms.mo
+${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/xmms.mo
+${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/xmms.mo
+${PKGLOCALEDIR}/locale/no/LC_MESSAGES/xmms.mo
+${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/xmms.mo
+${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/xmms.mo
+${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/xmms.mo
+${PKGLOCALEDIR}/locale/tg/LC_MESSAGES/xmms.mo
+${PKGLOCALEDIR}/locale/th/LC_MESSAGES/xmms.mo
+${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/xmms.mo
+${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/xmms.mo
+${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/xmms.mo
+${PKGLOCALEDIR}/locale/zh_CN.GB2312/LC_MESSAGES/xmms.mo
+${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/xmms.mo
+share/aclocal/xmms.m4
+share/xmms/wmxmms.xpm
+@dirrm share/xmms
+@dirrm lib/xmms/Visualization
+@dirrm lib/xmms/Output
+@dirrm lib/xmms/Input
+@dirrm lib/xmms/General
+@dirrm lib/xmms/Effect
+@dirrm lib/xmms
+@dirrm include/xmms
--X1bOJ3K7DJ5YkBrT--