From owner-svn-ports-all@FreeBSD.ORG Sun Jan 19 14:34:40 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0E4B3B43; Sun, 19 Jan 2014 14:34:40 +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 EE42611D1; Sun, 19 Jan 2014 14:34:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0JEYdpD050007; Sun, 19 Jan 2014 14:34:39 GMT (envelope-from matthew@svn.freebsd.org) Received: (from matthew@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0JEYdEt050006; Sun, 19 Jan 2014 14:34:39 GMT (envelope-from matthew@svn.freebsd.org) Message-Id: <201401191434.s0JEYdEt050006@svn.freebsd.org> From: Matthew Seaman Date: Sun, 19 Jan 2014 14:34:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r340312 - head/www/rt40 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Jan 2014 14:34:40 -0000 Author: matthew Date: Sun Jan 19 14:34:39 2014 New Revision: 340312 URL: http://svnweb.freebsd.org/changeset/ports/340312 QAT: https://qat.redports.org/buildarchive/r340312/ Log: * Since BUILD_DEPENDS is always going to be a super-set of RUN_DEPENDS, simplfy things by calculating RUN_DEPENDS based on the OPTIONS settings, then just append that to BUILD_DEPENDS. No functional change to the generated packaage, so no PORTREVISION bump. Modified: head/www/rt40/Makefile Modified: head/www/rt40/Makefile ============================================================================== --- head/www/rt40/Makefile Sun Jan 19 14:32:32 2014 (r340311) +++ head/www/rt40/Makefile Sun Jan 19 14:34:39 2014 (r340312) @@ -43,11 +43,11 @@ 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+= ${CORE_DEPS} \ +RUN_DEPENDS+= ${CORE_DEPS} \ ${MASON_DEPS} \ ${PSGI_DEPS} \ ${MAILGATE_DEPS} \ @@ -58,8 +58,6 @@ BUILD_DEPENDS+= ${CORE_DEPS} \ ${USERLOGO_DEPS} \ ${HTML_DOC_DEPS} -RUN_DEPENDS:= ${BUILD_DEPENDS} - USES+= perl5 USE_AUTOTOOLS= autoconf @@ -69,64 +67,53 @@ 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_MODPERL_CONFIGURE_ON= --with-apachectl=${LOCALBASE}/sbin/apachectl 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} AP_MODFASTCGI_CONFIGURE_ON= --with-apachectl=${LOCALBASE}/sbin/apachectl 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} 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= ${DEV_DEPS} DEV_RUN_DEPENDS= ${DEV_DEPS} DEV_CONFIGURE_ON= --enable-developer-mode SSL_MAILGATE_DESC= Enable HTTPS support for rt-mailgate -SSL_MAILGATE_BUILD_DEPENDS= ${SSL_MAILGATE_DEPS} SSL_MAILGATE_RUN_DEPENDS= ${SSL_MAILGATE_DEPS} SSL_MAILGATE_CONFIGURE_ENABLE= ssl-mailgate -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} && \