diff options
| -rw-r--r-- | audio/wsoundserver/Makefile | 2 | ||||
| -rw-r--r-- | audio/wsoundserver/files/patch-af | 20 | ||||
| -rw-r--r-- | audio/x11amp/Makefile | 2 | ||||
| -rw-r--r-- | audio/x11amp/files/patch-configure | 16 | ||||
| -rw-r--r-- | audio/x11amp/files/patch-libx11amp::configure | 11 | ||||
| -rw-r--r-- | audio/x11amp/pkg-plist | 2 | ||||
| -rw-r--r-- | devel/alf/Makefile | 2 | ||||
| -rw-r--r-- | devel/alf/pkg-plist | 3 |
8 files changed, 41 insertions, 17 deletions
diff --git a/audio/wsoundserver/Makefile b/audio/wsoundserver/Makefile index d0442d9dc28e..34b8ff92fe9f 100644 --- a/audio/wsoundserver/Makefile +++ b/audio/wsoundserver/Makefile @@ -24,7 +24,7 @@ RUN_DEPENDS= wmaker:${PORTSDIR}/x11-wm/windowmaker USE_X_PREFIX= yes WANT_GNOME= yes INSTALLS_SHLIB= yes -USE_INC_LIBTOOL_VER= 13 +USE_LIBTOOL_VER=15 CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include/WINGs" MAN1= get-wsound-flags.1x getsoundset.1x setsoundset.1x \ diff --git a/audio/wsoundserver/files/patch-af b/audio/wsoundserver/files/patch-af index 50cb9f9940b4..0a891d8bea4d 100644 --- a/audio/wsoundserver/files/patch-af +++ b/audio/wsoundserver/files/patch-af @@ -1,10 +1,18 @@ ---- configure.orig Sat Jun 3 14:45:53 2000 -+++ configure Sat Jun 3 14:48:21 2000 -@@ -3401,9 +3401,9 @@ - +--- configure.orig Tue May 31 17:26:42 2005 ++++ configure Tue May 31 17:26:57 2005 +@@ -1458,7 +1458,7 @@ + LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \ + LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \ + DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \ +-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \ ++$ac_aux_dir/ltconfig --no-reexec \ + $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \ + || { echo "configure: error: libtool configure failed" 1>&2; exit 1; } + +@@ -3402,8 +3402,8 @@ rm -f conf.audiofiletest - + - CFLAGS=$AUDIOFILE_CFLAGS - LIBS=$AUDIOFILE_LIBS + CFLAGS="$CFLAGS $AUDIOFILE_CFLAGS" @@ -12,7 +20,7 @@ if test "x$AUDIOFILE_LIBS" = "x"; then echo -@@ -3677,8 +3674,8 @@ +@@ -3677,8 +3677,8 @@ rm -f conf.esdtest diff --git a/audio/x11amp/Makefile b/audio/x11amp/Makefile index 421cb80938aa..31b6ac69877b 100644 --- a/audio/x11amp/Makefile +++ b/audio/x11amp/Makefile @@ -18,7 +18,7 @@ COMMENT= X11-based MP3 player with nice graphical interface USE_XLIB= yes USE_GNOME= gtk12 esound -USE_INC_LIBTOOL_VER= 13 +USE_LIBTOOL_VER=15 LIBTOOLFILES= configure libx11amp/configure CONFIGURE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}" MAKE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}" diff --git a/audio/x11amp/files/patch-configure b/audio/x11amp/files/patch-configure index 844e7d5e6dc7..c871bf698c2c 100644 --- a/audio/x11amp/files/patch-configure +++ b/audio/x11amp/files/patch-configure @@ -1,8 +1,14 @@ - -$FreeBSD$ - ---- configure.orig Tue Apr 13 23:33:00 1999 -+++ configure Mon Nov 26 20:10:50 2001 +--- configure.orig Tue May 31 17:38:58 2005 ++++ configure Tue May 31 17:39:14 2005 +@@ -1316,7 +1316,7 @@ + # Actually configure libtool. ac_aux_dir is where install-sh is found. + CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \ + LD="$LD" NM="$NM" RANLIB="$RANLIB" LN_S="$LN_S" \ +-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \ ++$ac_aux_dir/ltconfig \ + $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \ + || { echo "configure: error: libtool configure failed" 1>&2; exit 1; } + @@ -2202,14 +2202,14 @@ rm -f conf.gtktest diff --git a/audio/x11amp/files/patch-libx11amp::configure b/audio/x11amp/files/patch-libx11amp::configure new file mode 100644 index 000000000000..aa00c48b4b5a --- /dev/null +++ b/audio/x11amp/files/patch-libx11amp::configure @@ -0,0 +1,11 @@ +--- libx11amp/configure.orig Tue May 31 17:43:26 2005 ++++ libx11amp/configure Tue May 31 17:43:36 2005 +@@ -1304,7 +1304,7 @@ + # Actually configure libtool. ac_aux_dir is where install-sh is found. + CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \ + LD="$LD" NM="$NM" RANLIB="$RANLIB" LN_S="$LN_S" \ +-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \ ++$ac_aux_dir/ltconfig \ + $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \ + || { echo "configure: error: libtool configure failed" 1>&2; exit 1; } + diff --git a/audio/x11amp/pkg-plist b/audio/x11amp/pkg-plist index c25c4d7c263d..a9805a1ca2fd 100644 --- a/audio/x11amp/pkg-plist +++ b/audio/x11amp/pkg-plist @@ -12,7 +12,9 @@ lib/x11amp/General/libir.so lib/x11amp/Input/libmikmod.so lib/x11amp/Input/libmpg123.so lib/x11amp/Input/libwav.so +lib/x11amp/Output/libOSS.a lib/x11amp/Output/libOSS.so +lib/x11amp/Output/libesdout.a lib/x11amp/Output/libesdout.so share/x11amp/wmx11amp.xpm @dirrm share/x11amp diff --git a/devel/alf/Makefile b/devel/alf/Makefile index c5546b018ea9..650cdbe53364 100644 --- a/devel/alf/Makefile +++ b/devel/alf/Makefile @@ -16,6 +16,6 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Abstract Large File USE_PYTHON= yes -USE_INC_LIBTOOL_VER= 13 +USE_LIBTOOL_VER=15 .include <bsd.port.mk> diff --git a/devel/alf/pkg-plist b/devel/alf/pkg-plist index 4c8daeda87ac..18b73240b4d6 100644 --- a/devel/alf/pkg-plist +++ b/devel/alf/pkg-plist @@ -1,10 +1,7 @@ include/alf/alf.h include/alf/common.h lib/libalf.a -lib/libalf.la lib/libalf.so lib/libalf.so.0 -%%PYTHON_SITELIBDIR%%/alfmodule.a -%%PYTHON_SITELIBDIR%%/alfmodule.la %%PYTHON_SITELIBDIR%%/alfmodule.so @dirrm include/alf |