diff options
-rw-r--r-- | audio/musicbrainz/Makefile | 1 | ||||
-rw-r--r-- | audio/musicbrainz/files/patch-ltmain.sh | 25 | ||||
-rw-r--r-- | devel/jclassinfo/Makefile | 1 | ||||
-rw-r--r-- | devel/jclassinfo/files/patch-ltmain.sh | 15 | ||||
-rw-r--r-- | devel/sdlmm/Makefile | 1 | ||||
-rw-r--r-- | devel/sdlmm/files/patch-ltmain.sh | 28 | ||||
-rw-r--r-- | devel/shmap/Makefile | 1 | ||||
-rw-r--r-- | devel/shmap/files/patch-ltmain.sh | 42 | ||||
-rw-r--r-- | net/dhcp-agent/Makefile | 1 | ||||
-rw-r--r-- | net/dhcp-agent/files/patch-ltmain.sh | 15 | ||||
-rw-r--r-- | x11-toolkits/p5-qt/Makefile | 1 | ||||
-rw-r--r-- | x11-toolkits/p5-qt/files/patch-ltmain.sh | 15 | ||||
-rw-r--r-- | x11/gdkxft/Makefile | 1 | ||||
-rw-r--r-- | x11/gdkxft/files/patch-ltmain.sh | 33 |
14 files changed, 7 insertions, 173 deletions
diff --git a/audio/musicbrainz/Makefile b/audio/musicbrainz/Makefile index 517c353c786d..df2f5276a43a 100644 --- a/audio/musicbrainz/Makefile +++ b/audio/musicbrainz/Makefile @@ -19,6 +19,7 @@ CONFLICTS= libmusicbrainz-* USE_BZIP2= yes USE_GMAKE= yes USE_REINPLACE= yes +USE_LIBTOOL_VER=15 GNU_CONFIGURE= yes INSTALLS_SHLIB= yes diff --git a/audio/musicbrainz/files/patch-ltmain.sh b/audio/musicbrainz/files/patch-ltmain.sh deleted file mode 100644 index 285ecfe5d590..000000000000 --- a/audio/musicbrainz/files/patch-ltmain.sh +++ /dev/null @@ -1,25 +0,0 @@ ---- ltmain.sh.orig Thu Aug 23 07:47:42 2001 -+++ ltmain.sh Tue Dec 11 22:07:52 2001 -@@ -2408,6 +2408,9 @@ - *-*-netbsd*) - # Don't link with libc until the a.out ld.so is fixed. - ;; -+ *-*-freebsd*) -+ # FreeBSD doesn't need this... -+ ;; - *) - # Add libc to deplibs on all other systems if necessary. - if test "$build_libtool_need_lc" = "yes"; then -@@ -4175,10 +4178,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/devel/jclassinfo/Makefile b/devel/jclassinfo/Makefile index 5d57f57e9687..6b59eacb20c4 100644 --- a/devel/jclassinfo/Makefile +++ b/devel/jclassinfo/Makefile @@ -18,6 +18,7 @@ COMMENT= Shows information about Java class, dependencies and more USE_REINPLACE= yes USE_GETOPT_LONG= yes USE_GNOME= pkgconfig gnomehack +USE_LIBTOOL_VER=15 GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/devel/jclassinfo/files/patch-ltmain.sh b/devel/jclassinfo/files/patch-ltmain.sh deleted file mode 100644 index 74ae099b3e91..000000000000 --- a/devel/jclassinfo/files/patch-ltmain.sh +++ /dev/null @@ -1,15 +0,0 @@ ---- ltmain.sh.orig Wed May 5 09:16:19 2004 -+++ ltmain.sh Wed May 5 09:16:29 2004 -@@ -5528,10 +5528,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/devel/sdlmm/Makefile b/devel/sdlmm/Makefile index d3b3c5db8db6..d4232a6e6dfe 100644 --- a/devel/sdlmm/Makefile +++ b/devel/sdlmm/Makefile @@ -18,6 +18,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A C++ Wrapper for the SDL (Simple DirectMedia Layer) USE_SDL= sdl +USE_LIBTOOL_VER=15 GNU_CONFIGURE= yes INSTALLS_SHLIB= yes diff --git a/devel/sdlmm/files/patch-ltmain.sh b/devel/sdlmm/files/patch-ltmain.sh deleted file mode 100644 index 98cb05e4ddb3..000000000000 --- a/devel/sdlmm/files/patch-ltmain.sh +++ /dev/null @@ -1,28 +0,0 @@ - -$FreeBSD$ - ---- ltmain.sh 2001/08/27 09:51:26 1.1 -+++ ltmain.sh 2001/08/27 09:51:42 -@@ -2408,6 +2408,9 @@ - *-*-netbsd*) - # Don't link with libc until the a.out ld.so is fixed. - ;; -+ *-*-freebsd*) -+ # FreeBSD doesn't need this... -+ ;; - *) - # Add libc to deplibs on all other systems if necessary. - if test "$build_libtool_need_lc" = "yes"; then -@@ -4175,10 +4178,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/devel/shmap/Makefile b/devel/shmap/Makefile index f1a69b189353..1afad1decb4a 100644 --- a/devel/shmap/Makefile +++ b/devel/shmap/Makefile @@ -18,6 +18,7 @@ COMMENT= Shared-memory-based hashmaps LIB_DEPENDS= mm.13:${PORTSDIR}/devel/mm +USE_LIBTOOL_VER=15 GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/devel/shmap/files/patch-ltmain.sh b/devel/shmap/files/patch-ltmain.sh deleted file mode 100644 index e5d2d744a6ec..000000000000 --- a/devel/shmap/files/patch-ltmain.sh +++ /dev/null @@ -1,42 +0,0 @@ ---- ltmain.sh.orig Thu Sep 20 11:29:54 2001 -+++ ltmain.sh Thu Mar 21 04:16:02 2002 -@@ -1040,7 +1040,7 @@ - # These systems don't actually have a C library (as such) - test "X$arg" = "X-lc" && continue - ;; -- *-*-openbsd*) -+ *-*-openbsd* | *-*-freebsd*) - # Do not include libc due to us having libc/libc_r. - test "X$arg" = "X-lc" && continue - ;; -@@ -1048,7 +1048,7 @@ - fi - if test "X$arg" = "X-lc_r"; then - case $host in -- *-*-openbsd*) -+ *-*-openbsd* | *-*-freebsd*) - # Do not include libc_r directly, use -pthread flag. - continue - ;; -@@ -2439,7 +2439,7 @@ - *-*-netbsd*) - # Don't link with libc until the a.out ld.so is fixed. - ;; -- *-*-openbsd*) -+ *-*-openbsd* | *-*-freebsd*) - # Do not include libc due to us having libc/libc_r. - ;; - *) -@@ -4208,10 +4208,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/net/dhcp-agent/Makefile b/net/dhcp-agent/Makefile index c595b8e08662..aa6bb89ad999 100644 --- a/net/dhcp-agent/Makefile +++ b/net/dhcp-agent/Makefile @@ -18,6 +18,7 @@ COMMENT= A portable UNIX Dynamic Host Configuration suite BUILD_DEPENDS= ${LOCALBASE}/lib/libdnet.a:${PORTSDIR}/net/libdnet LIB_DEPENDS= guile.15:${PORTSDIR}/lang/guile +USE_LIBTOOL_VER=15 GNU_CONFIGURE= yes INSTALLS_SHLIB= yes diff --git a/net/dhcp-agent/files/patch-ltmain.sh b/net/dhcp-agent/files/patch-ltmain.sh deleted file mode 100644 index 3209342f280a..000000000000 --- a/net/dhcp-agent/files/patch-ltmain.sh +++ /dev/null @@ -1,15 +0,0 @@ ---- ltmain.sh.orig Wed Oct 8 01:18:12 2003 -+++ ltmain.sh Wed Oct 8 01:19:24 2003 -@@ -5425,10 +5425,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/x11-toolkits/p5-qt/Makefile b/x11-toolkits/p5-qt/Makefile index 700df2c50c04..0d627ddf6395 100644 --- a/x11-toolkits/p5-qt/Makefile +++ b/x11-toolkits/p5-qt/Makefile @@ -23,6 +23,7 @@ COMMENT= A set of Perl bindings for the Qt toolkit USE_GL= yes USE_QT_VER= 3 +USE_LIBTOOL_VER=15 GNU_CONFIGURE= yes INSTALLS_SHLIB= yes diff --git a/x11-toolkits/p5-qt/files/patch-ltmain.sh b/x11-toolkits/p5-qt/files/patch-ltmain.sh deleted file mode 100644 index fafd763de12c..000000000000 --- a/x11-toolkits/p5-qt/files/patch-ltmain.sh +++ /dev/null @@ -1,15 +0,0 @@ ---- admin/ltmain.sh.orig Wed Mar 17 11:03:30 2004 -+++ admin/ltmain.sh Wed Mar 17 11:03:42 2004 -@@ -4754,10 +4754,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/x11/gdkxft/Makefile b/x11/gdkxft/Makefile index f743dafc95f3..143ea846f371 100644 --- a/x11/gdkxft/Makefile +++ b/x11/gdkxft/Makefile @@ -22,6 +22,7 @@ USE_GNOME= gtk12 WANT_GNOME= yes USE_ICONV= yes USE_REINPLACE= yes +USE_LIBTOOL_VER=15 GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lgnuregex -liconv" \ diff --git a/x11/gdkxft/files/patch-ltmain.sh b/x11/gdkxft/files/patch-ltmain.sh deleted file mode 100644 index d74b3db2fef5..000000000000 --- a/x11/gdkxft/files/patch-ltmain.sh +++ /dev/null @@ -1,33 +0,0 @@ ---- ltmain.sh.orig Fri Oct 26 23:15:52 2001 -+++ ltmain.sh Sat Dec 29 12:52:15 2001 -@@ -944,6 +944,7 @@ - ;; - - -avoid-version) -+ build_old_libs=no - avoid_version=yes - continue - ;; -@@ -2408,6 +2409,9 @@ - *-*-netbsd*) - # Don't link with libc until the a.out ld.so is fixed. - ;; -+ *-*-freebsd*) -+ # FreeBSD doesn't need this... -+ ;; - *) - # Add libc to deplibs on all other systems if necessary. - if test "$build_libtool_need_lc" = "yes"; then -@@ -4175,10 +4179,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" |