resolve conflict between p5-Apache-Test and ap2-mod_perl

ok bernd@
2007-01-29 16:31:58 +00:00 · 2007-01-29 16:31:58 +00:00 · cf2aaceb2e
commit cf2aaceb2e
parent 2d22dbd7c7
6 changed files with 54 additions and 66 deletions
--- a/www/ap2-mod_perl/Makefile
+++ b/www/ap2-mod_perl/Makefile
@ -1,14 +1,13 @@
-# $OpenBSD: Makefile,v 1.6 2007/01/10 19:21:47 bernd Exp $
+# $OpenBSD: Makefile,v 1.7 2007/01/29 16:31:58 simon Exp $

 COMMENT=	"module that embeds a Perl interpreter into Apache2"

 DISTNAME=	mod_perl-2.0.3
-PKGNAME=	ap2-${DISTNAME}p3
+PKGNAME=	ap2-${DISTNAME}p4
 CATEGORIES=	www net

 WANTLIB=	c m perl util apr-1 aprutil-1 db expat
-MODULES=	converters/libiconv
-
+MODULES=	cpan converters/libiconv
 MASTER_SITES=	http://perl.apache.org/dist/ \
 		${MASTER_SITE_PERL_CPAN:=Apache/}

@ -23,9 +22,13 @@ PERMIT_DISTFILES_FTP=	Yes
 NO_REGRESS=		Yes
 SHARED_ONLY=		Yes

-CONFIGURE_STYLE=	perl
 CONFIGURE_ARGS+=	MP_APXS=${LOCALBASE}/sbin/apxs2
 RUN_DEPENDS=		::www/apache-httpd
-BUILD_DEPENDS=		${RUN_DEPENDS}
+BUILD_DEPENDS=		${RUN_DEPENDS} \
+			:p5-Apache-Test->=1.29:www/p5-Apache-Test
+
+# avoid conflicts
+post-extract:
+	@rm -rf ${WRKSRC}/Apache-Test

 .include <bsd.port.mk>
--- a/www/ap2-mod_perl/patches/patch-Makefile_PL
+++ b/www/ap2-mod_perl/patches/patch-Makefile_PL
@ -0,0 +1,37 @@
+$OpenBSD: patch-Makefile_PL,v 1.1 2007/01/29 16:31:58 simon Exp $
+--- Makefile.PL.orig	Mon Nov 20 00:31:43 2006
+++ Makefile.PL	Sun Jan 14 18:33:46 2007
+@@ -23,7 +23,7 @@ BEGIN {
+     };
+ }
+ 
+-use lib qw(lib Apache-Test/lib);
+use lib qw(lib);
+ 
+ use Config;
+ use File::Spec::Functions;
+@@ -116,15 +116,6 @@ sub get_DEFINE {
+ 
+ sub configure {
+ 
+-    # mod_perl test suite relies on having Apache-Test bundled with
+-    # the mod_perl source, since any pre-installed version may not do
+-    # the right thing
+-    unless (-d "Apache-Test") {
+-        error "Can't find a sub-directory Apache-Test. " .
+-            "Make sure that you are using a complete source distribution";
+-        exit 1;
+-    }
+-
+     set_modperl_version();
+ 
+     if ($old_modperl_version) {
+@@ -798,7 +789,7 @@ sub MY::postamble {
+     my $string = $self->ModPerl::BuildMM::MY::postamble;
+ 
+     $string .= <<'EOF';
+-mydist : Apache-Test/META.yml mod_perl.spec manifest tardist
+mydist : mod_perl.spec manifest tardist
+ 
+ rpm: dist
+ 	@[ -d $(PWD)/rpm ] || mkdir $(PWD)/rpm
--- a/www/ap2-mod_perl/pkg/PLIST
+++ b/www/ap2-mod_perl/pkg/PLIST
@ -1,5 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.2 2007/01/10 19:21:47 bernd Exp $
-@conflict p5-Apache-Test-*
+@comment $OpenBSD: PLIST,v 1.3 2007/01/29 16:31:58 simon Exp $
 bin/mp2bug
 include/apache2/mod_perl.h
 include/apache2/modperl_apache_compat.h
@ -78,39 +77,6 @@ ${P5ARCH}/APR/URI.pm
 ${P5ARCH}/APR/UUID.pm
 ${P5ARCH}/APR/Util.pm
 ${P5ARCH}/APR/XSLoader.pm
-${P5ARCH}/Apache/
-${P5ARCH}/Apache/Test.pm
-${P5ARCH}/Apache/Test5005compat.pm
-${P5ARCH}/Apache/TestBuild.pm
-${P5ARCH}/Apache/TestClient.pm
-${P5ARCH}/Apache/TestCommon.pm
-${P5ARCH}/Apache/TestCommonPost.pm
-${P5ARCH}/Apache/TestConfig.pm
-${P5ARCH}/Apache/TestConfigC.pm
-${P5ARCH}/Apache/TestConfigPHP.pm
-${P5ARCH}/Apache/TestConfigParrot.pm
-${P5ARCH}/Apache/TestConfigParse.pm
-${P5ARCH}/Apache/TestConfigPerl.pm
-${P5ARCH}/Apache/TestHandler.pm
-${P5ARCH}/Apache/TestHarness.pm
-${P5ARCH}/Apache/TestHarnessPHP.pm
-${P5ARCH}/Apache/TestMB.pm
-${P5ARCH}/Apache/TestMM.pm
-${P5ARCH}/Apache/TestPerlDB.pm
-${P5ARCH}/Apache/TestReport.pm
-${P5ARCH}/Apache/TestReportPerl.pm
-${P5ARCH}/Apache/TestRequest.pm
-${P5ARCH}/Apache/TestRun.pm
-${P5ARCH}/Apache/TestRunPHP.pm
-${P5ARCH}/Apache/TestRunParrot.pm
-${P5ARCH}/Apache/TestRunPerl.pm
-${P5ARCH}/Apache/TestSSLCA.pm
-${P5ARCH}/Apache/TestServer.pm
-${P5ARCH}/Apache/TestSmoke.pm
-${P5ARCH}/Apache/TestSmokePerl.pm
-${P5ARCH}/Apache/TestSort.pm
-${P5ARCH}/Apache/TestTrace.pm
-${P5ARCH}/Apache/TestUtil.pm
 ${P5ARCH}/Apache2/
 ${P5ARCH}/Apache2/Access.pm
 ${P5ARCH}/Apache2/Build.pm
@ -152,7 +118,6 @@ ${P5ARCH}/Apache2/compat.pm
 ${P5ARCH}/Apache2/porting.pm
 ${P5ARCH}/Bundle/
 ${P5ARCH}/Bundle/Apache2.pm
-${P5ARCH}/Bundle/ApacheTest.pm
 ${P5ARCH}/ModPerl/
 ${P5ARCH}/ModPerl/BuildMM.pm
 ${P5ARCH}/ModPerl/BuildOptions.pm
@ -389,20 +354,7 @@ ${P5ARCH}/mod_perl2.pm
@man man/man3p/Apache2::Util.3p
@man man/man3p/Apache2::compat.3p
@man man/man3p/Apache2::porting.3p
-@man man/man3p/Apache::Test.3p
-@man man/man3p/Apache::TestConfig.3p
-@man man/man3p/Apache::TestMB.3p
-@man man/man3p/Apache::TestMM.3p
-@man man/man3p/Apache::TestReport.3p
-@man man/man3p/Apache::TestRequest.3p
-@man man/man3p/Apache::TestRun.3p
-@man man/man3p/Apache::TestRunPHP.3p
-@man man/man3p/Apache::TestRunPerl.3p
-@man man/man3p/Apache::TestSmoke.3p
-@man man/man3p/Apache::TestTrace.3p
-@man man/man3p/Apache::TestUtil.3p
@man man/man3p/Bundle::Apache2.3p
-@man man/man3p/Bundle::ApacheTest.3p
@man man/man3p/ModPerl::BuildMM.3p
@man man/man3p/ModPerl::CScan.3p
@man man/man3p/ModPerl::Code.3p
--- a/www/p5-Apache-Test/Makefile
+++ b/www/p5-Apache-Test/Makefile
@ -1,10 +1,9 @@
-# $OpenBSD: Makefile,v 1.7 2007/01/16 17:52:06 simon Exp $
+# $OpenBSD: Makefile,v 1.8 2007/01/29 16:31:58 simon Exp $

 COMMENT=	"Test wrapper with helpers for testing Apache"

 MODULES=	cpan
-DISTNAME=	Apache-Test-1.28
-PKGNAME=	p5-${DISTNAME}p1
+DISTNAME=	Apache-Test-1.29
 CATEGORIES=	www

 MAINTAINER=	Michael Coulter <mjc@openbsd.org>
--- a/www/p5-Apache-Test/distinfo
+++ b/www/p5-Apache-Test/distinfo
@ -1,4 +1,4 @@
-MD5 (Apache-Test-1.28.tar.gz) = 76ca771bb9d36b6215e7f418a7fd5e9a
-RMD160 (Apache-Test-1.28.tar.gz) = 4d937baef75b563cdfddc98eb6eeb3bed26a3c86
-SHA1 (Apache-Test-1.28.tar.gz) = d7614aea5a8d391edfd5d46d40c1d4c577311650
-SIZE (Apache-Test-1.28.tar.gz) = 149856
+MD5 (Apache-Test-1.29.tar.gz) = d99c88b856302420211cee2f891ad931
+RMD160 (Apache-Test-1.29.tar.gz) = 69b21ac4872ce5c154262bf95e650934bb4b6869
+SHA1 (Apache-Test-1.29.tar.gz) = aec7577a5c6958f6dbce5fd22b7175743f7e7b1a
+SIZE (Apache-Test-1.29.tar.gz) = 151416
--- a/www/p5-Apache-Test/pkg/PLIST
+++ b/www/p5-Apache-Test/pkg/PLIST
@ -1,5 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.6 2007/01/10 19:21:47 bernd Exp $
-@conflict ap2-mod_perl-*
+@comment $OpenBSD: PLIST,v 1.7 2007/01/29 16:31:58 simon Exp $
 ${P5SITE}/Apache/
 ${P5SITE}/Apache/Test.pm
 ${P5SITE}/Apache/Test5005compat.pm
@ -9,7 +8,6 @@ ${P5SITE}/Apache/TestCommon.pm
 ${P5SITE}/Apache/TestCommonPost.pm
 ${P5SITE}/Apache/TestConfig.pm
 ${P5SITE}/Apache/TestConfigC.pm
-${P5SITE}/Apache/TestConfigData.pm
 ${P5SITE}/Apache/TestConfigPHP.pm
 ${P5SITE}/Apache/TestConfigParrot.pm
 ${P5SITE}/Apache/TestConfigParse.pm
@ -38,7 +36,6 @@ ${P5SITE}/Bundle/
 ${P5SITE}/Bundle/ApacheTest.pm
@man man/man3p/Apache::Test.3p
@man man/man3p/Apache::TestConfig.3p
-@man man/man3p/Apache::TestConfigData.3p
@man man/man3p/Apache::TestMB.3p
@man man/man3p/Apache::TestMM.3p
@man man/man3p/Apache::TestReport.3p