--- auxdir/ltmain.sh.orig	Sat Sep 19 10:47:03 1998
+++ auxdir/ltmain.sh	Sat Sep 19 10:51:53 1998
@@ -972,6 +972,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
--- auxdir/ltconfig.orig	Sat Sep 19 10:46:55 1998
+++ auxdir/ltconfig	Sat Sep 19 10:50:30 1998
@@ -1155,10 +1155,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
   ;;