aboutsummaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/xmms/Makefile87
-rw-r--r--multimedia/xmms/files/patch-ab30
-rw-r--r--multimedia/xmms/files/patch-ad24
-rw-r--r--multimedia/xmms/files/patch-ae12
-rw-r--r--multimedia/xmms/files/patch-af14
-rw-r--r--multimedia/xmms/pkg-plist4
6 files changed, 88 insertions, 83 deletions
diff --git a/multimedia/xmms/Makefile b/multimedia/xmms/Makefile
index df7550bffb6a..6663c0359fa5 100644
--- a/multimedia/xmms/Makefile
+++ b/multimedia/xmms/Makefile
@@ -22,70 +22,59 @@ PATCH_SITE_SUBDIR= sobomax
MAINTAINER= esk@ira.uka.de
-LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
- glib12.3:${PORTSDIR}/devel/glib12 \
- xml.5:${PORTSDIR}/textproc/libxml
+LIB_DEPENDS= xml.5:${PORTSDIR}/textproc/libxml
-USE_X_PREFIX= yes
-USE_LIBTOOL= yes
+USE_X_PREFIX= yes
+USE_GTK= yes
+WANT_ESOUND= yes
+WANT_GNOME= yes
+USE_LIBTOOL= yes
LIBTOOLFILES= configure libxmms/configure
-INSTALLS_SHLIB= yes
+INSTALLS_SHLIB= yes
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LIBS="-L${LOCALBASE}/lib" \
+ HAVE_MIKMOD=${HAVE_MIKMOD}
+
+.include <bsd.port.pre.mk>
.if !defined(WITHOUT_MIKMOD)
LIB_DEPENDS+= mikmod.2:${PORTSDIR}/audio/libmikmod
-HAVE_MIKMOD_OVERRIDE=
+HAVE_MIKMOD= yes
PLIST_SUB+= MIKMODPLUGIN:=""
.else
-HAVE_MIKMOD_OVERRIDE= yes
PLIST_SUB+= MIKMODPLUGIN:="@comment "
.endif
-.if !defined(WITHOUT_ESD)
-LIB_DEPENDS+= esd.2:${PORTSDIR}/audio/esound
-HAVE_ESD_OVERRIDE=
-PLIST_SUB+= ESDPLUGIN:=""
+.if defined(HAVE_GNOME)
+USE_GNOME= yes
.else
-HAVE_ESD_OVERRIDE= yes
-PLIST_SUB+= ESDPLUGIN:="@comment "
+CONFIGURE_ARGS= --without-gnome
.endif
-.if defined(WITH_GNOME)
-LIB_DEPENDS+= gnome.4:${PORTSDIR}/x11/gnomelibs \
- panel_applet.4:${PORTSDIR}/x11/gnomecore
-CONFIGURE_ARGS+= --with-gnome
-PLIST_SUB+= GNOME:=""
+.if defined(HAVE_ESOUND)
+USE_ESOUND= yes
+PLIST_SUB+= ESDPLUGIN:=""
.else
-CONFIGURE_ARGS+= --without-gnome
-PLIST_SUB+= GNOME:="@comment "
+PLIST_SUB+= ESDPLUGIN:="@comment "
.endif
-GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
-GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
-
-CONFIGURE_ENV+= GTK_CONFIG="${GTK_CONFIG}" \
- GLIB_CONFIG="${GLIB_CONFIG}" \
- CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" \
- HAVE_ESD_OVERRIDE="${HAVE_ESD_OVERRIDE}" \
- HAVE_MIKMOD_OVERRIDE="${HAVE_MIKMOD_OVERRIDE}"
-
-.include <bsd.port.pre.mk>
-
.if !defined(WITHOUT_3DNOW) && ${OSVERSION} >= 400021
PATCHFILES= xmms-${PORTVERSION}-3dnow.patch.gz
CONFIGURE_ARGS+= --enable-3dnow
.endif
+.if defined(WITHOUT_3DNOW) || ${OSVERSION} < 400021
+post-extract:
+ (cd ${WRKSRC}/Input/mpg123 && ${MV} decode_i586.s decode_i586.S && \
+ cd ${WRKSRC}/Visualization/blur_scope && ${MV} blur_8.s blur_8.S);
+ ${PERL} -pi.bak -e 's:\.s :\.S :g' ${WRKSRC}/Input/mpg123/Makefile.in
+ ${PERL} -pi.bak -e 's:blur_8.s:blur_8.S:g' \
+ ${WRKSRC}/Visualization/blur_scope/Makefile.in
+.endif
+
pre-extract:
-.if !defined(WITH_GNOME) || !defined(WITHOUT_ESD) || !defined(WITHOUT_MIKMOD) || \
- ( !defined(WITHOUT_3DNOW) && ${OSVERSION} >= 400021 )
+.if !defined(WITHOUT_MIKMOD) || ( !defined(WITHOUT_3DNOW) && ${OSVERSION} >= 400021 )
@${ECHO_MSG}
-.if !defined(WITH_GNOME)
- @${ECHO_MSG} "You can add support for GNOME by defining WITH_GNOME."
-.endif
-.if !defined(WITHOUT_ESD)
- @${ECHO_MSG} "You can disable support for ESD sound daemon by defining WITHOUT_ESD."
-.endif
.if !defined(WITHOUT_MIKMOD)
@${ECHO_MSG} "You can disable support for mikmod by defining WITHOUT_MIKMOD."
.endif
@@ -95,16 +84,12 @@ pre-extract:
@${ECHO_MSG}
.endif
-.if defined(WITHOUT_3DNOW) || ${OSVERSION} < 400021
-post-extract:
- (cd ${WRKSRC}/Input/mpg123 && ${MV} decode_i586.s decode_i586.S && \
- cd ${WRKSRC}/Visualization/blur_scope && ${MV} blur_8.s blur_8.S);
- ${PERL} -pi.bak -e 's:\.s :\.S :g' ${WRKSRC}/Input/mpg123/Makefile.in
- ${PERL} -pi.bak -e 's:blur_8.s:blur_8.S:g' \
- ${WRKSRC}/Visualization/blur_scope/Makefile.in
-.endif
-
pre-patch:
- @${PERL} -pi -e 's|-lpthread|-pthread|g' ${WRKSRC}/configure
+ @${PERL} -pi -e 's^-l(pthread|c_r)^-pthread^g ; \
+ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
+ @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
+ s|\$\(datadir\)/aclocal|\$\(prefix\)/share/aclocal|g ; \
+ s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
.include <bsd.port.post.mk>
diff --git a/multimedia/xmms/files/patch-ab b/multimedia/xmms/files/patch-ab
index a9842709cd22..a4895b94c00e 100644
--- a/multimedia/xmms/files/patch-ab
+++ b/multimedia/xmms/files/patch-ab
@@ -1,19 +1,11 @@
-*** Visualization/Makefile.in.org Wed Jun 14 13:21:50 2000
---- Visualization/Makefile.in Wed Jun 14 13:22:09 2000
-***************
-*** 148,154 ****
- sidplay_library = @sidplay_library@
- xmmsdir = @xmmsdir@
-
-! SUBDIRS = blur_scope sanalyzer opengl_spectrum
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
- CONFIG_CLEAN_FILES =
---- 148,154 ----
- sidplay_library = @sidplay_library@
- xmmsdir = @xmmsdir@
-
-! SUBDIRS = blur_scope sanalyzer
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
- CONFIG_CLEAN_FILES =
+--- Visualization/Makefile.in.orig Mon Jan 31 10:44:44 2000
++++ Visualization/Makefile.in Sun Feb 27 01:37:39 2000
+@@ -125,7 +125,7 @@
+ sidplay_library = @sidplay_library@
+ xmmsdir = @xmmsdir@
+
+-SUBDIRS = blur_scope sanalyzer opengl_spectrum
++SUBDIRS = blur_scope sanalyzer
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
+ CONFIG_CLEAN_FILES =
diff --git a/multimedia/xmms/files/patch-ad b/multimedia/xmms/files/patch-ad
index 69fc08dace8d..0b26a5e0f80b 100644
--- a/multimedia/xmms/files/patch-ad
+++ b/multimedia/xmms/files/patch-ad
@@ -5,7 +5,7 @@
fi
-
-+if [ x"${HAVE_ESD_OVERRIDE}" != x"" ]; then
++if [ x"${HAVE_ESOUND}" != x"yes" ]; then
+ have_esd=no
+fi
@@ -16,21 +16,12 @@
rm -f conf.mikmodtest
-
-+if [ x"${HAVE_MIKMOD_OVERRIDE}" != x"" ]; then
++if [ x"${HAVE_MIKMOD}" != x"yes" ]; then
+ have_mikmod=no
+fi
if test "x$have_mikmod" = xyes; then
HAVE_MIKMOD_TRUE=
-@@ -5549,7 +5553,7 @@
- cat conftest.$ac_ext >&5
- rm -rf conftest*
- CATOBJEXT=.mo
-- DATADIRNAME=lib
-+ DATADIRNAME=share
- fi
- rm -f conftest*
- INSTOBJEXT=.mo
@@ -7171,14 +7175,14 @@
if test -n "$GCC"
@@ -48,3 +39,14 @@
ARCH_DEFINES="-DI386_ASSEM"
arch_type=ix86
;;
+@@ -7885,10 +7889,6 @@
+ *) # Relative path.
+ ac_sub_cache_file="$ac_dots$cache_file" ;;
+ esac
+- case "$ac_given_INSTALL" in
+- [/$]*) INSTALL="$ac_given_INSTALL" ;;
+- *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
+- esac
+
+ echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir"
+ # The eval makes quoting arguments work.
diff --git a/multimedia/xmms/files/patch-ae b/multimedia/xmms/files/patch-ae
index 6494be16d0a2..8eea92cf33e2 100644
--- a/multimedia/xmms/files/patch-ae
+++ b/multimedia/xmms/files/patch-ae
@@ -1,5 +1,17 @@
--- Makefile.in.orig Mon Jul 31 10:27:32 2000
+++ Makefile.in Mon Jul 31 10:27:49 2000
+@@ -147,7 +147,10 @@
+ sidplay_library = @sidplay_library@
+ xmmsdir = @xmmsdir@
+
+-SUBDIRS = intl libxmms xmms Output Input Effect General Visualization wmxmms gnomexmms po
++SUBDIRS = intl libxmms xmms Output Input Effect General Visualization wmxmms po
++.ifdef HAVE_GNOME
++SUBDIRS += gnomexmms
++.endif
+
+ bin_SCRIPTS = xmms-config
+
@@ -205,9 +205,9 @@
rm -f $(srcdir)/stamp-h.in; \
$(MAKE) $(srcdir)/stamp-h.in; \
diff --git a/multimedia/xmms/files/patch-af b/multimedia/xmms/files/patch-af
new file mode 100644
index 000000000000..014ca1b56704
--- /dev/null
+++ b/multimedia/xmms/files/patch-af
@@ -0,0 +1,14 @@
+--- Output/Makefile.in.orig Mon Jan 31 10:44:32 2000
++++ Output/Makefile.in Sun Feb 27 01:37:39 2000
+@@ -125,7 +125,10 @@
+ sidplay_library = @sidplay_library@
+ xmmsdir = @xmmsdir@
+
+-SUBDIRS = OSS esd disk_writer
++SUBDIRS = OSS disk_writer
++.if defined(HAVE_ESOUND) || defined(HAVE_GNOME)
++SUBDIRS += esd
++.endif
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
+ CONFIG_CLEAN_FILES =
diff --git a/multimedia/xmms/pkg-plist b/multimedia/xmms/pkg-plist
index 09034c1b85fd..2e0b6b88c99e 100644
--- a/multimedia/xmms/pkg-plist
+++ b/multimedia/xmms/pkg-plist
@@ -32,6 +32,7 @@ lib/xmms/Output/libdisk_writer.so
lib/xmms/Visualization/libbscope.so
lib/xmms/Visualization/libsanalyzer.so
share/aclocal/xmms.m4
+%%DATADIR%%/xmms/wmxmms.xpm
share/locale/af/LC_MESSAGES/xmms.mo
share/locale/bg/LC_MESSAGES/xmms.mo
share/locale/ca/LC_MESSAGES/xmms.mo
@@ -61,8 +62,7 @@ share/locale/uk/LC_MESSAGES/xmms.mo
share/locale/wa/LC_MESSAGES/xmms.mo
share/locale/zh_CN.GB2312/LC_MESSAGES/xmms.mo
share/locale/zh_TW.Big5/LC_MESSAGES/xmms.mo
-share/xmms/wmxmms.xpm
-@dirrm share/xmms
+@dirrm %%DATADIR%%/xmms
@dirrm lib/xmms/Visualization
@dirrm lib/xmms/Output
@dirrm lib/xmms/Input
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 16:46:43 +0000