FreeBSD 10 is not FreeBSD 1.

3 files changed, 99 insertions, 4 deletions

diff --git a/databases/db5/distinfo b/databases/db5/distinfo
index 6c975f42cf1..215dfb47737 100644
--- a/databases/db5/distinfo
+++ b/databases/db5/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.8 2012/05/31 09:37:20 adam Exp $
+$NetBSD: distinfo,v 1.9 2014/04/22 14:42:35 asau Exp $
 
 SHA1 (db-5.3.21.tar.gz) = 32e43c4898c8996750c958a90c174bd116fcba83
 RMD160 (db-5.3.21.tar.gz) = 5768a4d835d02020165c6561cc5c406339662fa0
 Size (db-5.3.21.tar.gz) = 35062469 bytes
 SHA1 (patch-aa) = 9450e95f46787ddc1d661beaa239ea0ff4673f20
-SHA1 (patch-ab) = 92cb9722e3bb6cdadbd7a542157b4fee69564d78
+SHA1 (patch-ab) = b09fac68d7d847c5660078de90a16f27268e9858
 SHA1 (patch-ac) = 0a243583ae2b66290fb83b112c539001bf3feef2
+SHA1 (patch-dist_aclocal_libtool.m4) = 2d56b318b4f0d14a9352f6c1eb14a4c2b8315fc0
 SHA1 (patch-src_dbinc_atomic.h) = 6d1e97317c20021d13ff5b59f587730301b4a795
diff --git a/databases/db5/patches/patch-ab b/databases/db5/patches/patch-ab
index b1ad937e23c..c8556c21758 100644
--- a/databases/db5/patches/patch-ab
+++ b/databases/db5/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.4 2012/01/18 13:46:50 adam Exp $
+$NetBSD: patch-ab,v 1.5 2014/04/22 14:42:35 asau Exp $
 
---- dist/configure.orig	2011-12-20 01:00:49.000000000 +0000
+--- dist/configure.orig	2012-05-11 17:57:48.000000000 +0000
 +++ dist/configure
 @@ -5112,7 +5112,7 @@ bsdi3*)	CC=${CC-"shlicc2"}
  	LIBSO_LIBS="$LIBSO_LIBS -lipc";;
@@ -20,6 +20,60 @@ $NetBSD: patch-ab,v 1.4 2012/01/18 13:46:50 adam Exp $
  		CPPFLAGS="$CPPFLAGS -pthread"
  		LDFLAGS="$LDFLAGS -pthread"
  	else
+@@ -12227,7 +12227,7 @@ fi
+       hardcode_shlibpath_var=no
+       ;;
+ 
+-    freebsd1*)
++    freebsd1|freebsd1.*)
+       ld_shlibs=no
+       ;;
+ 
+@@ -13221,7 +13221,7 @@ dgux*)
+   shlibpath_var=LD_LIBRARY_PATH
+   ;;
+ 
+-freebsd1*)
++freebsd1|freebsd1.*)
+   dynamic_linker=no
+   ;;
+ 
+@@ -13232,7 +13232,7 @@ freebsd* | dragonfly*)
+     objformat=`/usr/bin/objformat`
+   else
+     case $host_os in
+-    freebsd[123]*) objformat=aout ;;
++    freebsd[123]|freebsd[123].*) objformat=aout ;;
+     *) objformat=elf ;;
+     esac
+   fi
+@@ -15190,7 +15190,7 @@ fi
+         esac
+         ;;
+ 
+-      freebsd[12]*)
++      freebsd[12]|freebsd[12].*)
+         # C++ shared libraries reported to be fairly broken before
+ 	# switch to ELF
+         ld_shlibs_CXX=no
+@@ -17054,7 +17054,7 @@ dgux*)
+   shlibpath_var=LD_LIBRARY_PATH
+   ;;
+ 
+-freebsd1*)
++freebsd1|freebsd1.*)
+   dynamic_linker=no
+   ;;
+ 
+@@ -17065,7 +17065,7 @@ freebsd* | dragonfly*)
+     objformat=`/usr/bin/objformat`
+   else
+     case $host_os in
+-    freebsd[123]*) objformat=aout ;;
++    freebsd[123]|freebsd[123].*) objformat=aout ;;
+     *) objformat=elf ;;
+     esac
+   fi
 @@ -17712,7 +17712,7 @@ LIBTOOL="./libtool"
  INSTALLER="\$(LIBTOOL) --mode=install cp -p"
  
diff --git a/databases/db5/patches/patch-dist_aclocal_libtool.m4 b/databases/db5/patches/patch-dist_aclocal_libtool.m4
new file mode 100644
index 00000000000..f468fd8917e
--- /dev/null
+++ b/databases/db5/patches/patch-dist_aclocal_libtool.m4
@@ -0,0 +1,40 @@
+$NetBSD: patch-dist_aclocal_libtool.m4,v 1.1 2014/04/22 14:42:35 asau Exp $
+
+--- dist/aclocal/libtool.m4.orig	2012-05-11 17:57:48.000000000 +0000
++++ dist/aclocal/libtool.m4
+@@ -2406,7 +2406,7 @@ dgux*)
+   shlibpath_var=LD_LIBRARY_PATH
+   ;;
+ 
+-freebsd1*)
++freebsd1|freebsd1.*)
+   dynamic_linker=no
+   ;;
+ 
+@@ -2417,7 +2417,7 @@ freebsd* | dragonfly*)
+     objformat=`/usr/bin/objformat`
+   else
+     case $host_os in
+-    freebsd[[123]]*) objformat=aout ;;
++    freebsd[[123]]|freebsd[[123]].*) objformat=aout ;;
+     *) objformat=elf ;;
+     esac
+   fi
+@@ -5110,7 +5110,7 @@ _LT_EOF
+       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+       ;;
+ 
+-    freebsd1*)
++    freebsd1|freebsd1.*)
+       _LT_TAGVAR(ld_shlibs, $1)=no
+       ;;
+ 
+@@ -6137,7 +6137,7 @@ if test "$_lt_caught_CXX_error" != yes; 
+         esac
+         ;;
+ 
+-      freebsd[[12]]*)
++      freebsd[[12]]|freebsd[[12]].*)
+         # C++ shared libraries reported to be fairly broken before
+ 	# switch to ELF
+         _LT_TAGVAR(ld_shlibs, $1)=no