From owner-svn-ports-all@FreeBSD.ORG Sat Jan 11 22:05:57 2014 Return-Path: Delivered-To: svn-ports-all@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 A349F78A; Sat, 11 Jan 2014 22:05:57 +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 8EE40190C; Sat, 11 Jan 2014 22:05:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0BM5vwK071265; Sat, 11 Jan 2014 22:05:57 GMT (envelope-from matthew@svn.freebsd.org) Received: (from matthew@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0BM5vil071264; Sat, 11 Jan 2014 22:05:57 GMT (envelope-from matthew@svn.freebsd.org) Message-Id: <201401112205.s0BM5vil071264@svn.freebsd.org> From: Matthew Seaman Date: Sat, 11 Jan 2014 22:05:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r339460 - in head/www/rt42: . files 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: Sat, 11 Jan 2014 22:05:57 -0000 Author: matthew Date: Sat Jan 11 22:05:57 2014 New Revision: 339460 URL: http://svnweb.freebsd.org/changeset/ports/339460 Log: * OPTIONS helpers * Install docs unconditionally to stage * DATADIR should be relative to $PREFIX, not $LOCALBASE * use CONFLICTS_INSTALL rather than CONFLICTS MFH: 2014Q1 Deleted: head/www/rt42/files/extra-patch-noportdocs-Makefile.in Modified: head/www/rt42/Makefile Modified: head/www/rt42/Makefile ============================================================================== --- head/www/rt42/Makefile Sat Jan 11 22:03:26 2014 (r339459) +++ head/www/rt42/Makefile Sat Jan 11 22:05:57 2014 (r339460) @@ -10,7 +10,7 @@ PKGNAMESUFFIX= 42 MAINTAINER= matthew@FreeBSD.org COMMENT= RT is an industrial-grade ticketing system written in Perl -CONFLICTS= rt-3.8* rt40-4.0* brlcad-[0-9]* +CONFLICTS_INSTALL= rt-3.8* rt40-4.0* brlcad-[0-9]* NO_ARCH= yes @@ -40,15 +40,6 @@ OPTIONS_RADIO_WEB= AP_MODFASTCGI AP_MODP OPTIONS_DEFAULT= AP_MODPERL GD GPG MYSQL -AP_MODFASTCGI_DESC= Deploy with apache and mod_fastcgi -AP_MODPERL_DESC= Deploy with apache and mod_perl -DEV_DESC= Configure for Developers -GD_DESC= Enable GD Graphs and Charts -GPG_DESC= Enable GnuPG support -SMIME_DESC= Enable Secure MIME support -LIGHTTPD_DESC= Deploy with lighttpd and mod_fastcgi -SPAWN_FCGI_DESC= Deploy with spawn_fcgi - USERS?= www GROUPS?= rt www @@ -68,35 +59,69 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} USES+= perl5 USE_AUTOTOOLS= autoconf -DATADIR= ${LOCALBASE}/share/${PORTNAME}${PKGNAMESUFFIX} - -.include - -.if !${PORT_OPTIONS:MDOCS} -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-noportdocs-Makefile.in -.endif - -.if ${PORT_OPTIONS:MAP_MODPERL} -BUILD_DEPENDS+= ${MODPERL2_DEPS} -RUN_DEPENDS+= ${MODPERL2_DEPS} -.endif - -.if ${PORT_OPTIONS:MAP_MODFASTCGI} -USE_APACHE_RUN= 22+ -BUILD_DEPENDS+= ${LOCALBASE}/${APACHEMODDIR}/mod_fastcgi.so:${PORTSDIR}/www/mod_fastcgi -RUN_DEPENDS+= ${LOCALBASE}/${APACHEMODDIR}/mod_fastcgi.so:${PORTSDIR}/www/mod_fastcgi \ - ${FASTCGI_DEPS} -.endif +RT_ETC_PATH?= ${PREFIX}/etc/${PORTNAME}${PKGNAMESUFFIX} +RT_LAYOUT= FreeBSD +DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} +DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX} -.if ${PORT_OPTIONS:MLIGHTTPD} -BUILD_DEPENDS+= ${LOCALBASE}/sbin/lighttpd:${PORTSDIR}/www/lighttpd -RUN_DEPENDS+= ${LOCALBASE}/sbin/lighttpd:${PORTSDIR}/www/lighttpd -.endif +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} + +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 + +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 -.if ${PORT_OPTIONS:MSPAWN_FCGI} -BUILD_DEPENDS+= ${LOCALBASE}/bin/spawn-fcgi:${PORTSDIR}/www/spawn-fcgi -RUN_DEPENDS+= ${LOCALBASE}/bin/spawn-fcgi:${PORTSDIR}/www/spawn-fcgi -.endif +.include .if !${PORT_OPTIONS:MMYSQL} && !${PORT_OPTIONS:MPGSQL} && \ ! ${PORT_OPTIONS:MORACLE} && !${PORT_OPTIONS:MSQLITE} @@ -105,75 +130,20 @@ IGNORE= please select one of MYSQL, PGSQ .if ${PORT_OPTIONS:MMYSQL} DB_TYPE= mysql -USE_MYSQL= yes -BUILD_DEPENDS+= ${MYSQL_DEPS} -RUN_DEPENDS+= ${MYSQL_DEPS} .endif .if ${PORT_OPTIONS:MPGSQL} DB_TYPE= Pg -USE_PGSQL= yes -BUILD_DEPENDS+= ${PGSQL_DEPS} -RUN_DEPENDS+= ${PGSQL_DEPS} .endif .if ${PORT_OPTIONS:MORACLE} DB_TYPE= Oracle -BUILD_DEPENDS+= ${ORACLE_DEPS} -RUN_DEPENDS+= ${ORACLE_DEPS} .endif .if ${PORT_OPTIONS:MSQLITE} DB_TYPE= SQLite -USE_SQLITE= yes -BUILD_DEPENDS+= ${SQLITE_DEPS} -RUN_DEPENDS+= ${SQLITE_DEPS} -.endif - -.if ${PORT_OPTIONS:MDEV} -BUILD_DEPENDS+= ${DEVELOPER_DEPS} -RUN_DEPENDS+= ${DEVELOPER_DEPS} -CONFIGURE_ARGS+= --enable-developer -.else -CONFIGURE_ARGS+= --disable-developer .endif -.if ${PORT_OPTIONS:MSMIME} -BUILD_DEPENDS+= ${SMIME_DEPS} -RUN_DEPENDS+= ${SMIME_DEPS} -CONFIGURE_ARGS+= --enable-smime -.else -CONFIGURE_ARGS+= --disable-smime -.endif - -.if ${PORT_OPTIONS:MGRAPHVIZ} -BUILD_DEPENDS+= ${GRAPHVIZ_DEPS} -RUN_DEPENDS+= ${GRAPHVIZ_DEPS} -CONFIGURE_ARGS+= --enable-graphviz -.else -CONFIGURE_ARGS+= --disable-graphviz -.endif - -.if ${PORT_OPTIONS:MGPG} -BUILD_DEPENDS+= ${GPG_DEPS} -RUN_DEPENDS+= ${GPG_DEPS} -CONFIGURE_ARGS+= --enable-gpg -.else -CONFIGURE_ARGS+= --disable-gpg -.endif - -.if ${PORT_OPTIONS:MGD} -BUILD_DEPENDS+= ${GD_DEPS} -RUN_DEPENDS+= ${GD_DEPS} -CONFIGURE_ARGS+= --enable-gd -.else -CONFIGURE_ARGS+= --disable-gd -.endif - -RT_ETC_PATH?= ${PREFIX}/etc/${PORTNAME}${PKGNAMESUFFIX} -RT_LAYOUT= FreeBSD -DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} - .if ${PORT_OPTIONS:MPGSQL} DB_DBA_USER?= pgsql .else