# 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.

share/libtool/libltdl/acconfig.h

share/libtool/ltconfig

 LIBTOOL_FLAGS = @LIBTOOL_FLAGS@

+EXPR_COMPAT=1

+export EXPR_COMPAT

+

 # Check that we have a working $echo.

 if test "X$1" = X--no-reexec; then

   # Discard the --no-reexec flag, and continue.

@@ -54,7 +57,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 +955,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 +1012,7 @@

 	;;

       -avoid-version)

+	build_old_libs=no

 	avoid_version=yes

 	continue

 	;;

@@ -1091,6 +1099,10 @@

 	deplibs="$deplibs $arg"

 	;;

+      -?thread)

+	deplibs="$deplibs $arg"

+	;;

+

       -module)

 	module=yes

 	continue

@@ -1168,7 +1180,7 @@

       *.o | *.obj | *.a | *.lib)

 	# A standard object.

-	objs="$objs $arg"

+	libobjs="$libobjs $arg"

 	;;

       *.lo)

@@ -1603,12 +1615,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 +1801,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 +1811,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 +1914,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 +2112,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 +3164,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 +3457,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 $?

+	fi

 	# Maybe install the static library, too.

 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"

@@ -3440,7 +3551,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

$FreeBSD: ports/devel/libtool/files/patch-ac,v 1.11 2002/06/08 08:57:34 sobomax Exp $

--- ltconfig.orig	Tue Dec  7 23:50:48 1999

+++ ltconfig	Sat Jun  8 11:48:12 2002

@@ -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'

@@ -1873,19 +1879,22 @@

   version_type=freebsd-$objformat

   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

+      deplibs_check_method='file_magic (ELF [0-9][0-9]*-bit [LM]SB shared object|current ar archive)'

       ;;

     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

$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"