Stop treating FreeBSD 10 as FreeBSD 1.

This lets multiple PHP modules to build on FreeBSD.

5 files changed, 148 insertions, 12 deletions

diff --git a/lang/php53/Makefile b/lang/php53/Makefile
index a0af6c6b02c..3caebbd5aab 100644
--- a/lang/php53/Makefile
+++ b/lang/php53/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.46 2014/02/12 23:18:05 tron Exp $
+# $NetBSD: Makefile,v 1.47 2014/03/12 19:52:04 asau Exp $
 
 #
 # We can't omit PKGNAME here to handle PKG_OPTIONS.
 #
 PKGNAME=		php-${PHP_BASE_VERS}
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		lang
 
 HOMEPAGE=		http://www.php.net/
diff --git a/lang/php53/distinfo b/lang/php53/distinfo
index 6afa70308da..47b891d253a 100644
--- a/lang/php53/distinfo
+++ b/lang/php53/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.70 2013/12/13 15:30:35 taca Exp $
+$NetBSD: distinfo,v 1.71 2014/03/12 19:52:04 asau Exp $
 
 SHA1 (php-5.3.28.tar.bz2) = f985ca1f6a5f49ebfb25a08f1837a44c563b31f8
 RMD160 (php-5.3.28.tar.bz2) = e4910c0c365f39a5009807801bd5ee6e25be020d
@@ -7,8 +7,9 @@ SHA1 (suhosin-patch-5.3.25-0.9.10.patch.bz2) = ce5883b05daf91e8a44fffbfa4d3989ac
 RMD160 (suhosin-patch-5.3.25-0.9.10.patch.bz2) = 6c4d0cfe070802481121be465b66d3cefe44da83
 Size (suhosin-patch-5.3.25-0.9.10.patch.bz2) = 32447 bytes
 SHA1 (patch-aa) = fd930d0d9b1c60e8c7c514cfb6864b61ce4d158d
-SHA1 (patch-ab) = 5e8f0b91426656cb7f9272d17586ce40ab0fb547
+SHA1 (patch-ab) = 36789fea71e316d5c4358e597df1928d94f8ea6a
 SHA1 (patch-ac) = e8a7218d74f2f4093acca2160693c9a245e4cfc7
+SHA1 (patch-aclocal.m4) = 473b76c8575331604d30e24a08c527e15b166778
 SHA1 (patch-ad) = 6b42868f41335ddfa5a8c1e982819166b05e4ad2
 SHA1 (patch-ae) = 3a354cb5c1253eb375041d8ee8549c2f663e6c74
 SHA1 (patch-af) = 4f5aac4c52ce576f4489cb1f06fdb672745a8fdb
@@ -17,6 +18,7 @@ SHA1 (patch-ah) = 697156508da2d837a1ea1a41f036eab4fb87e94b
 SHA1 (patch-ai) = 9659f73eef1b4fcca9b844bdaa785ac6d5e582a1
 SHA1 (patch-aj) = 181658ae523bd60f67750566711fc078b49191b7
 SHA1 (patch-al) = fe534d7d50a529e3c7d0ffed76afdb70bb55a521
+SHA1 (patch-build_libtool.m4) = 6835b90ebd34739440c8eb94ed19ebacdf2ba6a5
 SHA1 (patch-ext_date_lib_parse__iso__intervals.c) = 1243e4cda1d6446ee4f8b6cab61556fa07837139
 SHA1 (patch-ext_date_lib_parse__iso__intervals.re) = 75d4abd666c17d7d5f8a4ee9e489bf2565f83524
 SHA1 (patch-ext_standard_basic__functions.c) = 017fd25e646af4d7eb2a0bd13b3c8da34eaee8c5
diff --git a/lang/php53/patches/patch-ab b/lang/php53/patches/patch-ab
index c5144492721..fc1e9d36aef 100644
--- a/lang/php53/patches/patch-ab
+++ b/lang/php53/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.7 2013/07/12 00:07:04 taca Exp $
+$NetBSD: patch-ab,v 1.8 2014/03/12 19:52:04 asau Exp $
 
---- configure.orig	2013-07-11 17:08:25.000000000 +0000
+--- configure.orig	2013-12-10 20:13:12.000000000 +0000
 +++ configure
 @@ -14121,7 +14121,7 @@ EOF
    PHP_VAR_SUBST="$PHP_VAR_SUBST SAPI_CGI_PATH"
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.7 2013/07/12 00:07:04 taca Exp $
      
    if test "$PHP_SAPI" != "default"; then
  { echo "configure: error: 
-@@ -23465,7 +23465,7 @@ fi
+@@ -23462,7 +23462,7 @@ fi
      if test "$found_openssl" = "no"; then
    
      if test "$PHP_OPENSSL_DIR" = "yes"; then
@@ -20,7 +20,7 @@ $NetBSD: patch-ab,v 1.7 2013/07/12 00:07:04 taca Exp $
      fi
  
      for i in $PHP_OPENSSL_DIR; do
-@@ -25456,7 +25456,7 @@ echo "configure:25433: checking bundled 
+@@ -25453,7 +25453,7 @@ echo "configure:25433: checking bundled 
      PHP_SQLITE3_CFLAGS="-I@ext_srcdir@/libsqlite $other_flags $threadsafe_flags $debug_flags"
      
    
@@ -29,7 +29,7 @@ $NetBSD: patch-ab,v 1.7 2013/07/12 00:07:04 taca Exp $
        
    
    unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'`
-@@ -36318,7 +36318,7 @@ fi
+@@ -36315,7 +36315,7 @@ fi
      if test "$found_openssl" = "no"; then
    
      if test "$PHP_OPENSSL_DIR" = "yes"; then
@@ -38,7 +38,7 @@ $NetBSD: patch-ab,v 1.7 2013/07/12 00:07:04 taca Exp $
      fi
  
      for i in $PHP_OPENSSL_DIR; do
-@@ -50659,7 +50659,7 @@ fi
+@@ -50656,7 +50656,7 @@ fi
      if test "$found_openssl" = "no"; then
    
      if test "$PHP_OPENSSL_DIR" = "yes"; then
@@ -47,7 +47,7 @@ $NetBSD: patch-ab,v 1.7 2013/07/12 00:07:04 taca Exp $
      fi
  
      for i in $PHP_OPENSSL_DIR; do
-@@ -84777,7 +84777,7 @@ fi
+@@ -84774,7 +84774,7 @@ fi
      if test "$found_openssl" = "no"; then
    
      if test "$PHP_OPENSSL_DIR" = "yes"; then
@@ -56,7 +56,7 @@ $NetBSD: patch-ab,v 1.7 2013/07/12 00:07:04 taca Exp $
      fi
  
      for i in $PHP_OPENSSL_DIR; do
-@@ -107940,12 +107940,7 @@ old_CC=$CC
+@@ -107937,12 +107937,7 @@ old_CC=$CC
  if test "$PHP_THREAD_SAFETY" = "yes" && test -n "$ac_cv_pthreads_cflags"; then
    CXXFLAGS="$CXXFLAGS $ac_cv_pthreads_cflags"
    INLINE_CFLAGS="$INLINE_CFLAGS $ac_cv_pthreads_cflags"
@@ -70,3 +70,57 @@ $NetBSD: patch-ab,v 1.7 2013/07/12 00:07:04 taca Exp $
  fi
  
  if test "$PHP_THREAD_SAFETY" = "yes" && test "$PHP_MYSQL" = "yes"; then
+@@ -110873,7 +110868,7 @@ if test -z "$aix_libpath"; then aix_libp
+       hardcode_shlibpath_var=no
+       ;;
+ 
+-    freebsd1*)
++    freebsd1|freebsd1.*)
+       ld_shlibs=no
+       ;;
+ 
+@@ -111512,7 +111507,7 @@ dgux*)
+   shlibpath_var=LD_LIBRARY_PATH
+   ;;
+ 
+-freebsd1*)
++freebsd1|freebsd1.*)
+   dynamic_linker=no
+   ;;
+ 
+@@ -111523,7 +111518,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
+@@ -113653,7 +113648,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
+     ;;
+@@ -115181,7 +115176,7 @@ dgux*)
+   shlibpath_var=LD_LIBRARY_PATH
+   ;;
+ 
+-freebsd1*)
++freebsd1|freebsd1.*)
+   dynamic_linker=no
+   ;;
+ 
+@@ -115192,7 +115187,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
diff --git a/lang/php53/patches/patch-aclocal.m4 b/lang/php53/patches/patch-aclocal.m4
new file mode 100644
index 00000000000..3d0760a1f83
--- /dev/null
+++ b/lang/php53/patches/patch-aclocal.m4
@@ -0,0 +1,40 @@
+$NetBSD: patch-aclocal.m4,v 1.1 2014/03/12 19:52:04 asau Exp $
+
+--- aclocal.m4.orig	2013-12-10 20:13:10.000000000 +0000
++++ aclocal.m4
+@@ -4424,7 +4424,7 @@ dgux*)
+   shlibpath_var=LD_LIBRARY_PATH
+   ;;
+ 
+-freebsd1*)
++freebsd1|freebsd1.*)
+   dynamic_linker=no
+   ;;
+ 
+@@ -4435,7 +4435,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
+@@ -6051,7 +6051,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
+     ;;
+@@ -8734,7 +8734,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/php53/patches/patch-build_libtool.m4 b/lang/php53/patches/patch-build_libtool.m4
new file mode 100644
index 00000000000..a3bc479ab9c
--- /dev/null
+++ b/lang/php53/patches/patch-build_libtool.m4
@@ -0,0 +1,40 @@
+$NetBSD: patch-build_libtool.m4,v 1.1 2014/03/12 19:52:04 asau Exp $
+
+--- build/libtool.m4.orig	2013-12-10 19:04:57.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
+@@ -3159,7 +3159,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
+     ;;
+@@ -5842,7 +5842,7 @@ _LT_EOF
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       ;;
+ 
+-    freebsd1*)
++    freebsd1|freebsd1.*)
+       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       ;;
+