diff options
| -rw-r--r-- | audio/glame/Makefile | 6 | ||||
| -rw-r--r-- | audio/glame/distinfo | 2 | ||||
| -rw-r--r-- | audio/glame/files/patch-Makefile.in | 14 | ||||
| -rw-r--r-- | audio/glame/files/patch-configure | 42 | ||||
| -rw-r--r-- | audio/glame/files/patch-ltmain.sh | 37 | ||||
| -rw-r--r-- | audio/glame/pkg-plist | 28 |
6 files changed, 61 insertions, 68 deletions
diff --git a/audio/glame/Makefile b/audio/glame/Makefile index 8606b7f80b17..cd328b6b7e55 100644 --- a/audio/glame/Makefile +++ b/audio/glame/Makefile @@ -6,7 +6,7 @@ # PORTNAME= glame -PORTVERSION= 0.5.4 +PORTVERSION= 0.6.3 CATEGORIES= audio gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -16,10 +16,10 @@ MAINTAINER= sobomax@FreeBSD.org USE_GNOME= yes USE_X_PREFIX= yes USE_GMAKE= yes -GNU_CONFIGURE= yes +USE_LIBTOOL= yes INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" + LDFLAGS="-L${LOCALBASE}/lib -lltdl ${PTHREAD_LIBS}" pre-patch: @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ diff --git a/audio/glame/distinfo b/audio/glame/distinfo index 87188b6d7749..64767d02dfbd 100644 --- a/audio/glame/distinfo +++ b/audio/glame/distinfo @@ -1 +1 @@ -MD5 (glame-0.5.4.tar.gz) = 7c7a05c6d2d342218beee0a9c2d2640e +MD5 (glame-0.6.3.tar.gz) = 2570c08f70381dd3d6abf17ffa8765a8 diff --git a/audio/glame/files/patch-Makefile.in b/audio/glame/files/patch-Makefile.in new file mode 100644 index 000000000000..711599699e2d --- /dev/null +++ b/audio/glame/files/patch-Makefile.in @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- Makefile.in 2002/05/30 11:27:13 1.1 ++++ Makefile.in 2002/05/30 11:27:31 +@@ -133,7 +133,7 @@ + pkgpixmapsdir = @pkgpixmapsdir@ + pkgscriptsdir = @pkgscriptsdir@ + +-SUBDIRS = libltdl macros src doc data intl po ++SUBDIRS = macros src doc data intl po + + EXTRA_DIST = TODO MAINTAINERS CREDITS BUGS autogen.sh glame.spec + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 diff --git a/audio/glame/files/patch-configure b/audio/glame/files/patch-configure new file mode 100644 index 000000000000..c6ec3e16a1b4 --- /dev/null +++ b/audio/glame/files/patch-configure @@ -0,0 +1,42 @@ + +$FreeBSD$ + +--- configure 2002/05/30 11:20:36 1.1 ++++ configure 2002/05/30 11:20:46 +@@ -455,7 +455,7 @@ + # include <unistd.h> + #endif" + +-ac_subdirs_all="$ac_subdirs_all libltdl" ++ac_subdirs_all="$ac_subdirs_all" + + # Initialize some variables set by options. + ac_init_help= +@@ -7280,6 +7280,7 @@ + + # This can be used to rebuild libtool when needed + LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" ++$ac_aux_dir/ltconfig $LIBTOOL_DEPS + + # Always use our own libtool. + LIBTOOL='$(SHELL) $(top_builddir)/libtool' +@@ -18106,7 +18107,7 @@ + + + +-subdirs="$subdirs libltdl" ++subdirs="$subdirs" + + + ac_config_files="$ac_config_files Makefile macros/Makefile doc/Makefile doc/pix/Makefile data/Makefile data/pixmaps/Makefile src/Makefile src/filter/Makefile src/swapfile/Makefile src/hash/Makefile src/plugins/Makefile src/include/Makefile src/gui/Makefile src/gui/edit_filter/Makefile src/glmid/Makefile src/gui/libgtkwaveform/Makefile src/gui/timeline/Makefile src/gui/util/Makefile intl/Makefile po/Makefile.in" +@@ -18813,8 +18814,8 @@ + s,@GLAME_AUDIO_LIBS@,$GLAME_AUDIO_LIBS,;t t + s,@GLAME_AUDIO_CFLAGS@,$GLAME_AUDIO_CFLAGS,;t t + s,@GLAME_FFT_LIBS@,$GLAME_FFT_LIBS,;t t +-s,@LIBLTDL@,$LIBLTDL,;t t +-s,@LTDLINCL@,$LTDLINCL,;t t ++s,@LIBLTDL@,,;t t ++s,@LTDLINCL@,,;t t + s,@subdirs@,$subdirs,;t t + CEOF + diff --git a/audio/glame/files/patch-ltmain.sh b/audio/glame/files/patch-ltmain.sh deleted file mode 100644 index e60fec5e37db..000000000000 --- a/audio/glame/files/patch-ltmain.sh +++ /dev/null @@ -1,37 +0,0 @@ - -$FreeBSD$ - ---- ltmain.sh.orig Mon Dec 10 12:53:39 2001 -+++ ltmain.sh Thu Dec 20 17:29:14 2001 -@@ -1052,7 +1052,7 @@ - esac - elif test "X$arg" = "X-lc_r"; then - case $host in -- *-*-openbsd* | *-*-freebsd*) -+ *-*-openbsd* | *-*-freebsd[234]*) - # Do not include libc_r directly, use -pthread flag. - continue - ;; -@@ -2359,6 +2359,9 @@ - # problems, so we reset it completely - verstring="" - ;; -+ *-*-freebsd*) -+ # FreeBSD doesn't need this... -+ ;; - *) - verstring="0.0" - ;; -@@ -4247,10 +4250,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/audio/glame/pkg-plist b/audio/glame/pkg-plist index 056fed3ffa2b..6d97c89239e3 100644 --- a/audio/glame/pkg-plist +++ b/audio/glame/pkg-plist @@ -8,38 +8,12 @@ info/glame-dev.info-3 info/glame.info info/glame.info-1 info/glame.info-2 -lib/glame/arithmetic.a -lib/glame/arithmetic.so -lib/glame/audio_io_esd.a +info/glame.info-3 lib/glame/audio_io_esd.so -lib/glame/audio_io_oss.a lib/glame/audio_io_oss.so -lib/glame/debug.a lib/glame/debug.so -lib/glame/distortion.a -lib/glame/distortion.so -lib/glame/echo.a -lib/glame/echo.so -lib/glame/fader.a -lib/glame/fader.so -lib/glame/flanger.a -lib/glame/flanger.so -lib/glame/iir.a -lib/glame/iir.so -lib/glame/noisegate.a -lib/glame/noisegate.so -lib/glame/normalize.a lib/glame/normalize.so -lib/glame/pan.a -lib/glame/pan.so -lib/glame/pipe.a -lib/glame/pipe.so -lib/glame/ssp.a -lib/glame/ssp.so -lib/glame/tutorial.a lib/glame/tutorial.so -lib/glame/waveform.a -lib/glame/waveform.so share/gnome/apps/Multimedia/glame.desktop share/gnome/glame/default-accels share/gnome/glame/pixmaps/bandpass.png |