Sun Mar 22 21:21:05 2020 UTC ()
www/p5-libapreq2: remove ignored SUBST block

The file env/Makefile.in doesn't exist anymore, and the other Makefile.in
files don't run apxs anymore.


(rillig)
diff -r1.43 -r1.44 pkgsrc/www/p5-libapreq2/Makefile
diff -r1.11 -r1.12 pkgsrc/www/p5-libapreq2/distinfo
diff -r1.1 -r1.2 pkgsrc/www/p5-libapreq2/patches/patch-aa
diff -r1.1 -r1.2 pkgsrc/www/p5-libapreq2/patches/patch-ab
cvs diff -r1.43 -r1.44 pkgsrc/www/p5-libapreq2/Makefile (expand / switch to unified diff)

--- pkgsrc/www/p5-libapreq2/Makefile 2019/08/11 13:25:06 1.43
+++ pkgsrc/www/p5-libapreq2/Makefile 2020/03/22 21:21:05 1.44
@@ -1,38 +1,32 @@ @@ -1,38 +1,32 @@
1# $NetBSD: Makefile,v 1.43 2019/08/11 13:25:06 wiz Exp $ 1# $NetBSD: Makefile,v 1.44 2020/03/22 21:21:05 rillig Exp $
2 2
3DISTNAME= libapreq2-2.13 3DISTNAME= libapreq2-2.13
4PKGNAME= p5-${APACHE_PKG_PREFIX}-${DISTNAME} 4PKGNAME= p5-${APACHE_PKG_PREFIX}-${DISTNAME}
5PKGREVISION= 4 5PKGREVISION= 4
6CATEGORIES= www perl5 6CATEGORIES= www perl5
7MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/libapreq/} 7MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/libapreq/}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://httpd.apache.org/apreq/ 10HOMEPAGE= http://httpd.apache.org/apreq/
11COMMENT= Lots of Apache specific httpd handling modules 11COMMENT= Lots of Apache specific httpd handling modules
12LICENSE= apache-2.0 12LICENSE= apache-2.0
13 13
14DEPENDS+= p5-ExtUtils-XSBuilder>=0.23:../../devel/p5-ExtUtils-XSBuilder 14DEPENDS+= p5-ExtUtils-XSBuilder>=0.23:../../devel/p5-ExtUtils-XSBuilder
15 15
16USE_TOOLS+= gmake 16USE_TOOLS+= gmake
17USE_LIBTOOL= YES 17USE_LIBTOOL= YES
18PERL5_PACKLIST= auto/libapreq2/.packlist 18PERL5_PACKLIST= auto/libapreq2/.packlist
19 19
20SUBST_CLASSES+= apxs 
21SUBST_STAGE.apxs= pre-configure 
22SUBST_FILES.apxs= env/Makefile.in 
23SUBST_SED.apxs= -e "s|@APACHE2_APXS@ -i -a -n|@APACHE2_APXS@ -i -n|g" 
24SUBST_MESSAGE.apxs= Fixing module installation. 
25 
26.include "../../lang/perl5/module.mk" 20.include "../../lang/perl5/module.mk"
27 21
28MAKE_PARAMS:= ${MAKE_PARAMS:NINSTALLDIRS=vendor} 22MAKE_PARAMS:= ${MAKE_PARAMS:NINSTALLDIRS=vendor}
29MAKE_PARAMS+= --with-apache2-apxs="${APXS}" --with-mm-opts="INSTALLDIRS=vendor" 23MAKE_PARAMS+= --with-apache2-apxs="${APXS}" --with-mm-opts="INSTALLDIRS=vendor"
30 24
31pre-configure: 25pre-configure:
32 ${LN} -fs ${PKGSRCDIR}/mk/gnu-config/config.guess ${WRKSRC} 26 ${LN} -fs ${PKGSRCDIR}/mk/gnu-config/config.guess ${WRKSRC}
33 ${LN} -fs ${PKGSRCDIR}/mk/gnu-config/config.sub ${WRKSRC} 27 ${LN} -fs ${PKGSRCDIR}/mk/gnu-config/config.sub ${WRKSRC}
34 28
35#pre-configure: 29#pre-configure:
36# cd ${WRKSRC} && ./buildconf 30# cd ${WRKSRC} && ./buildconf
37 31
38.include "../../www/ap2-perl/buildlink3.mk" 32.include "../../www/ap2-perl/buildlink3.mk"
cvs diff -r1.11 -r1.12 pkgsrc/www/p5-libapreq2/distinfo (expand / switch to unified diff)

--- pkgsrc/www/p5-libapreq2/distinfo 2015/11/04 02:47:21 1.11
+++ pkgsrc/www/p5-libapreq2/distinfo 2020/03/22 21:21:05 1.12
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.11 2015/11/04 02:47:21 agc Exp $ 1$NetBSD: distinfo,v 1.12 2020/03/22 21:21:05 rillig Exp $
2 2
3SHA1 (libapreq2-2.13.tar.gz) = db3761625a62230147896b47e9b047660b20ba28 3SHA1 (libapreq2-2.13.tar.gz) = db3761625a62230147896b47e9b047660b20ba28
4RMD160 (libapreq2-2.13.tar.gz) = 8d7d2573624193b6dfbbe354b3771012257c1578 4RMD160 (libapreq2-2.13.tar.gz) = 8d7d2573624193b6dfbbe354b3771012257c1578
5SHA512 (libapreq2-2.13.tar.gz) = 54553cb90c0d3f6fb34ff19364c5804976c4aff1bae551ae051fdd06f41695770f1e285c40e03dbd93ae738adc332f38f1a1994167598364071feaec833fdf05 5SHA512 (libapreq2-2.13.tar.gz) = 54553cb90c0d3f6fb34ff19364c5804976c4aff1bae551ae051fdd06f41695770f1e285c40e03dbd93ae738adc332f38f1a1994167598364071feaec833fdf05
6Size (libapreq2-2.13.tar.gz) = 891320 bytes 6Size (libapreq2-2.13.tar.gz) = 891320 bytes
7SHA1 (patch-aa) = 8fa12ccc0a959c0b2430f4a3165185d3a4f1bf03 7SHA1 (patch-aa) = f3e9e3d0ecee2f2124045af622c60b6684475e3e
8SHA1 (patch-ab) = 46d68205d1759a74ee630a2a33c6fcb29b56bbe9 8SHA1 (patch-ab) = 8318a1248de9f79228a91334bae29aa91bcbf42c
9SHA1 (patch-apreq2-config.in) = 2125b6ddcb1e95fef016f7ab154effa7219438dc 9SHA1 (patch-apreq2-config.in) = 2125b6ddcb1e95fef016f7ab154effa7219438dc
cvs diff -r1.1 -r1.2 pkgsrc/www/p5-libapreq2/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/www/p5-libapreq2/patches/patch-aa 2011/03/30 18:38:07 1.1
+++ pkgsrc/www/p5-libapreq2/patches/patch-aa 2020/03/22 21:21:05 1.2
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: patch-aa,v 1.1 2011/03/30 18:38:07 bouyer Exp $ 1$NetBSD: patch-aa,v 1.2 2020/03/22 21:21:05 rillig Exp $
2 2
3perl_install cause the Makefile in perl/ to be rebuilt with /usr/pkg/lib 3perl_install causes the Makefile in perl/ to be rebuilt with /usr/pkg/lib
4as library path instead of the source tree. install the tries to relink 4as library path instead of the source tree. install then tries to relink
5the target with the new path, which fails because the just-installed 5the target with the new path, which fails because the just-installed
6libraries are not in the buildlink directory. 6libraries are not in the buildlink directory.
7Just don't rebuild makefiles, the run-time search path has been fixed 7Just don't rebuild makefiles, the run-time search path has been fixed
8by buildlink already. 8by buildlink already.
9 9
10--- glue/Makefile.am.orig 2011-03-29 21:44:52.000000000 +0200 10--- glue/Makefile.am.orig 2011-03-29 21:44:52.000000000 +0200
11+++ glue/Makefile.am 2011-03-29 21:45:29.000000000 +0200 11+++ glue/Makefile.am 2011-03-29 21:45:29.000000000 +0200
12@@ -15,7 +15,6 @@ 12@@ -15,7 +15,6 @@
13 cd perl; $(MAKE) test 13 cd perl; $(MAKE) test
14  14
15 perl_install: 15 perl_install:
16- cd perl; INSTALL=1 @PERL@ @PERL_OPTS@ Makefile.PL -apxs @APACHE2_APXS@ @MM_OPTS@ 16- cd perl; INSTALL=1 @PERL@ @PERL_OPTS@ Makefile.PL -apxs @APACHE2_APXS@ @MM_OPTS@
17 cd perl; $(MAKE) install 17 cd perl; $(MAKE) install
cvs diff -r1.1 -r1.2 pkgsrc/www/p5-libapreq2/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/www/p5-libapreq2/patches/patch-ab 2011/03/30 18:38:07 1.1
+++ pkgsrc/www/p5-libapreq2/patches/patch-ab 2020/03/22 21:21:05 1.2
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: patch-ab,v 1.1 2011/03/30 18:38:07 bouyer Exp $ 1$NetBSD: patch-ab,v 1.2 2020/03/22 21:21:05 rillig Exp $
2 2
3perl_install cause the Makefile in perl/ to be rebuilt with /usr/pkg/lib 3perl_install causes the Makefile in perl/ to be rebuilt with /usr/pkg/lib
4as library path instead of the source tree. install the tries to relink 4as library path instead of the source tree. install then tries to relink
5the target with the new path, which fails because the just-installed 5the target with the new path, which fails because the just-installed
6libraries are not in the buildlink directory. 6libraries are not in the buildlink directory.
7Just don't rebuild makefiles, the run-time search path has been fixed 7Just don't rebuild makefiles, the run-time search path has been fixed
8by buildlink already. 8by buildlink already.
9 9
10--- glue/Makefile.in.orig 2011-03-29 21:45:01.000000000 +0200 10--- glue/Makefile.in.orig 2011-03-29 21:45:01.000000000 +0200
11+++ glue/Makefile.in 2011-03-29 21:45:35.000000000 +0200 11+++ glue/Makefile.in 2011-03-29 21:45:35.000000000 +0200
12@@ -265,7 +265,6 @@ 12@@ -265,7 +265,6 @@
13 cd perl; $(MAKE) test 13 cd perl; $(MAKE) test
14  14
15 perl_install: 15 perl_install:
16- cd perl; INSTALL=1 @PERL@ @PERL_OPTS@ Makefile.PL -apxs @APACHE2_APXS@ @MM_OPTS@ 16- cd perl; INSTALL=1 @PERL@ @PERL_OPTS@ Makefile.PL -apxs @APACHE2_APXS@ @MM_OPTS@
17 cd perl; $(MAKE) install 17 cd perl; $(MAKE) install