summaryrefslogtreecommitdiff
path: root/time
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2006-06-02 18:27:54 +0000
committerjoerg <joerg@pkgsrc.org>2006-06-02 18:27:54 +0000
commit337c6b1297ecf0ce92e4814030662b8352b54ab4 (patch)
treeb7f585bd5e2d200a0004ced04920ab0be7a7445a /time
parent8757488bf5f26f41ea12d0d61cd79d3a80c7dceb (diff)
downloadpkgsrc-337c6b1297ecf0ce92e4814030662b8352b54ab4.tar.gz
Rename all PHP 4 packages to php4-*, all PHP 5 packages to php5-*,
all PEAR packages to php?-pear-* and all Apache packages to ap13-* or ap2-* respectively. Add new variables to simplify the Makefile handling. Add CONFLICTS on the old names. Reset revisions of bumped packages. ap-php will now depend on the default Apache and PHP version. All programs using it have an implicit option of the Apache version as well. OK from jlam@ and adrianp@.
Diffstat (limited to 'time')
-rw-r--r--time/kronolith/Makefile8
-rw-r--r--time/pear-Date/Makefile5
2 files changed, 8 insertions, 5 deletions
diff --git a/time/kronolith/Makefile b/time/kronolith/Makefile
index ad2b1343c8b..6075fe0af2d 100644
--- a/time/kronolith/Makefile
+++ b/time/kronolith/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2006/04/29 09:23:19 adrianp Exp $
+# $NetBSD: Makefile,v 1.5 2006/06/02 18:27:58 joerg Exp $
DISTNAME= kronolith-h3-${KRONOLITHVER}
PKGNAME= kronolith-${KRONOLITHVER}
+PKGREVISION= 1
CATEGORIES= www time
MASTER_SITES= http://ftp.horde.org/pub/kronolith/ \
ftp://ftp.horde.org/pub/kronolith/
@@ -11,8 +12,8 @@ HOMEPAGE= http://www.horde.org/kronolith/
COMMENT= Horde calendar application
DEPENDS+= horde>=3.0.0:../../www/horde3
-DEPENDS+= php-mysql>=4.3.3:../../databases/php-mysql
-DEPENDS+= pear-Date-[0-9]*:../../time/pear-Date
+DEPENDS+= ${PHP_PKG_PREFIX}-mysql>=4.3.3:../../databases/php-mysql
+DEPENDS+= ${PHP_PKG_PREFIX}-pear-Date-[0-9]*:../../time/pear-Date
.include "../../mk/bsd.prefs.mk"
@@ -81,4 +82,5 @@ do-install:
@${CHOWN} ${APACHE_USER}:${SHAREGRP} ${KRONOLITHDIR}/config
@${CHMOD} 0750 ${KRONOLITHDIR}/config
+.include "../../lang/php/phpversion.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/time/pear-Date/Makefile b/time/pear-Date/Makefile
index 52ec37da129..27b51020f0a 100644
--- a/time/pear-Date/Makefile
+++ b/time/pear-Date/Makefile
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.6 2006/02/05 23:11:10 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2006/06/02 18:27:58 joerg Exp $
DISTNAME= Date-1.4.3
-PKGREVISION= 1
CATEGORIES= time
MAINTAINER= jdolecek@NetBSD.org
COMMENT= PHP Date and Time Zone Classes
+CONFLICTS= php-pear-Date-[0-9]
+
.include "../../lang/php/pear.mk"
.include "../../mk/bsd.pkg.mk"