From 61d54aee81f079599b922ceb9859a4240791332d Mon Sep 17 00:00:00 2001 From: robert Date: Fri, 8 Jul 2011 23:01:39 +0000 Subject: [PATCH] switch to lang/php --- www/php-openid/Makefile | 9 +++++---- www/phpicalendar/Makefile | 5 +++-- www/phpldapadmin/Makefile | 11 ++++++----- www/phplist/Makefile | 8 +++++--- www/phpmyadmin/Makefile | 11 ++++++----- www/phppgadmin/Makefile | 8 ++++---- www/piwik/Makefile | 11 ++++++----- www/pmwiki/Makefile | 5 +++-- www/sabredav/Makefile | 6 +++--- www/statusnet/Makefile | 14 +++++++------- www/syweb/Makefile | 7 ++++--- www/tikiwiki/Makefile | 13 +++++++------ www/timetrex/Makefile | 10 ++++++---- www/tt-rss/Makefile | 10 +++++----- www/vtigercrm/Makefile | 12 ++++++------ www/webacula/Makefile | 9 +++++---- www/webcollab/Makefile | 7 ++++--- 17 files changed, 85 insertions(+), 71 deletions(-) diff --git a/www/php-openid/Makefile b/www/php-openid/Makefile index 05920ec2311..e3ff63b7241 100644 --- a/www/php-openid/Makefile +++ b/www/php-openid/Makefile @@ -1,8 +1,9 @@ -# $OpenBSD: Makefile,v 1.2 2010/11/22 08:36:52 espie Exp $ +# $OpenBSD: Makefile,v 1.3 2011/07/08 23:05:31 robert Exp $ COMMENT= OpenID authentication for PHP DISTNAME= php-openid-2.1.2 +REVISION= 0 CATEGORIES= www security # Apache 2.0 license @@ -27,10 +28,10 @@ PREFIX= /var/www INSTDIR= ${PREFIX}/pear/lib/ SUBST_VARS= INSTDIR -PHP_VERSION= 5 +MODULES= lang/php RUN_DEPENDS= databases/pear-DB \ - www/php${PHP_VERSION}/extensions,-gmp \ - www/php${PHP_VERSION}/extensions,-curl + lang/php/${MODPHP_VERSION},-gmp \ + lang/php/${MODPHP_VERSION},-curl do-install: ${INSTALL_DATA_DIR} ${INSTDIR} diff --git a/www/phpicalendar/Makefile b/www/phpicalendar/Makefile index 2000f928ad4..deaac8d6e27 100644 --- a/www/phpicalendar/Makefile +++ b/www/phpicalendar/Makefile @@ -1,10 +1,11 @@ -# $OpenBSD: Makefile,v 1.8 2010/11/22 08:36:52 espie Exp $ +# $OpenBSD: Makefile,v 1.9 2011/07/08 23:04:53 robert Exp $ COMMENT= web-based iCal file parser V= 2.31 DISTNAME= phpicalendar${V} PKGNAME= phpicalendar-${V} +REVISION= 0 CATEGORIES= www HOMEPAGE= http://phpicalendar.net/ @@ -18,7 +19,7 @@ PERMIT_DISTFILES_FTP= Yes MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=phpicalendar/} EXTRACT_SUFX= .tgz -RUN_DEPENDS= www/php5/core +MODULES= lang/php NO_BUILD= Yes NO_REGRESS= Yes diff --git a/www/phpldapadmin/Makefile b/www/phpldapadmin/Makefile index 0a0cfd2f4a3..ba413ded204 100644 --- a/www/phpldapadmin/Makefile +++ b/www/phpldapadmin/Makefile @@ -1,13 +1,13 @@ -# $OpenBSD: Makefile,v 1.24 2010/11/22 08:36:53 espie Exp $ +# $OpenBSD: Makefile,v 1.25 2011/07/08 23:04:53 robert Exp $ COMMENT= web-based LDAP browser to manage LDAP servers VERSION= 1.2.0.5 DISTNAME= phpldapadmin-${VERSION} CATEGORIES= www -HOMEPAGE= http://phpldapadmin.sourceforge.net/ +HOMEPAGE= http://phpldapadmin.sourceforge.net/ -REVISION= 0 +REVISION= 1 # GPLv2 PERMIT_PACKAGE_CDROM= Yes @@ -26,8 +26,9 @@ PREFIX= /var/www INSTDIR= ${PREFIX}/phpldapadmin SUBST_VARS= INSTDIR -RUN_DEPENDS= www/php5/extensions,-ldap \ - www/php5/extensions,-mhash +MODULES= lang/php +RUN_DEPENDS= lang/php/${MODPHP_VERSION},-ldap \ + lang/php/${MODPHP_VERSION},-mhash do-install: ${INSTALL_DATA_DIR} ${PREFIX}/phpldapadmin diff --git a/www/phplist/Makefile b/www/phplist/Makefile index 401a658bc38..521e2b73b33 100644 --- a/www/phplist/Makefile +++ b/www/phplist/Makefile @@ -1,8 +1,9 @@ -# $OpenBSD: Makefile,v 1.9 2011/06/24 09:04:30 sthen Exp $ +# $OpenBSD: Makefile,v 1.10 2011/07/08 23:04:53 robert Exp $ COMMENT= web-based double opt-in newsletter manager DISTNAME= phplist-2.10.14 +REVISION= 0 CATEGORIES= www @@ -25,8 +26,9 @@ PREFIX= /var/www INSTDIR= ${PREFIX}/lists SUBST_VARS= INSTDIR -RUN_DEPENDS= www/php5/extensions,-mysql \ - www/php5/extensions,-imap \ +MODULES= lang/php +RUN_DEPENDS= lang/php/${MODPHP_VERSION},-mysql \ + lang/php/${MODPHP_VERSION},-imap \ net/pear-HTTP-Request do-install: diff --git a/www/phpmyadmin/Makefile b/www/phpmyadmin/Makefile index 0a2c4fd6c62..16d32267754 100644 --- a/www/phpmyadmin/Makefile +++ b/www/phpmyadmin/Makefile @@ -1,9 +1,10 @@ -# $OpenBSD: Makefile,v 1.58 2011/07/06 14:28:35 sthen Exp $ +# $OpenBSD: Makefile,v 1.59 2011/07/08 23:04:53 robert Exp $ COMMENT= tool to handle the administration of MySQL over the web V= 3.4.3.1 DISTNAME= phpMyAdmin-${V} +REVISION= 0 CATEGORIES= www HOMEPAGE= http://www.phpmyadmin.net/ @@ -27,10 +28,10 @@ PREFIX= /var/www INSTDIR= ${PREFIX}/phpMyAdmin SUBST_VARS= INSTDIR V -RUN_DEPENDS= www/php5/extensions,-mysql \ - www/php5/extensions,-mbstring \ - www/php5/extensions,-mcrypt \ - www/php5/extensions,-gd +MODULES= lang/php +RUN_DEPENDS= lang/php/${MODPHP_VERSION},-mysql \ + lang/php/${MODPHP_VERSION},-mcrypt \ + lang/php/${MODPHP_VERSION},-gd do-install: @cd ${PREFIX} && tar zxf ${FULLDISTDIR}/${DISTFILES} diff --git a/www/phppgadmin/Makefile b/www/phppgadmin/Makefile index 82920714d0e..5143997ab59 100644 --- a/www/phppgadmin/Makefile +++ b/www/phppgadmin/Makefile @@ -1,10 +1,11 @@ -# $OpenBSD: Makefile,v 1.12 2011/06/22 11:51:32 pea Exp $ +# $OpenBSD: Makefile,v 1.13 2011/07/08 23:04:53 robert Exp $ COMMENT= tool to handle the administration of PostgreSQL over the web DISTNAME= phpPgAdmin-5.0.2 +REVISION= 0 CATEGORIES= www databases -HOMEPAGE= http://phppgadmin.sourceforge.net/ +HOMEPAGE= http://phppgadmin.sourceforge.net/ MAINTAINER= Pierre-Emmanuel Andre @@ -24,8 +25,7 @@ PREFIX= /var/www INSTDIR= ${PREFIX}/phpPgAdmin SUBST_VARS= INSTDIR -PHP_VERSION= 5 -RUN_DEPENDS= www/php${PHP_VERSION}/extensions,-pgsql +RUN_DEPENDS= lang/php/${MODPHP_VERSION},-pgsql do-install: @cp -Rp ${WRKDIST} ${INSTDIR} diff --git a/www/piwik/Makefile b/www/piwik/Makefile index 6655b02200d..0301d90d18e 100644 --- a/www/piwik/Makefile +++ b/www/piwik/Makefile @@ -1,8 +1,9 @@ -# $OpenBSD: Makefile,v 1.36 2011/06/21 08:44:09 giovanni Exp $ +# $OpenBSD: Makefile,v 1.37 2011/07/08 23:04:53 robert Exp $ COMMENT= open source web analytics software program DISTNAME= piwik-1.5 +REVISION= 0 CATEGORIES= www HOMEPAGE= http://www.piwik.org/ @@ -26,10 +27,10 @@ PREFIX= /var/www INSTDIR= ${PREFIX}/piwik/ SUBST_VARS= INSTDIR -PHP_VERSION= 5 -RUN_DEPENDS= www/php${PHP_VERSION}/extensions,-gd \ - www/php${PHP_VERSION}/extensions,-mysql \ - www/php${PHP_VERSION}/extensions,-pdo_mysql +MODULES= lang/php +RUN_DEPENDS= lang/php/${MODPHP_VERSION},-gd \ + lang/php/${MODPHP_VERSION},-mysql \ + lang/php/${MODPHP_VERSION},-pdo_mysql post-patch: @find ${WRKSRC} -name "*.orig" -exec rm -f {} \; diff --git a/www/pmwiki/Makefile b/www/pmwiki/Makefile index 324b356467e..32ea9256c61 100644 --- a/www/pmwiki/Makefile +++ b/www/pmwiki/Makefile @@ -1,8 +1,9 @@ -# $OpenBSD: Makefile,v 1.6 2010/12/23 13:06:50 jasper Exp $ +# $OpenBSD: Makefile,v 1.7 2011/07/08 23:01:39 robert Exp $ COMMENT= wiki-based system for collaborative creation of websites DISTNAME= pmwiki-2.2.21 +REVISION= 0 EXTRACT_SUFX= .tgz CATEGORIES= www @@ -25,7 +26,7 @@ PREFIX= /var/www INSTDIR= ${PREFIX}/pmwiki SUBST_VARS= INSTDIR -RUN_DEPENDS= www/php5/core +MODULES= lang/php do-install: @cd ${PREFIX} && tar zxf ${FULLDISTDIR}/${DISTFILES} diff --git a/www/sabredav/Makefile b/www/sabredav/Makefile index 493272daf4b..5cd35944b4e 100644 --- a/www/sabredav/Makefile +++ b/www/sabredav/Makefile @@ -1,7 +1,8 @@ -# $OpenBSD: Makefile,v 1.2 2010/11/22 08:36:54 espie Exp $ +# $OpenBSD: Makefile,v 1.3 2011/07/08 23:01:39 robert Exp $ COMMENT = php5 WebDAV server DISTNAME = Sabre_DAV-1.0.0 +REVISION = 0 PKGNAME = ${DISTNAME:L:S/_//} EXTRACT_SUFX = .tgz CATEGORIES = www @@ -24,8 +25,7 @@ PREFIX = /var/www INSTDIR = ${PREFIX}/sabredav SUBST_VARS = INSTDIR - -RUN_DEPENDS = www/php5/core +MODULES = lang/php do-install: ${INSTALL_DATA_DIR} ${INSTDIR} diff --git a/www/statusnet/Makefile b/www/statusnet/Makefile index 59a4817f1c6..eee89b7f08e 100644 --- a/www/statusnet/Makefile +++ b/www/statusnet/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.14 2011/06/02 13:41:41 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.15 2011/07/08 23:01:39 robert Exp $ COMMENT= open source micro messaging platform DISTNAME= statusnet-0.8.3 -REVISION= 5 +REVISION= 6 CATEGORIES= www net @@ -17,6 +17,7 @@ PERMIT_DISTFILES_FTP= Yes MASTER_SITES= ${HOMEPAGE} +MODULES= lang/php RUN_DEPENDS= databases/pear-DB \ databases/pear-DB_DataObject \ devel/pear-System-Command \ @@ -31,11 +32,10 @@ RUN_DEPENDS= databases/pear-DB \ textproc/sphinx \ www/apache-httpd \ www/php-markdown \ - www/php5/extensions,-curl \ - www/php5/extensions,-gd \ - www/php5/extensions,-mbstring \ - www/php5/extensions,-tidy - + lang/php/${MODPHP_VERSION},-curl \ + lang/php/${MODPHP_VERSION},-gd \ + lang/php/${MODPHP_VERSION},-tidy + NO_BUILD= Yes NO_REGRESS= Yes PKG_ARCH= * diff --git a/www/syweb/Makefile b/www/syweb/Makefile index d6a89d767ba..f59ba31c9c3 100644 --- a/www/syweb/Makefile +++ b/www/syweb/Makefile @@ -1,7 +1,8 @@ -# $OpenBSD: Makefile,v 1.10 2011/05/02 17:16:41 sthen Exp $ +# $OpenBSD: Makefile,v 1.11 2011/07/08 23:01:39 robert Exp $ COMMENT= web frontend to symon DISTNAME= syweb-0.63 +REVISION= 0 CATEGORIES= www sysutils MAINTAINER= Stuart Henderson @@ -21,8 +22,8 @@ NO_BUILD= Yes PREFIX= /var/www -RUN_DEPENDS= net/rrdtool \ - www/php5/core>=5.2 +MODULES= lang/php +RUN_DEPENDS= net/rrdtool WRKDIST= ${WRKDIR}/syweb diff --git a/www/tikiwiki/Makefile b/www/tikiwiki/Makefile index 8c08c4ac648..b04b2a9612a 100644 --- a/www/tikiwiki/Makefile +++ b/www/tikiwiki/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.16 2011/06/02 13:41:42 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.17 2011/07/08 23:01:39 robert Exp $ COMMENT= all-in-one wiki/groupware/CMS solution @@ -6,7 +6,7 @@ V= 4.2 DISTNAME= tikiwiki-${V} CATEGORIES= www -REVISION= 2 +REVISION= 3 HOMEPAGE= http://tikiwiki.org/ @@ -27,10 +27,11 @@ PREFIX= /var/www INSTDIR= ${PREFIX}/tikiwiki SUBST_VARS= INSTDIR -RUN_DEPENDS= www/php5/extensions,-gd \ - www/php5/extensions,-xmlrpc \ - www/php5/extensions,-mbstring \ - www/php5/extensions,-mysqli +MODULES= lang/php +RUN_DEPENDS= lang/php/${MODPHP_VERSION},-gd \ + lang/php/${MODPHP_VERSION},-xmlrpc \ + lang/php/${MODPHP_VERSION},-mbstring \ + lang/php/${MODPHP_VERSION},-mysqli do-install: @cd ${PREFIX} && tar zxf ${FULLDISTDIR}/${DISTNAME}${EXTRACT_SUFX} diff --git a/www/timetrex/Makefile b/www/timetrex/Makefile index fc58c8107f8..d5155b95a81 100644 --- a/www/timetrex/Makefile +++ b/www/timetrex/Makefile @@ -1,8 +1,9 @@ -# $OpenBSD: Makefile,v 1.27 2011/06/23 06:52:32 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.28 2011/07/08 23:01:39 robert Exp $ COMMENT= web-based payroll and time management suite V= 3.5.1 +REVISION= 0 DISTNAME= TimeTrex_Standard_Edition_v${V} PKGNAME= timetrex-${V} CATEGORIES= www productivity @@ -19,9 +20,10 @@ PERMIT_DISTFILES_FTP= Yes MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=timetrex/} -RUN_DEPENDS= www/php5/extensions,-gd \ - www/php5/extensions,-soap \ - php5-mysql-*|php5-pgsql-*:www/php5/extensions,-mysql \ +MODULES= lang/php +RUN_DEPENDS= lang/php/${MODPHP_VERSION},-gd \ + lang/php/${MODPHP_VERSION},-soap \ + php-mysql-*|php-pgsql-*:lang/php/${MODPHP_VERSION},-mysql \ www/pear NO_BUILD= Yes diff --git a/www/tt-rss/Makefile b/www/tt-rss/Makefile index ac106d5f4f3..48f1d118b77 100755 --- a/www/tt-rss/Makefile +++ b/www/tt-rss/Makefile @@ -1,8 +1,9 @@ -# $OpenBSD: Makefile,v 1.3 2010/11/22 08:36:54 espie Exp $ +# $OpenBSD: Makefile,v 1.4 2011/07/08 23:01:39 robert Exp $ COMMENT= webbased rss reader with standalone look and feel DISTNAME= tt-rss-1.3.3 +REVISION= 0 CATEGORIES= www HOMEPAGE= http://tt-rss.org/ @@ -26,10 +27,9 @@ PREFIX= /var/www INSTDIR= ${PREFIX}/tt-rss/ SUBST_VARS= INSTDIR -PHP_VERSION= 5 -RUN_DEPENDS= www/php${PHP_VERSION}/extensions,-mbstring \ - www/php${PHP_VERSION}/extensions,-pgsql \ - www/php${PHP_VERSION}/extensions,-xmlrpc +MODULES= lang/php +RUN_DEPENDS= lang/php/${MODPHP_VERSION},-pgsql \ + lang/php/${MODPHP_VERSION},-xmlrpc do-install: @cp -Rp ${WRKDIST} ${INSTDIR} diff --git a/www/vtigercrm/Makefile b/www/vtigercrm/Makefile index 7de4a3d55e1..d933826fb8c 100644 --- a/www/vtigercrm/Makefile +++ b/www/vtigercrm/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.7 2011/06/03 22:07:39 sthen Exp $ +# $OpenBSD: Makefile,v 1.8 2011/07/08 23:01:39 robert Exp $ COMMENT= customer relationship management (CRM) software DISTNAME= vtigercrm-5.2.1 -REVISION= 0 +REVISION= 1 CATEGORIES= www HOMEPAGE= http://www.vtiger.com/ @@ -26,10 +26,10 @@ PREFIX= /var/www INSTDIR= ${PREFIX}/vtigercrm SUBST_VARS= INSTDIR -RUN_DEPENDS= www/php5/core \ - www/php5/extensions,-gd \ - www/php5/extensions,-imap \ - www/php5/extensions,-mysql +MODULES= lang/php +RUN_DEPENDS= lang/php/${MODPHP_VERSION},-gd \ + lang/php/${MODPHP_VERSION},-imap \ + lang/php/${MODPHP_VERSION},-mysql do-install: @tar zxf ${FULLDISTDIR}/${DISTNAME}${EXTRACT_SUFX} -C ${PREFIX} diff --git a/www/webacula/Makefile b/www/webacula/Makefile index 217dec65a48..cef83e7da87 100644 --- a/www/webacula/Makefile +++ b/www/webacula/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.8 2011/06/02 13:41:42 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.9 2011/07/08 23:01:39 robert Exp $ COMMENT= bacula(8) web interface DISTNAME= webacula-5.0.3 -REVISION= 6 +REVISION= 7 CATEGORIES= www sysutils @@ -18,8 +18,9 @@ PERMIT_DISTFILES_FTP= Yes MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=webacula/} -RUN_DEPENDS= www/php5/extensions,-gd \ - php5-pdo_pgsql-*|php5-pdo_mysql-*|php5-pdo_sqlite-*:www/php5/extensions,-pdo_pgsql \ +MODULES= lang/php +RUN_DEPENDS= lang/php/${MODPHP_VERSION},-gd \ + php-pdo_pgsql-*|php-pdo_mysql-*|php-pdo_sqlite-*:lang/php/${MODPHP_VERSION},-pdo_pgsql \ www/zendframework>=1.10.8p1 \ sysutils/bacula,pgsql,-server diff --git a/www/webcollab/Makefile b/www/webcollab/Makefile index c277e86d2e2..c14197d0834 100644 --- a/www/webcollab/Makefile +++ b/www/webcollab/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.5 2010/11/22 08:36:55 espie Exp $ +# $OpenBSD: Makefile,v 1.6 2011/07/08 23:01:39 robert Exp $ COMMENT= collaborative web-based system for project management V= 1.70 DISTNAME= webcollab-${V} -REVISION= 0 +REVISION= 1 CATEGORIES= www HOMEPAGE= http://webcollab.sourceforge.net/ @@ -19,7 +19,8 @@ PERMIT_DISTFILES_FTP= Yes MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=webcollab/} -RUN_DEPENDS= www/php5/extensions,-mysql +MODULES= lang/php +RUN_DEPENDS= lang/php/${MODPHP_VERSION},-mysql EXTRACT_ONLY= NO_BUILD= Yes