diff options
author | Jeremy Lea <reg@FreeBSD.org> | 2000-10-05 07:22:56 +0000 |
---|---|---|
committer | Jeremy Lea <reg@FreeBSD.org> | 2000-10-05 07:22:56 +0000 |
commit | 7b4c77811e89d7fc1131ca6e63df3e719bc86b1d (patch) | |
tree | 9695733a1620c4c290c86f161a4f1b73160ed39a /audio | |
parent | Implement USE_GNOME, part 2. (diff) |
Implement WANT_GNOME.
Notes
Notes:
svn path=/head/; revision=33430
Diffstat (limited to 'audio')
-rw-r--r-- | audio/extace/Makefile | 28 | ||||
-rw-r--r-- | audio/extace/files/patch-ab | 29 | ||||
-rw-r--r-- | audio/extace/pkg-plist | 5 | ||||
-rw-r--r-- | audio/soundtracker/Makefile | 44 | ||||
-rw-r--r-- | audio/xhippo/Makefile | 14 | ||||
-rw-r--r-- | audio/xmms/Makefile | 87 | ||||
-rw-r--r-- | audio/xmms/files/patch-ab | 30 | ||||
-rw-r--r-- | audio/xmms/files/patch-ad | 24 | ||||
-rw-r--r-- | audio/xmms/files/patch-ae | 12 | ||||
-rw-r--r-- | audio/xmms/files/patch-af | 14 | ||||
-rw-r--r-- | audio/xmms/pkg-plist | 4 |
11 files changed, 162 insertions, 129 deletions
diff --git a/audio/extace/Makefile b/audio/extace/Makefile index de54804f2d01..1de4d59ca929 100644 --- a/audio/extace/Makefile +++ b/audio/extace/Makefile @@ -13,22 +13,24 @@ MASTER_SITE_SUBDIR= eXtace MAINTAINER= sobomax@FreeBSD.org -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - gdk_imlib.5:${PORTSDIR}/graphics/imlib \ - esd.2:${PORTSDIR}/audio/esound \ - fftw.2:${PORTSDIR}/math/fftw +LIB_DEPENDS= fftw.2:${PORTSDIR}/math/fftw USE_X_PREFIX= yes +USE_IMLIB= yes +USE_ESOUND= yes +WANT_GNOME= yes USE_LIBTOOL= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -DHAVE_LIBFFTW" \ + LIBS="-L${LOCALBASE}/lib" -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config -GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config -ESD_CONFIG?= ${LOCALBASE}/bin/esd-config +.include <bsd.port.pre.mk> -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" \ - GLIB_CONFIG="${GLIB_CONFIG}" \ - ESD_CONFIG="${ESD_CONFIG}" \ - LIBS="-L${LOCALBASE}/lib" \ - CPPFLAGS="-I${LOCALBASE}/include -DHAVE_LIBFFTW" +.if defined(HAVE_GNOME) +USE_GNOME= yes +.endif -.include <bsd.port.mk> +pre-patch: + @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ + 's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g' + +.include <bsd.port.post.mk> diff --git a/audio/extace/files/patch-ab b/audio/extace/files/patch-ab new file mode 100644 index 000000000000..c72137e89ac4 --- /dev/null +++ b/audio/extace/files/patch-ab @@ -0,0 +1,29 @@ +--- extace/Makefile.in.orig Fri Jun 2 23:30:29 2000 ++++ extace/Makefile.in Fri Jun 2 23:32:26 2000 +@@ -108,7 +108,9 @@ + + EXTRA_DIST = extace.desktop README NEWS TODO + ++.ifdef HAVE_GNOME + Multimedia_DATA = extace.desktop ++.endif + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../config.h + CONFIG_CLEAN_FILES = +@@ -237,7 +239,6 @@ + + install-MultimediaDATA: $(Multimedia_DATA) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(Multimediadir) + @list='$(Multimedia_DATA)'; for p in $$list; do \ + if test -f $(srcdir)/$$p; then \ + echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(Multimediadir)/$$p"; \ +@@ -340,7 +341,7 @@ + install-strip: + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install + installdirs: +- $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(Multimediadir) ++ $(mkinstalldirs) $(DESTDIR)$(bindir) + + + mostlyclean-generic: diff --git a/audio/extace/pkg-plist b/audio/extace/pkg-plist index 073ecc938785..4ce717d85627 100644 --- a/audio/extace/pkg-plist +++ b/audio/extace/pkg-plist @@ -1,5 +1,2 @@ bin/extace -share/gnome/apps/Multimedia/extace.desktop -@unexec rmdir %D/share/gnome/apps/Multimedia 2>/dev/null || true -@unexec rmdir %D/share/gnome/apps 2>/dev/null || true -@unexec rmdir %D/share/gnome 2>/dev/null || true +%%GNOME:%%share/gnome/apps/Multimedia/extace.desktop diff --git a/audio/soundtracker/Makefile b/audio/soundtracker/Makefile index c12fbb353e23..a69ce5774f00 100644 --- a/audio/soundtracker/Makefile +++ b/audio/soundtracker/Makefile @@ -12,32 +12,28 @@ MASTER_SITES= ftp://ftp.soundtracker.org/pub/soundtracker/v0.5/ MAINTAINER= kzentner@u.washington.edu -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - -.if defined(USE_GNOME) -LIB_DEPENDS+= gnome.4:${PORTSDIR}/x11/gnomelibs -.endif - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config -GNU_CONFIGURE= YES - -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" - USE_X_PREFIX= yes - -.if defined(USE_GNOME) -CONFIGURE_ARGS+= --enable-gnome -PLIST_SUB+= GNOME:="" -PLIST= ${PKGDIR}/PLIST.gnome +USE_GTK= yes +USE_ESOUND= yes +WANT_GNOME= yes +GNU_CONFIGURE= yes +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" + +.include <bsd.port.pre.mk> + +.if defined(HAVE_GNOME) +USE_GNOME= yes +CONFIGURE_ARGS+=--enable-gnome .else -CONFIGURE_ARGS+= --disable-gnome -PLIST_SUB+= GNOME:="@comment " +CONFIGURE_ARGS+=--disable-gnome .endif -CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib" - -post-install: - @strip ${PREFIX}/bin/soundtracker +pre-patch: + @${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\)/locale|\$\(prefix\)/share/locale|g' -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/audio/xhippo/Makefile b/audio/xhippo/Makefile index d872d512f1e7..62f686710c26 100644 --- a/audio/xhippo/Makefile +++ b/audio/xhippo/Makefile @@ -14,13 +14,17 @@ MASTER_SITES= http://zenchaos.netpedia.net/software/ \ MAINTAINER= rod@zort.on.ca RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 -LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 - -GTK_CONFIG?= ${X11BASE}/bin/gtk12-config USE_XLIB= yes +USE_GTK= yes +WANT_GNOME= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" + +.include <bsd.port.pre.mk> + +.if defined(HAVE_GNOME) +USE_GNOME= yes +.endif post-install: ${INSTALL_DATA} ${WRKSRC}/xhippo.config ${PREFIX}/etc/xhippo.config.default @@ -29,4 +33,4 @@ post-install: .endif @${CAT} ${PKGMESSAGE} -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/audio/xmms/Makefile b/audio/xmms/Makefile index df7550bffb6a..6663c0359fa5 100644 --- a/audio/xmms/Makefile +++ b/audio/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/audio/xmms/files/patch-ab b/audio/xmms/files/patch-ab index a9842709cd22..a4895b94c00e 100644 --- a/audio/xmms/files/patch-ab +++ b/audio/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/audio/xmms/files/patch-ad b/audio/xmms/files/patch-ad index 69fc08dace8d..0b26a5e0f80b 100644 --- a/audio/xmms/files/patch-ad +++ b/audio/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/audio/xmms/files/patch-ae b/audio/xmms/files/patch-ae index 6494be16d0a2..8eea92cf33e2 100644 --- a/audio/xmms/files/patch-ae +++ b/audio/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/audio/xmms/files/patch-af b/audio/xmms/files/patch-af new file mode 100644 index 000000000000..014ca1b56704 --- /dev/null +++ b/audio/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/audio/xmms/pkg-plist b/audio/xmms/pkg-plist index 09034c1b85fd..2e0b6b88c99e 100644 --- a/audio/xmms/pkg-plist +++ b/audio/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 |