FreeBSD 10 is not FreeBSD 1.

3 files changed, 72 insertions, 4 deletions

diff --git a/chat/silc-client/distinfo b/chat/silc-client/distinfo
index dad3d4e3b60..081e9c8ae22 100644
--- a/chat/silc-client/distinfo
+++ b/chat/silc-client/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.39 2013/10/27 20:30:44 joerg Exp $
+$NetBSD: distinfo,v 1.40 2014/04/23 20:31:45 asau Exp $
 
 SHA1 (silc-client-1.1.8.tar.bz2) = 5936ab682e746ae413f938ce9c9b72215d6524c0
 RMD160 (silc-client-1.1.8.tar.bz2) = a010384b5e498a62cc6cd69e97602f3118b64d2f
@@ -6,9 +6,10 @@ Size (silc-client-1.1.8.tar.bz2) = 1532816 bytes
 SHA1 (patch-aa) = 52cc285982176c1680f74059de47d1bde456a871
 SHA1 (patch-ab) = 40aa1a2722d483afd99a27dc65f715b5bae30ea5
 SHA1 (patch-ac) = 576299d98ea63f6c42cc341bf31ad7ec903f93c8
+SHA1 (patch-aclocal.m4) = 029e5e61b9801f6a1f968538ec6364d37f3c44c6
 SHA1 (patch-ad) = 490e3b2a99e14683b9a0005494d29b5a91186755
 SHA1 (patch-ae) = c5b21eb9d65cb0bbc685f5e771849f1ccf07681b
 SHA1 (patch-af) = 29738fac989989fdd2a8865f9f5e2b3ea2ed7198
 SHA1 (patch-ag) = f0700879a6780283f62bda7022e89d702876c916
-SHA1 (patch-configure) = 2c8d60e1b29a285f95cd73e77bcb9bfa9192094b
+SHA1 (patch-configure) = fc17c83157a1bb3530c5960cedacc2f02eb19467
 SHA1 (patch-configure.ac) = c3f770c7b0199233a65181f77b55436bc76f0907
diff --git a/chat/silc-client/patches/patch-aclocal.m4 b/chat/silc-client/patches/patch-aclocal.m4
new file mode 100644
index 00000000000..5ef04818687
--- /dev/null
+++ b/chat/silc-client/patches/patch-aclocal.m4
@@ -0,0 +1,40 @@
+$NetBSD: patch-aclocal.m4,v 1.1 2014/04/23 20:31:45 asau Exp $
+
+--- aclocal.m4.orig	2014-04-23 08:57:37.216137000 +0000
++++ aclocal.m4
+@@ -2301,7 +2301,7 @@ dgux*)
+   shlibpath_var=LD_LIBRARY_PATH
+   ;;
+ 
+-freebsd1*)
++freebsd1|freebsd1.*)
+   dynamic_linker=no
+   ;;
+ 
+@@ -2312,7 +2312,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
+@@ -4735,7 +4735,7 @@ _LT_EOF
+       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+       ;;
+ 
+-    freebsd1*)
++    freebsd1|freebsd1.*)
+       _LT_TAGVAR(ld_shlibs, $1)=no
+       ;;
+ 
+@@ -5693,7 +5693,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
diff --git a/chat/silc-client/patches/patch-configure b/chat/silc-client/patches/patch-configure
index fb6c3a91928..960aa04554b 100644
--- a/chat/silc-client/patches/patch-configure
+++ b/chat/silc-client/patches/patch-configure
@@ -1,7 +1,34 @@
-$NetBSD: patch-configure,v 1.1 2013/10/27 20:30:44 joerg Exp $
+$NetBSD: patch-configure,v 1.2 2014/04/23 20:31:45 asau Exp $
 
---- configure.orig	2013-10-17 11:14:11.000000000 +0000
+--- configure.orig	2009-08-01 06:53:41.000000000 +0000
 +++ configure
+@@ -9245,7 +9245,7 @@ if test -z "$aix_libpath"; then aix_libp
+       hardcode_shlibpath_var=no
+       ;;
+ 
+-    freebsd1*)
++    freebsd1|freebsd1.*)
+       ld_shlibs=no
+       ;;
+ 
+@@ -10146,7 +10146,7 @@ dgux*)
+   shlibpath_var=LD_LIBRARY_PATH
+   ;;
+ 
+-freebsd1*)
++freebsd1|freebsd1.*)
+   dynamic_linker=no
+   ;;
+ 
+@@ -10157,7 +10157,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
 @@ -22229,7 +22229,6 @@ esac
  fi