diff options
| author | petef <petef@FreeBSD.org> | 2004-01-11 02:30:44 +0000 |
|---|---|---|
| committer | petef <petef@FreeBSD.org> | 2004-01-11 02:30:44 +0000 |
| commit | 60a243572b6b706282737c96882aeb57011ce731 (patch) | |
| tree | 97b893c95c1d9162ae7d0ece1fefa76cfa597b56 | |
| parent | 96dd376ee65f39ef3d5fbc3ef97d86a732108388 (diff) | |
| download | FreeBSD-ports-60a243572b6b706282737c96882aeb57011ce731.zip FreeBSD-ports-60a243572b6b706282737c96882aeb57011ce731.tar.gz | |
- convert to using PERL_CONFIGURE. this fixes issues with some manpages
(since PERL_CONFIGURE sets MAN3PREFIX for us) [0]
- fix pkg-plist to not be greedy about ${SITE_PERL}/${PERL_ARCH}/Bundle and
Apache directories.
PR: 58724, 59710 [0]
Submitted by: lev [0]
| -rw-r--r-- | www/mod_perl/Makefile | 16 | ||||
| -rw-r--r-- | www/mod_perl/pkg-plist | 4 |
2 files changed, 7 insertions, 13 deletions
diff --git a/www/mod_perl/Makefile b/www/mod_perl/Makefile index 5afd8e5..6aaaa38 100644 --- a/www/mod_perl/Makefile +++ b/www/mod_perl/Makefile @@ -18,7 +18,11 @@ BUILD_DEPENDS= ${APXS}:${PORTSDIR}/${APACHE_PORT} \ ${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww RUN_DEPENDS= ${BUILD_DEPENDS} -USE_PERL5= YES +PERL_CONFIGURE= yes +CONFIGURE_ARGS+= USE_APXS=1 EVERYTHING=1 INSTALLSITELIB=${SITE_PERL} \ + INSTALLSITEARCH=${SITE_PERL}/${PERL_ARCH} \ + WITH_APXS=${APXS} \ + PERL_EXTRA_CFLAGS='-DDEFAULT_PATH=\"/bin:/usr/bin:/usr/local/bin\"' MAN3= Apache.3 Apache::Constants.3 Apache::ExtUtils.3 \ Apache::FakeRequest.3 Apache::File.3 Apache::Leak.3 \ @@ -35,19 +39,9 @@ MAN3= Apache.3 Apache::Constants.3 Apache::ExtUtils.3 \ Apache::PerlSections.3 cgi_to_mod_perl.3 \ mod_perl_cvs.3 mod_perl_method_handlers.3 mod_perl_traps.3 \ mod_perl_tuning.3 -PERLSITEDIR= ${PREFIX}/lib/perl5/site_perl/${PERL_VER} .include <bsd.port.pre.mk> -do-configure: - @ cd ${WRKSRC}; \ - ${PERL5} Makefile.PL USE_APXS=1 EVERYTHING=1 \ - PREFIX=${PREFIX} INSTALLSITELIB=${PERLSITEDIR} \ - INSTALLSITEARCH=${PERLSITEDIR}/${PERL_ARCH} \ - INSTALLMAN3DIR=${MANPREFIX}/man/man3 \ - WITH_APXS=${APXS} \ - PERL_EXTRA_CFLAGS='-DDEFAULT_PATH=\"/bin:/usr/bin:/usr/local/bin\"' - post-install: ${MKDIR} ${PREFIX}/include/apache/modules/perl ${INSTALL_DATA} ${WRKSRC}/src/modules/perl/*.h \ diff --git a/www/mod_perl/pkg-plist b/www/mod_perl/pkg-plist index 2b14814..cfe7580 100644 --- a/www/mod_perl/pkg-plist +++ b/www/mod_perl/pkg-plist @@ -73,7 +73,7 @@ libexec/apache/libperl.so @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache/Symbol @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Apache @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/mod_perl +@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Bundle 2>/dev/null || true @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache/Constants -@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Apache -@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Bundle +@unexec rmdir %D/%%SITE_PERL%%/%%PERL_ARCH%%/Apache 2>/dev/null || true @unexec rmdir %D/etc/apache 2> /dev/null || true |
