diff options
| author | joerg <joerg@pkgsrc.org> | 2006-06-02 18:27:54 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2006-06-02 18:27:54 +0000 |
| commit | 337c6b1297ecf0ce92e4814030662b8352b54ab4 (patch) | |
| tree | b7f585bd5e2d200a0004ced04920ab0be7a7445a /mail/turba | |
| parent | 8757488bf5f26f41ea12d0d61cd79d3a80c7dceb (diff) | |
| download | pkgsrc-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 'mail/turba')
| -rw-r--r-- | mail/turba/Makefile | 3 | ||||
| -rw-r--r-- | mail/turba/options.mk | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/mail/turba/Makefile b/mail/turba/Makefile index 98728d95cfc..030ed8a01d1 100644 --- a/mail/turba/Makefile +++ b/mail/turba/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2006/05/12 21:12:28 adrianp Exp $ +# $NetBSD: Makefile,v 1.17 2006/06/02 18:27:56 joerg Exp $ DISTNAME= turba-h3-${TURBAVER} PKGNAME= turba-${TURBAVER} @@ -86,4 +86,5 @@ do-install: @${CHOWN} ${APACHE_USER}:${SHAREGRP} ${TURBADIR}/config @${CHMOD} 0750 ${TURBADIR}/config +.include "../../lang/php/phpversion.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/turba/options.mk b/mail/turba/options.mk index d618651cc1d..27f39d1266c 100644 --- a/mail/turba/options.mk +++ b/mail/turba/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2005/05/31 10:01:38 dillo Exp $ +# $NetBSD: options.mk,v 1.3 2006/06/02 18:27:56 joerg Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.turba PKG_SUPPORTED_OPTIONS= ldap mysql @@ -10,12 +10,12 @@ PKG_SUGGESTED_OPTIONS= ldap ### Use OpenLDAP for storing data ### .if !empty(PKG_OPTIONS:Mldap) -DEPENDS+= php-ldap>=4.3.3:../../databases/php-ldap +DEPENDS+= ${PHP_PKG_PREFIX}-ldap>=4.3.3:../../databases/php-ldap .endif ### ### Use MySQL for storing data ### .if !empty(PKG_OPTIONS:Mmysql) -DEPENDS+= php-mysql>=4.3.3:../../databases/php-mysql +DEPENDS+= ${PHP_PKG_PREFIX}-mysql>=4.3.3:../../databases/php-mysql .endif |