Stop treating FreeBSD 10 as FreeBSD 1.

This lets a number of PHP extensions build.
Bump package revision.

5 files changed, 142 insertions, 5 deletions

diff --git a/lang/php55/Makefile b/lang/php55/Makefile
index 31a4701b87e..4e10c4dbd94 100644
--- a/lang/php55/Makefile
+++ b/lang/php55/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.9 2014/03/09 14:09:20 taca Exp $
+# $NetBSD: Makefile,v 1.10 2014/03/19 21:56:31 asau Exp $
 
 #
 # We can't omit PKGNAME here to handle PKG_OPTIONS.
 #
 PKGNAME=		php-${PHP_BASE_VERS}
+PKGREVISION=		1
 CATEGORIES=		lang
 
 HOMEPAGE=		http://www.php.net/
diff --git a/lang/php55/distinfo b/lang/php55/distinfo
index 8d2a731482f..a853420ee11 100644
--- a/lang/php55/distinfo
+++ b/lang/php55/distinfo
@@ -1,10 +1,12 @@
-$NetBSD: distinfo,v 1.15 2014/03/09 14:09:20 taca Exp $
+$NetBSD: distinfo,v 1.16 2014/03/19 21:56:31 asau Exp $
 
 SHA1 (php-5.5.10.tar.bz2) = 833cf2a7f5428e95b92c28b6440211f9bd0c7937
 RMD160 (php-5.5.10.tar.bz2) = 9f3a5a4521304bb9e9aa2846f0834a7a28d1f704
 Size (php-5.5.10.tar.bz2) = 13102742 bytes
 SHA1 (patch-acinclude.m4) = 9e9c433e4cb96e469f7cf14b2064a0f41fc4568a
-SHA1 (patch-configure) = 5e7e78fe0cdfdb76cb2cdf77ad8774becb2426a0
+SHA1 (patch-aclocal.m4) = 14ae2898e1d68b552e76a7e4ee7006f1aee1f932
+SHA1 (patch-build_libtool.m4) = 6ee935c55cc01704c6e9edb4e383b2ddb7c746e7
+SHA1 (patch-configure) = 8d8af34ce99d91f8086079963b31b145caab66d3
 SHA1 (patch-ext_gd_config.m4) = 91c9798333d4776856a0a9e20196986856b758b2
 SHA1 (patch-ext_imap_config.m4) = 01681e8b54ee586ec4db72a5da2d0aec3fa89fcc
 SHA1 (patch-ext_mssql_php__mssql.c) = 4ef1837850443e9db2e71620a3ddaed5ab5c435b
diff --git a/lang/php55/patches/patch-aclocal.m4 b/lang/php55/patches/patch-aclocal.m4
new file mode 100644
index 00000000000..90178766cd1
--- /dev/null
+++ b/lang/php55/patches/patch-aclocal.m4
@@ -0,0 +1,40 @@
+$NetBSD: patch-aclocal.m4,v 1.1 2014/03/19 21:56:31 asau Exp $
+
+--- aclocal.m4.orig	2014-03-05 10:52:28.000000000 +0000
++++ aclocal.m4
+@@ -4546,7 +4546,7 @@ dgux*)
+   shlibpath_var=LD_LIBRARY_PATH
+   ;;
+ 
+-freebsd1*)
++freebsd1|freebsd1.*)
+   dynamic_linker=no
+   ;;
+ 
+@@ -4557,7 +4557,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
+@@ -6174,7 +6174,7 @@ case $host_os in
+ 	;;
+     esac
+     ;;
+-  freebsd[[12]]*)
++  freebsd[[12]]|freebsd[[12]].*)
+     # C++ shared libraries reported to be fairly broken before switch to ELF
+     _LT_AC_TAGVAR(ld_shlibs, $1)=no
+     ;;
+@@ -8857,7 +8857,7 @@ _LT_EOF
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       ;;
+ 
+-    freebsd1*)
++    freebsd1|freebsd1.*)
+       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       ;;
+ 
diff --git a/lang/php55/patches/patch-build_libtool.m4 b/lang/php55/patches/patch-build_libtool.m4
new file mode 100644
index 00000000000..6a328bba7d1
--- /dev/null
+++ b/lang/php55/patches/patch-build_libtool.m4
@@ -0,0 +1,40 @@
+$NetBSD: patch-build_libtool.m4,v 1.1 2014/03/19 21:56:31 asau Exp $
+
+--- build/libtool.m4.orig	2014-03-05 10:18:00.000000000 +0000
++++ build/libtool.m4
+@@ -1532,7 +1532,7 @@ dgux*)
+   shlibpath_var=LD_LIBRARY_PATH
+   ;;
+ 
+-freebsd1*)
++freebsd1|freebsd1.*)
+   dynamic_linker=no
+   ;;
+ 
+@@ -1543,7 +1543,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
+@@ -3160,7 +3160,7 @@ case $host_os in
+ 	;;
+     esac
+     ;;
+-  freebsd[[12]]*)
++  freebsd[[12]]|freebsd[[12]].*)
+     # C++ shared libraries reported to be fairly broken before switch to ELF
+     _LT_AC_TAGVAR(ld_shlibs, $1)=no
+     ;;
+@@ -5843,7 +5843,7 @@ _LT_EOF
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       ;;
+ 
+-    freebsd1*)
++    freebsd1|freebsd1.*)
+       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       ;;
+ 
diff --git a/lang/php55/patches/patch-configure b/lang/php55/patches/patch-configure
index 966901d9105..47a51d8713e 100644
--- a/lang/php55/patches/patch-configure
+++ b/lang/php55/patches/patch-configure
@@ -1,6 +1,6 @@
-$NetBSD: patch-configure,v 1.4 2014/01/11 17:05:09 taca Exp $
+$NetBSD: patch-configure,v 1.5 2014/03/19 21:56:31 asau Exp $
 
---- configure.orig	2014-01-08 10:33:50.000000000 +0000
+--- configure.orig	2014-03-05 10:52:32.000000000 +0000
 +++ configure
 @@ -23604,7 +23604,7 @@ fi
      if test "$found_openssl" = "no"; then
@@ -61,3 +61,57 @@ $NetBSD: patch-configure,v 1.4 2014/01/11 17:05:09 taca Exp $
  fi
  
  if test "$PHP_THREAD_SAFETY" = "yes" && test "$PHP_MYSQL" = "yes"; then
+@@ -107703,7 +107698,7 @@ if test -z "$aix_libpath"; then aix_libp
+       hardcode_shlibpath_var=no
+       ;;
+ 
+-    freebsd1*)
++    freebsd1|freebsd1.*)
+       ld_shlibs=no
+       ;;
+ 
+@@ -108352,7 +108347,7 @@ dgux*)
+   shlibpath_var=LD_LIBRARY_PATH
+   ;;
+ 
+-freebsd1*)
++freebsd1|freebsd1.*)
+   dynamic_linker=no
+   ;;
+ 
+@@ -108363,7 +108358,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
+@@ -110443,7 +110438,7 @@ if test -z "$aix_libpath"; then aix_libp
+ 	;;
+     esac
+     ;;
+-  freebsd[12]*)
++  freebsd[12]|freebsd[12].*)
+     # C++ shared libraries reported to be fairly broken before switch to ELF
+     ld_shlibs_CXX=no
+     ;;
+@@ -111989,7 +111984,7 @@ dgux*)
+   shlibpath_var=LD_LIBRARY_PATH
+   ;;
+ 
+-freebsd1*)
++freebsd1|freebsd1.*)
+   dynamic_linker=no
+   ;;
+ 
+@@ -112000,7 +111995,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