2 files changed, 58 insertions, 108 deletions

diff --git a/www/rt42/Makefile b/www/rt42/Makefile
index 3181a5871aa5..74db3153ef01 100644
--- a/www/rt42/Makefile
+++ b/www/rt42/Makefile
@@ -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_MODPERL LIGHTTPD SPAWN_FCGI
 
 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}
+RT_ETC_PATH?=	${PREFIX}/etc/${PORTNAME}${PKGNAMESUFFIX}
+RT_LAYOUT=	FreeBSD
+DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
+DATADIR=	${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
 
-.include <bsd.port.options.mk>
+AP_MODPERL_DESC=		Deploy with apache and mod_perl
+AP_MODPERL_BUILD_DEPENDS=	${MODPERL2_DEPS}
+AP_MODPERL_RUN_DEPENDS=		${MODPERL2_DEPS}
 
-.if !${PORT_OPTIONS:MDOCS}
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-noportdocs-Makefile.in
-.endif
+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}
 
-.if ${PORT_OPTIONS:MAP_MODPERL}
-BUILD_DEPENDS+=	${MODPERL2_DEPS}
-RUN_DEPENDS+=	${MODPERL2_DEPS}
-.endif
+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
 
-.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
+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
 
-.if ${PORT_OPTIONS:MLIGHTTPD}
-BUILD_DEPENDS+=	${LOCALBASE}/sbin/lighttpd:${PORTSDIR}/www/lighttpd
-RUN_DEPENDS+=	${LOCALBASE}/sbin/lighttpd:${PORTSDIR}/www/lighttpd
-.endif
+MYSQL_USE=			MYSQL=yes
+MYSQL_BUILD_DEPENDS=		${MYSQL_DEPS}
+MYSQL_RUN_DEPENDS=		${MYSQL_DEPS}
 
-.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
+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
+
+.include <bsd.port.options.mk>
 
 .if !${PORT_OPTIONS:MMYSQL} && !${PORT_OPTIONS:MPGSQL} && \
 	! ${PORT_OPTIONS:MORACLE} && !${PORT_OPTIONS:MSQLITE}
@@ -105,75 +130,20 @@ IGNORE=	please select one of MYSQL, PGSQL, ORACLE or SQLITE
 
 .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
diff --git a/www/rt42/files/extra-patch-noportdocs-Makefile.in b/www/rt42/files/extra-patch-noportdocs-Makefile.in
deleted file mode 100644
index c7e1b53f8ad2..000000000000
--- a/www/rt42/files/extra-patch-noportdocs-Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- Makefile.in.orig	2011-10-07 09:19:16.000000000 +0200
-+++ Makefile.in	2011-10-07 09:18:51.000000000 +0200
-@@ -404,16 +404,7 @@
- 
- 
- doc-install:
--@COMMENT_INPLACE_LAYOUT@	# RT 3.0.0 - RT 3.0.2 would accidentally create a file instead of a dir
--@COMMENT_INPLACE_LAYOUT@	-[ -f $(DESTDIR)$(RT_DOC_PATH) ] && rm $(DESTDIR)$(RT_DOC_PATH) 
--@COMMENT_INPLACE_LAYOUT@	[ -d $(DESTDIR)$(RT_DOC_PATH) ] || $(INSTALL) -m 0755 -d $(DESTDIR)$(RT_DOC_PATH)
--@COMMENT_INPLACE_LAYOUT@	-( cd docs && find . -type d -print ) | while read dir ; do \
--@COMMENT_INPLACE_LAYOUT@	    $(INSTALL) -m 0755 -d "$(DESTDIR)$(RT_DOC_PATH)/$$dir" ; \
--@COMMENT_INPLACE_LAYOUT@	done
--@COMMENT_INPLACE_LAYOUT@	-( cd docs && find . -type f -print ) | while read file ; do \
--@COMMENT_INPLACE_LAYOUT@	    $(INSTALL) -m 0644 "docs/$$file" "$(DESTDIR)$(RT_DOC_PATH)/$$file" ; \
--@COMMENT_INPLACE_LAYOUT@	done
--@COMMENT_INPLACE_LAYOUT@	-$(INSTALL) -m 0644 ./README $(DESTDIR)$(RT_DOC_PATH)/
-+@COMMENT_INPLACE_LAYOUT@	/usr/bin/true
- 
- 
- etc-install: