Date: Fri, 18 Mar 2011 00:32:44 +0100 From: Pav Lucistnik <pav@FreeBSD.org> To: ohauer@FreeBSD.org Cc: "Philip M. Gollucci" <pgollucci@p6m7g8.com>, cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org, ports-committers@FreeBSD.org Subject: Re: cvs commit: ports/devel/otrs Makefile Message-ID: <1300404764.20589.0.camel@hood.oook.cz> In-Reply-To: <4D828A42.7050606@FreeBSD.org> References: <201103162128.p2GLSVOR045823@repoman.freebsd.org> <4D8173F8.70706@p6m7g8.com> <4D81E7CA.7080409@FreeBSD.org> <4D8215CB.10604@p6m7g8.com> <4D8258FF.2090103@gmx.de> <1300390857.93905.0.camel@hood.oook.cz> <4D826AB0.3020003@gmx.de> <1300397730.93905.27.camel@hood.oook.cz> <4D828A42.7050606@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--=-zc1oFa/jxrJppggdt+Hx Content-Type: text/plain; charset="ISO-8859-2" Content-Transfer-Encoding: quoted-printable This works for me. Olli Hauer p=ED=B9e v =E8t 17. 03. 2011 v 23:25 +0100: > On 2011-03-17 22:35, Pav Lucistnik wrote: > > Don't see how this could help (and indeed, it does not.) > >=20 >=20 > I've overlooked that MOD_PERL2 was added meanwhile as > OPTION and defaults to ON! >=20 > The following diff was tested with the original > bsd.apache.mk and a patched one for PR 152498 > (apache22 as default). >=20 > It reverts the settings of otrs/Makefile to rev. 1.34 > and fix build with apache13/20/22 >=20 >=20 > --- 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=3D ${BUILD_DEPENDS} >=20 > -BROKEN=3D conflicting dependencies > - > OPTIONS=3D 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 >=20 > +USE_APACHE=3D 1.3+ > USE_PERL5=3D yes >=20 > .include <bsd.port.pre.mk> > @@ -90,11 +88,8 @@ > USE_PGSQL=3D yes > .endif >=20 > -.ifdef WITH_MODPERL2 > -USE_APACHE=3D 2.2+ > +.if ${APACHE_VERSION} > 13 > RUN_DEPENDS+=3D ${APACHE_PKGNAMEPREFIX}mod_perl2>=3D2.0.0:${PORTSDIR}/ww= w/mod_perl2 > -.else > -USE_APACHE=3D 1.3+ > .endif >=20 > .ifdef WITH_REPORTS_MODULES --=20 --=20 Pav Lucistnik <pav@oook.cz> <pav@FreeBSD.org> > Why do we need a film of "Lord of the Rings" when we have the book? Because watching a cg enhanced Legolas fire a flaming arrow into the heart of a warg is cool? - asdf@asdf.com in rec.games.roguelike.angband --=-zc1oFa/jxrJppggdt+Hx Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (FreeBSD) iEYEABECAAYFAk2CmhgACgkQntdYP8FOsoIHngCguGAaiPgpbfFNWlNmGYGBLsXD RrUAniiP5T6FvZtOW/fA4tC1rZvuMMMr =vCkF -----END PGP SIGNATURE----- --=-zc1oFa/jxrJppggdt+Hx--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1300404764.20589.0.camel>