CVS commit: pkgsrc/lang

["Emmanuel Dreyfus" <manu%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   manu
Date:           Wed Jul 12 09:11:36 UTC 2017

Modified Files:
        pkgsrc/lang/php56: Makefile.php
        pkgsrc/lang/php70: Makefile.php
        pkgsrc/lang/php71: Makefile.php

Log Message:
Back out the calendar option for PHP

The functionnality is already avaialable from pkgsrc/time/php-calendar
moduke. Thnaks to Takahiro Kambe for pointing it out.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/php56/Makefile.php
cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/php70/Makefile.php
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/php71/Makefile.php

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/php56/Makefile.php
diff -u pkgsrc/lang/php56/Makefile.php:1.3 pkgsrc/lang/php56/Makefile.php:1.4
--- pkgsrc/lang/php56/Makefile.php:1.3  Tue Jul 11 03:28:08 2017
+++ pkgsrc/lang/php56/Makefile.php      Wed Jul 12 09:11:35 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.3 2017/07/11 03:28:08 manu Exp $
+# $NetBSD: Makefile.php,v 1.4 2017/07/12 09:11:35 manu Exp $
 # used by lang/php56/Makefile
 # used by www/ap-php/Makefile
 # used by www/php-fpm/Makefile
@@ -42,7 +42,7 @@ CONFIGURE_ARGS+=      --with-libxml-dir=${PRE
 .include "../../textproc/libxml2/buildlink3.mk"
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.${PHP_PKG_PREFIX}
-PKG_SUPPORTED_OPTIONS+=        inet6 ssl maintainer-zts readline calendar
+PKG_SUPPORTED_OPTIONS+=        inet6 ssl maintainer-zts readline
 PKG_SUGGESTED_OPTIONS+=        inet6 ssl
 
 .if ${OPSYS} == "SunOS" || ${OPSYS} == "Darwin" || ${OPSYS} == "FreeBSD"
@@ -89,9 +89,5 @@ CONFIGURE_ARGS+=      --enable-dtrace
 INSTALL_MAKE_FLAGS+=   -r
 .endif
 
-.if !empty(PKG_OPTIONS:Mcalendar)
-CONFIGURE_ARGS+=        --enable-calendar
-.endif
-
 DL_AUTO_VARS=          yes
 .include "../../mk/dlopen.buildlink3.mk"

Index: pkgsrc/lang/php70/Makefile.php
diff -u pkgsrc/lang/php70/Makefile.php:1.5 pkgsrc/lang/php70/Makefile.php:1.6
--- pkgsrc/lang/php70/Makefile.php:1.5  Tue Jul 11 03:28:08 2017
+++ pkgsrc/lang/php70/Makefile.php      Wed Jul 12 09:11:35 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.5 2017/07/11 03:28:08 manu Exp $
+# $NetBSD: Makefile.php,v 1.6 2017/07/12 09:11:35 manu Exp $
 # used by lang/php70/Makefile
 # used by www/ap-php/Makefile
 # used by www/php-fpm/Makefile
@@ -45,7 +45,7 @@ CONFIGURE_ARGS+=      --with-libxml-dir=${PRE
 .include "../../textproc/libxml2/buildlink3.mk"
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.${PHP_PKG_PREFIX}
-PKG_SUPPORTED_OPTIONS+=        inet6 ssl maintainer-zts readline calendar
+PKG_SUPPORTED_OPTIONS+=        inet6 ssl maintainer-zts readline
 PKG_SUGGESTED_OPTIONS+=        inet6 ssl
 
 .if ${OPSYS} == "SunOS" || ${OPSYS} == "Darwin" || ${OPSYS} == "FreeBSD"
@@ -92,9 +92,5 @@ CONFIGURE_ARGS+=      --enable-dtrace
 INSTALL_MAKE_FLAGS+=   -r
 .endif
 
-.if !empty(PKG_OPTIONS:Mcalendar)
-CONFIGURE_ARGS+=        --enable-calendar
-.endif
-
 DL_AUTO_VARS=          yes
 .include "../../mk/dlopen.buildlink3.mk"

Index: pkgsrc/lang/php71/Makefile.php
diff -u pkgsrc/lang/php71/Makefile.php:1.4 pkgsrc/lang/php71/Makefile.php:1.5
--- pkgsrc/lang/php71/Makefile.php:1.4  Tue Jul 11 03:28:09 2017
+++ pkgsrc/lang/php71/Makefile.php      Wed Jul 12 09:11:36 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.4 2017/07/11 03:28:09 manu Exp $
+# $NetBSD: Makefile.php,v 1.5 2017/07/12 09:11:36 manu Exp $
 # used by lang/php71/Makefile
 # used by www/ap-php/Makefile
 # used by www/php-fpm/Makefile
@@ -45,7 +45,7 @@ CONFIGURE_ARGS+=      --with-libxml-dir=${PRE
 .include "../../textproc/libxml2/buildlink3.mk"
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.${PHP_PKG_PREFIX}
-PKG_SUPPORTED_OPTIONS+=        inet6 ssl maintainer-zts readline calendar
+PKG_SUPPORTED_OPTIONS+=        inet6 ssl maintainer-zts readline
 PKG_SUGGESTED_OPTIONS+=        inet6 ssl
 
 .if ${OPSYS} == "SunOS" || ${OPSYS} == "Darwin" || ${OPSYS} == "FreeBSD"
@@ -92,9 +92,5 @@ CONFIGURE_ARGS+=      --enable-dtrace
 INSTALL_MAKE_FLAGS+=   -r
 .endif
 
-.if !empty(PKG_OPTIONS:Mcalendar)
-CONFIGURE_ARGS+=        --enable-calendar
-.endif
-
 DL_AUTO_VARS=          yes
 .include "../../mk/dlopen.buildlink3.mk"