Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 14 Dec 2017 20:49:24 +0000 (UTC)
From:      Dan Langille <dvl@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r456372 - head/www/Stikked
Message-ID:  <201712142049.vBEKnO7N076738@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dvl
Date: Thu Dec 14 20:49:24 2017
New Revision: 456372
URL: https://svnweb.freebsd.org/changeset/ports/456372

Log:
  Provide options for SQLite, MySQL, and PostgreSQL.
  Make the sample configuration file a true @sample.
  
  Points to mat@ for shaming me into this. Thank you.

Modified:
  head/www/Stikked/Makefile
  head/www/Stikked/pkg-plist

Modified: head/www/Stikked/Makefile
==============================================================================
--- head/www/Stikked/Makefile	Thu Dec 14 20:44:30 2017	(r456371)
+++ head/www/Stikked/Makefile	Thu Dec 14 20:49:24 2017	(r456372)
@@ -3,6 +3,7 @@
 
 PORTNAME=	Stikked
 DISTVERSION=	0.12.0
+PORTREVISION=	1
 CATEGORIES=	www
 
 MAINTAINER=	dvl@FreeBSD.org
@@ -13,17 +14,34 @@ USES=		php:web
 USE_GITHUB=	yes
 GH_ACCOUNT=	claudehohl
 
-WANT_PGSQL=	client
-WANT_SQLITE=	client
-WANT_MYSQL=	client
+USE_PHP=	ctype filter gd pgsql session
 
-USE_PHP=	gd pdo session ctype filter pgsql
-PGSQL_USE=	PHP=pdo_pgsql
-
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 SUB_FILES=	pkg-message
+
+OPTIONS_MULTI=	DB
+OPTIONS_MULTI_DB=	MYSQL PGSQL SQLITE
+OPTIONS_DEFAULT=	PGSQL
+
+MYSQL_DESC=	Include the PHP shared extension for MySQL
+PGSQL_DESC=	Include the PHP shared extension for PostgreSQL
+SQLITE_DESC=	Include the PHP shared extension for SQLite3
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MMYSQL}
+USE_PHP+=	mysql
+.endif
+
+.if ${PORT_OPTIONS:MPGSQL}
+USE_PHP+=	pgsql
+.endif
+
+.if ${PORT_OPTIONS:MSQLITE}
+USE_PHP+=	sqlite3
+.endif
 
 do-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR}

Modified: head/www/Stikked/pkg-plist
==============================================================================
--- head/www/Stikked/pkg-plist	Thu Dec 14 20:44:30 2017	(r456371)
+++ head/www/Stikked/pkg-plist	Thu Dec 14 20:49:24 2017	(r456372)
@@ -1,5 +1,4 @@
-%%ETCDIR%%/stikked.php.sample
-
+@sample %%ETCDIR%%/stikked.php.sample
 %%WWWDIR%%/.htaccess
 %%WWWDIR%%/application/.htaccess
 %%WWWDIR%%/application/cache/.htaccess



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201712142049.vBEKnO7N076738>