diff options
Diffstat (limited to 'www')
-rw-r--r-- | www/ap-php4/Makefile | 6 | ||||
-rw-r--r-- | www/php4/Makefile | 4 | ||||
-rw-r--r-- | www/php4/Makefile.common | 6 | ||||
-rw-r--r-- | www/php4/Makefile.module | 12 |
4 files changed, 10 insertions, 18 deletions
diff --git a/www/ap-php4/Makefile b/www/ap-php4/Makefile index e784c0f6b6b..92b1f42256a 100644 --- a/www/ap-php4/Makefile +++ b/www/ap-php4/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.17 2001/10/19 09:55:31 veego Exp $ +# $NetBSD: Makefile,v 1.18 2001/12/03 08:31:04 jlam Exp $ .include "../php4/Makefile.php" -PKGNAME= ap-php-${PHP_VERS} -PHP_PKG_VERS= # empty +PKGNAME= ap-php-${PHP_BASE_VERS} +PKGREVISION= # empty COMMENT= Apache module for PHP4 DEPENDS+= php>=${PHP_BASE_VERS}:../php4 diff --git a/www/php4/Makefile b/www/php4/Makefile index 42e47a725c0..85c3d68c432 100644 --- a/www/php4/Makefile +++ b/www/php4/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.19 2001/12/02 06:56:47 jlam Exp $ +# $NetBSD: Makefile,v 1.20 2001/12/03 08:31:05 jlam Exp $ .include "Makefile.php" -PKGNAME= php-${PHP_VERS} +PKGNAME= php-${PHP_BASE_VERS} PHP_PKG_VERS= # empty CATEGORIES+= lang COMMENT= HTML-embedded scripting language diff --git a/www/php4/Makefile.common b/www/php4/Makefile.common index bbba9734b3b..ab4414f2542 100644 --- a/www/php4/Makefile.common +++ b/www/php4/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.19 2001/11/26 07:34:07 jlam Exp $ +# $NetBSD: Makefile.common,v 1.20 2001/12/03 08:31:05 jlam Exp $ DISTNAME= php-${PHP_DIST_VERS} CATEGORIES+= www php4 @@ -13,13 +13,9 @@ HOMEPAGE= http://www.php.net/ # # PHP_DIST_VERS version number on the php distfile # PHP_BASE_VERS pkgsrc-mangled version number (convert pl -> .) -# PHP_PKG_VERS pkgsrc revisions of php (nbX, etc.) -# PHP_VERS pkgsrc version number of package # PHP_DIST_VERS= 4.0.6 PHP_BASE_VERS= ${PHP_DIST_VERS} -PHP_PKG_VERS?= # empty -PHP_VERS= ${PHP_BASE_VERS}${PHP_PKG_VERS} # Location of installed PHP4 loadable modules under ${PREFIX}. # This is derived from the value of `php-config --extension-dir`. diff --git a/www/php4/Makefile.module b/www/php4/Makefile.module index 3019d90d042..55eb2cd585d 100644 --- a/www/php4/Makefile.module +++ b/www/php4/Makefile.module @@ -1,20 +1,16 @@ -# $NetBSD: Makefile.module,v 1.13 2001/11/01 09:41:14 jlam Exp $ +# $NetBSD: Makefile.module,v 1.14 2001/12/03 08:31:05 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, define PHP_PKG_VERS if necessary, +# Just include this file, define MODNAME, define PKGREVISION if necessary, # add dependencies, and add the appropriate --with-configure-arg, then include # bsd.pkg.mk. -# -# PHP_PKG_VERS should be of the form "nbX" and is used to indicate revisions -# of the PHP4 module package that don't affect other PHP4 modules. It is -# typically left empty. .include "../../www/php4/Makefile.common" -PKGNAME= php-${MODNAME}-${PHP_VERS} -PHP_PKG_VERS?= # empty +PKGNAME= php-${MODNAME}-${PHP_BASE_VERS} +PKGREVISION?= # empty BUILD_DEPENDS+= automake>=1.4:../../devel/automake DEPENDS+= php>=${PHP_BASE_VERS}:../../www/php4 |