remove useless FreeBSD patch and fixup PLIST

This commit is contained in:
brad 1999-04-06 22:30:04 +00:00
parent a531c0f122
commit 187b72fd6f
3 changed files with 40 additions and 45 deletions

View File

@ -1,44 +0,0 @@
--- ltmain.sh.orig Wed Sep 23 23:37:14 1998
+++ ltmain.sh Wed Sep 23 23:38:02 1998
@@ -967,6 +967,16 @@
versuffix="$current.$revision"
;;
+ freebsd)
+ version_vars="$version_vars major versuffix"
+ major="$current"
+ if [ $PORTOBJFORMAT = elf ]; then
+ versuffix="$current";
+ else
+ versuffix="$current.$revision";
+ fi
+ ;;
+
*)
$echo "$modename: unknown library version type \`$version_type'" 1>&2
echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
--- ltconfig.orig Wed Sep 23 23:37:18 1998
+++ ltconfig Wed Sep 23 23:39:06 1998
@@ -1123,10 +1123,21 @@
finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
;;
-freebsd2* | freebsd3*)
+freebsd2*)
version_type=sunos
library_names_spec='${libname}${release}.so.$versuffix $libname.so'
finish_cmds='PATH="$PATH:/sbin" ldconfig -m $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+
+freebsd3*)
+ version_type=freebsd
+ library_names_spec='${libname}${release}.so.$versuffix $libname.so'
+ if [ $PORTOBJFORMAT = elf ]; then
+ finish_cmds='PATH="$PATH:/sbin" OBJFORMAT="$PORTOBJFORMAT" ldconfig -m $libdir'
+ else
+ finish_cmds='PATH="$PATH:/sbin" ldconfig -m $libdir'
+ fi
shlibpath_var=LD_LIBRARY_PATH
;;

View File

@ -0,0 +1,40 @@
--- ltmain.sh.orig Tue Apr 6 17:30:27 1999
+++ ltmain.sh Tue Apr 6 17:30:43 1999
@@ -2023,37 +2023,6 @@
done
fi
- echo "------------------------------------------------------------------------------"
- echo "Libraries have been installed in:"
- for libdir in $libdirs; do
- echo " $libdir"
- done
- echo
- echo "To link against installed libraries in a given directory, LIBDIR,"
- echo "you must use the \`-LLIBDIR' flag during linking."
- echo
- echo " You will also need to do one of the following:"
- if test -n "$shlibpath_var"; then
- echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
- echo " during execution"
- fi
- if test -n "$runpath_var"; then
- echo " - add LIBDIR to the \`$runpath_var' environment variable"
- echo " during linking"
- fi
- if test -n "$hardcode_libdir_flag_spec"; then
- libdir=LIBDIR
- eval flag=\"$hardcode_libdir_flag_spec\"
-
- echo " - use the \`$flag' linker flag"
- fi
- if test -f /etc/ld.so.conf; then
- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
- fi
- echo
- echo "See any operating system documentation about shared libraries for"
- echo "more information, such as the ld(1) and ld.so(8) manual pages."
- echo "------------------------------------------------------------------------------"
exit 0
;;

View File

@ -10,4 +10,3 @@ share/libtool/config.sub
share/libtool/ltconfig
share/libtool/ltmain.sh
@dirrm share/libtool
@unexec rmdir %D/share/aclocal 2>/dev/null || true