Index: head/devel/gnu-libtool/Makefile =================================================================== --- head/devel/gnu-libtool/Makefile (revision 21647) +++ head/devel/gnu-libtool/Makefile (revision 21648) @@ -1,20 +1,20 @@ # New ports collection makefile for: libtool -# Version required: 1.3 +# Version required: 1.3.3 # Date created: 6 May 1998 # Whom: Motoyuki Kasahara # # $FreeBSD$ # -DISTNAME= libtool-1.3 +DISTNAME= libtool-1.3.3 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= libtool MAINTAINER= reg@shale.csir.co.za GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-ltdl-install CONFIGURE_ENV= PREFIX=${PREFIX} .include Property changes on: head/devel/gnu-libtool/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.6 \ No newline at end of property +1.7 \ No newline at end of property Index: head/devel/gnu-libtool/distinfo =================================================================== --- head/devel/gnu-libtool/distinfo (revision 21647) +++ head/devel/gnu-libtool/distinfo (revision 21648) @@ -1 +1 @@ -MD5 (libtool-1.3.tar.gz) = 770f8b97b03e95b7e0cf383297906353 +MD5 (libtool-1.3.3.tar.gz) = 574b5a12423c2aa575efe122c6c5831b Property changes on: head/devel/gnu-libtool/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/devel/gnu-libtool/files/patch-aa =================================================================== --- head/devel/gnu-libtool/files/patch-aa (revision 21647) +++ head/devel/gnu-libtool/files/patch-aa (revision 21648) @@ -1,11 +1,11 @@ ---- doc/libtool.texi.orig Wed Mar 11 02:04:36 1998 -+++ doc/libtool.texi Mon Apr 27 16:57:24 1998 -@@ -10,7 +10,7 @@ - @set BUGADDR the libtool mailing list @email{bug-libtool@@gnu.org} +--- doc/libtool.texi.orig Tue Jun 29 15:48:12 1999 ++++ doc/libtool.texi Tue Aug 31 23:41:25 1999 +@@ -11,7 +11,7 @@ + @set MAILLIST the libtool mailing list @email{libtool@@gnu.org} @set objdir .libs -@dircategory GNU programming tools +@dircategory Programming & development tools @direntry * Libtool: (libtool). Generic shared library support script. @end direntry Property changes on: head/devel/gnu-libtool/files/patch-aa ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/devel/gnu-libtool/files/patch-ab =================================================================== --- head/devel/gnu-libtool/files/patch-ab (revision 21647) +++ head/devel/gnu-libtool/files/patch-ab (revision 21648) @@ -1,11 +1,11 @@ ---- doc/Makefile.in.orig Fri Mar 20 17:01:52 1998 -+++ doc/Makefile.in Mon Apr 27 17:22:55 1998 +--- 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 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_FLAGS = @LIBTOOL_FLAGS@ LN_S = @LN_S@ -MAKEINFO = @MAKEINFO@ +MAKEINFO = @MAKEINFO@ --no-split NM = @NM@ + OBJDUMP = @OBJDUMP@ PACKAGE = @PACKAGE@ - RANLIB = @RANLIB@ Property changes on: head/devel/gnu-libtool/files/patch-ab ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/devel/gnu-libtool/files/patch-ac =================================================================== --- head/devel/gnu-libtool/files/patch-ac (revision 21647) +++ head/devel/gnu-libtool/files/patch-ac (revision 21648) @@ -1,90 +1,139 @@ ---- ltconfig.orig Thu Apr 29 15:30:36 1999 -+++ ltconfig Sat May 22 15:52:24 1999 +--- ltconfig.orig Fri Jul 2 09:02:37 1999 ++++ ltconfig Sat Sep 4 11:34:21 1999 @@ -169,7 +169,7 @@ # Constants: PROGRAM=ltconfig PACKAGE=libtool --VERSION=1.3 -+VERSION=1.3-freebsd-ports - TIMESTAMP=" (1.385.2.117 1999/04/29 13:07:13)" +-VERSION=1.3.3 ++VERSION=1.3.3-freebsd-ports + TIMESTAMP=" (1.385.2.181 1999/07/02 15:49:11)" ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.c 1>&5' ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.c $LIBS 1>&5' -@@ -184,6 +184,7 @@ - # All known linkers require a `.a' archive for static linking. +@@ -185,6 +185,8 @@ + # which needs '.lib'). enable_static=yes enable_fast_install=yes -+install_ltlibs=no ++install_ltlibs=yes ++release_suffix=yes enable_dlopen=unknown enable_win32_dll=no ltmain= -@@ -244,6 +245,7 @@ +@@ -246,6 +248,9 @@ --disable-shared do not build shared libraries --disable-static do not build static libraries --disable-fast-install do not optimize for fast installation -+ --install-ltlibs install the .la archives ++ --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 -@@ -277,6 +279,8 @@ +@@ -279,6 +284,12 @@ --disable-fast-install) enable_fast_install=no ;; -+ --install-ltlibs) install_ltlibs=yes ;; ++ --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 ;; -@@ -927,11 +931,11 @@ +@@ -971,11 +982,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 -@@ -1742,19 +1746,17 @@ +@@ -1226,8 +1237,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 +@@ -1348,14 +1359,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' ;; +@@ -1732,7 +1735,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' +@@ -1829,19 +1832,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 - finish_cmds='PATH="\$PATH:/sbin" OBJFORMAT="'"$objformat"'" ldconfig -m $libdir' + 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' ++ 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]*) +@@ -2719,6 +2724,15 @@ -@@ -2613,6 +2615,12 @@ - # Shell to use when invoking shell scripts. SHELL=$LTSHELL + -+# Install PREFIX -+PREFIX=$PREFIX -+ +# 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 Property changes on: head/devel/gnu-libtool/files/patch-ac ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.7 \ No newline at end of property +1.8 \ No newline at end of property Index: head/devel/gnu-libtool/files/patch-ad =================================================================== --- head/devel/gnu-libtool/files/patch-ad (revision 21647) +++ head/devel/gnu-libtool/files/patch-ad (revision 21648) @@ -1,113 +1,212 @@ ---- ltmain.sh.orig Thu Apr 29 15:30:37 1999 -+++ ltmain.sh Sat May 22 13:59:59 1999 +--- ltmain.sh.orig Fri Jul 2 09:02:40 1999 ++++ ltmain.sh Fri Sep 3 02:01:51 1999 @@ -54,7 +54,7 @@ # Constants. PROGRAM=ltmain.sh PACKAGE=libtool --VERSION=1.3 -+VERSION=1.3-freebsd-ports - TIMESTAMP=" (1.385.2.117 1999/04/29 13:07:13)" +-VERSION=1.3.3 ++VERSION=1.3.3-freebsd-ports + TIMESTAMP=" (1.385.2.181 1999/07/02 15:49:11)" default_mode= -@@ -150,6 +150,11 @@ - exit 0 - ;; - -+ --prefix) -+ echo "$PREFIX" -+ exit 0 -+ ;; -+ - --debug) - echo "$progname: enabling shell trace mode" - set -x -@@ -928,7 +933,7 @@ +@@ -946,7 +946,11 @@ continue ;; release) - release="-$arg" -+ release="$arg" ++ if test "$release_suffix" = all; then ++ release="$arg" ++ elif test "$release_suffix" = yes; then ++ release="-$arg" ++ fi prev= continue ;; -@@ -981,6 +986,7 @@ +@@ -999,6 +1003,7 @@ ;; -avoid-version) + build_old_libs=no avoid_version=yes continue ;; -@@ -1066,6 +1072,10 @@ +@@ -1085,6 +1090,10 @@ deplibs="$deplibs $arg" ;; + -?thread) + deplibs="$deplibs $arg" + ;; + -module) module=yes continue -@@ -1763,6 +1773,9 @@ +@@ -1789,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" -@@ -1785,7 +1798,7 @@ +@@ -1796,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}.*" +@@ -1811,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" -+ oldlibs="$oldlibs $output_objdir/$libname$release.$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` -@@ -1979,7 +1992,7 @@ +@@ -2005,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" -+ oldlibs="$output_objdir/$libname$release.$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 -@@ -2933,7 +2946,7 @@ +@@ -3026,7 +3134,11 @@ case "$output" in *.la) old_library= - test "$build_old_libs" = yes && old_library="$libname.$libext" -+ test "$build_old_libs" = yes && old_library="$libname$release.$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 -@@ -3230,10 +3243,12 @@ +@@ -3315,10 +3427,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" -@@ -3322,7 +3337,6 @@ +@@ -3407,7 +3521,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 Property changes on: head/devel/gnu-libtool/files/patch-ad ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.4 \ No newline at end of property +1.5 \ No newline at end of property Index: head/devel/gnu-libtool/files/patch-ae =================================================================== --- head/devel/gnu-libtool/files/patch-ae (revision 21647) +++ head/devel/gnu-libtool/files/patch-ae (revision 21648) @@ -1,13 +1,13 @@ ---- configure.orig Fri Feb 19 00:50:06 1999 -+++ configure Fri Feb 19 00:50:21 1999 -@@ -5288,10 +5288,6 @@ +--- configure.orig Fri Jul 2 09:01:56 1999 ++++ configure Tue Aug 31 23:45:29 1999 +@@ -1853,10 +1853,6 @@ *) # Relative path. ac_sub_cache_file="$ac_dots$cache_file" ;; esac - case "$ac_given_INSTALL" in - [/$]*) INSTALL="$ac_given_INSTALL" ;; - *) INSTALL="$ac_dots$ac_given_INSTALL" ;; - esac echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir" # The eval makes quoting arguments work. Property changes on: head/devel/gnu-libtool/files/patch-ae ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/devel/gnu-libtool/files/patch-af =================================================================== --- head/devel/gnu-libtool/files/patch-af (nonexistent) +++ head/devel/gnu-libtool/files/patch-af (revision 21648) @@ -0,0 +1,24 @@ +--- libltdl/Makefile.in.orig Fri Jul 2 09:02:06 1999 ++++ libltdl/Makefile.in Thu Sep 9 22:40:10 1999 +@@ -328,17 +328,16 @@ + distdir: $(DISTFILES) + -rm -rf $(distdir) + mkdir $(distdir) +- -chmod 777 $(distdir) ++ -chmod 555 $(distdir) + @for file in $(DISTFILES); do \ + d=$(srcdir); \ + if test -d $$d/$$file; then \ +- cp -pr $$/$$file $(distdir)/$$file; \ ++ echo no copy dir $$d/$$file; \ + else \ +- test -f $(distdir)/$$file \ +- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ +- || cp -p $$d/$$file $(distdir)/$$file || :; \ ++ install -c -o root -g wheel -m 444 $$d/$$file $(distdir)/$$file; \ + fi; \ + done ++ -chmod a+x $(distdir)/configure + info-am: + info: info-am + dvi-am: Property changes on: head/devel/gnu-libtool/files/patch-af ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/devel/libtool/Makefile =================================================================== --- head/devel/libtool/Makefile (revision 21647) +++ head/devel/libtool/Makefile (revision 21648) @@ -1,20 +1,20 @@ # New ports collection makefile for: libtool -# Version required: 1.3 +# Version required: 1.3.3 # Date created: 6 May 1998 # Whom: Motoyuki Kasahara # # $FreeBSD$ # -DISTNAME= libtool-1.3 +DISTNAME= libtool-1.3.3 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= libtool MAINTAINER= reg@shale.csir.co.za GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-ltdl-install CONFIGURE_ENV= PREFIX=${PREFIX} .include Property changes on: head/devel/libtool/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.6 \ No newline at end of property +1.7 \ No newline at end of property Index: head/devel/libtool/distinfo =================================================================== --- head/devel/libtool/distinfo (revision 21647) +++ head/devel/libtool/distinfo (revision 21648) @@ -1 +1 @@ -MD5 (libtool-1.3.tar.gz) = 770f8b97b03e95b7e0cf383297906353 +MD5 (libtool-1.3.3.tar.gz) = 574b5a12423c2aa575efe122c6c5831b Property changes on: head/devel/libtool/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/devel/libtool/files/patch-aa =================================================================== --- head/devel/libtool/files/patch-aa (revision 21647) +++ head/devel/libtool/files/patch-aa (revision 21648) @@ -1,11 +1,11 @@ ---- doc/libtool.texi.orig Wed Mar 11 02:04:36 1998 -+++ doc/libtool.texi Mon Apr 27 16:57:24 1998 -@@ -10,7 +10,7 @@ - @set BUGADDR the libtool mailing list @email{bug-libtool@@gnu.org} +--- doc/libtool.texi.orig Tue Jun 29 15:48:12 1999 ++++ doc/libtool.texi Tue Aug 31 23:41:25 1999 +@@ -11,7 +11,7 @@ + @set MAILLIST the libtool mailing list @email{libtool@@gnu.org} @set objdir .libs -@dircategory GNU programming tools +@dircategory Programming & development tools @direntry * Libtool: (libtool). Generic shared library support script. @end direntry Property changes on: head/devel/libtool/files/patch-aa ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/devel/libtool/files/patch-ab =================================================================== --- head/devel/libtool/files/patch-ab (revision 21647) +++ head/devel/libtool/files/patch-ab (revision 21648) @@ -1,11 +1,11 @@ ---- doc/Makefile.in.orig Fri Mar 20 17:01:52 1998 -+++ doc/Makefile.in Mon Apr 27 17:22:55 1998 +--- 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 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_FLAGS = @LIBTOOL_FLAGS@ LN_S = @LN_S@ -MAKEINFO = @MAKEINFO@ +MAKEINFO = @MAKEINFO@ --no-split NM = @NM@ + OBJDUMP = @OBJDUMP@ PACKAGE = @PACKAGE@ - RANLIB = @RANLIB@ Property changes on: head/devel/libtool/files/patch-ab ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/devel/libtool/files/patch-ac =================================================================== --- head/devel/libtool/files/patch-ac (revision 21647) +++ head/devel/libtool/files/patch-ac (revision 21648) @@ -1,90 +1,139 @@ ---- ltconfig.orig Thu Apr 29 15:30:36 1999 -+++ ltconfig Sat May 22 15:52:24 1999 +--- ltconfig.orig Fri Jul 2 09:02:37 1999 ++++ ltconfig Sat Sep 4 11:34:21 1999 @@ -169,7 +169,7 @@ # Constants: PROGRAM=ltconfig PACKAGE=libtool --VERSION=1.3 -+VERSION=1.3-freebsd-ports - TIMESTAMP=" (1.385.2.117 1999/04/29 13:07:13)" +-VERSION=1.3.3 ++VERSION=1.3.3-freebsd-ports + TIMESTAMP=" (1.385.2.181 1999/07/02 15:49:11)" ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.c 1>&5' ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.c $LIBS 1>&5' -@@ -184,6 +184,7 @@ - # All known linkers require a `.a' archive for static linking. +@@ -185,6 +185,8 @@ + # which needs '.lib'). enable_static=yes enable_fast_install=yes -+install_ltlibs=no ++install_ltlibs=yes ++release_suffix=yes enable_dlopen=unknown enable_win32_dll=no ltmain= -@@ -244,6 +245,7 @@ +@@ -246,6 +248,9 @@ --disable-shared do not build shared libraries --disable-static do not build static libraries --disable-fast-install do not optimize for fast installation -+ --install-ltlibs install the .la archives ++ --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 -@@ -277,6 +279,8 @@ +@@ -279,6 +284,12 @@ --disable-fast-install) enable_fast_install=no ;; -+ --install-ltlibs) install_ltlibs=yes ;; ++ --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 ;; -@@ -927,11 +931,11 @@ +@@ -971,11 +982,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 -@@ -1742,19 +1746,17 @@ +@@ -1226,8 +1237,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 +@@ -1348,14 +1359,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' ;; +@@ -1732,7 +1735,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' +@@ -1829,19 +1832,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 - finish_cmds='PATH="\$PATH:/sbin" OBJFORMAT="'"$objformat"'" ldconfig -m $libdir' + 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' ++ 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]*) +@@ -2719,6 +2724,15 @@ -@@ -2613,6 +2615,12 @@ - # Shell to use when invoking shell scripts. SHELL=$LTSHELL + -+# Install PREFIX -+PREFIX=$PREFIX -+ +# 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 Property changes on: head/devel/libtool/files/patch-ac ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.7 \ No newline at end of property +1.8 \ No newline at end of property Index: head/devel/libtool/files/patch-ad =================================================================== --- head/devel/libtool/files/patch-ad (revision 21647) +++ head/devel/libtool/files/patch-ad (revision 21648) @@ -1,113 +1,212 @@ ---- ltmain.sh.orig Thu Apr 29 15:30:37 1999 -+++ ltmain.sh Sat May 22 13:59:59 1999 +--- ltmain.sh.orig Fri Jul 2 09:02:40 1999 ++++ ltmain.sh Fri Sep 3 02:01:51 1999 @@ -54,7 +54,7 @@ # Constants. PROGRAM=ltmain.sh PACKAGE=libtool --VERSION=1.3 -+VERSION=1.3-freebsd-ports - TIMESTAMP=" (1.385.2.117 1999/04/29 13:07:13)" +-VERSION=1.3.3 ++VERSION=1.3.3-freebsd-ports + TIMESTAMP=" (1.385.2.181 1999/07/02 15:49:11)" default_mode= -@@ -150,6 +150,11 @@ - exit 0 - ;; - -+ --prefix) -+ echo "$PREFIX" -+ exit 0 -+ ;; -+ - --debug) - echo "$progname: enabling shell trace mode" - set -x -@@ -928,7 +933,7 @@ +@@ -946,7 +946,11 @@ continue ;; release) - release="-$arg" -+ release="$arg" ++ if test "$release_suffix" = all; then ++ release="$arg" ++ elif test "$release_suffix" = yes; then ++ release="-$arg" ++ fi prev= continue ;; -@@ -981,6 +986,7 @@ +@@ -999,6 +1003,7 @@ ;; -avoid-version) + build_old_libs=no avoid_version=yes continue ;; -@@ -1066,6 +1072,10 @@ +@@ -1085,6 +1090,10 @@ deplibs="$deplibs $arg" ;; + -?thread) + deplibs="$deplibs $arg" + ;; + -module) module=yes continue -@@ -1763,6 +1773,9 @@ +@@ -1789,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" -@@ -1785,7 +1798,7 @@ +@@ -1796,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}.*" +@@ -1811,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" -+ oldlibs="$oldlibs $output_objdir/$libname$release.$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` -@@ -1979,7 +1992,7 @@ +@@ -2005,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" -+ oldlibs="$output_objdir/$libname$release.$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 -@@ -2933,7 +2946,7 @@ +@@ -3026,7 +3134,11 @@ case "$output" in *.la) old_library= - test "$build_old_libs" = yes && old_library="$libname.$libext" -+ test "$build_old_libs" = yes && old_library="$libname$release.$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 -@@ -3230,10 +3243,12 @@ +@@ -3315,10 +3427,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" -@@ -3322,7 +3337,6 @@ +@@ -3407,7 +3521,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 Property changes on: head/devel/libtool/files/patch-ad ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.4 \ No newline at end of property +1.5 \ No newline at end of property Index: head/devel/libtool/files/patch-ae =================================================================== --- head/devel/libtool/files/patch-ae (revision 21647) +++ head/devel/libtool/files/patch-ae (revision 21648) @@ -1,13 +1,13 @@ ---- configure.orig Fri Feb 19 00:50:06 1999 -+++ configure Fri Feb 19 00:50:21 1999 -@@ -5288,10 +5288,6 @@ +--- configure.orig Fri Jul 2 09:01:56 1999 ++++ configure Tue Aug 31 23:45:29 1999 +@@ -1853,10 +1853,6 @@ *) # Relative path. ac_sub_cache_file="$ac_dots$cache_file" ;; esac - case "$ac_given_INSTALL" in - [/$]*) INSTALL="$ac_given_INSTALL" ;; - *) INSTALL="$ac_dots$ac_given_INSTALL" ;; - esac echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir" # The eval makes quoting arguments work. Property changes on: head/devel/libtool/files/patch-ae ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/devel/libtool/files/patch-af =================================================================== --- head/devel/libtool/files/patch-af (nonexistent) +++ head/devel/libtool/files/patch-af (revision 21648) @@ -0,0 +1,24 @@ +--- libltdl/Makefile.in.orig Fri Jul 2 09:02:06 1999 ++++ libltdl/Makefile.in Thu Sep 9 22:40:10 1999 +@@ -328,17 +328,16 @@ + distdir: $(DISTFILES) + -rm -rf $(distdir) + mkdir $(distdir) +- -chmod 777 $(distdir) ++ -chmod 555 $(distdir) + @for file in $(DISTFILES); do \ + d=$(srcdir); \ + if test -d $$d/$$file; then \ +- cp -pr $$/$$file $(distdir)/$$file; \ ++ echo no copy dir $$d/$$file; \ + else \ +- test -f $(distdir)/$$file \ +- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ +- || cp -p $$d/$$file $(distdir)/$$file || :; \ ++ install -c -o root -g wheel -m 444 $$d/$$file $(distdir)/$$file; \ + fi; \ + done ++ -chmod a+x $(distdir)/configure + info-am: + info: info-am + dvi-am: Property changes on: head/devel/libtool/files/patch-af ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/devel/libtool13/Makefile =================================================================== --- head/devel/libtool13/Makefile (revision 21647) +++ head/devel/libtool13/Makefile (revision 21648) @@ -1,20 +1,20 @@ # New ports collection makefile for: libtool -# Version required: 1.3 +# Version required: 1.3.3 # Date created: 6 May 1998 # Whom: Motoyuki Kasahara # # $FreeBSD$ # -DISTNAME= libtool-1.3 +DISTNAME= libtool-1.3.3 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= libtool MAINTAINER= reg@shale.csir.co.za GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-ltdl-install CONFIGURE_ENV= PREFIX=${PREFIX} .include Property changes on: head/devel/libtool13/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.6 \ No newline at end of property +1.7 \ No newline at end of property Index: head/devel/libtool13/distinfo =================================================================== --- head/devel/libtool13/distinfo (revision 21647) +++ head/devel/libtool13/distinfo (revision 21648) @@ -1 +1 @@ -MD5 (libtool-1.3.tar.gz) = 770f8b97b03e95b7e0cf383297906353 +MD5 (libtool-1.3.3.tar.gz) = 574b5a12423c2aa575efe122c6c5831b Property changes on: head/devel/libtool13/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/devel/libtool13/files/patch-aa =================================================================== --- head/devel/libtool13/files/patch-aa (revision 21647) +++ head/devel/libtool13/files/patch-aa (revision 21648) @@ -1,11 +1,11 @@ ---- doc/libtool.texi.orig Wed Mar 11 02:04:36 1998 -+++ doc/libtool.texi Mon Apr 27 16:57:24 1998 -@@ -10,7 +10,7 @@ - @set BUGADDR the libtool mailing list @email{bug-libtool@@gnu.org} +--- doc/libtool.texi.orig Tue Jun 29 15:48:12 1999 ++++ doc/libtool.texi Tue Aug 31 23:41:25 1999 +@@ -11,7 +11,7 @@ + @set MAILLIST the libtool mailing list @email{libtool@@gnu.org} @set objdir .libs -@dircategory GNU programming tools +@dircategory Programming & development tools @direntry * Libtool: (libtool). Generic shared library support script. @end direntry Property changes on: head/devel/libtool13/files/patch-aa ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/devel/libtool13/files/patch-ab =================================================================== --- head/devel/libtool13/files/patch-ab (revision 21647) +++ head/devel/libtool13/files/patch-ab (revision 21648) @@ -1,11 +1,11 @@ ---- doc/Makefile.in.orig Fri Mar 20 17:01:52 1998 -+++ doc/Makefile.in Mon Apr 27 17:22:55 1998 +--- 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 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_FLAGS = @LIBTOOL_FLAGS@ LN_S = @LN_S@ -MAKEINFO = @MAKEINFO@ +MAKEINFO = @MAKEINFO@ --no-split NM = @NM@ + OBJDUMP = @OBJDUMP@ PACKAGE = @PACKAGE@ - RANLIB = @RANLIB@ Property changes on: head/devel/libtool13/files/patch-ab ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/devel/libtool13/files/patch-ac =================================================================== --- head/devel/libtool13/files/patch-ac (revision 21647) +++ head/devel/libtool13/files/patch-ac (revision 21648) @@ -1,90 +1,139 @@ ---- ltconfig.orig Thu Apr 29 15:30:36 1999 -+++ ltconfig Sat May 22 15:52:24 1999 +--- ltconfig.orig Fri Jul 2 09:02:37 1999 ++++ ltconfig Sat Sep 4 11:34:21 1999 @@ -169,7 +169,7 @@ # Constants: PROGRAM=ltconfig PACKAGE=libtool --VERSION=1.3 -+VERSION=1.3-freebsd-ports - TIMESTAMP=" (1.385.2.117 1999/04/29 13:07:13)" +-VERSION=1.3.3 ++VERSION=1.3.3-freebsd-ports + TIMESTAMP=" (1.385.2.181 1999/07/02 15:49:11)" ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.c 1>&5' ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.c $LIBS 1>&5' -@@ -184,6 +184,7 @@ - # All known linkers require a `.a' archive for static linking. +@@ -185,6 +185,8 @@ + # which needs '.lib'). enable_static=yes enable_fast_install=yes -+install_ltlibs=no ++install_ltlibs=yes ++release_suffix=yes enable_dlopen=unknown enable_win32_dll=no ltmain= -@@ -244,6 +245,7 @@ +@@ -246,6 +248,9 @@ --disable-shared do not build shared libraries --disable-static do not build static libraries --disable-fast-install do not optimize for fast installation -+ --install-ltlibs install the .la archives ++ --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 -@@ -277,6 +279,8 @@ +@@ -279,6 +284,12 @@ --disable-fast-install) enable_fast_install=no ;; -+ --install-ltlibs) install_ltlibs=yes ;; ++ --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 ;; -@@ -927,11 +931,11 @@ +@@ -971,11 +982,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 -@@ -1742,19 +1746,17 @@ +@@ -1226,8 +1237,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 +@@ -1348,14 +1359,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' ;; +@@ -1732,7 +1735,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' +@@ -1829,19 +1832,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 - finish_cmds='PATH="\$PATH:/sbin" OBJFORMAT="'"$objformat"'" ldconfig -m $libdir' + 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' ++ 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]*) +@@ -2719,6 +2724,15 @@ -@@ -2613,6 +2615,12 @@ - # Shell to use when invoking shell scripts. SHELL=$LTSHELL + -+# Install PREFIX -+PREFIX=$PREFIX -+ +# 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 Property changes on: head/devel/libtool13/files/patch-ac ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.7 \ No newline at end of property +1.8 \ No newline at end of property Index: head/devel/libtool13/files/patch-ad =================================================================== --- head/devel/libtool13/files/patch-ad (revision 21647) +++ head/devel/libtool13/files/patch-ad (revision 21648) @@ -1,113 +1,212 @@ ---- ltmain.sh.orig Thu Apr 29 15:30:37 1999 -+++ ltmain.sh Sat May 22 13:59:59 1999 +--- ltmain.sh.orig Fri Jul 2 09:02:40 1999 ++++ ltmain.sh Fri Sep 3 02:01:51 1999 @@ -54,7 +54,7 @@ # Constants. PROGRAM=ltmain.sh PACKAGE=libtool --VERSION=1.3 -+VERSION=1.3-freebsd-ports - TIMESTAMP=" (1.385.2.117 1999/04/29 13:07:13)" +-VERSION=1.3.3 ++VERSION=1.3.3-freebsd-ports + TIMESTAMP=" (1.385.2.181 1999/07/02 15:49:11)" default_mode= -@@ -150,6 +150,11 @@ - exit 0 - ;; - -+ --prefix) -+ echo "$PREFIX" -+ exit 0 -+ ;; -+ - --debug) - echo "$progname: enabling shell trace mode" - set -x -@@ -928,7 +933,7 @@ +@@ -946,7 +946,11 @@ continue ;; release) - release="-$arg" -+ release="$arg" ++ if test "$release_suffix" = all; then ++ release="$arg" ++ elif test "$release_suffix" = yes; then ++ release="-$arg" ++ fi prev= continue ;; -@@ -981,6 +986,7 @@ +@@ -999,6 +1003,7 @@ ;; -avoid-version) + build_old_libs=no avoid_version=yes continue ;; -@@ -1066,6 +1072,10 @@ +@@ -1085,6 +1090,10 @@ deplibs="$deplibs $arg" ;; + -?thread) + deplibs="$deplibs $arg" + ;; + -module) module=yes continue -@@ -1763,6 +1773,9 @@ +@@ -1789,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" -@@ -1785,7 +1798,7 @@ +@@ -1796,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}.*" +@@ -1811,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" -+ oldlibs="$oldlibs $output_objdir/$libname$release.$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` -@@ -1979,7 +1992,7 @@ +@@ -2005,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" -+ oldlibs="$output_objdir/$libname$release.$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 -@@ -2933,7 +2946,7 @@ +@@ -3026,7 +3134,11 @@ case "$output" in *.la) old_library= - test "$build_old_libs" = yes && old_library="$libname.$libext" -+ test "$build_old_libs" = yes && old_library="$libname$release.$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 -@@ -3230,10 +3243,12 @@ +@@ -3315,10 +3427,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" -@@ -3322,7 +3337,6 @@ +@@ -3407,7 +3521,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 Property changes on: head/devel/libtool13/files/patch-ad ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.4 \ No newline at end of property +1.5 \ No newline at end of property Index: head/devel/libtool13/files/patch-ae =================================================================== --- head/devel/libtool13/files/patch-ae (revision 21647) +++ head/devel/libtool13/files/patch-ae (revision 21648) @@ -1,13 +1,13 @@ ---- configure.orig Fri Feb 19 00:50:06 1999 -+++ configure Fri Feb 19 00:50:21 1999 -@@ -5288,10 +5288,6 @@ +--- configure.orig Fri Jul 2 09:01:56 1999 ++++ configure Tue Aug 31 23:45:29 1999 +@@ -1853,10 +1853,6 @@ *) # Relative path. ac_sub_cache_file="$ac_dots$cache_file" ;; esac - case "$ac_given_INSTALL" in - [/$]*) INSTALL="$ac_given_INSTALL" ;; - *) INSTALL="$ac_dots$ac_given_INSTALL" ;; - esac echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir" # The eval makes quoting arguments work. Property changes on: head/devel/libtool13/files/patch-ae ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/devel/libtool13/files/patch-af =================================================================== --- head/devel/libtool13/files/patch-af (nonexistent) +++ head/devel/libtool13/files/patch-af (revision 21648) @@ -0,0 +1,24 @@ +--- libltdl/Makefile.in.orig Fri Jul 2 09:02:06 1999 ++++ libltdl/Makefile.in Thu Sep 9 22:40:10 1999 +@@ -328,17 +328,16 @@ + distdir: $(DISTFILES) + -rm -rf $(distdir) + mkdir $(distdir) +- -chmod 777 $(distdir) ++ -chmod 555 $(distdir) + @for file in $(DISTFILES); do \ + d=$(srcdir); \ + if test -d $$d/$$file; then \ +- cp -pr $$/$$file $(distdir)/$$file; \ ++ echo no copy dir $$d/$$file; \ + else \ +- test -f $(distdir)/$$file \ +- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ +- || cp -p $$d/$$file $(distdir)/$$file || :; \ ++ install -c -o root -g wheel -m 444 $$d/$$file $(distdir)/$$file; \ + fi; \ + done ++ -chmod a+x $(distdir)/configure + info-am: + info: info-am + dvi-am: Property changes on: head/devel/libtool13/files/patch-af ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Index: head/devel/libtool14/Makefile =================================================================== --- head/devel/libtool14/Makefile (revision 21647) +++ head/devel/libtool14/Makefile (revision 21648) @@ -1,20 +1,20 @@ # New ports collection makefile for: libtool -# Version required: 1.3 +# Version required: 1.3.3 # Date created: 6 May 1998 # Whom: Motoyuki Kasahara # # $FreeBSD$ # -DISTNAME= libtool-1.3 +DISTNAME= libtool-1.3.3 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= libtool MAINTAINER= reg@shale.csir.co.za GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-ltdl-install CONFIGURE_ENV= PREFIX=${PREFIX} .include Property changes on: head/devel/libtool14/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.6 \ No newline at end of property +1.7 \ No newline at end of property Index: head/devel/libtool14/distinfo =================================================================== --- head/devel/libtool14/distinfo (revision 21647) +++ head/devel/libtool14/distinfo (revision 21648) @@ -1 +1 @@ -MD5 (libtool-1.3.tar.gz) = 770f8b97b03e95b7e0cf383297906353 +MD5 (libtool-1.3.3.tar.gz) = 574b5a12423c2aa575efe122c6c5831b Property changes on: head/devel/libtool14/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/devel/libtool14/files/patch-aa =================================================================== --- head/devel/libtool14/files/patch-aa (revision 21647) +++ head/devel/libtool14/files/patch-aa (revision 21648) @@ -1,11 +1,11 @@ ---- doc/libtool.texi.orig Wed Mar 11 02:04:36 1998 -+++ doc/libtool.texi Mon Apr 27 16:57:24 1998 -@@ -10,7 +10,7 @@ - @set BUGADDR the libtool mailing list @email{bug-libtool@@gnu.org} +--- doc/libtool.texi.orig Tue Jun 29 15:48:12 1999 ++++ doc/libtool.texi Tue Aug 31 23:41:25 1999 +@@ -11,7 +11,7 @@ + @set MAILLIST the libtool mailing list @email{libtool@@gnu.org} @set objdir .libs -@dircategory GNU programming tools +@dircategory Programming & development tools @direntry * Libtool: (libtool). Generic shared library support script. @end direntry Property changes on: head/devel/libtool14/files/patch-aa ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/devel/libtool14/files/patch-ab =================================================================== --- head/devel/libtool14/files/patch-ab (revision 21647) +++ head/devel/libtool14/files/patch-ab (revision 21648) @@ -1,11 +1,11 @@ ---- doc/Makefile.in.orig Fri Mar 20 17:01:52 1998 -+++ doc/Makefile.in Mon Apr 27 17:22:55 1998 +--- 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 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_FLAGS = @LIBTOOL_FLAGS@ LN_S = @LN_S@ -MAKEINFO = @MAKEINFO@ +MAKEINFO = @MAKEINFO@ --no-split NM = @NM@ + OBJDUMP = @OBJDUMP@ PACKAGE = @PACKAGE@ - RANLIB = @RANLIB@ Property changes on: head/devel/libtool14/files/patch-ab ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/devel/libtool14/files/patch-ac =================================================================== --- head/devel/libtool14/files/patch-ac (revision 21647) +++ head/devel/libtool14/files/patch-ac (revision 21648) @@ -1,90 +1,139 @@ ---- ltconfig.orig Thu Apr 29 15:30:36 1999 -+++ ltconfig Sat May 22 15:52:24 1999 +--- ltconfig.orig Fri Jul 2 09:02:37 1999 ++++ ltconfig Sat Sep 4 11:34:21 1999 @@ -169,7 +169,7 @@ # Constants: PROGRAM=ltconfig PACKAGE=libtool --VERSION=1.3 -+VERSION=1.3-freebsd-ports - TIMESTAMP=" (1.385.2.117 1999/04/29 13:07:13)" +-VERSION=1.3.3 ++VERSION=1.3.3-freebsd-ports + TIMESTAMP=" (1.385.2.181 1999/07/02 15:49:11)" ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.c 1>&5' ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.c $LIBS 1>&5' -@@ -184,6 +184,7 @@ - # All known linkers require a `.a' archive for static linking. +@@ -185,6 +185,8 @@ + # which needs '.lib'). enable_static=yes enable_fast_install=yes -+install_ltlibs=no ++install_ltlibs=yes ++release_suffix=yes enable_dlopen=unknown enable_win32_dll=no ltmain= -@@ -244,6 +245,7 @@ +@@ -246,6 +248,9 @@ --disable-shared do not build shared libraries --disable-static do not build static libraries --disable-fast-install do not optimize for fast installation -+ --install-ltlibs install the .la archives ++ --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 -@@ -277,6 +279,8 @@ +@@ -279,6 +284,12 @@ --disable-fast-install) enable_fast_install=no ;; -+ --install-ltlibs) install_ltlibs=yes ;; ++ --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 ;; -@@ -927,11 +931,11 @@ +@@ -971,11 +982,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 -@@ -1742,19 +1746,17 @@ +@@ -1226,8 +1237,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 +@@ -1348,14 +1359,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' ;; +@@ -1732,7 +1735,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' +@@ -1829,19 +1832,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 - finish_cmds='PATH="\$PATH:/sbin" OBJFORMAT="'"$objformat"'" ldconfig -m $libdir' + 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' ++ 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]*) +@@ -2719,6 +2724,15 @@ -@@ -2613,6 +2615,12 @@ - # Shell to use when invoking shell scripts. SHELL=$LTSHELL + -+# Install PREFIX -+PREFIX=$PREFIX -+ +# 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 Property changes on: head/devel/libtool14/files/patch-ac ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.7 \ No newline at end of property +1.8 \ No newline at end of property Index: head/devel/libtool14/files/patch-ad =================================================================== --- head/devel/libtool14/files/patch-ad (revision 21647) +++ head/devel/libtool14/files/patch-ad (revision 21648) @@ -1,113 +1,212 @@ ---- ltmain.sh.orig Thu Apr 29 15:30:37 1999 -+++ ltmain.sh Sat May 22 13:59:59 1999 +--- ltmain.sh.orig Fri Jul 2 09:02:40 1999 ++++ ltmain.sh Fri Sep 3 02:01:51 1999 @@ -54,7 +54,7 @@ # Constants. PROGRAM=ltmain.sh PACKAGE=libtool --VERSION=1.3 -+VERSION=1.3-freebsd-ports - TIMESTAMP=" (1.385.2.117 1999/04/29 13:07:13)" +-VERSION=1.3.3 ++VERSION=1.3.3-freebsd-ports + TIMESTAMP=" (1.385.2.181 1999/07/02 15:49:11)" default_mode= -@@ -150,6 +150,11 @@ - exit 0 - ;; - -+ --prefix) -+ echo "$PREFIX" -+ exit 0 -+ ;; -+ - --debug) - echo "$progname: enabling shell trace mode" - set -x -@@ -928,7 +933,7 @@ +@@ -946,7 +946,11 @@ continue ;; release) - release="-$arg" -+ release="$arg" ++ if test "$release_suffix" = all; then ++ release="$arg" ++ elif test "$release_suffix" = yes; then ++ release="-$arg" ++ fi prev= continue ;; -@@ -981,6 +986,7 @@ +@@ -999,6 +1003,7 @@ ;; -avoid-version) + build_old_libs=no avoid_version=yes continue ;; -@@ -1066,6 +1072,10 @@ +@@ -1085,6 +1090,10 @@ deplibs="$deplibs $arg" ;; + -?thread) + deplibs="$deplibs $arg" + ;; + -module) module=yes continue -@@ -1763,6 +1773,9 @@ +@@ -1789,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" -@@ -1785,7 +1798,7 @@ +@@ -1796,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}.*" +@@ -1811,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" -+ oldlibs="$oldlibs $output_objdir/$libname$release.$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` -@@ -1979,7 +1992,7 @@ +@@ -2005,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" -+ oldlibs="$output_objdir/$libname$release.$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 -@@ -2933,7 +2946,7 @@ +@@ -3026,7 +3134,11 @@ case "$output" in *.la) old_library= - test "$build_old_libs" = yes && old_library="$libname.$libext" -+ test "$build_old_libs" = yes && old_library="$libname$release.$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 -@@ -3230,10 +3243,12 @@ +@@ -3315,10 +3427,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" -@@ -3322,7 +3337,6 @@ +@@ -3407,7 +3521,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 Property changes on: head/devel/libtool14/files/patch-ad ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.4 \ No newline at end of property +1.5 \ No newline at end of property Index: head/devel/libtool14/files/patch-ae =================================================================== --- head/devel/libtool14/files/patch-ae (revision 21647) +++ head/devel/libtool14/files/patch-ae (revision 21648) @@ -1,13 +1,13 @@ ---- configure.orig Fri Feb 19 00:50:06 1999 -+++ configure Fri Feb 19 00:50:21 1999 -@@ -5288,10 +5288,6 @@ +--- configure.orig Fri Jul 2 09:01:56 1999 ++++ configure Tue Aug 31 23:45:29 1999 +@@ -1853,10 +1853,6 @@ *) # Relative path. ac_sub_cache_file="$ac_dots$cache_file" ;; esac - case "$ac_given_INSTALL" in - [/$]*) INSTALL="$ac_given_INSTALL" ;; - *) INSTALL="$ac_dots$ac_given_INSTALL" ;; - esac echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir" # The eval makes quoting arguments work. Property changes on: head/devel/libtool14/files/patch-ae ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/devel/libtool14/files/patch-af =================================================================== --- head/devel/libtool14/files/patch-af (nonexistent) +++ head/devel/libtool14/files/patch-af (revision 21648) @@ -0,0 +1,24 @@ +--- libltdl/Makefile.in.orig Fri Jul 2 09:02:06 1999 ++++ libltdl/Makefile.in Thu Sep 9 22:40:10 1999 +@@ -328,17 +328,16 @@ + distdir: $(DISTFILES) + -rm -rf $(distdir) + mkdir $(distdir) +- -chmod 777 $(distdir) ++ -chmod 555 $(distdir) + @for file in $(DISTFILES); do \ + d=$(srcdir); \ + if test -d $$d/$$file; then \ +- cp -pr $$/$$file $(distdir)/$$file; \ ++ echo no copy dir $$d/$$file; \ + else \ +- test -f $(distdir)/$$file \ +- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ +- || cp -p $$d/$$file $(distdir)/$$file || :; \ ++ install -c -o root -g wheel -m 444 $$d/$$file $(distdir)/$$file; \ + fi; \ + done ++ -chmod a+x $(distdir)/configure + info-am: + info: info-am + dvi-am: Property changes on: head/devel/libtool14/files/patch-af ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/devel/libtool15/Makefile =================================================================== --- head/devel/libtool15/Makefile (revision 21647) +++ head/devel/libtool15/Makefile (revision 21648) @@ -1,20 +1,20 @@ # New ports collection makefile for: libtool -# Version required: 1.3 +# Version required: 1.3.3 # Date created: 6 May 1998 # Whom: Motoyuki Kasahara # # $FreeBSD$ # -DISTNAME= libtool-1.3 +DISTNAME= libtool-1.3.3 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= libtool MAINTAINER= reg@shale.csir.co.za GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-ltdl-install CONFIGURE_ENV= PREFIX=${PREFIX} .include Property changes on: head/devel/libtool15/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.6 \ No newline at end of property +1.7 \ No newline at end of property Index: head/devel/libtool15/distinfo =================================================================== --- head/devel/libtool15/distinfo (revision 21647) +++ head/devel/libtool15/distinfo (revision 21648) @@ -1 +1 @@ -MD5 (libtool-1.3.tar.gz) = 770f8b97b03e95b7e0cf383297906353 +MD5 (libtool-1.3.3.tar.gz) = 574b5a12423c2aa575efe122c6c5831b Property changes on: head/devel/libtool15/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/devel/libtool15/files/patch-aa =================================================================== --- head/devel/libtool15/files/patch-aa (revision 21647) +++ head/devel/libtool15/files/patch-aa (revision 21648) @@ -1,11 +1,11 @@ ---- doc/libtool.texi.orig Wed Mar 11 02:04:36 1998 -+++ doc/libtool.texi Mon Apr 27 16:57:24 1998 -@@ -10,7 +10,7 @@ - @set BUGADDR the libtool mailing list @email{bug-libtool@@gnu.org} +--- doc/libtool.texi.orig Tue Jun 29 15:48:12 1999 ++++ doc/libtool.texi Tue Aug 31 23:41:25 1999 +@@ -11,7 +11,7 @@ + @set MAILLIST the libtool mailing list @email{libtool@@gnu.org} @set objdir .libs -@dircategory GNU programming tools +@dircategory Programming & development tools @direntry * Libtool: (libtool). Generic shared library support script. @end direntry Property changes on: head/devel/libtool15/files/patch-aa ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/devel/libtool15/files/patch-ab =================================================================== --- head/devel/libtool15/files/patch-ab (revision 21647) +++ head/devel/libtool15/files/patch-ab (revision 21648) @@ -1,11 +1,11 @@ ---- doc/Makefile.in.orig Fri Mar 20 17:01:52 1998 -+++ doc/Makefile.in Mon Apr 27 17:22:55 1998 +--- 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 @@ LIBTOOL = @LIBTOOL@ LIBTOOL_FLAGS = @LIBTOOL_FLAGS@ LN_S = @LN_S@ -MAKEINFO = @MAKEINFO@ +MAKEINFO = @MAKEINFO@ --no-split NM = @NM@ + OBJDUMP = @OBJDUMP@ PACKAGE = @PACKAGE@ - RANLIB = @RANLIB@ Property changes on: head/devel/libtool15/files/patch-ab ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/devel/libtool15/files/patch-ac =================================================================== --- head/devel/libtool15/files/patch-ac (revision 21647) +++ head/devel/libtool15/files/patch-ac (revision 21648) @@ -1,90 +1,139 @@ ---- ltconfig.orig Thu Apr 29 15:30:36 1999 -+++ ltconfig Sat May 22 15:52:24 1999 +--- ltconfig.orig Fri Jul 2 09:02:37 1999 ++++ ltconfig Sat Sep 4 11:34:21 1999 @@ -169,7 +169,7 @@ # Constants: PROGRAM=ltconfig PACKAGE=libtool --VERSION=1.3 -+VERSION=1.3-freebsd-ports - TIMESTAMP=" (1.385.2.117 1999/04/29 13:07:13)" +-VERSION=1.3.3 ++VERSION=1.3.3-freebsd-ports + TIMESTAMP=" (1.385.2.181 1999/07/02 15:49:11)" ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.c 1>&5' ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.c $LIBS 1>&5' -@@ -184,6 +184,7 @@ - # All known linkers require a `.a' archive for static linking. +@@ -185,6 +185,8 @@ + # which needs '.lib'). enable_static=yes enable_fast_install=yes -+install_ltlibs=no ++install_ltlibs=yes ++release_suffix=yes enable_dlopen=unknown enable_win32_dll=no ltmain= -@@ -244,6 +245,7 @@ +@@ -246,6 +248,9 @@ --disable-shared do not build shared libraries --disable-static do not build static libraries --disable-fast-install do not optimize for fast installation -+ --install-ltlibs install the .la archives ++ --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 -@@ -277,6 +279,8 @@ +@@ -279,6 +284,12 @@ --disable-fast-install) enable_fast_install=no ;; -+ --install-ltlibs) install_ltlibs=yes ;; ++ --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 ;; -@@ -927,11 +931,11 @@ +@@ -971,11 +982,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 -@@ -1742,19 +1746,17 @@ +@@ -1226,8 +1237,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 +@@ -1348,14 +1359,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' ;; +@@ -1732,7 +1735,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' +@@ -1829,19 +1832,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 - finish_cmds='PATH="\$PATH:/sbin" OBJFORMAT="'"$objformat"'" ldconfig -m $libdir' + 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' ++ 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]*) +@@ -2719,6 +2724,15 @@ -@@ -2613,6 +2615,12 @@ - # Shell to use when invoking shell scripts. SHELL=$LTSHELL + -+# Install PREFIX -+PREFIX=$PREFIX -+ +# 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 Property changes on: head/devel/libtool15/files/patch-ac ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.7 \ No newline at end of property +1.8 \ No newline at end of property Index: head/devel/libtool15/files/patch-ad =================================================================== --- head/devel/libtool15/files/patch-ad (revision 21647) +++ head/devel/libtool15/files/patch-ad (revision 21648) @@ -1,113 +1,212 @@ ---- ltmain.sh.orig Thu Apr 29 15:30:37 1999 -+++ ltmain.sh Sat May 22 13:59:59 1999 +--- ltmain.sh.orig Fri Jul 2 09:02:40 1999 ++++ ltmain.sh Fri Sep 3 02:01:51 1999 @@ -54,7 +54,7 @@ # Constants. PROGRAM=ltmain.sh PACKAGE=libtool --VERSION=1.3 -+VERSION=1.3-freebsd-ports - TIMESTAMP=" (1.385.2.117 1999/04/29 13:07:13)" +-VERSION=1.3.3 ++VERSION=1.3.3-freebsd-ports + TIMESTAMP=" (1.385.2.181 1999/07/02 15:49:11)" default_mode= -@@ -150,6 +150,11 @@ - exit 0 - ;; - -+ --prefix) -+ echo "$PREFIX" -+ exit 0 -+ ;; -+ - --debug) - echo "$progname: enabling shell trace mode" - set -x -@@ -928,7 +933,7 @@ +@@ -946,7 +946,11 @@ continue ;; release) - release="-$arg" -+ release="$arg" ++ if test "$release_suffix" = all; then ++ release="$arg" ++ elif test "$release_suffix" = yes; then ++ release="-$arg" ++ fi prev= continue ;; -@@ -981,6 +986,7 @@ +@@ -999,6 +1003,7 @@ ;; -avoid-version) + build_old_libs=no avoid_version=yes continue ;; -@@ -1066,6 +1072,10 @@ +@@ -1085,6 +1090,10 @@ deplibs="$deplibs $arg" ;; + -?thread) + deplibs="$deplibs $arg" + ;; + -module) module=yes continue -@@ -1763,6 +1773,9 @@ +@@ -1789,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" -@@ -1785,7 +1798,7 @@ +@@ -1796,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}.*" +@@ -1811,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" -+ oldlibs="$oldlibs $output_objdir/$libname$release.$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` -@@ -1979,7 +1992,7 @@ +@@ -2005,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" -+ oldlibs="$output_objdir/$libname$release.$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 -@@ -2933,7 +2946,7 @@ +@@ -3026,7 +3134,11 @@ case "$output" in *.la) old_library= - test "$build_old_libs" = yes && old_library="$libname.$libext" -+ test "$build_old_libs" = yes && old_library="$libname$release.$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 -@@ -3230,10 +3243,12 @@ +@@ -3315,10 +3427,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" -@@ -3322,7 +3337,6 @@ +@@ -3407,7 +3521,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 Property changes on: head/devel/libtool15/files/patch-ad ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.4 \ No newline at end of property +1.5 \ No newline at end of property Index: head/devel/libtool15/files/patch-ae =================================================================== --- head/devel/libtool15/files/patch-ae (revision 21647) +++ head/devel/libtool15/files/patch-ae (revision 21648) @@ -1,13 +1,13 @@ ---- configure.orig Fri Feb 19 00:50:06 1999 -+++ configure Fri Feb 19 00:50:21 1999 -@@ -5288,10 +5288,6 @@ +--- configure.orig Fri Jul 2 09:01:56 1999 ++++ configure Tue Aug 31 23:45:29 1999 +@@ -1853,10 +1853,6 @@ *) # Relative path. ac_sub_cache_file="$ac_dots$cache_file" ;; esac - case "$ac_given_INSTALL" in - [/$]*) INSTALL="$ac_given_INSTALL" ;; - *) INSTALL="$ac_dots$ac_given_INSTALL" ;; - esac echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir" # The eval makes quoting arguments work. Property changes on: head/devel/libtool15/files/patch-ae ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/devel/libtool15/files/patch-af =================================================================== --- head/devel/libtool15/files/patch-af (nonexistent) +++ head/devel/libtool15/files/patch-af (revision 21648) @@ -0,0 +1,24 @@ +--- libltdl/Makefile.in.orig Fri Jul 2 09:02:06 1999 ++++ libltdl/Makefile.in Thu Sep 9 22:40:10 1999 +@@ -328,17 +328,16 @@ + distdir: $(DISTFILES) + -rm -rf $(distdir) + mkdir $(distdir) +- -chmod 777 $(distdir) ++ -chmod 555 $(distdir) + @for file in $(DISTFILES); do \ + d=$(srcdir); \ + if test -d $$d/$$file; then \ +- cp -pr $$/$$file $(distdir)/$$file; \ ++ echo no copy dir $$d/$$file; \ + else \ +- test -f $(distdir)/$$file \ +- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ +- || cp -p $$d/$$file $(distdir)/$$file || :; \ ++ install -c -o root -g wheel -m 444 $$d/$$file $(distdir)/$$file; \ + fi; \ + done ++ -chmod a+x $(distdir)/configure + info-am: + info: info-am + dvi-am: Property changes on: head/devel/libtool15/files/patch-af ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property