summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--doc/CHANGES3
-rw-r--r--lang/php5/MESSAGE7
-rw-r--r--lang/php5/Makefile4
-rw-r--r--lang/php5/Makefile.php11
-rw-r--r--meta-pkgs/php4-extensions/Makefile5
-rw-r--r--meta-pkgs/php5-extensions/Makefile5
-rw-r--r--security/Makefile3
-rw-r--r--security/php-openssl/DESCR2
-rw-r--r--security/php-openssl/Makefile20
-rw-r--r--www/ap-php/Makefile4
-rw-r--r--www/php4/MESSAGE5
-rw-r--r--www/php4/Makefile4
-rw-r--r--www/php4/Makefile.php3
13 files changed, 30 insertions, 46 deletions
diff --git a/doc/CHANGES b/doc/CHANGES
index ecdb7d62c89..d3650c094a7 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.11374 2005/10/08 16:05:48 jdolecek Exp $
+$NetBSD: CHANGES,v 1.11375 2005/10/08 16:49:35 jdolecek Exp $
Changes to the packages collection and infrastructure in 2005:
@@ -4341,3 +4341,4 @@ Changes to the packages collection and infrastructure in 2005:
Updated print/dvipdfmx to 0.0.0.20031116nb3 [hira 2005-10-08]
Added net/php-xmlrpc 4.4.0 [jdolecek 2005-10-08]
Added net/php-xmlrpc 5.0.5 [jdolecek 2005-10-08]
+ Removed security/php-openssl [jdolecek 2005-10-08]
diff --git a/lang/php5/MESSAGE b/lang/php5/MESSAGE
new file mode 100644
index 00000000000..0955f8edf4a
--- /dev/null
+++ b/lang/php5/MESSAGE
@@ -0,0 +1,7 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.3 2005/10/08 16:50:23 jdolecek Exp $
+
+Note php-openssl has been removed as separate package as of 5.0.5nb1, the
+main PHP5 package has them built-in now.
+===========================================================================
+
diff --git a/lang/php5/Makefile b/lang/php5/Makefile
index c04106275d1..28abb99d253 100644
--- a/lang/php5/Makefile
+++ b/lang/php5/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2005/09/08 18:49:01 jdolecek Exp $
+# $NetBSD: Makefile,v 1.17 2005/10/08 16:49:35 jdolecek Exp $
#
PKGNAME= php-${PHP_BASE_VERS}
-PKGREVISION= # empty
+PKGREVISION= 1
CATEGORIES= lang
HOMEPAGE= http://www.php.net/
diff --git a/lang/php5/Makefile.php b/lang/php5/Makefile.php
index a716eacef30..69b59006a4b 100644
--- a/lang/php5/Makefile.php
+++ b/lang/php5/Makefile.php
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.7 2005/09/04 20:13:59 jlam Exp $
+# $NetBSD: Makefile.php,v 1.8 2005/10/08 16:49:35 jdolecek Exp $
#
.include "../../lang/php5/Makefile.common"
@@ -34,8 +34,10 @@ CONFIGURE_ARGS+= --enable-xml
CONFIGURE_ARGS+= --with-libxml-dir=${PREFIX}
.include "../../textproc/libxml2/buildlink3.mk"
+CONFIGURE_ARGS+= --with-openssl
+.include "../../security/openssl/buildlink3.mk"
+
PKG_OPTIONS_VAR= PKG_OPTIONS.${PKGNAME:C/-[^-]*$//}
-PKG_SUPPORTED_OPTIONS+= ssl
.include "../../mk/bsd.options.mk"
@@ -44,8 +46,3 @@ CONFIGURE_ARGS+= --enable-ipv6
.else
CONFIGURE_ARGS+= --disable-ipv6
.endif
-
-.if !empty(PKG_OPTIONS:Mssl)
-. include "../../security/openssl/buildlink3.mk"
-CONFIGURE_ARGS+= --with-openssl
-.endif
diff --git a/meta-pkgs/php4-extensions/Makefile b/meta-pkgs/php4-extensions/Makefile
index b6f7ef19a2a..cab543540d4 100644
--- a/meta-pkgs/php4-extensions/Makefile
+++ b/meta-pkgs/php4-extensions/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2005/10/08 16:05:48 jdolecek Exp $
+# $NetBSD: Makefile,v 1.13 2005/10/08 16:49:35 jdolecek Exp $
DISTNAME= php-extensions-4.4
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= meta-pkgs www php4
MASTER_SITES= # empty
DISTFILES= # empty
@@ -38,7 +38,6 @@ DEPENDS+= php-mhash-4.4.*:../../security/php-mhash
DEPENDS+= php-mssql-4.4.*:../../databases/php-mssql
DEPENDS+= php-mysql-4.4.*:../../databases/php-mysql
DEPENDS+= php-odbc-4.4.*:../../databases/php-odbc
-DEPENDS+= php-openssl-4.4.*:../../security/php-openssl
DEPENDS+= php-pcntl-4.4.*:../../devel/php-pcntl
DEPENDS+= php-pdflib-4.4.*:../../print/php-pdflib
DEPENDS+= php-pgsql-4.4.*:../../databases/php-pgsql
diff --git a/meta-pkgs/php5-extensions/Makefile b/meta-pkgs/php5-extensions/Makefile
index f9a835269e0..171b03d3444 100644
--- a/meta-pkgs/php5-extensions/Makefile
+++ b/meta-pkgs/php5-extensions/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2005/10/08 16:05:48 jdolecek Exp $
+# $NetBSD: Makefile,v 1.12 2005/10/08 16:49:35 jdolecek Exp $
DISTNAME= php-extensions-5.0
-PKGREVISION= 7
+PKGREVISION= 8
CATEGORIES= meta-pkgs www php5
MASTER_SITES= # empty
DISTFILES= # empty
@@ -38,7 +38,6 @@ DEPENDS+= php-mhash-5.0.*:../../security/php-mhash
DEPENDS+= php-mssql-5.0.*:../../databases/php-mssql
DEPENDS+= php-mysql-5.0.*:../../databases/php-mysql
DEPENDS+= php-odbc-5.0.*:../../databases/php-odbc
-DEPENDS+= php-openssl-5.0.*:../../security/php-openssl
DEPENDS+= php-pcntl-5.0.*:../../devel/php-pcntl
DEPENDS+= php-pdflib-5.0.*:../../print/php-pdflib
DEPENDS+= php-pgsql-5.0.*:../../databases/php-pgsql
diff --git a/security/Makefile b/security/Makefile
index a0ad9e49615..b1c5f86aee1 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.245 2005/09/03 22:47:23 xtraeme Exp $
+# $NetBSD: Makefile,v 1.246 2005/10/08 16:49:35 jdolecek Exp $
#
COMMENT= Security tools
@@ -173,7 +173,6 @@ SUBDIR+= pgpdump
SUBDIR+= pgpenvelope
SUBDIR+= php-mcrypt
SUBDIR+= php-mhash
-SUBDIR+= php-openssl
SUBDIR+= pinentry
SUBDIR+= pinepgp
SUBDIR+= pks
diff --git a/security/php-openssl/DESCR b/security/php-openssl/DESCR
deleted file mode 100644
index 02094829dfa..00000000000
--- a/security/php-openssl/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-PHP is a programming language designed to be embedded into web pages.
-This module provides access to the OpenSSL library.
diff --git a/security/php-openssl/Makefile b/security/php-openssl/Makefile
deleted file mode 100644
index 2e39d60c2ec..00000000000
--- a/security/php-openssl/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:47:17 tv Exp $
-
-MODNAME= openssl
-CATEGORIES+= security
-PKGREVISION= # empty
-COMMENT= PHP extension for the OpenSSL library
-
-
-CONFIGURE_ARGS+= --with-${MODNAME}=shared,${BUILDLINK_PREFIX.openssl}
-
-# the config test for -lssl fails to link in -lcrypto; just force it
-# to succeed
-CONFIGURE_ENV+= ac_cv_lib_ssl_SSL_CTX_set_ssl_version=yes
-
-post-extract:
- cd ${WRKSRC} && ln -s config0.m4 config.m4
-
-.include "../../lang/php/ext.mk"
-.include "../../security/openssl/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/www/ap-php/Makefile b/www/ap-php/Makefile
index 5993c4e3bca..c29dbb4eb28 100644
--- a/www/ap-php/Makefile
+++ b/www/ap-php/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2005/10/07 16:51:41 jdolecek Exp $
+# $NetBSD: Makefile,v 1.5 2005/10/08 16:49:36 jdolecek Exp $
#
PKGNAME= ap-php-${PHP_BASE_VERS}
-PKGREVISION= 1
+PKGREVISION= 2
COMMENT= Apache (${PKG_APACHE}) module for ${PKG_PHP}
APACHE_MODULE= YES
diff --git a/www/php4/MESSAGE b/www/php4/MESSAGE
index f47f633debe..b7cf176a0de 100644
--- a/www/php4/MESSAGE
+++ b/www/php4/MESSAGE
@@ -1,5 +1,5 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.8 2004/12/16 17:42:14 jdolecek Exp $
+$NetBSD: MESSAGE,v 1.9 2005/10/08 16:49:35 jdolecek Exp $
To process PHP scripts, you will need a PHP-enabled HTTP server. You may
either configure the HTTP server to use PHP as a CGI program, or install a
@@ -12,4 +12,7 @@ Some additional packages you may wish to install are:
Note that php4-pcre, php4-session and php4-xml are no longer
separate packages since 4.3.3, the main PHP4 package has them built-in now.
+
+Note php-openssl has been removed as separate package as of 4.4.0nb2, the
+main PHP4 package has them built-in now.
===========================================================================
diff --git a/www/php4/Makefile b/www/php4/Makefile
index 03977cd529a..f930f9452ea 100644
--- a/www/php4/Makefile
+++ b/www/php4/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.53 2005/10/05 15:59:47 tron Exp $
+# $NetBSD: Makefile,v 1.54 2005/10/08 16:49:35 jdolecek Exp $
PKGNAME= php-${PHP_BASE_VERS}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES+= lang
COMMENT= HTML-embedded scripting language
diff --git a/www/php4/Makefile.php b/www/php4/Makefile.php
index 5f7565aa979..754422910fc 100644
--- a/www/php4/Makefile.php
+++ b/www/php4/Makefile.php
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.php,v 1.23 2005/09/04 20:13:59 jlam Exp $
+# $NetBSD: Makefile.php,v 1.24 2005/10/08 16:49:35 jdolecek Exp $
.include "../../www/php4/Makefile.common"
@@ -40,6 +40,7 @@ CONFIGURE_ENV+= EXTENSION_DIR="${PREFIX}/${PHP_EXTENSION_DIR}"
PKG_OPTIONS_VAR= PKG_OPTIONS.${PKGNAME:C/-[^-]*$//}
PKG_SUPPORTED_OPTIONS+= ssl
+PKG_SUGGESTED_OPTIONS+= ssl
.include "../../mk/bsd.options.mk"
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-29 18:20:25 +0000