From f86105f02ccd3a61b41bb020c032e6c33002ab41 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Sun, 16 Oct 2011 15:20:33 +0000 Subject: [PATCH] php5 -> php. --- www/mantis/Makefile | 7 ++++--- www/mantis/pkg/MESSAGE | 4 ++-- www/mediawiki/Makefile | 4 ++-- www/mediawiki/pkg/DESCR | 2 +- www/mollify/Makefile | 4 ++-- www/mollify/pkg/MESSAGE | 2 +- www/statusnet/Makefile | 7 ++++--- www/statusnet/pkg/README | 6 +++--- www/tikiwiki/Makefile | 4 ++-- www/tikiwiki/pkg/README | 6 +++--- www/webacula/Makefile | 4 ++-- www/webacula/pkg/README | 8 ++++---- 12 files changed, 30 insertions(+), 28 deletions(-) diff --git a/www/mantis/Makefile b/www/mantis/Makefile index 6999dd989a7..5fec893fdaa 100644 --- a/www/mantis/Makefile +++ b/www/mantis/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.13 2010/11/22 08:36:49 espie Exp $ +# $OpenBSD: Makefile,v 1.14 2011/10/16 15:20:33 ajacoutot Exp $ COMMENT= web based bug tracking V= 1.1.6 DISTNAME= mantisbt-${V} PKGNAME= mantis-${V} -REVISION= 2 +REVISION= 3 CATEGORIES= www HOMEPAGE= http://www.mantisbt.org/ @@ -25,7 +25,8 @@ PREFIX= /var/www INSTDIR= /var/www/mantis SUBST_VARS= INSTDIR -RUN_DEPENDS= mail/femail,-chroot +RUN_DEPENDS= mail/femail,-chroot \ + php-mysql-*|php-pgsql-*:lang/php/${MODPHP_VERSION},-mysql do-install: @-test ! -d ${PREFIX}/mantis && mkdir ${PREFIX}/mantis diff --git a/www/mantis/pkg/MESSAGE b/www/mantis/pkg/MESSAGE index 79735747881..2bc974cd411 100644 --- a/www/mantis/pkg/MESSAGE +++ b/www/mantis/pkg/MESSAGE @@ -13,8 +13,8 @@ Some important notes: Choose a database system: -Mantis can use a PostgreSQL or MySQL database. Install either the php5-pgsql -or the php5-mysql package before you use Mantis. +Mantis can use a PostgreSQL or MySQL database. Install either the php-pgsql +or the php-mysql package before you use Mantis. MySQL Database: diff --git a/www/mediawiki/Makefile b/www/mediawiki/Makefile index 9a0913161cd..e5e6ccd7010 100644 --- a/www/mediawiki/Makefile +++ b/www/mediawiki/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.29 2011/10/16 14:37:45 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.30 2011/10/16 15:20:33 ajacoutot Exp $ COMMENT = web-based collaborative editing environment DISTNAME = mediawiki-1.15.5 -REVISION = 5 +REVISION = 6 CATEGORIES = www HOMEPAGE = http://www.mediawiki.org/ diff --git a/www/mediawiki/pkg/DESCR b/www/mediawiki/pkg/DESCR index 9ab9f025f46..7d9ef3794e6 100644 --- a/www/mediawiki/pkg/DESCR +++ b/www/mediawiki/pkg/DESCR @@ -1,5 +1,5 @@ MediaWiki is the software used for Wikipedia and the other Wikimedia Foundation websites. -To use MediaWiki you must install either the php5-mysql or php5-pgsql +To use MediaWiki you must install either the php-mysql or php-pgsql extension, depending on which database you want to run MediaWiki with. diff --git a/www/mollify/Makefile b/www/mollify/Makefile index e1332e52c40..8dcb309de1d 100644 --- a/www/mollify/Makefile +++ b/www/mollify/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.5 2011/09/16 12:00:07 espie Exp $ +# $OpenBSD: Makefile,v 1.6 2011/10/16 15:20:33 ajacoutot Exp $ COMMENT= simple and clean multi-user web file manager DISTNAME= mollify_1.6.5.5 -REVISION= 1 +REVISION= 2 PKGNAME= ${DISTNAME:S/_/-/} EXTRACT_SUFX= .zip CATEGORIES= www diff --git a/www/mollify/pkg/MESSAGE b/www/mollify/pkg/MESSAGE index 4854f7dc5f9..33415517204 100644 --- a/www/mollify/pkg/MESSAGE +++ b/www/mollify/pkg/MESSAGE @@ -3,4 +3,4 @@ at http://yourhost/mollify/backend/install/ and following the directions to modify ${INSTDIR}/backend/configuration.php Mollify optionally supports MySQL configuration storage; the installer -can create the tables for you if you install the php5-mysqli package. +can create the tables for you if you install the php-mysqli package. diff --git a/www/statusnet/Makefile b/www/statusnet/Makefile index b6df9c1c4ad..66e53912e67 100644 --- a/www/statusnet/Makefile +++ b/www/statusnet/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.17 2011/09/16 12:00:09 espie Exp $ +# $OpenBSD: Makefile,v 1.18 2011/10/16 15:20:33 ajacoutot Exp $ COMMENT= open source micro messaging platform DISTNAME= statusnet-0.8.3 -REVISION= 8 +REVISION= 9 CATEGORIES= www net @@ -34,7 +34,8 @@ RUN_DEPENDS= databases/pear-DB \ www/php-markdown \ lang/php/${MODPHP_VERSION},-curl \ lang/php/${MODPHP_VERSION},-gd \ - lang/php/${MODPHP_VERSION},-tidy + lang/php/${MODPHP_VERSION},-tidy \ + php-mysql-*|php-pgsql-*:lang/php/${MODPHP_VERSION},-mysql NO_BUILD= Yes NO_REGRESS= Yes diff --git a/www/statusnet/pkg/README b/www/statusnet/pkg/README index fefbc158c45..3e276d79ec8 100644 --- a/www/statusnet/pkg/README +++ b/www/statusnet/pkg/README @@ -1,4 +1,4 @@ -$OpenBSD: README,v 1.4 2011/06/02 13:41:42 ajacoutot Exp $ +$OpenBSD: README,v 1.5 2011/10/16 15:20:33 ajacoutot Exp $ +----------------------------------------------------------------------- | Running ${FULLPKGNAME} on OpenBSD @@ -21,7 +21,7 @@ DocumentRoot of your web-server: == MySQL== -Please add the php5-mysql package to enable MySQL support in PHP. +Please add the php-mysql package to enable MySQL support in PHP. MySQL users running with chroot'ed httpd might like to take the following steps to place the mysql socket inside the chroot: @@ -50,7 +50,7 @@ Now connect to MySQL and create a user and database for Status.net: == PostgreSQL == -Please add the php5-pqsql package to enable PostgreSQL support in PHP. +Please add the php-pqsql package to enable PostgreSQL support in PHP. Assuming you have an administrative account named `postgres', you can create the 'statusnet' user and database like this: diff --git a/www/tikiwiki/Makefile b/www/tikiwiki/Makefile index 509ac0840d0..12455e51c64 100644 --- a/www/tikiwiki/Makefile +++ b/www/tikiwiki/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.20 2011/09/16 12:00:09 espie Exp $ +# $OpenBSD: Makefile,v 1.21 2011/10/16 15:20:33 ajacoutot Exp $ COMMENT= all-in-one wiki/groupware/CMS solution @@ -6,7 +6,7 @@ V= 4.2 DISTNAME= tikiwiki-${V} CATEGORIES= www -REVISION= 5 +REVISION= 6 HOMEPAGE= http://tikiwiki.org/ diff --git a/www/tikiwiki/pkg/README b/www/tikiwiki/pkg/README index 787cf234259..02e42181d1d 100644 --- a/www/tikiwiki/pkg/README +++ b/www/tikiwiki/pkg/README @@ -1,4 +1,4 @@ -$OpenBSD: README,v 1.3 2011/06/02 13:41:42 ajacoutot Exp $ +$OpenBSD: README,v 1.4 2011/10/16 15:20:33 ajacoutot Exp $ +----------------------------------------------------------------------- | Running ${FULLPKGNAME} on OpenBSD @@ -25,7 +25,7 @@ The default superuser account is: admin (password: admin). * Creating a dedicated user and database for Tikiwiki: While Tikiwiki partially supports any relational databases such as PostgreSQL or SQLite, only MySQL is fully supported. - Also, it is recommended to use the mysqli extension (php5-mysqli) for php + Also, it is recommended to use the mysqli extension (php-mysqli) for php communication to the database. $ mysqladmin -u root -p create 'tiki' @@ -43,7 +43,7 @@ The default superuser account is: admin (password: admin). default_charset = "utf-8" * In order to use the Maps feature, please install the Mapserver PHP extension - (php5-mapscript). + (php-mapscript). * Tikiwiki is a big piece of software, you should refer to the official documentation before using it. (http://doc.tikiwiki.org/) diff --git a/www/webacula/Makefile b/www/webacula/Makefile index 26dff9e04f2..d9ee29763cc 100644 --- a/www/webacula/Makefile +++ b/www/webacula/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.12 2011/09/16 12:00:09 espie Exp $ +# $OpenBSD: Makefile,v 1.13 2011/10/16 15:20:33 ajacoutot Exp $ COMMENT= bacula(8) web interface DISTNAME= webacula-5.5 -REVISION= 0 +REVISION= 1 CATEGORIES= www sysutils diff --git a/www/webacula/pkg/README b/www/webacula/pkg/README index c7d2fce47fc..5d2026f79d9 100644 --- a/www/webacula/pkg/README +++ b/www/webacula/pkg/README @@ -1,4 +1,4 @@ -$OpenBSD: README,v 1.5 2011/07/28 09:24:35 ajacoutot Exp $ +$OpenBSD: README,v 1.6 2011/10/16 15:20:33 ajacoutot Exp $ +----------------------------------------------------------------------- | Running ${FULLPKGNAME} on OpenBSD @@ -14,9 +14,9 @@ Database creation You need to install the PHP module corresponding to the database used by your bacula(8) installation. e.g: - for PostreSQL you'll need to install php5-pdo_pgsql - for MySQL you'll need to install php5-pdo_mysql - for SQLite3 you'll need to install php5-pdo_sqlite + for PostreSQL you'll need to install php-pdo_pgsql + for MySQL you'll need to install php-pdo_mysql + for SQLite3 you'll need to install php-pdo_sqlite To add the webacula DB tables, run the following commands according to the RDBMS that bacula(8) uses. Note that prior to run these commands,