From owner-svn-ports-head@FreeBSD.ORG Sun Jan 19 14:32:33 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A8D2899A; Sun, 19 Jan 2014 14:32:33 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 892CE11B4; Sun, 19 Jan 2014 14:32:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0JEWX18049658; Sun, 19 Jan 2014 14:32:33 GMT (envelope-from matthew@svn.freebsd.org) Received: (from matthew@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0JEWXlw049656; Sun, 19 Jan 2014 14:32:33 GMT (envelope-from matthew@svn.freebsd.org) Message-Id: <201401191432.s0JEWXlw049656@svn.freebsd.org> From: Matthew Seaman Date: Sun, 19 Jan 2014 14:32:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r340311 - head/www/rt42 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Jan 2014 14:32:33 -0000 Author: matthew Date: Sun Jan 19 14:32:32 2014 New Revision: 340311 URL: http://svnweb.freebsd.org/changeset/ports/340311 QAT: https://qat.redports.org/buildarchive/r340311/ Log: * Fix up botched PGSQL dependencies * Add the missing HTML_DOC_DEPS * Use 'DEVELOPER' rather than 'DEV' consistently for that option * Since BUILD_DEPENDS is always going to be a super-set of RUN_DEPENDS for this port, simplify things by generating RUN_DEPENDS from the OPTIONS choices, and then just append that to the BUILD_DEPENDS. Modified: head/www/rt42/Makefile head/www/rt42/Makefile.cpan Modified: head/www/rt42/Makefile ============================================================================== --- head/www/rt42/Makefile Sun Jan 19 14:32:08 2014 (r340310) +++ head/www/rt42/Makefile Sun Jan 19 14:32:32 2014 (r340311) @@ -2,6 +2,7 @@ PORTNAME= rt DISTVERSION= 4.2.2 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://download.bestpractical.com/pub/rt/release/ PKGNAMESUFFIX= 42 @@ -31,7 +32,7 @@ NO_ARCH= yes # mentioned in the docs is currently unsupported in the ports, but see # http://www.infracaninophile.co.uk/articles/sphinxse.html -OPTIONS_DEFINE= DEV GD GPG GRAPHVIZ SMIME +OPTIONS_DEFINE= DEVELOPER GD GPG GRAPHVIZ SMIME OPTIONS_SINGLE= DB OPTIONS_SINGLE_DB= MYSQL ORACLE PGSQL SQLITE OPTIONS_RADIO= WEB @@ -42,18 +43,17 @@ OPTIONS_DEFAULT= AP_MODPERL GD GPG MYSQL USERS?= www GROUPS?= rt www -BUILD_DEPENDS+= ${LOCALBASE}/bin/jsmin:${PORTSDIR}/devel/jsmin +RUN_DEPENDS+= ${LOCALBASE}/bin/jsmin:${PORTSDIR}/devel/jsmin .include "${.CURDIR}/Makefile.cpan" -BUILD_DEPENDS+= ${CLI_DEPS} \ +RUN_DEPENDS+= ${CLI_DEPS} \ ${CORE_DEPS} \ ${DASHBOARDS_DEPS} \ ${ICAL_DEPS} \ ${MAILGATE_DEPS} \ - ${USERLOGO_DEPS} - -RUN_DEPENDS:= ${BUILD_DEPENDS} + ${USERLOGO_DEPS} \ + ${HTML_DOC_DEPS} USES+= perl5 USE_AUTOTOOLS= autoconf @@ -64,62 +64,51 @@ DOCSDIR= ${PREFIX}/share/doc/${PORTNAME} DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX} AP_MODPERL_DESC= Deploy with apache and mod_perl -AP_MODPERL_BUILD_DEPENDS= ${MODPERL2_DEPS} AP_MODPERL_RUN_DEPENDS= ${MODPERL2_DEPS} AP_MODFASTCGI_DESC= Deploy with apache and mod_fastcgi AP_MODFASTCGI_USE= APACHE_RUN=22+ -AP_MODFASTCGI_BUILD_DEPENDS= ${LOCALBASE}/${APACHEMODDIR}/mod_fastcgi.so:${PORTSDIR}/www/mod_fastcgi AP_MODFASTCGI_RUN_DEPENDS= ${LOCALBASE}/${APACHEMODDIR}/mod_fastcgi.so:${PORTSDIR}/www/mod_fastcgi \ ${FASTCGI_DEPS} LIGHTTPD_DESC= Deploy with lighttpd and mod_fastcgi -LIGHTTPD_BUILD_DEPENDS= ${LOCALBASE}/sbin/lighttpd:${PORTSDIR}/www/lighttpd LIGHTTPD_RUN_DEPENDS= ${LOCALBASE}/sbin/lighttpd:${PORTSDIR}/www/lighttpd SPAWN_FCGI_DESC= Deploy with spawn_fcgi -SPAWN_FCGI_BUILD_DEPENDS= ${LOCALBASE}/bin/spawn-fcgi:${PORTSDIR}/www/spawn-fcgi SPAWN_FCGI_RUN_DEPENDS= ${LOCALBASE}/bin/spawn-fcgi:${PORTSDIR}/www/spawn-fcgi MYSQL_USE= MYSQL=yes -MYSQL_BUILD_DEPENDS= ${MYSQL_DEPS} MYSQL_RUN_DEPENDS= ${MYSQL_DEPS} PGSQL_USE= PGSQL=yes -PGSQL_BUILD_DEPENDS= ${PGSQL_DEPS} -RUN_DEPENDS= ${PGSQL_DEPS} +PGSQL_RUN_DEPENDS= ${PGSQL_DEPS} -ORACLE_BUILD_DEPENDS= ${ORACLE_DEPS} ORACLE_RUN_DEPENDS= ${ORACLE_DEPS} SQLITE_USE= SQLITE=yes -SQLITE_BUILD_DEPENDS= ${SQLITE_DEPS} SQLITE_RUN_DEPENDS= ${SQLITE_DEPS} -DEV_DESC= Configure for Developers -DEV_BUILD_DEPENDS= ${DEVELOPER_DEPS} -DEV_RUN_DEPENDS= ${DEVELOPER_DEPS} -DEV_CONFIGURE_ENABLE= developer +DEVELOPER_DESC= Configure for Developers +DEVELOPER_RUN_DEPENDS= ${DEVELOPER_DEPS} +DEVELOPER_CONFIGURE_ENABLE= developer SMIME_DESC= Enable Secure MIME support -SMIME_BUILD_DEPENDS= ${SMIME_DEPS} SMIME_RUN_DEPENDS= ${SMIME_DEPS} SMIME_CONFIGURE_ENABLE= smime -GRAPHVIZ_BUILD_DEPENDS= ${GRAPHVIZ_DEPS} GRAPHVIZ_RUN_DEPENDS= ${GRAPHVIZ_DEPS} GRAPHVIZ_CONFIGURE_ENABLE= graphviz GPG_DESC= Enable GnuPG support -GPG_BUILD_DEPENDS= ${GPG_DEPS} GPG_RUN_DEPENDS= ${GPG_DEPS} GPG_CONFIGURE_ENABLE= gpg GD_DESC= Enable GD Graphs and Charts -GD_BUILD_DEPENDS= ${GD_DEPS} GD_RUN_DEPENDS= ${GD_DEPS} GD_CONFIGURE_ENABLE= gd +BUILD_DEPENDS+= ${RUN_DEPENDS} + .include .if !${PORT_OPTIONS:MMYSQL} && !${PORT_OPTIONS:MPGSQL} && \ @@ -209,10 +198,8 @@ pre-install: @${RM} -f ${WRKSRC}/lib/RT.pm.in post-install: -.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${STAGEDIR}${DOCSDIR}/upgrade (cd ${WRKSRC}/etc && \ ${COPYTREE_SHARE} upgrade ${STAGEDIR}${DOCSDIR} "! -name *\.in") -.endif .include Modified: head/www/rt42/Makefile.cpan ============================================================================== --- head/www/rt42/Makefile.cpan Sun Jan 19 14:32:08 2014 (r340310) +++ head/www/rt42/Makefile.cpan Sun Jan 19 14:32:32 2014 (r340311) @@ -224,10 +224,10 @@ MYSQL_DEPS= p5-DBD-mysql>=2.1018:${PORTS ORACLE_DEPS= p5-DBD-Oracle>0:${PORTSDIR}/databases/p5-DBD-Oracle -### --- PG --- +### --- PGSQL --- ### DBD::Pg 1.43 -PG_DEPS= p5-DBD-Pg>=1.43:${PORTSDIR}/databases/p5-DBD-Pg +PGSQL_DEPS= p5-DBD-Pg>=1.43:${PORTSDIR}/databases/p5-DBD-Pg ### --- SQLITE --- ### DBD::SQLite 1.00