On 2011-03-17 22:35, Pav Lucistnik wrote:
> Don't see how this could help (and indeed, it does not.)
>
I've overlooked that MOD_PERL2 was added meanwhile as
OPTION and defaults to ON!
The following diff was tested with the original
bsd.apache.mk and a patched one for PR 152498
(apache22 as default).
It reverts the settings of otrs/Makefile to rev. 1.34
and fix build with apache13/20/22
--- otrs/Makefile 2011/03/17 19:52:03 1.1
+++ otrs/Makefile 2011/03/17 22:03:02
@@ -39,11 +39,8 @@
${SITE_PERL}/XML/FeedPP.pm:${PORTSDIR}/textproc/p5-XML-FeedPP
RUN_DEPENDS= ${BUILD_DEPENDS}
-BROKEN= conflicting dependencies
-
OPTIONS= MYSQL "MySQL database support" on \
PGSQL "PostgreSQL database support" off \
- MODPERL2 "ModPerl2 support" on \
REPORTS_MODULES "Reports support" on \
SMTP "Send email via SMTP" on \
POP3 "Fetch email via POP3" on \
@@ -76,6 +73,7 @@
var/httpd/htdocs/js/thirdparty/ckeditor-3.4.2/_source \
var/httpd/htdocs/skins/Agent/*/img/source
+USE_APACHE= 1.3+
USE_PERL5= yes
.include <bsd.port.pre.mk>
@@ -90,11 +88,8 @@
USE_PGSQL= yes
.endif
-.ifdef WITH_MODPERL2
-USE_APACHE= 2.2+
+.if ${APACHE_VERSION} > 13
RUN_DEPENDS+=
${APACHE_PKGNAMEPREFIX}mod_perl2>=2.0.0:${PORTSDIR}/www/mod_perl2
-.else
-USE_APACHE= 1.3+
.endif
.ifdef WITH_REPORTS_MODULES
--- otrs/Makefile 2011/03/17 19:52:03 1.1
+++ otrs/Makefile 2011/03/17 22:03:02
@@ -39,11 +39,8 @@
${SITE_PERL}/XML/FeedPP.pm:${PORTSDIR}/textproc/p5-XML-FeedPP
RUN_DEPENDS= ${BUILD_DEPENDS}
-BROKEN= conflicting dependencies
-
OPTIONS= MYSQL "MySQL database support" on \
PGSQL "PostgreSQL database support" off \
- MODPERL2 "ModPerl2 support" on \
REPORTS_MODULES "Reports support" on \
SMTP "Send email via SMTP" on \
POP3 "Fetch email via POP3" on \
@@ -76,6 +73,7 @@
var/httpd/htdocs/js/thirdparty/ckeditor-3.4.2/_source \
var/httpd/htdocs/skins/Agent/*/img/source
+USE_APACHE= 1.3+
USE_PERL5= yes
.include <bsd.port.pre.mk>
@@ -90,11 +88,8 @@
USE_PGSQL= yes
.endif
-.ifdef WITH_MODPERL2
-USE_APACHE= 2.2+
+.if ${APACHE_VERSION} > 13
RUN_DEPENDS+=
${APACHE_PKGNAMEPREFIX}mod_perl2>=2.0.0:${PORTSDIR}/www/mod_perl2
-.else
-USE_APACHE= 1.3+
.endif
.ifdef WITH_REPORTS_MODULES
_______________________________________________
cvs-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "cvs-all-unsubscr...@freebsd.org"
