svn commit: r301488 - in head: devel/bugzilla devel/bugzilla3 mail/p5-qpsmtpd

[Olli Hauer]

Author: ohauer
Date: Tue Jul 24 19:24:22 2012
New Revision: 301488
URL: http://svn.freebsd.org/changeset/ports/301488

Log:
  - fix broken mod_perl include
  
  apache version detect was not enabled,
  the time SITE_PERL was removed from *_DEPENDS

Modified:
  head/devel/bugzilla/Makefile
  head/devel/bugzilla3/Makefile
  head/mail/p5-qpsmtpd/Makefile

Modified: head/devel/bugzilla/Makefile
==============================================================================
--- head/devel/bugzilla/Makefile	Tue Jul 24 19:23:23 2012	(r301487)
+++ head/devel/bugzilla/Makefile	Tue Jul 24 19:24:22 2012	(r301488)
@@ -58,6 +58,12 @@ OPTIONS=	MYSQL "MySQL database support" 
 		LDAP "LDAP Authentication" off \
 		RADIUS "RADIUS Authentication" off
 
+.include <bsd.port.options.mk>
+
+.ifdef (WITH_MODPERL2)
+USE_APACHE_RUN=	20+
+.endif
+
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 501000

Modified: head/devel/bugzilla3/Makefile
==============================================================================
--- head/devel/bugzilla3/Makefile	Tue Jul 24 19:23:23 2012	(r301487)
+++ head/devel/bugzilla3/Makefile	Tue Jul 24 19:24:22 2012	(r301488)
@@ -58,6 +58,12 @@ OPTIONS=	MYSQL "MySQL database support" 
 		LDAP "LDAP Authentication" off \
 		RADIUS "RADIUS Authentication" off
 
+.include <bsd.port.options.mk>
+
+.ifdef (WITH_MODPERL2)
+USE_APACHE_RUN=	20+
+.endif
+
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 501000

Modified: head/mail/p5-qpsmtpd/Makefile
==============================================================================
--- head/mail/p5-qpsmtpd/Makefile	Tue Jul 24 19:23:23 2012	(r301487)
+++ head/mail/p5-qpsmtpd/Makefile	Tue Jul 24 19:24:22 2012	(r301488)
@@ -7,7 +7,7 @@
 
 PORTNAME=	qpsmtpd
 PORTVERSION=	0.84
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	mail perl5
 MASTER_SITES=	http://smtpd.develooper.com/files/
 PKGNAMEPREFIX=	p5-
@@ -25,9 +25,13 @@ BUILD_DEPENDS=	spamd:${PORTSDIR}/mail/p5
 		p5-Time-HiRes>0:${PORTSDIR}/devel/p5-Time-HiRes
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-OPTIONS	=	MODPERL "Enable Apache Support via mod_perl"	On
+OPTIONS_DEFINE=	MODPERL
+OPTIONS_DEFAULT=MODPERL
+MOD_PERL_DESC=	"Apache Support via mod_perl"
 
-.ifdef WITH_MODPERL
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MMODPERL}
 USE_APACHE=	20+
 RUN_DEPENDS+=	${APACHE_PKGNAMEPREFIX}mod_perl2>=0:${PORTSDIR}/www/mod_perl2
 .endif