summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2001-03-01 18:18:15 +0000
committerjlam <jlam@pkgsrc.org>2001-03-01 18:18:15 +0000
commitca621c745a10ff22c22be4cae39bd9dd3243c456 (patch)
treec496d6d9f475b4391092cf02b6c82ba1bfd3458e /www
parentcf09a994f39211badf0bf637d563ced1792d8cf0 (diff)
downloadpkgsrc-ca621c745a10ff22c22be4cae39bd9dd3243c456.tar.gz
Disassociate the version number of the php4 package from the version numbers of
the php4 modules. The rule is that php4 modules depend on php-${PHP_VERS}, but they are allowed to have their own ${PHP_BASE_VERS}nbX package version numbers.
Diffstat (limited to 'www')
-rw-r--r--www/php4-gd/Makefile3
-rw-r--r--www/php4-imap/Makefile3
-rw-r--r--www/php4-ldap/Makefile3
-rw-r--r--www/php4-mysql/Makefile3
-rw-r--r--www/php4-pgsql/Makefile3
-rw-r--r--www/php4/Makefile4
-rw-r--r--www/php4/Makefile.common7
-rw-r--r--www/php4/Makefile.module15
8 files changed, 24 insertions, 17 deletions
diff --git a/www/php4-gd/Makefile b/www/php4-gd/Makefile
index 3fb426657ff..ef516e7cffa 100644
--- a/www/php4-gd/Makefile
+++ b/www/php4-gd/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2001/02/17 17:22:32 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/03/01 18:18:15 jlam Exp $
.include "../../www/php4/Makefile.module"
MODNAME= gd
CATEGORIES+= graphics
+PHP_PKG_VERS= nb1
COMMENT= PHP4 extension for GD graphics library
diff --git a/www/php4-imap/Makefile b/www/php4-imap/Makefile
index aa9568e7414..7d012ae3e91 100644
--- a/www/php4-imap/Makefile
+++ b/www/php4-imap/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2001/02/17 17:22:33 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2001/03/01 18:18:16 jlam Exp $
.include "../../www/php4/Makefile.module"
MODNAME= imap
CATEGORIES+= mail
+PHP_PKG_VERS= nb1
COMMENT= PHP4 extension for IMAP (Internet Mailbox Access Protocol)
diff --git a/www/php4-ldap/Makefile b/www/php4-ldap/Makefile
index 7536c92ee5c..96c8cea35b9 100644
--- a/www/php4-ldap/Makefile
+++ b/www/php4-ldap/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2001/02/17 17:22:33 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/03/01 18:18:16 jlam Exp $
.include "../../www/php4/Makefile.module"
MODNAME= ldap
CATEGORIES+= databases
+PHP_PKG_VERS= nb1
COMMENT= PHP4 extension for LDAP databases
diff --git a/www/php4-mysql/Makefile b/www/php4-mysql/Makefile
index 9fd043ec898..b8e7a176388 100644
--- a/www/php4-mysql/Makefile
+++ b/www/php4-mysql/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2001/02/17 17:22:34 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2001/03/01 18:18:16 jlam Exp $
.include "../../www/php4/Makefile.module"
MODNAME= mysql
CATEGORIES+= databases
+PHP_PKG_VERS= nb1
COMMENT= PHP4 extension for MySQL databases
diff --git a/www/php4-pgsql/Makefile b/www/php4-pgsql/Makefile
index 2cb30e12fd2..7b824662be7 100644
--- a/www/php4-pgsql/Makefile
+++ b/www/php4-pgsql/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2001/02/17 17:22:35 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/03/01 18:18:16 jlam Exp $
.include "../../www/php4/Makefile.module"
MODNAME= pgsql
CATEGORIES+= databases
+PHP_PKG_VERS= nb1
COMMENT= PHP4 extension for PostgreSQL databases
diff --git a/www/php4/Makefile b/www/php4/Makefile
index ea57ba2093f..e27e6a7dfb8 100644
--- a/www/php4/Makefile
+++ b/www/php4/Makefile
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile,v 1.9 2001/02/17 17:22:31 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2001/03/01 18:18:17 jlam Exp $
.include "../../www/php4/Makefile.common"
PKGNAME= php-${PHP_VERS}
CATEGORIES+= lang
-MAINTAINER= jlam@netbsd.org
-HOMEPAGE= http://www.php.net/
COMMENT= PHP4: Hypertext Preprocessor
CONFLICTS+= ap-php-4.0.3pl1
diff --git a/www/php4/Makefile.common b/www/php4/Makefile.common
index 89ddbbdd8df..731d46146bb 100644
--- a/www/php4/Makefile.common
+++ b/www/php4/Makefile.common
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile.common,v 1.7 2001/02/07 15:39:33 tron Exp $
+# $NetBSD: Makefile.common,v 1.8 2001/03/01 18:18:17 jlam Exp $
DISTNAME= php-${PHP_DIST_VERS}
PHP_DIST_VERS= 4.0.4pl1
-PHP_VERS= 4.0.4.1nb1
+PHP_BASE_VERS= 4.0.4.1
+PHP_VERS= ${PHP_BASE_VERS}nb1
CATEGORIES+= www php4
# Note the http address is written this way by purpose, so that bsd.pkg.mk DTRT
@@ -10,7 +11,7 @@ MASTER_SITES= http://www.php.net/distributions/ \
http://php3.de/distributions/ \
ftp://ftp.php.net/pub/distributions/
-MAINTAINER= jdolecek@netbsd.org
+MAINTAINER= jlam@netbsd.org
HOMEPAGE= http://www.php.net/
# Put this dependency here to compile in dbm support for all PHP4 modules.
diff --git a/www/php4/Makefile.module b/www/php4/Makefile.module
index 3d624bfb9e5..1e92173c11f 100644
--- a/www/php4/Makefile.module
+++ b/www/php4/Makefile.module
@@ -1,14 +1,17 @@
-# $NetBSD: Makefile.module,v 1.2 2001/01/29 11:34:47 wiz Exp $
+# $NetBSD: Makefile.module,v 1.3 2001/03/01 18:18:17 jlam Exp $
#
# This Makefile is provided to ease creating PHP4 packages for the extension
# modules distributed in the PHP4 sources.
#
-# Just include this file, define MODNAME, add dependencies, and add the
-# appropriate --with-configure-arg, then include bsd.pkg.mk.
+# Just include this file, define MODNAME, define PHP_PKG_VERS if necessary,
+# add dependencies, and add the appropriate --with-configure-arg, then include
+# bsd.pkg.mk.
.include "../../www/php4/Makefile.common"
-PKGNAME= php-${MODNAME}-${PHP_VERS}
+PKGNAME= php-${MODNAME}-${PHP_MODULE_VERS}
+PHP_PKG_VERS?= # empty
+PHP_MODULE_VERS= ${PHP_BASE_VERS}${PHP_PKG_VERS}
DEPENDS+= php-${PHP_VERS}:../../www/php4
@@ -17,7 +20,7 @@ MODULESDIR= ${WRKSRC}/modules
PLIST_SUBST+= MODNAME=${MODNAME}
MESSAGE_SRC= ${.CURDIR}/../../www/php4/pkg/MESSAGE.module
-MESSAGE_SUBST+= MODNAME=${MODNAME} \
+MESSAGE_SUBST+= MODNAME=${MODNAME} \
PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR}
PLIST_SRC= ${.CURDIR}/../../www/php4/pkg/PLIST.module
@@ -29,5 +32,5 @@ do-install: do-module-install
do-module-install:
${INSTALL_DATA_DIR} ${PREFIX}/${PHP_EXTENSION_DIR}
- ${INSTALL_DATA} ${MODULESDIR}/${MODNAME}.so \
+ ${INSTALL_DATA} ${MODULESDIR}/${MODNAME}.so \
${PREFIX}/${PHP_EXTENSION_DIR}