..and here are diffs for the other ports to use new infra.
It adds deps to owncloud/nextcloud which aren't currently there at
all, from what I read on their websites pdo is actually needed but
not listed as a dep.
Index: mail/roundcubemail/Makefile
===================================================================
RCS file: /cvs/ports/mail/roundcubemail/Makefile,v
retrieving revision 1.130
diff -u -p -r1.130 Makefile
--- mail/roundcubemail/Makefile 22 May 2018 08:19:06 -0000 1.130
+++ mail/roundcubemail/Makefile 25 May 2018 12:39:49 -0000
@@ -5,7 +5,7 @@ COMMENT= imap4 webmail client
V= 1.3.6
DISTNAME= roundcubemail-$V
PKGNAME= roundcubemail-${V:S/-rc/rc/}
-REVISION= 0
+REVISION= 1
EXTRACT_SUFX= -complete.tar.gz
FIX_EXTRACT_PERMISSIONS= Yes
@@ -31,7 +31,8 @@ TINSTDIR= ${TRUEPREFIX}/roundcubemail
SUBST_VARS= INSTDIR TINSTDIR MODPHP_BIN
MODULES= lang/php
-RUN_DEPENDS= lang/php/${MODPHP_VERSION},-pspell \
+RUN_DEPENDS= ${MODPHP_PDO_DEPENDS} \
+ lang/php/${MODPHP_VERSION},-pspell \
lang/php/${MODPHP_VERSION},-zip
do-configure:
Index: net/icinga/web/Makefile
===================================================================
RCS file: /cvs/ports/net/icinga/web/Makefile,v
retrieving revision 1.37
diff -u -p -r1.37 Makefile
--- net/icinga/web/Makefile 22 May 2018 08:18:08 -0000 1.37
+++ net/icinga/web/Makefile 25 May 2018 12:39:50 -0000
@@ -5,17 +5,20 @@ COMMENT = web UI for icinga
GH_ACCOUNT = Icinga
GH_PROJECT = icinga-web
GH_TAGNAME = v1.14.1
-REVISION = 0
+REVISION = 1
MODULES= lang/php
COMMON = www/pear \
shells/bash
+MODPHP_PDO_ALLOWED = mysql pgsql
+MODPHP_PDO_PREF = mysql
+
RUN_DEPENDS = ${COMMON_DEPENDS} \
+ ${MODPHP_PDO_DEPENDS}
lang/php/${MODPHP_VERSION},-gd \
lang/php/${MODPHP_VERSION},-xsl \
- php-pdo_mysql-${MODPHP_VSPEC}|php-pdo_pgsql-${MODPHP_VSPEC}:lang/php/${MODPHP_VERSION},-pdo_mysql \
net/icinga/core \
net/icinga/core,-ido>=1.11
# Optional php extensions: ldap soap xmlrpc memcache
Index: net/icinga/web2/Makefile
===================================================================
RCS file: /cvs/ports/net/icinga/web2/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- net/icinga/web2/Makefile 22 May 2018 08:18:08 -0000 1.19
+++ net/icinga/web2/Makefile 25 May 2018 12:39:50 -0000
@@ -5,13 +5,16 @@ COMMENT = next-generation web UI for ici
GH_ACCOUNT = Icinga
GH_PROJECT = icingaweb2
GH_TAGNAME = v2.5.3
-REVISION = 0
+REVISION = 1
PKGNAME = icinga-web2-${GH_TAGNAME:S/v//}
MODULES= lang/php
+MODPHP_PDO_ALLOWED = mysql pgsql
+MODPHP_PDO_PREF = mysql
+
RUN_DEPENDS = lang/php/${MODPHP_VERSION},-intl \
- php-pdo_mysql-${MODPHP_VSPEC}|php-pdo_pgsql-${MODPHP_VSPEC}:lang/php/${MODPHP_VERSION},-pdo_mysql
+ ${MODPHP_PDO_DEPENDS}
NO_TEST = Yes
NO_BUILD = Yes
Index: www/drupal7/core7/Makefile
===================================================================
RCS file: /cvs/ports/www/drupal7/core7/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- www/drupal7/core7/Makefile 22 May 2018 08:18:08 -0000 1.7
+++ www/drupal7/core7/Makefile 25 May 2018 12:39:50 -0000
@@ -4,11 +4,12 @@ COMMENT = powerful content management sy
DISTNAME = drupal-7.59
PKGNAME = drupal-7.59
-REVISION = 0
+REVISION = 1
DISTFILES = ${DISTNAME}${EXTRACT_SUFX}
MODULES = lang/php
-RUN_DEPENDS = lang/php/${MODPHP_VERSION},-gd
+RUN_DEPENDS = lang/php/${MODPHP_VERSION},-gd \
+ ${MODPHP_PDO_DEPENDS}
do-install:
mkdir -p ${PREFIX}/${DRUPAL_ROOT}
Index: www/drupal7/core7/pkg/README
===================================================================
RCS file: /cvs/ports/www/drupal7/core7/pkg/README,v
retrieving revision 1.1
diff -u -p -r1.1 README
--- www/drupal7/core7/pkg/README 30 Jun 2016 12:05:41 -0000 1.1
+++ www/drupal7/core7/pkg/README 25 May 2018 12:39:50 -0000
@@ -11,9 +11,8 @@ ln -sf ../modules.sample/${DRUPAL}.conf
/var/www/conf/modules
Drupal can work with a PostgreSQL, MySQL or SQLite3 database.
-Support for SQLite3 is included with the main php package; to use
-another database, the corresponding package needs to be installed:
- php-pdo_pgsql or php-pdo_mysql
+If you don't already have the corresponding PDO package, install it:
+ php-pdo_pgsql, php-pdo_mysql or php-pdo_sqlite
If you just want to try out drupal, you don't need any database server,
an sqlite file will do just fine.
Index: www/drush/Makefile
===================================================================
RCS file: /cvs/ports/www/drush/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- www/drush/Makefile 22 May 2018 08:18:08 -0000 1.12
+++ www/drush/Makefile 25 May 2018 12:39:50 -0000
@@ -5,7 +5,7 @@ COMMENT = command line access to most of
CATEGORIES = www devel
V= 8.0.3
-REVISION= 0
+REVISION= 1
DISTNAME= drush-$V
EXTRACT_SUFX= -deps.tar.xz
@@ -20,7 +20,8 @@ MODULES= lang/php
PERMIT_PACKAGE_CDROM= Yes
NO_BUILD= Yes
-RUN_DEPENDS= archivers/gtar
+RUN_DEPENDS= archivers/gtar \
+ ${MODPHP_PDO_DEPENDS}
SUBST_VARS= MODPHP_BIN
do-install:
Index: www/nextcloud/Makefile
===================================================================
RCS file: /cvs/ports/www/nextcloud/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- www/nextcloud/Makefile 22 May 2018 08:19:06 -0000 1.14
+++ www/nextcloud/Makefile 25 May 2018 12:39:50 -0000
@@ -3,7 +3,7 @@
COMMENT= easy and universal access to shared and/or personal files
V= 13.0.2
-REVISION= 0
+REVISION= 1
DISTNAME= nextcloud-${V}
EXTRACT_SUFX= .tar.bz2
@@ -39,8 +39,11 @@ VR= ${V:R}
MAJOR= ${VR:R}
SUBST_VARS= INSTDIR TINSTDIR MODPHP_BIN VR MAJOR
+MODPHP_PDO_ALLOWED= mysql pgsql
+MODPHP_PDO_PREF= mysql
RUN_DEPENDS= lang/php/${MODPHP_VERSION},-gd \
- lang/php/${MODPHP_VERSION},-zip
+ lang/php/${MODPHP_VERSION},-zip \
+ ${MODPHP_PDO_DEPENDS}
# http user authentication
RUN_DEPENDS += lang/php/${MODPHP_VERSION},-curl
Index: www/owncloud/Makefile
===================================================================
RCS file: /cvs/ports/www/owncloud/Makefile,v
retrieving revision 1.127
diff -u -p -r1.127 Makefile
--- www/owncloud/Makefile 24 May 2018 07:27:45 -0000 1.127
+++ www/owncloud/Makefile 25 May 2018 12:39:50 -0000
@@ -6,7 +6,7 @@ V= 10.0.8
DISTNAME= owncloud-${V}
EXTRACT_SUFX= .tar.bz2
-REVISION= 2
+REVISION= 3
CATEGORIES= www
@@ -39,8 +39,11 @@ TINSTDIR= ${TRUEPREFIX}/owncloud
VR= ${V:R}
SUBST_VARS= INSTDIR TINSTDIR MODPHP_BIN VR
+MODPHP_PDO_ALLOWED= mysql pgsql
+MODPHP_PDO_PREF= mysql
RUN_DEPENDS= lang/php/${MODPHP_VERSION},-gd \
- lang/php/${MODPHP_VERSION},-zip
+ lang/php/${MODPHP_VERSION},-zip \
+ ${MODPHP_PDO_DEPENDS}
# http user authentication
RUN_DEPENDS += lang/php/${MODPHP_VERSION},-curl
No comments:
Post a Comment