CVS commit: pkgsrc/www/p5-libapreq2

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Sun Mar 22 21:21:05 UTC 2020

Modified Files:
        pkgsrc/www/p5-libapreq2: Makefile distinfo
        pkgsrc/www/p5-libapreq2/patches: patch-aa patch-ab

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 pkgsrc/www/p5-libapreq2/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/www/p5-libapreq2/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/p5-libapreq2/patches/patch-aa \
    pkgsrc/www/p5-libapreq2/patches/patch-ab

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/p5-libapreq2/Makefile
diff -u pkgsrc/www/p5-libapreq2/Makefile:1.43 pkgsrc/www/p5-libapreq2/Makefile:1.44
--- pkgsrc/www/p5-libapreq2/Makefile:1.43       Sun Aug 11 13:25:06 2019
+++ pkgsrc/www/p5-libapreq2/Makefile    Sun Mar 22 21:21:05 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2019/08/11 13:25:06 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2020/03/22 21:21:05 rillig Exp $
 
 DISTNAME=      libapreq2-2.13
 PKGNAME=       p5-${APACHE_PKG_PREFIX}-${DISTNAME}
@@ -17,12 +17,6 @@ USE_TOOLS+=  gmake
 USE_LIBTOOL=   YES
 PERL5_PACKLIST=        auto/libapreq2/.packlist
 
-SUBST_CLASSES+=                apxs
-SUBST_STAGE.apxs=      pre-configure
-SUBST_FILES.apxs=      env/Makefile.in
-SUBST_SED.apxs=                -e "s|@APACHE2_APXS@ -i -a -n|@APACHE2_APXS@ -i -n|g"
-SUBST_MESSAGE.apxs=    Fixing module installation.
-
 .include "../../lang/perl5/module.mk"
 
 MAKE_PARAMS:=  ${MAKE_PARAMS:NINSTALLDIRS=vendor}

Index: pkgsrc/www/p5-libapreq2/distinfo
diff -u pkgsrc/www/p5-libapreq2/distinfo:1.11 pkgsrc/www/p5-libapreq2/distinfo:1.12
--- pkgsrc/www/p5-libapreq2/distinfo:1.11       Wed Nov  4 02:47:21 2015
+++ pkgsrc/www/p5-libapreq2/distinfo    Sun Mar 22 21:21:05 2020
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.11 2015/11/04 02:47:21 agc Exp $
+$NetBSD: distinfo,v 1.12 2020/03/22 21:21:05 rillig Exp $
 
 SHA1 (libapreq2-2.13.tar.gz) = db3761625a62230147896b47e9b047660b20ba28
 RMD160 (libapreq2-2.13.tar.gz) = 8d7d2573624193b6dfbbe354b3771012257c1578
 SHA512 (libapreq2-2.13.tar.gz) = 54553cb90c0d3f6fb34ff19364c5804976c4aff1bae551ae051fdd06f41695770f1e285c40e03dbd93ae738adc332f38f1a1994167598364071feaec833fdf05
 Size (libapreq2-2.13.tar.gz) = 891320 bytes
-SHA1 (patch-aa) = 8fa12ccc0a959c0b2430f4a3165185d3a4f1bf03
-SHA1 (patch-ab) = 46d68205d1759a74ee630a2a33c6fcb29b56bbe9
+SHA1 (patch-aa) = f3e9e3d0ecee2f2124045af622c60b6684475e3e
+SHA1 (patch-ab) = 8318a1248de9f79228a91334bae29aa91bcbf42c
 SHA1 (patch-apreq2-config.in) = 2125b6ddcb1e95fef016f7ab154effa7219438dc

Index: pkgsrc/www/p5-libapreq2/patches/patch-aa
diff -u pkgsrc/www/p5-libapreq2/patches/patch-aa:1.1 pkgsrc/www/p5-libapreq2/patches/patch-aa:1.2
--- pkgsrc/www/p5-libapreq2/patches/patch-aa:1.1        Wed Mar 30 18:38:07 2011
+++ pkgsrc/www/p5-libapreq2/patches/patch-aa    Sun Mar 22 21:21:05 2020
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.1 2011/03/30 18:38:07 bouyer Exp $
+$NetBSD: patch-aa,v 1.2 2020/03/22 21:21:05 rillig Exp $
 
-perl_install cause the Makefile in perl/ to be rebuilt with /usr/pkg/lib
-as library path instead of the source tree. install the tries to relink
+perl_install causes the Makefile in perl/ to be rebuilt with /usr/pkg/lib
+as library path instead of the source tree. install then tries to relink
 the target with the new path, which fails because the just-installed
 libraries are not in the buildlink directory.
 Just don't rebuild makefiles, the run-time search path has been fixed
Index: pkgsrc/www/p5-libapreq2/patches/patch-ab
diff -u pkgsrc/www/p5-libapreq2/patches/patch-ab:1.1 pkgsrc/www/p5-libapreq2/patches/patch-ab:1.2
--- pkgsrc/www/p5-libapreq2/patches/patch-ab:1.1        Wed Mar 30 18:38:07 2011
+++ pkgsrc/www/p5-libapreq2/patches/patch-ab    Sun Mar 22 21:21:05 2020
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.1 2011/03/30 18:38:07 bouyer Exp $
+$NetBSD: patch-ab,v 1.2 2020/03/22 21:21:05 rillig Exp $
 
-perl_install cause the Makefile in perl/ to be rebuilt with /usr/pkg/lib
-as library path instead of the source tree. install the tries to relink
+perl_install causes the Makefile in perl/ to be rebuilt with /usr/pkg/lib
+as library path instead of the source tree. install then tries to relink
 the target with the new path, which fails because the just-installed
 libraries are not in the buildlink directory.
 Just don't rebuild makefiles, the run-time search path has been fixed