diff options
| author | gdt <gdt> | 2012-06-17 18:27:19 +0000 |
|---|---|---|
| committer | gdt <gdt> | 2012-06-17 18:27:19 +0000 |
| commit | 54548854d645b287c7b528e17907556134ffa275 (patch) | |
| tree | bb3dd8e7a118228cce2eb9d6fbd166fc4e2c2b67 /www | |
| parent | e404eaf6264bf466a25ac83c7c37927bdb44674a (diff) | |
| download | pkgsrc-54548854d645b287c7b528e17907556134ffa275.tar.gz | |
Move pdo_sqlite3 dependency to under sqlite option.
Previously, I added a dependency on pdo_sqlite3 because an owncloud
instance failed to run without PDO. This commit moves the dependency
to be conditional on the sqlite option, so that it doesn't apply if
mysql is selected.
The upstream method selection code is hard to follow, and in
particular I don't understand how dbtype=sqlite is expected to use
MDB2 and dbtype=sqlite3 PDO. So with the sqlite option both chunks of
code are availale. I suspect there is an upstream bug lurking, but I
can't point to it.
Diffstat (limited to 'www')
| -rw-r--r-- | www/php-owncloud/Makefile | 5 | ||||
| -rw-r--r-- | www/php-owncloud/options.mk | 9 |
2 files changed, 10 insertions, 4 deletions
diff --git a/www/php-owncloud/Makefile b/www/php-owncloud/Makefile index dbd4160d57f..43768b94c26 100644 --- a/www/php-owncloud/Makefile +++ b/www/php-owncloud/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.13 2012/06/16 22:34:23 dholland Exp $ +# $NetBSD: Makefile,v 1.14 2012/06/17 18:27:19 gdt Exp $ # DISTNAME= owncloud-4.0.1 PKGNAME= ${PHP_PKG_PREFIX}-${DISTNAME} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= www MASTER_SITES= http://owncloud.org/releases/ EXTRACT_SUFX= .tar.bz2 @@ -25,7 +25,6 @@ DEPENDS+= ${PHP_PKG_PREFIX}-gd>=5.2.0:../../graphics/php-gd DEPENDS+= ${PHP_PKG_PREFIX}-json>=5.2.0:../../textproc/php-json DEPENDS+= ${PHP_PKG_PREFIX}-mbstring>=5.2.0:../../converters/php-mbstring DEPENDS+= ${PHP_PKG_PREFIX}-zip>=5.2.0:../../archivers/php-zip -DEPENDS+= ${PHP_PKG_PREFIX}-pdo_sqlite>=5.2.0:../../databases/php-pdo_sqlite .include "options.mk" diff --git a/www/php-owncloud/options.mk b/www/php-owncloud/options.mk index 812e2ef1174..c0f8b98f7d0 100644 --- a/www/php-owncloud/options.mk +++ b/www/php-owncloud/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2011/12/18 08:38:14 ryoon Exp $ +# $NetBSD: options.mk,v 1.2 2012/06/17 18:27:19 gdt Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.php-owncloud @@ -15,5 +15,12 @@ PKG_SUGGESTED_OPTIONS= sqlite .if !empty(PKG_OPTIONS:Mmysql) DEPENDS+= ${PHP_PKG_PREFIX}-mysql>=5.2.0:../../databases/php-mysql .elif !empty(PKG_OPTIONS:Msqlite) + +# php-sqlite provides sqlite2 DEPENDS+= ${PHP_PKG_PREFIX}-sqlite>=5.2.0:../../databases/php-sqlite + +# php-pdo_sqlite provides sqlite3. An owncloud instance that was +# installed as version 2 and upgraded to 3 and then 4 +# complained/failed that PDO was not present. +DEPENDS+= ${PHP_PKG_PREFIX}-pdo_sqlite>=5.2.0:../../databases/php-pdo_sqlite .endif |