From 29a4a9b873025f72c731c1522c3c786af4889c5a Mon Sep 17 00:00:00 2001 From: joerg Date: Fri, 2 Jun 2006 18:27:54 +0000 Subject: 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@. --- devel/mantis/Makefile | 9 +++++---- devel/php-gettext/Makefile | 4 ++-- devel/php-gmp/Makefile | 4 ++-- devel/php-memcache/Makefile | 4 +++- devel/php-pcntl/Makefile | 3 ++- devel/php-posix/Makefile | 4 ++-- devel/php-shmop/Makefile | 4 ++-- devel/php-sysvsem/Makefile | 4 ++-- devel/php-sysvshm/Makefile | 4 ++-- 9 files changed, 22 insertions(+), 18 deletions(-) (limited to 'devel') diff --git a/devel/mantis/Makefile b/devel/mantis/Makefile index 3778fe21537..b3f21e0ba23 100644 --- a/devel/mantis/Makefile +++ b/devel/mantis/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.21 2006/05/28 15:17:47 adrianp Exp $ +# $NetBSD: Makefile,v 1.22 2006/06/02 18:27:55 joerg Exp $ DISTNAME= mantis-1.0.3 +PKGREVISION= 1 CATEGORIES= devel www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mantisbt/} @@ -8,8 +9,8 @@ MAINTAINER= adrianp@NetBSD.org HOMEPAGE= http://www.mantisdb.org/ COMMENT= PHP/MySQL/web based bugtracking system -DEPENDS+= ap-php>=4.0.6:../../www/ap-php -DEPENDS+= php-mysql>=4.0.6:../../databases/php-mysql +DEPENDS+= ${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}>=4.0.6:../../www/ap-php +DEPENDS+= ${PHP_PKG_PREFIX}-mysql>=4.0.6:../../databases/php-mysql NO_BUILD= YES @@ -21,7 +22,7 @@ PKG_SUPPORTED_OPTIONS= charts .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Mcharts) -DEPENDS+= php-jpgraph-[0-9]*:../../graphics/php-jpgraph +DEPENDS+= ${PHP_PKG_PREFIX}-jpgraph-[0-9]*:../../graphics/php-jpgraph .endif APACHE_USER?= www diff --git a/devel/php-gettext/Makefile b/devel/php-gettext/Makefile index e1753bbd747..000d748071e 100644 --- a/devel/php-gettext/Makefile +++ b/devel/php-gettext/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.6 2006/02/05 23:08:50 joerg Exp $ +# $NetBSD: Makefile,v 1.7 2006/06/02 18:27:55 joerg Exp $ MODNAME= gettext -PKGREVISION= 1 CATEGORIES+= devel COMMENT= PHP extension for gettext support +CONFLICTS= php-gettext-[0-9] CONFIGURE_ARGS+= --with-${MODNAME}=shared,${BUILDLINK_PREFIX.gettext} diff --git a/devel/php-gmp/Makefile b/devel/php-gmp/Makefile index 1c2aa1493db..549d5cf3a7b 100644 --- a/devel/php-gmp/Makefile +++ b/devel/php-gmp/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.6 2006/02/05 23:08:50 joerg Exp $ +# $NetBSD: Makefile,v 1.7 2006/06/02 18:27:55 joerg Exp $ MODNAME= gmp -PKGREVISION= 1 CATEGORIES+= devel math COMMENT= PHP extension for arbitrary precision math +CONFLICTS= php-gmp-[0-9] CONFIGURE_ARGS+= --with-${MODNAME}=shared,${BUILDLINK_PREFIX.gmp} diff --git a/devel/php-memcache/Makefile b/devel/php-memcache/Makefile index 3b33a4cd099..6333d487527 100644 --- a/devel/php-memcache/Makefile +++ b/devel/php-memcache/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2006/04/20 11:30:47 grant Exp $ +# $NetBSD: Makefile,v 1.2 2006/06/02 18:27:55 joerg Exp $ # MODNAME= memcache @@ -6,6 +6,8 @@ PECL_VERSION= 2.0.1 CATEGORIES+= devel COMMENT= PHP extension for memcached +CONFLICTS= php-memcache-[0-9] + CONFIGURE_ARGS+= --enable-${MODNAME} WRKSRC= ${WRKDIR}/${MODNAME}-${PECL_VERSION} diff --git a/devel/php-pcntl/Makefile b/devel/php-pcntl/Makefile index 6d6c7ec8ef2..7edd0bb4107 100644 --- a/devel/php-pcntl/Makefile +++ b/devel/php-pcntl/Makefile @@ -1,10 +1,11 @@ -# $NetBSD: Makefile,v 1.3 2006/02/05 23:08:50 joerg Exp $ +# $NetBSD: Makefile,v 1.4 2006/06/02 18:27:55 joerg Exp $ MODNAME= pcntl PKGREVISION= 1 CATEGORIES+= devel COMMENT= PHP extension for Process Control functions +CONFLICTS= php-pcntl-[0-9] CONFIGURE_ARGS+= --enable-${MODNAME}=shared diff --git a/devel/php-posix/Makefile b/devel/php-posix/Makefile index 7630264bfb7..05c6bcfadf4 100644 --- a/devel/php-posix/Makefile +++ b/devel/php-posix/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.6 2006/02/05 23:08:50 joerg Exp $ +# $NetBSD: Makefile,v 1.7 2006/06/02 18:27:55 joerg Exp $ MODNAME= posix -PKGREVISION= 1 CATEGORIES+= devel COMMENT= PHP extension for POSIX-like functions +CONFLICTS= php-posix-[0-9] CONFIGURE_ARGS+= --enable-${MODNAME}=shared diff --git a/devel/php-shmop/Makefile b/devel/php-shmop/Makefile index 44ec706ab53..869c7da6f6b 100644 --- a/devel/php-shmop/Makefile +++ b/devel/php-shmop/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.6 2006/02/05 23:08:50 joerg Exp $ +# $NetBSD: Makefile,v 1.7 2006/06/02 18:27:55 joerg Exp $ MODNAME= shmop -PKGREVISION= 1 CATEGORIES+= devel COMMENT= PHP extension for simple SysV shared memory operations +CONFLICTS= php-shmop-[0-9] CONFIGURE_ARGS+= --enable-${MODNAME}=shared,${BUILDLINK_DIR} diff --git a/devel/php-sysvsem/Makefile b/devel/php-sysvsem/Makefile index 2fd1e56d596..6742877edf5 100644 --- a/devel/php-sysvsem/Makefile +++ b/devel/php-sysvsem/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.6 2006/02/05 23:08:50 joerg Exp $ +# $NetBSD: Makefile,v 1.7 2006/06/02 18:27:55 joerg Exp $ MODNAME= sysvsem -PKGREVISION= 1 CATEGORIES+= devel COMMENT= PHP extension for SysV semaphore support +CONFLICTS= php-sysvsem-[0-9] CONFIGURE_ARGS+= --enable-${MODNAME}=shared,${BUILDLINK_DIR} diff --git a/devel/php-sysvshm/Makefile b/devel/php-sysvshm/Makefile index b0fe256b32b..0470d4af3da 100644 --- a/devel/php-sysvshm/Makefile +++ b/devel/php-sysvshm/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.6 2006/02/05 23:08:50 joerg Exp $ +# $NetBSD: Makefile,v 1.7 2006/06/02 18:27:56 joerg Exp $ MODNAME= sysvshm -PKGREVISION= 1 CATEGORIES+= devel COMMENT= PHP extension for SysV shared memory support +CONFLICTS= php-sysvshm-[0-9] CONFIGURE_ARGS+= --enable-${MODNAME}=shared,${BUILDLINK_DIR} -- cgit v1.2.3