pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang Stop treating FreeBSD 10 as FreeBSD 1.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/8af6f6cf3ba8
branches:  trunk
changeset: 632216:8af6f6cf3ba8
user:      asau <asau%pkgsrc.org@localhost>
date:      Wed Mar 19 21:50:22 2014 +0000

description:
Stop treating FreeBSD 10 as FreeBSD 1.
This lets a number of PHP extensions build.
Bump package revision.

diffstat:

 lang/php54/Makefile                       |   3 +-
 lang/php54/distinfo                       |   6 ++-
 lang/php54/patches/patch-aclocal.m4       |  40 +++++++++++++++++++++
 lang/php54/patches/patch-build_libtool.m4 |  40 +++++++++++++++++++++
 lang/php54/patches/patch-configure        |  58 +++++++++++++++++++++++++++++-
 lang/php55/Makefile                       |   3 +-
 lang/php55/distinfo                       |   6 ++-
 lang/php55/patches/patch-aclocal.m4       |  40 +++++++++++++++++++++
 lang/php55/patches/patch-build_libtool.m4 |  40 +++++++++++++++++++++
 lang/php55/patches/patch-configure        |  58 +++++++++++++++++++++++++++++-
 10 files changed, 284 insertions(+), 10 deletions(-)

diffs (truncated from 382 to 300 lines):

diff -r 036f5fa62759 -r 8af6f6cf3ba8 lang/php54/Makefile
--- a/lang/php54/Makefile       Wed Mar 19 21:48:54 2014 +0000
+++ b/lang/php54/Makefile       Wed Mar 19 21:50:22 2014 +0000
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.18 2014/03/09 14:08:17 taca Exp $
+# $NetBSD: Makefile,v 1.19 2014/03/19 21:50:22 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 -r 036f5fa62759 -r 8af6f6cf3ba8 lang/php54/distinfo
--- a/lang/php54/distinfo       Wed Mar 19 21:48:54 2014 +0000
+++ b/lang/php54/distinfo       Wed Mar 19 21:50:22 2014 +0000
@@ -1,10 +1,12 @@
-$NetBSD: distinfo,v 1.34 2014/03/09 14:08:17 taca Exp $
+$NetBSD: distinfo,v 1.35 2014/03/19 21:50:22 asau Exp $
 
 SHA1 (php-5.4.26.tar.bz2) = d8b309f4891e2a0a8061a518162fa267e0304a01
 RMD160 (php-5.4.26.tar.bz2) = 5714914bd6704234b87b28faa66ded286f35e712
 Size (php-5.4.26.tar.bz2) = 12270535 bytes
 SHA1 (patch-acinclude.m4) = 71635e5381abf99a9fc9f2537b1c2f18e8096f00
-SHA1 (patch-configure) = 592b4521f78d7dbfa666dab21e85a64196c3978c
+SHA1 (patch-aclocal.m4) = eae2ed8ea2985933c4fe88ba52577c14ac88eb92
+SHA1 (patch-build_libtool.m4) = 6dfef7c07a42dc54611c104265ef43c50a4e88ca
+SHA1 (patch-configure) = 361f943d4aa2ef18335091f3c7ebcc5c17b37810
 SHA1 (patch-ext_gd_config.m4) = 2353efe6f25e1081b41d61033c3185cc643c7891
 SHA1 (patch-ext_imap_config.m4) = 01681e8b54ee586ec4db72a5da2d0aec3fa89fcc
 SHA1 (patch-ext_mssql_php__mssql.c) = 732e48b05086180585a3087c2e9737db557dbc3b
diff -r 036f5fa62759 -r 8af6f6cf3ba8 lang/php54/patches/patch-aclocal.m4
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/php54/patches/patch-aclocal.m4       Wed Mar 19 21:50:22 2014 +0000
@@ -0,0 +1,40 @@
+$NetBSD: patch-aclocal.m4,v 1.1 2014/03/19 21:50:23 asau Exp $
+
+--- aclocal.m4.orig    2014-03-05 08:26:32.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
+@@ -6173,7 +6173,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
+     ;;
+@@ -8856,7 +8856,7 @@ _LT_EOF
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+       ;;
+ 
+-    freebsd1*)
++    freebsd1|freebsd1.*)
+       _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       ;;
+ 
diff -r 036f5fa62759 -r 8af6f6cf3ba8 lang/php54/patches/patch-build_libtool.m4
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/php54/patches/patch-build_libtool.m4 Wed Mar 19 21:50:22 2014 +0000
@@ -0,0 +1,40 @@
+$NetBSD: patch-build_libtool.m4,v 1.1 2014/03/19 21:50:23 asau Exp $
+
+--- build/libtool.m4.orig      2014-03-05 08:07:14.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
+       ;;
+ 
diff -r 036f5fa62759 -r 8af6f6cf3ba8 lang/php54/patches/patch-configure
--- a/lang/php54/patches/patch-configure        Wed Mar 19 21:48:54 2014 +0000
+++ b/lang/php54/patches/patch-configure        Wed Mar 19 21:50:22 2014 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-configure,v 1.5 2014/01/11 17:03:57 taca Exp $
+$NetBSD: patch-configure,v 1.6 2014/03/19 21:50:23 asau Exp $
 
---- configure.orig     2014-01-08 02:58:52.000000000 +0000
+--- configure.orig     2014-03-05 08:26:39.000000000 +0000
 +++ configure
 @@ -23554,7 +23554,7 @@ fi
      if test "$found_openssl" = "no"; then
@@ -52,3 +52,57 @@
  fi
  
  if test "$PHP_THREAD_SAFETY" = "yes" && test "$PHP_MYSQL" = "yes"; then
+@@ -108735,7 +108730,7 @@ if test -z "$aix_libpath"; then aix_libp
+       hardcode_shlibpath_var=no
+       ;;
+ 
+-    freebsd1*)
++    freebsd1|freebsd1.*)
+       ld_shlibs=no
+       ;;
+ 
+@@ -109384,7 +109379,7 @@ dgux*)
+   shlibpath_var=LD_LIBRARY_PATH
+   ;;
+ 
+-freebsd1*)
++freebsd1|freebsd1.*)
+   dynamic_linker=no
+   ;;
+ 
+@@ -109395,7 +109390,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
+@@ -111475,7 +111470,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
+     ;;
+@@ -113021,7 +113016,7 @@ dgux*)
+   shlibpath_var=LD_LIBRARY_PATH
+   ;;
+ 
+-freebsd1*)
++freebsd1|freebsd1.*)
+   dynamic_linker=no
+   ;;
+ 
+@@ -113032,7 +113027,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 -r 036f5fa62759 -r 8af6f6cf3ba8 lang/php55/Makefile
--- a/lang/php55/Makefile       Wed Mar 19 21:48:54 2014 +0000
+++ b/lang/php55/Makefile       Wed Mar 19 21:50:22 2014 +0000
@@ -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 -r 036f5fa62759 -r 8af6f6cf3ba8 lang/php55/distinfo
--- a/lang/php55/distinfo       Wed Mar 19 21:48:54 2014 +0000
+++ b/lang/php55/distinfo       Wed Mar 19 21:50:22 2014 +0000
@@ -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 -r 036f5fa62759 -r 8af6f6cf3ba8 lang/php55/patches/patch-aclocal.m4
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/php55/patches/patch-aclocal.m4       Wed Mar 19 21:50:22 2014 +0000
@@ -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 -r 036f5fa62759 -r 8af6f6cf3ba8 lang/php55/patches/patch-build_libtool.m4
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/php55/patches/patch-build_libtool.m4 Wed Mar 19 21:50:22 2014 +0000
@@ -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]].*)



Home | Main Index | Thread Index | Old Index