From 8cc6055063825bd3ee82a403b134d011b5cac665 Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Mon, 3 Dec 2001 08:30:58 +0000
Subject: Use PKGREVISION to manage the package-specific version number when it
 differs from the distfile version number.  G/C some the unused variables in
 php4/Makefile.common related to the old way of handling version numbers.

---
 archivers/php4-bz2/Makefile     |  4 ++--
 archivers/php4-zlib/Makefile    |  4 ++--
 databases/php4-dba/Makefile     |  4 ++--
 databases/php4-dbase/Makefile   |  4 ++--
 databases/php4-filepro/Makefile |  4 ++--
 databases/php4-ldap/Makefile    |  4 ++--
 databases/php4-mysql/Makefile   |  4 ++--
 databases/php4-odbc/Makefile    |  4 ++--
 databases/php4-pgsql/Makefile   |  4 ++--
 devel/php4-gettext/Makefile     |  4 ++--
 devel/php4-gmp/Makefile         |  4 ++--
 devel/php4-pcre/Makefile        |  4 ++--
 devel/php4-posix/Makefile       |  4 ++--
 devel/php4-session/Makefile     |  4 ++--
 devel/php4-sysvsem/Makefile     |  4 ++--
 devel/php4-sysvshm/Makefile     |  4 ++--
 graphics/php4-gd/Makefile       |  4 ++--
 mail/php4-imap/Makefile         |  4 ++--
 math/php4-bcmath/Makefile       |  4 ++--
 misc/php4-calendar/Makefile     |  4 ++--
 misc/php4-mbstring/Makefile     |  4 ++--
 net/php4-ftp/Makefile           |  4 ++--
 net/php4-sockets/Makefile       |  4 ++--
 net/php4-yp/Makefile            |  4 ++--
 print/php4-pdflib/Makefile      |  6 +++---
 security/php4-mcrypt/Makefile   |  4 ++--
 textproc/php4-sablot/Makefile   |  4 ++--
 textproc/php4-wddx/Makefile     |  4 ++--
 textproc/php4-xml/Makefile      |  4 ++--
 www/ap-php4/Makefile            |  6 +++---
 www/php4/Makefile               |  4 ++--
 www/php4/Makefile.common        |  6 +-----
 www/php4/Makefile.module        | 12 ++++--------
 33 files changed, 69 insertions(+), 77 deletions(-)

diff --git a/archivers/php4-bz2/Makefile b/archivers/php4-bz2/Makefile
index 7233b2a206b..f54b0159361 100644
--- a/archivers/php4-bz2/Makefile
+++ b/archivers/php4-bz2/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/10/16 07:02:12 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2001/12/03 08:30:58 jlam Exp $
 
 .include "../../www/php4/Makefile.module"
 
 MODNAME=		bz2
 CATEGORIES+=		archivers
-PHP_PKG_VERS=		# empty
+PKGREVISION=		# empty
 COMMENT=		PHP4 extension for bzip2 compression
 
 USE_BUILDLINK_ONLY=	YES
diff --git a/archivers/php4-zlib/Makefile b/archivers/php4-zlib/Makefile
index 3044af1f05f..0e1ba7ff79f 100644
--- a/archivers/php4-zlib/Makefile
+++ b/archivers/php4-zlib/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/10/16 07:03:01 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2001/12/03 08:30:58 jlam Exp $
 
 .include "../../www/php4/Makefile.module"
 
 MODNAME=		zlib
-PHP_PKG_VERS=		# empty
 CATEGORIES+=		archivers
+PKGREVISION=		# empty
 COMMENT=		PHP4 extension for zlib compression
 
 USE_BUILDLINK_ONLY=	YES
diff --git a/databases/php4-dba/Makefile b/databases/php4-dba/Makefile
index 1a697f85a4f..4228b8f97c1 100644
--- a/databases/php4-dba/Makefile
+++ b/databases/php4-dba/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2001/10/16 07:12:35 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2001/12/03 08:30:59 jlam Exp $
 
 .include "../../www/php4/Makefile.module"
 
 MODNAME=		dba
 CATEGORIES+=		databases
-PHP_PKG_VERS=		# empty
+PKGREVISION=		# empty
 COMMENT=		PHP4 extension for DBM database access
 
 USE_BUILDLINK_ONLY=	YES
diff --git a/databases/php4-dbase/Makefile b/databases/php4-dbase/Makefile
index d849642059c..2c252330988 100644
--- a/databases/php4-dbase/Makefile
+++ b/databases/php4-dbase/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2001/10/16 06:58:30 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2001/12/03 08:30:59 jlam Exp $
 
 .include "../../www/php4/Makefile.module"
 
 MODNAME=		dbase
 CATEGORIES+=		databases
-PHP_PKG_VERS=		# empty
+PKGREVISION=		# empty
 COMMENT=		PHP4 extension for dBase database access
 
 USE_BUILDLINK_ONLY=	YES
diff --git a/databases/php4-filepro/Makefile b/databases/php4-filepro/Makefile
index 581c024bf79..5a3e9ea5e1a 100644
--- a/databases/php4-filepro/Makefile
+++ b/databases/php4-filepro/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2001/10/16 06:58:30 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2001/12/03 08:30:59 jlam Exp $
 
 .include "../../www/php4/Makefile.module"
 
 MODNAME=		filepro
 CATEGORIES+=		databases
-PHP_PKG_VERS=		# empty
+PKGREVISION=		# empty
 COMMENT=		PHP4 extension for read-only filePro database access
 
 USE_BUILDLINK_ONLY=	YES
diff --git a/databases/php4-ldap/Makefile b/databases/php4-ldap/Makefile
index 0ff5c2a026f..17755d73398 100644
--- a/databases/php4-ldap/Makefile
+++ b/databases/php4-ldap/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2001/10/16 06:58:31 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2001/12/03 08:30:59 jlam Exp $
 
 .include "../../www/php4/Makefile.module"
 
 MODNAME=		ldap
 CATEGORIES+=		databases
-PHP_PKG_VERS=		# empty
+PKGREVISION=		# empty
 COMMENT=		PHP4 extension for LDAP database access
 
 USE_BUILDLINK_ONLY=	YES
diff --git a/databases/php4-mysql/Makefile b/databases/php4-mysql/Makefile
index 70d2933d2b4..2836dbff820 100644
--- a/databases/php4-mysql/Makefile
+++ b/databases/php4-mysql/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2001/10/16 06:58:31 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2001/12/03 08:30:59 jlam Exp $
 
 .include "../../www/php4/Makefile.module"
 
 MODNAME=		mysql
 CATEGORIES+=		databases
-PHP_PKG_VERS=		# empty
+PKGREVISION=		# empty
 COMMENT=		PHP4 extension for MySQL databases
 
 DEPENDS+=		mysql-client>=3.23.35:../../databases/mysql-client
diff --git a/databases/php4-odbc/Makefile b/databases/php4-odbc/Makefile
index cf796b9ef7c..e22f9030e8c 100644
--- a/databases/php4-odbc/Makefile
+++ b/databases/php4-odbc/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/11/19 22:54:09 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2001/12/03 08:31:00 jlam Exp $
 
 .include "../../www/php4/Makefile.module"
 
 MODNAME=		odbc
 CATEGORIES+=		databases
-PHP_PKG_VERS=		# empty
+PKGREVISION=		# empty
 COMMENT=		PHP4 extension for ODBC access
 
 USE_BUILDLINK_ONLY=	YES
diff --git a/databases/php4-pgsql/Makefile b/databases/php4-pgsql/Makefile
index b2090b5bff3..b6fbe8f8b08 100644
--- a/databases/php4-pgsql/Makefile
+++ b/databases/php4-pgsql/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2001/10/16 06:58:31 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2001/12/03 08:31:00 jlam Exp $
 
 .include "../../www/php4/Makefile.module"
 
 MODNAME=		pgsql
 CATEGORIES+=		databases
-PHP_PKG_VERS=		# empty
+PKGREVISION=		# empty
 COMMENT=		PHP4 extension for PostgreSQL databases
 
 USE_BUILDLINK_ONLY=	YES
diff --git a/devel/php4-gettext/Makefile b/devel/php4-gettext/Makefile
index 5be6393c555..e9e4fcabfde 100644
--- a/devel/php4-gettext/Makefile
+++ b/devel/php4-gettext/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2001/10/16 06:58:31 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2001/12/03 08:31:00 jlam Exp $
 
 .include "../../www/php4/Makefile.module"
 
 MODNAME=		gettext
 CATEGORIES+=		devel
-PHP_PKG_VERS=		# empty
+PKGREVISION=		# empty
 COMMENT=		PHP4 extension for gettext support
 
 USE_BUILDLINK_ONLY=	YES
diff --git a/devel/php4-gmp/Makefile b/devel/php4-gmp/Makefile
index 95ee2a51795..a28e14bf95b 100644
--- a/devel/php4-gmp/Makefile
+++ b/devel/php4-gmp/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2001/10/16 06:58:31 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2001/12/03 08:31:00 jlam Exp $
 
 .include "../../www/php4/Makefile.module"
 
 MODNAME=		gmp
 CATEGORIES+=		devel math
-PHP_PKG_VERS=		# empty
+PKGREVISION=		# empty
 COMMENT=		PHP4 extension for arbitrary precision math
 
 USE_BUILDLINK_ONLY=	YES
diff --git a/devel/php4-pcre/Makefile b/devel/php4-pcre/Makefile
index 73e54be86e4..1040bebc5c2 100644
--- a/devel/php4-pcre/Makefile
+++ b/devel/php4-pcre/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2001/10/16 06:58:32 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2001/12/03 08:31:01 jlam Exp $
 
 .include "../../www/php4/Makefile.module"
 
 MODNAME=		pcre
 CATEGORIES+=		devel
-PHP_PKG_VERS=		# empty
+PKGREVISION=		# empty
 COMMENT=		PHP4 extension for Perl-compatible regular expressions
 
 USE_BUILDLINK_ONLY=	YES
diff --git a/devel/php4-posix/Makefile b/devel/php4-posix/Makefile
index e47dee20efe..859baa245b5 100644
--- a/devel/php4-posix/Makefile
+++ b/devel/php4-posix/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2001/10/16 06:58:32 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2001/12/03 08:31:01 jlam Exp $
 
 .include "../../www/php4/Makefile.module"
 
 MODNAME=		posix
 CATEGORIES+=		devel
-PHP_PKG_VERS=		# empty
+PKGREVISION=		# empty
 COMMENT=		PHP4 extension for POSIX-like functions
 
 USE_BUILDLINK_ONLY=	YES
diff --git a/devel/php4-session/Makefile b/devel/php4-session/Makefile
index d962a2c3e8c..0470f3cda2f 100644
--- a/devel/php4-session/Makefile
+++ b/devel/php4-session/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2001/10/16 06:58:32 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2001/12/03 08:31:01 jlam Exp $
 
 .include "../../www/php4/Makefile.module"
 
 MODNAME=		session
 CATEGORIES+=		devel
-PHP_PKG_VERS=		# empty
+PKGREVISION=		# empty
 COMMENT=		PHP4 extension for session-handling
 
 USE_BUILDLINK_ONLY=	YES
diff --git a/devel/php4-sysvsem/Makefile b/devel/php4-sysvsem/Makefile
index 7f5f27b1e1a..e8fb010c8c7 100644
--- a/devel/php4-sysvsem/Makefile
+++ b/devel/php4-sysvsem/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2001/10/16 06:58:32 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2001/12/03 08:31:01 jlam Exp $
 
 .include "../../www/php4/Makefile.module"
 
 MODNAME=		sysvsem
 CATEGORIES+=		devel
-PHP_PKG_VERS=		# empty
+PKGREVISION=		# empty
 COMMENT=		PHP4 extension for SysV semaphore support
 
 USE_BUILDLINK_ONLY=	YES
diff --git a/devel/php4-sysvshm/Makefile b/devel/php4-sysvshm/Makefile
index 4675e3eb9a0..c01b53c2a26 100644
--- a/devel/php4-sysvshm/Makefile
+++ b/devel/php4-sysvshm/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2001/10/16 06:58:33 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2001/12/03 08:31:01 jlam Exp $
 
 .include "../../www/php4/Makefile.module"
 
 MODNAME=		sysvshm
 CATEGORIES+=		devel
-PHP_PKG_VERS=		# empty
+PKGREVISION=		# empty
 COMMENT=		PHP4 extension for SysV shared memory support
 
 USE_BUILDLINK_ONLY=	YES
diff --git a/graphics/php4-gd/Makefile b/graphics/php4-gd/Makefile
index 3d68c846819..9b65a11ddf2 100644
--- a/graphics/php4-gd/Makefile
+++ b/graphics/php4-gd/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2001/10/29 17:08:35 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2001/12/03 08:31:02 jlam Exp $
 
 .include "../../www/php4/Makefile.module"
 
 MODNAME=		gd
 CATEGORIES+=		graphics
-PHP_PKG_VERS=		nb1
+PKGREVISION=		1
 COMMENT=		PHP4 extension for GD graphics library
 
 USE_BUILDLINK_ONLY=	YES
diff --git a/mail/php4-imap/Makefile b/mail/php4-imap/Makefile
index 492b5f5b894..f0b9ba4aad0 100644
--- a/mail/php4-imap/Makefile
+++ b/mail/php4-imap/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2001/10/16 13:01:57 tron Exp $
+# $NetBSD: Makefile,v 1.4 2001/12/03 08:31:02 jlam Exp $
 
 .include "../../www/php4/Makefile.module"
 
 MODNAME=		imap
 CATEGORIES+=		mail
-PHP_PKG_VERS=		# empty
+PKGREVISION=		# empty
 COMMENT=		PHP4 extension for IMAP (Internet Mailbox Access Protocol)
 
 CONFIGURE_ARGS+=	--with-${MODNAME}=shared,${BUILDLINK_DIR}
diff --git a/math/php4-bcmath/Makefile b/math/php4-bcmath/Makefile
index 24c1200397c..a387ee3b41b 100644
--- a/math/php4-bcmath/Makefile
+++ b/math/php4-bcmath/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/10/16 07:00:05 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2001/12/03 08:31:02 jlam Exp $
 
 .include "../../www/php4/Makefile.module"
 
 MODNAME=		bcmath
 CATEGORIES+=		math
-PHP_PKG_VERS=		# empty
+PKGREVISION=		# empty
 COMMENT=		PHP4 extension for bc-style arbitrary precision math
 
 USE_BUILDLINK_ONLY=	YES
diff --git a/misc/php4-calendar/Makefile b/misc/php4-calendar/Makefile
index a8ff66e53ab..6afbeb38090 100644
--- a/misc/php4-calendar/Makefile
+++ b/misc/php4-calendar/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/10/16 07:05:00 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2001/12/03 08:31:02 jlam Exp $
 
 .include "../../www/php4/Makefile.module"
 
 MODNAME=		calendar
 CATEGORIES+=		misc
-PHP_PKG_VERS=		# empty
+PKGREVISION=		# empty
 COMMENT=		PHP4 extension for calendar conversion support
 
 USE_BUILDLINK_ONLY=	YES
diff --git a/misc/php4-mbstring/Makefile b/misc/php4-mbstring/Makefile
index 9668981a6c1..1de71299fd2 100644
--- a/misc/php4-mbstring/Makefile
+++ b/misc/php4-mbstring/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/10/19 07:30:09 kei Exp $
+# $NetBSD: Makefile,v 1.2 2001/12/03 08:31:03 jlam Exp $
 
 .include "../../www/php4/Makefile.module"
 
 MODNAME=		mbstring
 CATEGORIES+=		misc
-PHP_PKG_VERS=		# empty
+PKGREVISION=		# empty
 COMMENT=		PHP4 extension for multibyte characters support (currently, Japanese only)
 
 USE_BUILDLINK_ONLY=	YES
diff --git a/net/php4-ftp/Makefile b/net/php4-ftp/Makefile
index 0c556e2501b..ceaf5fb2a87 100644
--- a/net/php4-ftp/Makefile
+++ b/net/php4-ftp/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/10/16 07:06:52 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2001/12/03 08:31:03 jlam Exp $
 
 .include "../../www/php4/Makefile.module"
 
 MODNAME=		ftp
 CATEGORIES+=		net
-PHP_PKG_VERS=		# empty
+PKGREVISION=		# empty
 COMMENT=		PHP4 extension for FTP access
 
 USE_BUILDLINK_ONLY=	YES
diff --git a/net/php4-sockets/Makefile b/net/php4-sockets/Makefile
index 669b4b03e44..680786e905e 100644
--- a/net/php4-sockets/Makefile
+++ b/net/php4-sockets/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/10/16 07:07:59 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2001/12/03 08:31:03 jlam Exp $
 
 .include "../../www/php4/Makefile.module"
 
 MODNAME=		sockets
 CATEGORIES+=		net
-PHP_PKG_VERS=		# empty
+PKGREVISION=		# empty
 COMMENT=		PHP4 extension for sockets support
 
 USE_BUILDLINK_ONLY=	YES
diff --git a/net/php4-yp/Makefile b/net/php4-yp/Makefile
index ce199c0883b..5ee64531460 100644
--- a/net/php4-yp/Makefile
+++ b/net/php4-yp/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/10/16 07:08:38 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2001/12/03 08:31:03 jlam Exp $
 
 .include "../../www/php4/Makefile.module"
 
 MODNAME=		yp
 CATEGORIES+=		net
-PHP_PKG_VERS=		# empty
+PKGREVISION=		# empty
 COMMENT=		PHP4 extension for YP domain support
 
 USE_BUILDLINK_ONLY=	YES
diff --git a/print/php4-pdflib/Makefile b/print/php4-pdflib/Makefile
index 4894478315a..a10975be824 100644
--- a/print/php4-pdflib/Makefile
+++ b/print/php4-pdflib/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2001/10/16 06:58:33 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2001/12/03 08:31:03 jlam Exp $
 
 .include "../../www/php4/Makefile.module"
 
 MODNAME=		pdf
-PKGNAME=		php-pdflib-${PHP_VERS}
+PKGNAME=		php-pdflib-${PHP_BASE_VERS}
 CATEGORIES+=		print
-PHP_PKG_VERS=		# empty
+PKGREVISION=		# empty
 COMMENT=		PHP4 extension for PDFlib on-the-fly PDF generation
 
 USE_BUILDLINK_ONLY=	YES
diff --git a/security/php4-mcrypt/Makefile b/security/php4-mcrypt/Makefile
index 379fec0a00a..a2a698c01f3 100644
--- a/security/php4-mcrypt/Makefile
+++ b/security/php4-mcrypt/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2001/10/16 06:58:34 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2001/12/03 08:31:04 jlam Exp $
 
 .include "../../www/php4/Makefile.module"
 
 MODNAME=		mcrypt
 CATEGORIES+=		security
-PHP_PKG_VERS=		# empty
+PKGREVISION=		# empty
 COMMENT=		PHP4 extension for the mcrypt crypto algorithms library
 
 CONFIGURE_ARGS+=	--with-${MODNAME}=shared,${BUILDLINK_DIR}
diff --git a/textproc/php4-sablot/Makefile b/textproc/php4-sablot/Makefile
index 4a1149b9d41..ee7d058587d 100644
--- a/textproc/php4-sablot/Makefile
+++ b/textproc/php4-sablot/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2001/10/16 06:58:34 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2001/12/03 08:31:04 jlam Exp $
 
 .include "../../www/php4/Makefile.module"
 
 MODNAME=		sablot
 CATEGORIES+=		textproc
-PHP_PKG_VERS=		# empty
+PKGREVISION=		# empty
 
 MAINTAINER=		uithuis@dds.nl
 COMMENT=		PHP4 XSLT functions using Sablotron
diff --git a/textproc/php4-wddx/Makefile b/textproc/php4-wddx/Makefile
index c8529d166cc..83134592e39 100644
--- a/textproc/php4-wddx/Makefile
+++ b/textproc/php4-wddx/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2001/10/29 05:43:47 jmc Exp $
+# $NetBSD: Makefile,v 1.4 2001/12/03 08:31:04 jlam Exp $
 
 .include "../../www/php4/Makefile.module"
 
 MODNAME=		wddx
 CATEGORIES+=		textproc
-PHP_PKG_VERS=		# empty
+PKGREVISION=		# empty
 COMMENT=		PHP4 extension for WDDX support
 
 DEPENDS+=		php-session>=${PHP_BASE_VERS}:../../devel/php4-session
diff --git a/textproc/php4-xml/Makefile b/textproc/php4-xml/Makefile
index 994f92ec49d..bfbfaf89b5f 100644
--- a/textproc/php4-xml/Makefile
+++ b/textproc/php4-xml/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2001/10/16 06:58:34 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2001/12/03 08:31:04 jlam Exp $
 
 .include "../../www/php4/Makefile.module"
 
 MODNAME=		xml
 CATEGORIES+=		textproc
-PHP_PKG_VERS=		# empty
+PKGREVISION=		# empty
 COMMENT=		PHP4 extension for parsing XML
 
 USE_BUILDLINK_ONLY=	YES
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
-- 
cgit v1.2.3