Date: Mon, 25 Aug 2014 12:19:44 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r366069 - in head/www: MT bacula-web davical drupal7 fusionpbx hastymail2 hastymail2-devel limesurvey mnogosearch mod_auth_pgsql2 mod_tsa nginx nginx-devel oops otrs pglogd phprecipeboo... Message-ID: <201408251219.s7PCJiUr061262@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Mon Aug 25 12:19:43 2014 New Revision: 366069 URL: http://svnweb.freebsd.org/changeset/ports/366069 QAT: https://qat.redports.org/buildarchive/r366069/ Log: Convert to USES=pgsql Modified: head/www/MT/Makefile head/www/bacula-web/Makefile head/www/davical/Makefile head/www/drupal7/Makefile head/www/fusionpbx/Makefile head/www/hastymail2-devel/Makefile head/www/hastymail2/Makefile head/www/limesurvey/Makefile head/www/mnogosearch/Makefile head/www/mod_auth_pgsql2/Makefile head/www/mod_tsa/Makefile head/www/nginx-devel/Makefile head/www/nginx/Makefile head/www/oops/Makefile head/www/otrs/Makefile head/www/pglogd/Makefile head/www/phprecipebook/Makefile head/www/rt38/Makefile head/www/tengine/Makefile Modified: head/www/MT/Makefile ============================================================================== --- head/www/MT/Makefile Mon Aug 25 11:45:23 2014 (r366068) +++ head/www/MT/Makefile Mon Aug 25 12:19:43 2014 (r366069) @@ -101,7 +101,8 @@ DB_DIR?= ${BASEDIR}/var/db/mysql/WEBLOG_ RUN_DEPENDS+= p5-DBD-mysql>=2.9005:${PORTSDIR}/databases/p5-DBD-mysql .endif .if ${PORT_OPTIONS:MPGSQL} -USE_PGSQL= server +USES+= pgsql +WANT_PGSQL= server RUN_DEPENDS+= p5-DBD-Pg>=1.32:${PORTSDIR}/databases/p5-DBD-Pg .endif .if empty(PORT_OPTIONS:MPGSQL) && empty(PORT_OPTIONS:MMYSQL) Modified: head/www/bacula-web/Makefile ============================================================================== --- head/www/bacula-web/Makefile Mon Aug 25 11:45:23 2014 (r366068) +++ head/www/bacula-web/Makefile Mon Aug 25 12:19:43 2014 (r366069) @@ -37,7 +37,7 @@ USE_PHP+= pdo_mysql .endif .if ${PORT_OPTIONS:MPGSQL} -USE_PGSQL= yes +USES+= pgsql CONFIGURE_ARGS+= --with-postgresql=yes SUB_LIST+= REQ_PGSQL=postgresql USE_PHP+= pdo_pgsql Modified: head/www/davical/Makefile ============================================================================== --- head/www/davical/Makefile Mon Aug 25 11:45:23 2014 (r366068) +++ head/www/davical/Makefile Mon Aug 25 12:19:43 2014 (r366069) @@ -23,9 +23,8 @@ GH_ACCOUNT= DAViCal GH_TAGNAME= r${DISTVERSION} GH_COMMIT= cc8e6a0 NO_BUILD= yes -USE_PGSQL= yes USE_PHP= gettext iconv pcre pdo pdo_pgsql pgsql xml calendar -USES= shebangfix +USES= shebangfix pgsql SHEBANG_FILES= scripts/sync-remote-caldav.php SUB_FILES= pkg-message httpd-davical.conf Modified: head/www/drupal7/Makefile ============================================================================== --- head/www/drupal7/Makefile Mon Aug 25 11:45:23 2014 (r366068) +++ head/www/drupal7/Makefile Mon Aug 25 12:19:43 2014 (r366069) @@ -31,6 +31,9 @@ DOCS= CHANGELOG.txt INSTALL.mysql.txt I SUB_FILES+= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message +PGSQL_USES= pgsql +PGSQL_USE= PHP=pdo_pgsql + .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MSQLITE3} @@ -40,10 +43,6 @@ USE_PHP+= pdo_sqlite USE_MYSQL= yes USE_PHP+= pdo_mysql .endif -.if ${PORT_OPTIONS:MPGSQL} -USE_PGSQL= yes -USE_PHP+= pdo_pgsql -.endif do-install: ${MKDIR} ${STAGEDIR}${DRUPAL_DIR} Modified: head/www/fusionpbx/Makefile ============================================================================== --- head/www/fusionpbx/Makefile Mon Aug 25 11:45:23 2014 (r366068) +++ head/www/fusionpbx/Makefile Mon Aug 25 12:19:43 2014 (r366069) @@ -33,12 +33,10 @@ OPTIONS_DEFINE= PDOPGSQL PDOMYSQL PDOPGSQL_DESC= Install POSTGRESQL PDO Connector PDOMYSQL_DESC= Install MySQL PDO Connector -.include <bsd.port.options.mk> +PDOPGSQL_USES= pgsql +PDOPGSQL_USE= PHP=pgsql,pdo_pgsql -.if ${PORT_OPTIONS:MPDOPGSQL} -USE_PGSQL= yes -USE_PHP+= pgsql pdo_pgsql -.endif +.include <bsd.port.options.mk> .if ${PORT_OPTIONS:MPDOMYSQL} USE_MYSQL= client Modified: head/www/hastymail2-devel/Makefile ============================================================================== --- head/www/hastymail2-devel/Makefile Mon Aug 25 11:45:23 2014 (r366068) +++ head/www/hastymail2-devel/Makefile Mon Aug 25 12:19:43 2014 (r366069) @@ -43,7 +43,7 @@ RUN_DEPENDS+= ${LOCALBASE}/share/pear/MD .endif .if ${PORT_OPTIONS:MPGSQL} -USE_PGSQL= yes +USES+= pgsql .if ! ${PORT_OPTIONS:MDB} RUN_DEPENDS+= ${LOCALBASE}/share/pear/MDB2/Driver/pgsql.php:${PORTSDIR}/databases/pear-MDB2_Driver_pgsql .endif Modified: head/www/hastymail2/Makefile ============================================================================== --- head/www/hastymail2/Makefile Mon Aug 25 11:45:23 2014 (r366068) +++ head/www/hastymail2/Makefile Mon Aug 25 12:19:43 2014 (r366069) @@ -42,7 +42,7 @@ RUN_DEPENDS+= ${LOCALBASE}/share/pear/MD .endif .if ${PORT_OPTIONS:MPGSQL} -USE_PGSQL= yes +USES+= pgsql .if ! ${PORT_OPTIONS:MDB} RUN_DEPENDS+= ${LOCALBASE}/share/pear/MDB2/Driver/pgsql.php:${PORTSDIR}/databases/pear-MDB2_Driver_pgsql .endif Modified: head/www/limesurvey/Makefile ============================================================================== --- head/www/limesurvey/Makefile Mon Aug 25 11:45:23 2014 (r366068) +++ head/www/limesurvey/Makefile Mon Aug 25 12:19:43 2014 (r366069) @@ -25,7 +25,7 @@ ZIP_DESC= Install PHP zip extension # http://docs.limesurvey.org/Installation&structure=English+Instructions+for+LimeSurvey#Make_sure_you_can_use_LimeSurvey_on_your_website .if ${PORT_OPTIONS:MPGSQL} -USE_PGSQL= yes +USES+= pgsql USE_PHP= pgsql .else # server is not necessary on this host. Modified: head/www/mnogosearch/Makefile ============================================================================== --- head/www/mnogosearch/Makefile Mon Aug 25 11:45:23 2014 (r366068) +++ head/www/mnogosearch/Makefile Mon Aug 25 12:19:43 2014 (r366069) @@ -38,6 +38,9 @@ CONFIGURE_ARGS= --sysconfdir=${ETCDIR} \ SUB_FILES+= pkg-message +PGSQL_USES= pgsql +PGSQL_CONFIGURE_ARGS+= --with-pgsql=${LOCALBASE} + .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MSSL} @@ -62,11 +65,6 @@ CONFIGURE_ARGS+= --with-extra-charsets=a CONFIGURE_ARGS+= --disable-syslog .endif -.if ${PORT_OPTIONS:MPGSQL} -USE_PGSQL= yes -CONFIGURE_ARGS+= --with-pgsql=${LOCALBASE} -.endif - .if ${PORT_OPTIONS:MMSQL} LIB_DEPENDS+= libmsql.so:${PORTSDIR}/databases/msql CONFIGURE_ARGS+= --with-msql=${LOCALBASE} Modified: head/www/mod_auth_pgsql2/Makefile ============================================================================== --- head/www/mod_auth_pgsql2/Makefile Mon Aug 25 11:45:23 2014 (r366068) +++ head/www/mod_auth_pgsql2/Makefile Mon Aug 25 12:19:43 2014 (r366069) @@ -11,7 +11,7 @@ PKGNAMESUFFIX= 2 MAINTAINER= apache@FreeBSD.org COMMENT= Allows users to use PostgreSQL databases for user authentication -USE_PGSQL= yes +USES= pgsql USE_APACHE= 22 AP_INC?= ${LOCALBASE}/include Modified: head/www/mod_tsa/Makefile ============================================================================== --- head/www/mod_tsa/Makefile Mon Aug 25 11:45:23 2014 (r366068) +++ head/www/mod_tsa/Makefile Mon Aug 25 12:19:43 2014 (r366069) @@ -44,7 +44,7 @@ AP_LIB+= -L${LOCALBASE}/lib/mysql -lmysq .endif .if ${PORT_OPTIONS:MPGSQL} -USE_PGSQL= yes +USES+= pgsql CONFIGURE_ARGS+= --enable-pgsql=yes SRC_FILE+= db_postgresql.c AP_LIB+= -lpq Modified: head/www/nginx-devel/Makefile ============================================================================== --- head/www/nginx-devel/Makefile Mon Aug 25 11:45:23 2014 (r366068) +++ head/www/nginx-devel/Makefile Mon Aug 25 12:19:43 2014 (r366069) @@ -655,7 +655,7 @@ CFLAGS+= -DNDEBUG .if ${PORT_OPTIONS:MPOSTGRES} IGNORE= POSTGRES: update require -USE_PGSQL= yes +USES+= pgsql NGINX_POSTGRES_VERSION= 0.9 MASTER_SITES+= http://labs.frickle.com/files/:postgres DISTFILES+= ngx_postgres-${NGINX_POSTGRES_VERSION}.tar.gz:postgres Modified: head/www/nginx/Makefile ============================================================================== --- head/www/nginx/Makefile Mon Aug 25 11:45:23 2014 (r366068) +++ head/www/nginx/Makefile Mon Aug 25 12:19:43 2014 (r366069) @@ -667,7 +667,7 @@ CFLAGS+= -DNDEBUG .if ${PORT_OPTIONS:MPOSTGRES} IGNORE= POSTGRES: update require -USE_PGSQL= yes +USES+= pgsql NGINX_POSTGRES_VERSION= 0.9 MASTER_SITES+= http://labs.frickle.com/files/:postgres DISTFILES+= ngx_postgres-${NGINX_POSTGRES_VERSION}.tar.gz:postgres Modified: head/www/oops/Makefile ============================================================================== --- head/www/oops/Makefile Mon Aug 25 11:45:23 2014 (r366068) +++ head/www/oops/Makefile Mon Aug 25 12:19:43 2014 (r366069) @@ -56,6 +56,9 @@ DB4_DESC= Berkeley DB v4 storage MYSQL_DESC= MySQL auth support PGSQL_DESC= PostgreSQL auth support +PGSQL_USES= pgsql +PGSQL_CONFIGURE_ARGS= --with-PGSQL=${PREFIX}/pgsql + .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MGIGABASE} @@ -73,11 +76,6 @@ USE_MYSQL= YES CONFIGURE_ARGS+= --with-MYSQL=${PREFIX} .endif -.if ${PORT_OPTIONS:MPGSQL} -USE_PGSQL= YES -CONFIGURE_ARGS+= --with-PGSQL=${PREFIX}/pgsql -.endif - .if ${PORT_OPTIONS:MPCRE} LIB_DEPENDS+= libpcre.so:${PORTSDIR}/devel/pcre CONFIGURE_ARGS+= --with-regexp=pcre Modified: head/www/otrs/Makefile ============================================================================== --- head/www/otrs/Makefile Mon Aug 25 11:45:23 2014 (r366068) +++ head/www/otrs/Makefile Mon Aug 25 12:19:43 2014 (r366069) @@ -86,6 +86,9 @@ USE_APACHE_RUN= 22+ PLIST_SUB+= VER_CKEDITOR="4.3" OTRS_USER=${USERS} WWWOWN=${WWWOWN} +PGSQL_RUN_DEPENDS+= p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg +PGSQL_USES= pgsql + .include <bsd.port.pre.mk> .if ${PORT_OPTIONS:MMYSQL} @@ -93,11 +96,6 @@ RUN_DEPENDS+= p5-DBD-mysql>=0:${PORTSDIR USE_MYSQL= yes .endif -.if ${PORT_OPTIONS:MPGSQL} -RUN_DEPENDS+= p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg -USE_PGSQL= yes -.endif - RUN_DEPENDS+= ${APACHE_PKGNAMEPREFIX}mod_perl2>=2.0.5:${PORTSDIR}/www/mod_perl2 \ p5-Apache-DBI>0:${PORTSDIR}/www/p5-Apache-DBI Modified: head/www/pglogd/Makefile ============================================================================== --- head/www/pglogd/Makefile Mon Aug 25 11:45:23 2014 (r366068) +++ head/www/pglogd/Makefile Mon Aug 25 12:19:43 2014 (r366069) @@ -10,7 +10,7 @@ MASTER_SITES= http://digitalstratum.com/ MAINTAINER= ports@FreeBSD.org COMMENT= Sends web server log entries to a PostgreSQL database -USE_PGSQL= yes +USES= pgsql USE_RC_SUBR= 020.pglogd.sh SUB_FILES= pkg-message Modified: head/www/phprecipebook/Makefile ============================================================================== --- head/www/phprecipebook/Makefile Mon Aug 25 11:45:23 2014 (r366068) +++ head/www/phprecipebook/Makefile Mon Aug 25 12:19:43 2014 (r366069) @@ -32,7 +32,7 @@ USE_MYSQL= yes .if ${PORT_OPTIONS:MPGSQL} USE_PHP+= pgsql -USE_PGSQL= yes +USES+= pgsql .endif post-extract: Modified: head/www/rt38/Makefile ============================================================================== --- head/www/rt38/Makefile Mon Aug 25 11:45:23 2014 (r366068) +++ head/www/rt38/Makefile Mon Aug 25 12:19:43 2014 (r366069) @@ -92,7 +92,7 @@ BUILD_DEPENDS+= p5-DBD-mysql>=0:${PORTSD RUN_DEPENDS+= p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql .elif ${PORT_OPTIONS:MPGSQL} DB_TYPE= Pg -USE_PGSQL= yes +USES+= pgsql BUILD_DEPENDS+= p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg RUN_DEPENDS+= p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg .elif ${PORT_OPTIONS:MQLITE} Modified: head/www/tengine/Makefile ============================================================================== --- head/www/tengine/Makefile Mon Aug 25 11:45:23 2014 (r366068) +++ head/www/tengine/Makefile Mon Aug 25 12:19:43 2014 (r366069) @@ -549,7 +549,7 @@ WITH_HTTP_REWRITE= yes .endif .if ${PORT_OPTIONS:MPOSTGRES} -USE_PGSQL= yes +USES+= pgsql WITH_HTTP_REWRITE= yes NGINX_POSTGRES_VERSION= 0.9 MASTER_SITES+= http://labs.frickle.com/files/:postgres
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408251219.s7PCJiUr061262>