diff options
| author | naddy <naddy@FreeBSD.org> | 2003-11-03 07:29:08 +0800 |
|---|---|---|
| committer | naddy <naddy@FreeBSD.org> | 2003-11-03 07:29:08 +0800 |
| commit | 02d97632e7f5903c88739b52db17069e0934272f (patch) | |
| tree | 6ce1186e88fa0288a6044ca83724c41ce224483a | |
| parent | bc5966cf27c508c92701c3f9114a7b782df9f4a9 (diff) | |
| download | freebsd-ports-gnome-02d97632e7f5903c88739b52db17069e0934272f.tar.gz freebsd-ports-gnome-02d97632e7f5903c88739b52db17069e0934272f.tar.zst freebsd-ports-gnome-02d97632e7f5903c88739b52db17069e0934272f.zip | |
* Fix install with perl < 5.8.
PR: 58490
Submitted by: Lars Eggert <larse@isi.edu>
Reported by: Peter McGarvey <xaphod@packet.org.uk>
* Use PERL_CONFIGURE.
* Fix packing list.
Approved by: maintainer
| -rw-r--r-- | www/mod_perl2/Makefile | 15 | ||||
| -rw-r--r-- | www/mod_perl2/files/patch-ab | 14 | ||||
| -rw-r--r-- | www/mod_perl2/pkg-plist | 4 |
3 files changed, 22 insertions, 11 deletions
diff --git a/www/mod_perl2/Makefile b/www/mod_perl2/Makefile index 7b9436e6008a..853be43abb06 100644 --- a/www/mod_perl2/Makefile +++ b/www/mod_perl2/Makefile @@ -7,6 +7,7 @@ PORTNAME= mod_perl PORTVERSION= 1.99r10 +PORTREVISION= 1 CATEGORIES= www perl5 MASTER_SITES= http://perl.apache.org/dist/ \ http://perl.apache.org/dist/old/ @@ -19,10 +20,9 @@ COMMENT= Embeds a Perl interpreter in the Apache2 server BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${APACHE2_PORT} RUN_DEPENDS= ${LOCALBASE}/sbin/apxs:${APACHE2_PORT} -USE_PERL5= YES - -INSTALLS_SHLIB= YES -LDCONFIG_DIRS= %%PREFIX%%/libexec/apache2/ +PERL_CONFIGURE= yes +CONFIGURE_ARGS= MP_APXS=${LOCALBASE}/sbin/apxs \ + MP_INST_APACHE2=1 PREFIX=${PREFIX} MAN3= Apache::TestRequest.3 Apache::TestSmoke.3 Apache::TestRun.3 \ Apache::TestTrace.3 Apache::TestMM.3 Bundle::ApacheTest.3 \ @@ -41,14 +41,9 @@ MAN3+= ModPerl::Config.3 Apache::TestConfig.3 ## this port requires PERL 5.6.x or later ## .if ${PERL_LEVEL} < 500600 -IGNORE= Port requires perl 5.6.x or later. Install lang/perl5 then try again +IGNORE= requires perl 5.6.x or later. Install lang/perl5 then try again .endif -do-configure: - @ cd ${WRKSRC}; \ - ${PERL5} Makefile.PL MP_APXS=${LOCALBASE}/sbin/apxs \ - MP_INST_APACHE2=1 PREFIX=${PREFIX} - post-install: ${MKDIR} ${PREFIX}/include/apache2/modules/perl ${INSTALL_DATA} ${WRKSRC}/src/modules/perl/*.h \ diff --git a/www/mod_perl2/files/patch-ab b/www/mod_perl2/files/patch-ab new file mode 100644 index 000000000000..b14e639ad3a0 --- /dev/null +++ b/www/mod_perl2/files/patch-ab @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- Apache-Test/install-pl.old Fri Oct 24 07:42:28 2003 ++++ Apache-Test/install-pl Fri Oct 24 07:42:38 2003 +@@ -58,7 +58,7 @@ + return <<EOF; + + nuke_Apache__test: +-\t\$(PERLRUN) -MExtUtils::Install -e \\ ++\t\$(PERL) -MExtUtils::Install -e \\ + \t"-e qq{$cleanup_packlist} && uninstall(qq{$cleanup_packlist}, 1, 0)" + EOF + diff --git a/www/mod_perl2/pkg-plist b/www/mod_perl2/pkg-plist index 3ea627d3a33f..0bbc01fd7015 100644 --- a/www/mod_perl2/pkg-plist +++ b/www/mod_perl2/pkg-plist @@ -1,3 +1,4 @@ +@comment $FreeBSD$ bin/mp2bug bin/mp2doc include/apache2/modules/perl/mod_perl.h @@ -116,6 +117,7 @@ include/apache2/modules/perl/modperl_util.h %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/XSLoader.pm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/compat.pm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache/porting.pm +%%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Bundle/Apache2.pm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/ModPerl/BuildMM.pm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/ModPerl/BuildOptions.pm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/ModPerl/Code.pm @@ -225,7 +227,6 @@ include/apache2/modules/perl/modperl_util.h %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/ModPerl/Util/Util.bs %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/ModPerl/Util/Util.so %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/mod_perl.pm -%%SITE_PERL%%/%%PERL_ARCH%%/Bundle/Apache2.pm %%SITE_PERL%%/%%PERL_ARCH%%/Bundle/ApacheTest.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/mod_perl/.packlist libexec/apache2/mod_perl.so @@ -278,6 +279,7 @@ libexec/apache2/mod_perl.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto/APR @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/auto @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/ModPerl +@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Bundle @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/Apache @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2/APR @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache2 |