Date: Mon, 14 Jan 2002 18:02:37 -0600 From: Jeremy Norris <ishmael27x@yahoo.com> To: portmgr@freebsd.org Cc: ports@freebsd.org Subject: Fix the libtool situation [PATCH] Message-ID: <20020115000237.GA5940@babylon.merseine.nu>
next in thread | raw e-mail | index | archive | help
--1yeeQ81UyVL57Vl7
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
I got tired of the fact that FreeBSD's libtool port is stuck at 1.3.4. I am
working on improving the build procedure for the ferite scripting language
(lang/ferite) and it is difficult to build out of cvs with old libtool. So I
spent the last hour making changes to libtool in ports tree. These patches do
the following:
patch-libtool-1.4.2
upgrade devel/libtool to latest version, 1.4.2. This update includes slightly
modified version of the commonly used patch-ltmain.sh (as patch-ad) which
checks that it is on a FreeBSD system before deciding whether or not to install
.la files. Also removed some patches that aren't needed anymore.
patch-libtool13-1.3.4
repo-copy devel/libtool to devel/libtool13. Then apply this patch. This fixes
the old libtool to install bin/libtool and bin/libtoolize as libtool13 and
libtoolize13. Also changed share directory from share/libtool to
share/libtool13. Also disabled libltdl installation. Ports should depend on
devel/libtool for newer version of libltdl. Several ports will probably need
shared lib revision chasing.
patch-bsd.port.mk
Changed USE_LIBTOOL to depend on new libtool13 port. I didn't go through all
the effort of making USE_LIBTOOL_VER, because it didn't seem necessary right
now (because patch-ltmain.sh fixes libtool-1.4 distributions). At some point in
the future it should probably be implemented.
I tested these patches with the esound port (which uses USE_LIBTOOL) and
everything succeeded as previously. It would be really nice to see these
patches integrated after 4.5 is released (it would be too dangerous to apply
them now so close to the ports freeze).
Jeremy
--1yeeQ81UyVL57Vl7
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="patch-libtool-1.4.2"
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/libtool/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- Makefile 22 May 2001 09:21:05 -0000 1.15
+++ Makefile 14 Jan 2002 23:24:34 -0000
@@ -6,18 +6,13 @@
#
PORTNAME= libtool
-PORTVERSION= 1.3.4
-PORTREVISION= 2
+PORTVERSION= 1.4.2
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= libtool
#MAINTAINER= reg@FreeBSD.org
MAINTAINER= portmgr@FreeBSD.org
-
-# This port has not been upgraded to 1.4 because it is used by about 30% of
-# the ports collection, and more testing is needed. If someone can supply a
-# working patch then it will be upgraded.
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/devel/libtool/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- distinfo 2 Apr 2000 08:26:20 -0000 1.4
+++ distinfo 14 Jan 2002 23:25:40 -0000
@@ -1 +1 @@
-MD5 (libtool-1.3.4.tar.gz) = 0c3844fedd382e5796865ca58842713e
+MD5 (libtool-1.4.2.tar.gz) = 95dd3de3b249fe1199ed60ed8e46f60c
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/devel/libtool/pkg-plist,v
retrieving revision 1.5
diff -u -r1.5 pkg-plist
--- pkg-plist 5 Feb 2001 08:21:50 -0000 1.5
+++ pkg-plist 14 Jan 2002 23:36:04 -0000
@@ -6,7 +6,7 @@
@exec install-info %D/info/libtool.info %D/info/dir
lib/libltdl.a
lib/libltdl.so
-lib/libltdl.so.1
+lib/libltdl.so.4
share/aclocal/libtool.m4
share/libtool/config.guess
share/libtool/config.sub
@@ -14,16 +14,14 @@
share/libtool/libltdl/Makefile.am
share/libtool/libltdl/Makefile.in
share/libtool/libltdl/README
-share/libtool/libltdl/acconfig.h
share/libtool/libltdl/acinclude.m4
share/libtool/libltdl/aclocal.m4
-share/libtool/libltdl/config.h.in
+share/libtool/libltdl/config-h.in
share/libtool/libltdl/configure
share/libtool/libltdl/configure.in
share/libtool/libltdl/ltdl.c
share/libtool/libltdl/ltdl.h
share/libtool/libltdl/stamp-h.in
-share/libtool/ltconfig
share/libtool/ltmain.sh
@dirrm share/libtool/libltdl
@dirrm share/libtool
Index: files/patch-ab
===================================================================
RCS file: /home/ncvs/ports/devel/libtool/files/patch-ab,v
retrieving revision 1.3
diff -u -r1.3 patch-ab
--- files/patch-ab 11 Sep 1999 01:04:52 -0000 1.3
+++ files/patch-ab 14 Jan 2002 23:26:31 -0000
@@ -1,11 +1,14 @@
---- doc/Makefile.in.orig Fri Jul 2 09:24:54 1999
-+++ doc/Makefile.in Tue Aug 31 23:41:57 1999
-@@ -70,7 +70,7 @@
+
+$FreeBSD$
+
+--- doc/Makefile.in.orig Mon Sep 10 22:44:12 2001
++++ doc/Makefile.in Mon Jan 14 17:26:12 2002
+@@ -74,7 +74,7 @@
+ LD = @LD@
LIBTOOL = @LIBTOOL@
- LIBTOOL_FLAGS = @LIBTOOL_FLAGS@
LN_S = @LN_S@
-MAKEINFO = @MAKEINFO@
+MAKEINFO = @MAKEINFO@ --no-split
NM = @NM@
OBJDUMP = @OBJDUMP@
- PACKAGE = @PACKAGE@
+ OBJEXT = @OBJEXT@
Index: files/patch-ac
===================================================================
RCS file: files/patch-ac
diff -N files/patch-ac
--- files/patch-ac 25 Sep 2000 07:38:14 -0000 1.10
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,152 +0,0 @@
---- ltconfig.orig Tue Dec 7 23:50:48 1999
-+++ ltconfig Wed Sep 20 11:11:39 2000
-@@ -169,7 +169,7 @@
- # Constants:
- PROGRAM=ltconfig
- PACKAGE=libtool
--VERSION=1.3.4
-+VERSION=1.3.4-freebsd-ports
- TIMESTAMP=" (1.385.2.196 1999/12/07 21:47:57)"
- ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
- ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-@@ -185,6 +185,8 @@
- # which needs '.lib').
- enable_static=yes
- enable_fast_install=yes
-+install_ltlibs=yes
-+release_suffix=yes
- enable_dlopen=unknown
- enable_win32_dll=no
- ltmain=
-@@ -242,10 +244,14 @@
-
- Generate a system-specific libtool script.
-
-+ --build no-op to keep compatability with configure scripts generated for 1.4
- --debug enable verbose shell tracing
- --disable-shared do not build shared libraries
- --disable-static do not build static libraries
- --disable-fast-install do not optimize for fast installation
-+ --disable-ltlibs don't install the .la archives
-+ --release-ignore don't use -release specification
-+ --release-suffix use -release suffix for all files
- --enable-dlopen enable dlopen support
- --enable-win32-dll enable building dlls on win32 hosts
- --help display this help and exit
-@@ -268,6 +274,8 @@
- exit 0
- ;;
-
-+ --build=*) ;;
-+
- --debug)
- echo "$progname: enabling shell trace mode"
- set -x
-@@ -279,6 +287,12 @@
-
- --disable-fast-install) enable_fast_install=no ;;
-
-+ --disable-ltlibs) install_ltlibs=no ;;
-+
-+ --release-ignore) release_suffix=no ;;
-+
-+ --release-suffix) release_suffix=all ;;
-+
- --enable-dlopen) enable_dlopen=yes ;;
-
- --enable-win32-dll) enable_win32_dll=yes ;;
-@@ -971,11 +985,11 @@
- $rm conftest.dat
- if ln -s X conftest.dat 2>/dev/null; then
- $rm conftest.dat
-- LN_S="ln -s"
-+ LN_S="ln -sf"
- else
- LN_S=ln
- fi
-- if test "$LN_S" = "ln -s"; then
-+ if test "$LN_S" = "ln -sf"; then
- echo "$ac_t"yes 1>&6
- else
- echo "$ac_t"no 1>&6
-@@ -1226,8 +1240,8 @@
-
- *)
- if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
-- archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
-- archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+ archive_cmds='$CC -shared $compile_rpath $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
-+ archive_expsym_cmds='$CC -shared $compile_rpath $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- else
- ld_shlibs=no
- fi
-@@ -1353,14 +1367,6 @@
- hardcode_shlibpath_var=no
- ;;
-
-- # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-- freebsd*)
-- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $linkopts'
-- hardcode_libdir_flag_spec='-R$libdir'
-- hardcode_direct=yes
-- hardcode_shlibpath_var=no
-- ;;
--
- hpux9* | hpux10* | hpux11*)
- case "$host_os" in
- hpux9*) archive_cmds='$rm $objdir/$soname~$LD -b +b $install_libdir -o $objdir/$soname $libobjs $deplibs $linkopts~test $objdir/$soname = $lib || mv $objdir/$soname $lib' ;;
-@@ -1775,7 +1781,7 @@
- version_type=none
- dynamic_linker="$host_os ld.so"
- sys_lib_dlsearch_path_spec="/lib /usr/lib"
--sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-+sys_lib_search_path_spec="/lib /usr/lib"
- file_magic_cmd=
- file_magic_test_file=
- deplibs_check_method='unknown'
-@@ -1874,18 +1880,21 @@
- case "$version_type" in
- freebsd-elf*)
- deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
-- file_magic_cmd=/usr/bin/file
-- file_magic_test_file=`echo /usr/lib/libc.so*`
-- library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
-- need_version=no
-- need_lib_prefix=no
- ;;
- freebsd-*)
-- deplibs_check_method=unknown
-- library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix'
-- need_version=yes
-+ deplibs_check_method='file_magic FreeBSD.* shared library'
- ;;
- esac
-+ file_magic_cmd=/usr/bin/file
-+ file_magic_test_file=`echo /usr/lib/libc.so.*`
-+ if test "$release_suffix" = all; then
-+ library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so'
-+ else
-+ library_names_spec='${libname}${release}.so$versuffix ${libname}.so'
-+ fi
-+ need_version=no
-+ need_lib_prefix=no
-+ finish_cmds='/usr/bin/env OBJFORMAT="'"$objformat"'" /sbin/ldconfig -m $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- case "$host_os" in
- freebsd2* | freebsd3.[01]* | freebsdelf3.[01]*)
-@@ -2776,6 +2785,15 @@
-
- # Shell to use when invoking shell scripts.
- SHELL=$LTSHELL
-+
-+# Whether to waste disk space.
-+install_ltlibs=$install_ltlibs
-+
-+# What to do with -release.
-+# yes - only for shared archive
-+# no - ingnore
-+# all - for all archives
-+release_suffix=$release_suffix
-
- # Whether or not to build shared libraries.
- build_libtool_libs=$enable_shared
Index: files/patch-ad
===================================================================
RCS file: /home/ncvs/ports/devel/libtool/files/patch-ad,v
retrieving revision 1.7
diff -u -r1.7 patch-ad
--- files/patch-ad 2 Apr 2000 08:26:22 -0000 1.7
+++ files/patch-ad 14 Jan 2002 23:43:34 -0000
@@ -1,234 +1,28 @@
---- ltmain.sh.orig Tue Dec 7 13:50:49 1999
-+++ ltmain.sh Mon Jan 17 16:33:06 2000
-@@ -54,7 +54,7 @@
- # Constants.
- PROGRAM=ltmain.sh
- PACKAGE=libtool
--VERSION=1.3.4
-+VERSION=1.3.4-freebsd-ports
- TIMESTAMP=" (1.385.2.196 1999/12/07 21:47:57)"
-
- default_mode=
-@@ -952,7 +952,11 @@
- continue
- ;;
- release)
-- release="-$arg"
-+ if test "$release_suffix" = all; then
-+ release="$arg"
-+ elif test "$release_suffix" = yes; then
-+ release="-$arg"
-+ fi
- prev=
- continue
- ;;
-@@ -1005,6 +1009,7 @@
- ;;
-
- -avoid-version)
-+ build_old_libs=no
- avoid_version=yes
- continue
- ;;
-@@ -1091,6 +1096,10 @@
- deplibs="$deplibs $arg"
- ;;
-
-+ -?thread)
-+ deplibs="$deplibs $arg"
-+ ;;
-+
- -module)
- module=yes
- continue
-@@ -1168,7 +1177,7 @@
-
- *.o | *.obj | *.a | *.lib)
- # A standard object.
-- objs="$objs $arg"
-+ libobjs="$libobjs $arg"
- ;;
-
- *.lo)
-@@ -1603,12 +1612,6 @@
- exit 1
- fi
-
-- # How the heck are we supposed to write a wrapper for a shared library?
-- if test -n "$link_against_libtool_libs"; then
-- $echo "$modename: error: cannot link shared libraries into libtool libraries" 1>&2
-- exit 1
-- fi
--
- if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
- $echo "$modename: warning: \`-dlopen' is ignored for libtool libraries" 1>&2
- fi
-@@ -1795,6 +1798,9 @@
- *-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*)
- # these systems don't actually have a c library (as such)!
- ;;
-+ *-*-freebsd*)
-+ # FreeBSD doesn't need this...
-+ ;;
- *)
- # Add libc to deplibs on all other systems.
- deplibs="$deplibs -lc"
-@@ -1802,6 +1808,94 @@
- esac
- fi
-
-+ if test -n "$rpath$xrpath"; then
-+ # If the user specified any rpath flags, then add them.
-+ for libdir in $rpath $xrpath; do
-+ # This is the magic to use -rpath.
-+ case "$compile_rpath " in
-+ *" $libdir "*) ;;
-+ *) compile_rpath="$compile_rpath $libdir" ;;
-+ esac
-+ case "$finalize_rpath " in
-+ *" $libdir "*) ;;
-+ *) finalize_rpath="$finalize_rpath $libdir" ;;
-+ esac
-+ done
-+ fi
-+
-+ # Now hardcode the library paths
-+ rpath=
-+ hardcode_libdirs=
-+ for libdir in $compile_rpath; do
-+ if test -n "$hardcode_libdir_flag_spec"; then
-+ if test -n "$hardcode_libdir_separator"; then
-+ if test -z "$hardcode_libdirs"; then
-+ hardcode_libdirs="$libdir"
-+ else
-+ # Just accumulate the unique libdirs.
-+ case "$hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator" in
-+ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-+ ;;
-+ *)
-+ hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-+ ;;
-+ esac
-+ fi
-+ else
-+ eval flag=\"$hardcode_libdir_flag_spec\"
-+ rpath="$rpath $flag"
-+ fi
-+ elif test -n "$runpath_var"; then
-+ case "$perm_rpath " in
-+ *" $libdir "*) ;;
-+ *) perm_rpath="$perm_rpath $libdir" ;;
-+ esac
-+ fi
-+ done
-+ # Substitute the hardcoded libdirs into the rpath.
-+ if test -n "$hardcode_libdir_separator" &&
-+ test -n "$hardcode_libdirs"; then
-+ libdir="$hardcode_libdirs"
-+ eval rpath=\" $hardcode_libdir_flag_spec\"
-+ fi
-+ compile_rpath="$rpath"
-+
-+ rpath=
-+ hardcode_libdirs=
-+ for libdir in $finalize_rpath; do
-+ if test -n "$hardcode_libdir_flag_spec"; then
-+ if test -n "$hardcode_libdir_separator"; then
-+ if test -z "$hardcode_libdirs"; then
-+ hardcode_libdirs="$libdir"
-+ else
-+ # Just accumulate the unique libdirs.
-+ case "$hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator" in
-+ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-+ ;;
-+ *)
-+ hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-+ ;;
-+ esac
-+ fi
-+ else
-+ eval flag=\"$hardcode_libdir_flag_spec\"
-+ rpath="$rpath $flag"
-+ fi
-+ elif test -n "$runpath_var"; then
-+ case "$finalize_perm_rpath " in
-+ *" $libdir "*) ;;
-+ *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
-+ esac
-+ fi
-+ done
-+ # Substitute the hardcoded libdirs into the rpath.
-+ if test -n "$hardcode_libdir_separator" &&
-+ test -n "$hardcode_libdirs"; then
-+ libdir="$hardcode_libdirs"
-+ eval rpath=\" $hardcode_libdir_flag_spec\"
-+ fi
-+ finalize_rpath="$rpath"
-+
- # Create the output directory, or remove our outputs if we need to.
- if test -d $output_objdir; then
- $show "${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*"
-@@ -1817,7 +1911,11 @@
-
- # Now set the variables for building old libraries.
- if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
-- oldlibs="$oldlibs $output_objdir/$libname.$libext"
-+ if test "$release_suffix" = all; then
-+ oldlibs="$oldlibs $output_objdir/$libname$release.$libext"
-+ else
-+ oldlibs="$oldlibs $output_objdir/$libname.$libext"
-+ fi
-
- # Transform .lo files to .o files.
- oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
-@@ -2011,7 +2109,11 @@
- echo "*** \`nm' from GNU binutils and a full rebuild may help."
- fi
- if test "$build_old_libs" = no; then
-- oldlibs="$output_objdir/$libname.$libext"
-+ if test "$release_suffix" = all; then
-+ oldlibs="$output_objdir/$libname$release.$libext"
-+ else
-+ oldlibs="$output_objdir/$libname.$libext"
-+ fi
- build_libtool_libs=module
- build_old_libs=yes
- else
-@@ -3059,7 +3161,11 @@
- case "$output" in
- *.la)
- old_library=
-- test "$build_old_libs" = yes && old_library="$libname.$libext"
-+ if test "$release_suffix" = all; then
-+ test "$build_old_libs" = yes && old_library="$libname$release.$libext"
-+ else
-+ test "$build_old_libs" = yes && old_library="$libname.$libext"
-+ fi
- $show "creating $output"
-
- if test -n "$xrpath"; then
-@@ -3348,10 +3454,12 @@
+
+$FreeBSD$
+
+--- ltmain.sh.orig Mon Sep 10 22:33:26 2001
++++ ltmain.sh Mon Jan 14 17:43:05 2002
+@@ -2444,6 +2444,9 @@
+ *-*-openbsd*)
+ # Do not include libc due to us having libc/libc_r.
+ ;;
++ *-*-freebsd*)
++ # FreeBSD doesn't need this...
++ ;;
+ *)
+ # Add libc to deplibs on all other systems if necessary.
+ if test $build_libtool_need_lc = "yes"; then
+@@ -4210,10 +4213,12 @@
fi
# Install the pseudo-library for information purposes.
-- 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 $?
-+ if test "$install_ltlibs" = yes; 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 $?
++ if test `uname -s` != "FreeBSD"; 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"
-@@ -3440,7 +3548,6 @@
- fi
- libfile="$libdir/`$echo "X$lib" | $Xsed -e 's%^.*/%%g'`"
- if test -n "$libdir" && test ! -f "$libfile"; then
-- $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2
- finalize=no
- fi
- done
Index: files/patch-ae
===================================================================
RCS file: /home/ncvs/ports/devel/libtool/files/patch-ae,v
retrieving revision 1.2
diff -u -r1.2 patch-ae
--- files/patch-ae 11 Sep 1999 01:04:52 -0000 1.2
+++ files/patch-ae 14 Jan 2002 23:27:03 -0000
@@ -1,6 +1,9 @@
---- configure.orig Fri Jul 2 09:01:56 1999
-+++ configure Tue Aug 31 23:45:29 1999
-@@ -1853,10 +1853,6 @@
+
+$FreeBSD$
+
+--- configure.orig Mon Sep 10 22:33:00 2001
++++ configure Mon Jan 14 17:26:41 2002
+@@ -6184,10 +6184,6 @@
*) # Relative path.
ac_sub_cache_file="$ac_dots$cache_file" ;;
esac
Index: files/patch-af
===================================================================
RCS file: /home/ncvs/ports/devel/libtool/files/patch-af,v
retrieving revision 1.2
diff -u -r1.2 patch-af
--- files/patch-af 2 Apr 2000 08:26:22 -0000 1.2
+++ files/patch-af 14 Jan 2002 23:27:50 -0000
@@ -1,6 +1,9 @@
---- libltdl/Makefile.in.orig Tue Dec 7 13:03:38 1999
-+++ libltdl/Makefile.in Mon Jan 17 16:35:34 2000
-@@ -326,17 +326,16 @@
+
+$FreeBSD$
+
+--- libltdl/Makefile.in.orig Mon Sep 10 22:33:02 2001
++++ libltdl/Makefile.in Mon Jan 14 17:27:14 2002
+@@ -345,17 +345,16 @@
distdir: $(DISTFILES)
-rm -rf $(distdir)
mkdir $(distdir)
Index: files/patch-ag
===================================================================
RCS file: files/patch-ag
diff -N files/patch-ag
--- files/patch-ag 5 Feb 2001 08:21:54 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-
-$FreeBSD: ports/devel/libtool/files/patch-ag,v 1.1 2001/02/05 08:21:54 reg Exp $
-
---- libltdl/configure 2001/01/31 10:58:38 1.1
-+++ libltdl/configure 2001/01/31 10:59:14
-@@ -1455,7 +1455,7 @@
- esac
-
- # Check for any special flags to pass to ltconfig.
--libtool_flags="--cache-file=$cache_file"
-+libtool_flags="--cache-file=$cache_file --disable-ltlibs"
- test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
- test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
- test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
--1yeeQ81UyVL57Vl7
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="patch-libtool13-1.3.4"
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/libtool/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- Makefile 22 May 2001 09:21:05 -0000 1.15
+++ Makefile 14 Jan 2002 22:43:15 -0000
@@ -5,22 +5,23 @@
# $FreeBSD: ports/devel/libtool/Makefile,v 1.15 2001/05/22 09:21:05 reg Exp $
#
-PORTNAME= libtool
+PORTNAME= libtool13
PORTVERSION= 1.3.4
PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= libtool
+DISTNAME= libtool-${PORTVERSION}
#MAINTAINER= reg@FreeBSD.org
MAINTAINER= portmgr@FreeBSD.org
-# This port has not been upgraded to 1.4 because it is used by about 30% of
-# the ports collection, and more testing is needed. If someone can supply a
-# working patch then it will be upgraded.
-
-INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
+CONFIGURE_ARGS= --disable-ltdl-install
CONFIGURE_ENV= PREFIX=${PREFIX}
+
+post-extract:
+ @${MV} -f ${WRKSRC}/libtool.m4 ${WRKSRC}/libtool13.m4
+ @${MV} -f ${WRKSRC}/libtoolize.in ${WRKSRC}/libtoolize13.in
.include <bsd.port.mk>
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/devel/libtool/pkg-plist,v
retrieving revision 1.5
diff -u -r1.5 pkg-plist
--- pkg-plist 5 Feb 2001 08:21:50 -0000 1.5
+++ pkg-plist 14 Jan 2002 23:23:39 -0000
@@ -1,29 +1,26 @@
-bin/libtool
-bin/libtoolize
-include/ltdl.h
+@comment $FreeBSD$
+bin/libtool13
+bin/libtoolize13
@unexec install-info --delete %D/info/libtool.info %D/info/dir
info/libtool.info
@exec install-info %D/info/libtool.info %D/info/dir
-lib/libltdl.a
-lib/libltdl.so
-lib/libltdl.so.1
-share/aclocal/libtool.m4
-share/libtool/config.guess
-share/libtool/config.sub
-share/libtool/libltdl/COPYING.LIB
-share/libtool/libltdl/Makefile.am
-share/libtool/libltdl/Makefile.in
-share/libtool/libltdl/README
-share/libtool/libltdl/acconfig.h
-share/libtool/libltdl/acinclude.m4
-share/libtool/libltdl/aclocal.m4
-share/libtool/libltdl/config.h.in
-share/libtool/libltdl/configure
-share/libtool/libltdl/configure.in
-share/libtool/libltdl/ltdl.c
-share/libtool/libltdl/ltdl.h
-share/libtool/libltdl/stamp-h.in
-share/libtool/ltconfig
-share/libtool/ltmain.sh
-@dirrm share/libtool/libltdl
-@dirrm share/libtool
+share/aclocal/libtool13.m4
+share/libtool13/config.guess
+share/libtool13/config.sub
+share/libtool13/libltdl/COPYING.LIB
+share/libtool13/libltdl/Makefile.am
+share/libtool13/libltdl/Makefile.in
+share/libtool13/libltdl/README
+share/libtool13/libltdl/acconfig.h
+share/libtool13/libltdl/acinclude.m4
+share/libtool13/libltdl/aclocal.m4
+share/libtool13/libltdl/config.h.in
+share/libtool13/libltdl/configure
+share/libtool13/libltdl/configure.in
+share/libtool13/libltdl/ltdl.c
+share/libtool13/libltdl/ltdl.h
+share/libtool13/libltdl/stamp-h.in
+share/libtool13/ltconfig
+share/libtool13/ltmain.sh
+@dirrm share/libtool13/libltdl
+@dirrm share/libtool13
Index: files/patch-Makefile.in
===================================================================
RCS file: files/patch-Makefile.in
diff -N files/patch-Makefile.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-Makefile.in 14 Jan 2002 23:21:57 -0000
@@ -0,0 +1,68 @@
+
+$FreeBSD$
+
+--- Makefile.in.orig Tue Dec 7 15:55:45 1999
++++ Makefile.in Mon Jan 14 16:53:17 2002
+@@ -92,11 +92,11 @@
+ LDFLAGS = @LDFLAGS@
+ LIBS = @LIBS@
+
+-aclocal_macros = libtool.m4
++aclocal_macros = libtool13.m4
+
+-EXTRA_DIST = $(aclocal_macros) libtoolize.in ltconfig.in ltmain.in mkstamp ChangeLog.0
++EXTRA_DIST = $(aclocal_macros) libtoolize13.in ltconfig.in ltmain.in mkstamp ChangeLog.0
+
+-CLEANFILES = libtool libtoolize ltconfig.T ltmain.shT
++CLEANFILES = libtool13 libtoolize13 ltconfig.T ltmain.shT
+
+ # These are required by libtoolize.
+ pkgdata_SCRIPTS = config.guess config.sub ltconfig
+@@ -106,11 +106,11 @@
+ aclocal_DATA = $(aclocal_macros)
+
+ # The standalone libtool script, and the libtool distributor.
+-bin_SCRIPTS = libtool libtoolize
++bin_SCRIPTS = libtool13 libtoolize13
+
+ # TSDEPS will be defined to TSDEPS_DIST at `make dist' time
+ TSDEPS =
+-TSDEPS_DIST = ChangeLog libtool.m4
++TSDEPS_DIST = ChangeLog libtool13.m4
+ CVS = cvs # set it to `:' to avoid CVS operations
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -451,7 +451,7 @@
+ maintainer-clean
+
+
+-libtool: $(srcdir)/ltmain.sh $(srcdir)/ltconfig
++libtool13: $(srcdir)/ltmain.sh $(srcdir)/ltconfig
+ CC="$(CC)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
+ LD="$(LD)" LDFLAGS="$(LDFLAGS)" LIBS="$(LIBS)" \
+ LN_S="$(LN_S)" NM="$(NM)" RANLIB="$(RANLIB)" \
+@@ -468,9 +468,9 @@
+ $(SHELL) $(srcdir)/ltconfig $(LIBTOOL_FLAGS) --srcdir=$(srcdir) \
+ --output=$@ $(srcdir)/ltmain.c
+
+-libtoolize: $(srcdir)/libtoolize.in $(top_builddir)/config.status
+- CONFIG_FILES=libtoolize CONFIG_HEADERS= $(top_builddir)/config.status
+- chmod +x libtoolize
++libtoolize13: $(srcdir)/libtoolize13.in $(top_builddir)/config.status
++ CONFIG_FILES=libtoolize13 CONFIG_HEADERS= $(top_builddir)/config.status
++ chmod +x libtoolize13
+
+ .PHONY: timestamps update-timestamps
+ timestamps distdir: update-timestamps
+@@ -505,9 +505,9 @@
+ # All our rules should depend on these demo files.
+ all-recursive: $(ACINCLUDE_M4_LIST)
+
+-@ACINCLUDE_M4_LIST@: $(srcdir)/libtool.m4
++@ACINCLUDE_M4_LIST@: $(srcdir)/libtool13.m4
+ rm -f $@
+- cp $(srcdir)/libtool.m4 $@
++ cp $(srcdir)/libtool13.m4 $@
+
+ .PHONY: configure-subdirs
+ configure-subdirs distdir: $(DIST_MAKEFILE_LIST)
Index: files/patch-ae
===================================================================
RCS file: /home/ncvs/ports/devel/libtool/files/patch-ae,v
retrieving revision 1.2
diff -u -r1.2 patch-ae
--- files/patch-ae 11 Sep 1999 01:04:52 -0000 1.2
+++ files/patch-ae 14 Jan 2002 23:23:02 -0000
@@ -1,6 +1,18 @@
---- configure.orig Fri Jul 2 09:01:56 1999
-+++ configure Tue Aug 31 23:45:29 1999
-@@ -1853,10 +1853,6 @@
+
+$FreeBSD$
+
+--- configure.orig Tue Dec 7 15:22:41 1999
++++ configure Mon Jan 14 16:21:53 2002
+@@ -702,7 +702,7 @@
+ fi
+
+
+-PACKAGE=libtool
++PACKAGE=libtool13
+
+ VERSION=1.3.4
+
+@@ -1859,10 +1859,6 @@
*) # Relative path.
ac_sub_cache_file="$ac_dots$cache_file" ;;
esac
Index: files/patch-af
===================================================================
RCS file: /home/ncvs/ports/devel/libtool/files/patch-af,v
retrieving revision 1.2
diff -u -r1.2 patch-af
--- files/patch-af 2 Apr 2000 08:26:22 -0000 1.2
+++ files/patch-af 14 Jan 2002 23:23:10 -0000
@@ -1,5 +1,8 @@
---- libltdl/Makefile.in.orig Tue Dec 7 13:03:38 1999
-+++ libltdl/Makefile.in Mon Jan 17 16:35:34 2000
+
+$FreeBSD$
+
+--- libltdl/Makefile.in.orig Tue Dec 7 15:03:38 1999
++++ libltdl/Makefile.in Mon Jan 14 17:05:36 2002
@@ -326,17 +326,16 @@
distdir: $(DISTFILES)
-rm -rf $(distdir)
@@ -22,3 +25,24 @@
info-am:
info: info-am
dvi-am:
+@@ -435,15 +434,15 @@
+ $(SHELL) ./config.status --recheck
+
+ local-install-files: $(DISTFILES)
+- -rm -rf $(DESTDIR)$(datadir)/libtool/libltdl
+- $(mkinstalldirs) $(DESTDIR)$(datadir)/libtool/libltdl
++ -rm -rf $(DESTDIR)$(datadir)/libtool13/libltdl
++ $(mkinstalldirs) $(DESTDIR)$(datadir)/libtool13/libltdl
+ @for file in $(DISTFILES); do \
+ d=$(srcdir); \
+ if test -d $$d/$$file; then \
+- cp -r $$d/$$file $(DESTDIR)$(datadir)/libtool/libltdl/$$file; \
++ cp -r $$d/$$file $(DESTDIR)$(datadir)/libtool13/libltdl/$$file; \
+ else \
+- test -f $(DESTDIR)$(datadir)/libtool/libltdl/$$file \
+- || cp $$d/$$file $(DESTDIR)$(datadir)/libtool/libltdl/$$file || :; \
++ test -f $(DESTDIR)$(datadir)/libtool13/libltdl/$$file \
++ || cp $$d/$$file $(DESTDIR)$(datadir)/libtool13/libltdl/$$file || :; \
+ fi; \
+ done
+
Index: files/patch-ag
===================================================================
RCS file: files/patch-ag
diff -N files/patch-ag
--- files/patch-ag 5 Feb 2001 08:21:54 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-
-$FreeBSD: ports/devel/libtool/files/patch-ag,v 1.1 2001/02/05 08:21:54 reg Exp $
-
---- libltdl/configure 2001/01/31 10:58:38 1.1
-+++ libltdl/configure 2001/01/31 10:59:14
-@@ -1455,7 +1455,7 @@
- esac
-
- # Check for any special flags to pass to ltconfig.
--libtool_flags="--cache-file=$cache_file"
-+libtool_flags="--cache-file=$cache_file --disable-ltlibs"
- test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
- test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
- test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
Index: files/patch-libtoolize13.in
===================================================================
RCS file: files/patch-libtoolize13.in
diff -N files/patch-libtoolize13.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-libtoolize13.in 14 Jan 2002 23:22:05 -0000
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- libtoolize13.in.orig Tue Mar 30 13:25:27 1999
++++ libtoolize13.in Mon Jan 14 16:26:55 2002
+@@ -37,7 +37,7 @@
+ pkgdatadir=@pkgdatadir@
+ aclocaldir=@aclocaldir@
+
+-libtool_m4="$aclocaldir/libtool.m4"
++libtool_m4="$aclocaldir/libtool13.m4"
+
+ dry_run=no
+ help="Try \`$progname --help' for more information."
--1yeeQ81UyVL57Vl7
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="patch-bsd.port.mk"
Index: bsd.port.mk
===================================================================
RCS file: /home/ncvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.395
diff -u -r1.395 bsd.port.mk
--- bsd.port.mk 22 Dec 2001 17:13:38 -0000 1.395
+++ bsd.port.mk 14 Jan 2002 23:19:43 -0000
@@ -188,7 +188,7 @@
# AUTOCONF_DIR - Set to path of GNU autoconf shared directory (default:
# according to USE_AUTOCONF_VER value)
# USE_LIBTOOL - Says that the port uses Libtool. Implies GNU_CONFIGURE.
-# LIBTOOL - Set to path of libtool (default: libtool).
+# LIBTOOL - Set to path of libtool (default: libtool13).
# LIBTOOLFILES - Files to patch for libtool (defaults: "aclocal.m4" if
# USE_AUTOCONF is set, "configure" otherwise).
# LIBTOOLFLAGS - Additional flags to pass to ltconfig
@@ -893,7 +893,7 @@
.endif
.if defined(USE_LIBTOOL)
GNU_CONFIGURE= yes
-BUILD_DEPENDS+= libtool:${PORTSDIR}/devel/libtool
+BUILD_DEPENDS+= libtool13:${PORTSDIR}/devel/libtool13
.if defined(USE_AUTOCONF)
LIBTOOLFILES?= aclocal.m4
.else
@@ -1044,7 +1044,7 @@
AUTOUPDATE?= autoupdate213
AUTOIFNAMES?= ifnames213
AUTOCONF_DIR?= ${LOCALBASE}/share/autoconf213/autoconf
-LIBTOOL?= libtool
+LIBTOOL?= libtool13
XMKMF?= xmkmf -a
.if exists(/sbin/md5)
MD5?= /sbin/md5
@@ -2310,10 +2310,10 @@
patch-libtool:
@(if ${LIBTOOL} --version | grep -vq "1\.3\.4-freebsd-ports"; then \
(${ECHO} "Your libtool installation is out of date. Please remove"; \
- ${ECHO} "and reinstall ${PORTSDIR}/devel/libtool."; \
+ ${ECHO} "and reinstall ${PORTSDIR}/devel/libtool13."; \
exit 1); \
fi; \
- LIBTOOLDIR=`${WHICH} ${LIBTOOL} | ${SED} -e 's^/bin/libtool^/share/libtool^'` || ${LOCALBASE}/share/libtool; \
+ LIBTOOLDIR=`${WHICH} ${LIBTOOL} | ${SED} -e 's^/bin/libtool13^/share/libtool13^'` || ${LOCALBASE}/share/libtool13; \
cd ${PATCH_WRKSRC}; \
for file in ${LIBTOOLFILES}; do \
${CP} $$file $$file.tmp; \
--1yeeQ81UyVL57Vl7--
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020115000237.GA5940>