diff options
| author | jlam <jlam@pkgsrc.org> | 2002-08-25 21:50:52 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2002-08-25 21:50:52 +0000 |
| commit | a020ed9056d4d74e13cd2a99898f3dec09c162b7 (patch) | |
| tree | f54fdc39f5381d6b58a06e7e3ed458f63f0e9df2 /www/ap-perl | |
| parent | 287b5c5601b23446d25c27bbf0140c8dc4b4391e (diff) | |
| download | pkgsrc-a020ed9056d4d74e13cd2a99898f3dec09c162b7.tar.gz | |
Merge packages from the buildlink2 branch back into the main trunk that
have been converted to USE_BUILDLINK2.
Diffstat (limited to 'www/ap-perl')
| -rw-r--r-- | www/ap-perl/Makefile | 18 | ||||
| -rw-r--r-- | www/ap-perl/distinfo | 4 | ||||
| -rw-r--r-- | www/ap-perl/patches/patch-aa | 11 |
3 files changed, 13 insertions, 20 deletions
diff --git a/www/ap-perl/Makefile b/www/ap-perl/Makefile index 8e924177f8d..2df99c2f086 100644 --- a/www/ap-perl/Makefile +++ b/www/ap-perl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2002/07/26 08:57:14 grant Exp $ +# $NetBSD: Makefile,v 1.23 2002/08/25 21:51:49 jlam Exp $ # DISTNAME= mod_perl-1.25 @@ -16,13 +16,11 @@ DEPENDS+= ${BUILDLINK_DEPENDS.apache}:../../www/apache DEPENDS+= {libperl>=${LIBPERL5_REQD},perl>=5.8.0}:../../lang/libperl DEPENDS+= p5-BSD-Resource>=1.10:../../devel/p5-BSD-Resource -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES +APACHE_MODULE= YES LIBPERL5_REQD= ${PERL5_REQD} PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/mod_perl/.packlist -REPLACE_BUILDLINK= blib/lib/Apache/MyConfig.pm -REPLACE_BUILDLINK_SED= -e "s|${APXS}|${PREFIX}/sbin/apxs|g" - MAKE_PARAMS+= USE_APXS=1 MAKE_PARAMS+= WITH_APXS=${APXS} MAKE_PARAMS+= EVERYTHING=1 @@ -35,10 +33,14 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/htdocs/manual/mod/mod_perl.html \ ${PREFIX}/share/httpd/htdocs/manual/mod -.include "../../lang/perl5/buildlink.mk" -.include "../../www/apache/buildlink.mk" +.include "../../lang/perl5/buildlink2.mk" +.include "../../www/apache/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" .if exists(${PERL5_ARCHLIB}/DynaLoader_pic.o) -MAKE_ENV+= DYNALOADER_OBJ_PIC="${PERL5_ARCHLIB}/DynaLoader_pic.o" +DYNALOADER_OBJ_PIC= ${PERL5_ARCHLIB}/DynaLoader_pic.o +.elif ${OPSYS} == "NetBSD" +DYNALOADER_OBJ_PIC= ${PERL5_ARCHLIB}/auto/DynaLoader/DynaLoader.a .endif +MAKE_ENV+= DYNALOADER_OBJ_PIC="${DYNALOADER_OBJ_PIC}" diff --git a/www/ap-perl/distinfo b/www/ap-perl/distinfo index efd5f4ad331..e556646eafa 100644 --- a/www/ap-perl/distinfo +++ b/www/ap-perl/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.6 2002/07/26 08:57:15 grant Exp $ +$NetBSD: distinfo,v 1.7 2002/08/25 21:51:50 jlam Exp $ SHA1 (mod_perl-1.25.tar.gz) = a3ad57bbf1143cdda4b80754ce8f34913f5df053 Size (mod_perl-1.25.tar.gz) = 366834 bytes -SHA1 (patch-aa) = c19469efd351e3a545feb79a6d3af4f734b27449 +SHA1 (patch-aa) = 22e439087a30b042e8a79e646b57f61040c47f36 SHA1 (patch-ab) = 18b02747ae4b9ab17ce252cf003bf9fd7e4b2560 diff --git a/www/ap-perl/patches/patch-aa b/www/ap-perl/patches/patch-aa index e6cde71440a..f6c76bdbc2d 100644 --- a/www/ap-perl/patches/patch-aa +++ b/www/ap-perl/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.5 2001/10/01 08:36:44 jlam Exp $ +$NetBSD: patch-aa,v 1.6 2002/08/25 21:51:50 jlam Exp $ --- apaci/Makefile.tmpl.orig Tue Nov 24 11:38:52 1998 +++ apaci/Makefile.tmpl Fri Apr 30 20:36:05 1999 @@ -11,15 +11,6 @@ $NetBSD: patch-aa,v 1.5 2001/10/01 08:36:44 jlam Exp $ all: lib -@@ -58,7 +58,7 @@ - - libperl.so: $(MP_OBJS_PIC) - $(MP_RM) $@ -- $(MP_LD) $(MP_LDFLAGS_SHLIB) -o $@ $(MP_OBJS_PIC) $(MP_LIBS) -+ ld $(MP_LDFLAGS_SHLIB:S/-Wl,//g) -o $@ $(MP_OBJS_PIC) $(MP_LIBS:S/-Wl,//g:N*.a) - - .SUFFIXES: .xs .c .o .lo - @@ -94,7 +94,8 @@ # FOR STAND-ALONE BUILDING ONLY |