CVS commit: pkgsrc/www

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

Module Name:    pkgsrc
Committed By:   rillig
Date:           Thu May  7 05:41:33 UTC 2020

Modified Files:
        pkgsrc/www/ap2-python: Makefile
        pkgsrc/www/apache24: buildlink3.mk

Log Message:
www/ap2-python: omit unknown configure option

This fixes the build with GNU_CONFIGURE_STRICT=yes.


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 pkgsrc/www/ap2-python/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/www/apache24/buildlink3.mk

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

Modified files:

Index: pkgsrc/www/ap2-python/Makefile
diff -u pkgsrc/www/ap2-python/Makefile:1.36 pkgsrc/www/ap2-python/Makefile:1.37
--- pkgsrc/www/ap2-python/Makefile:1.36 Thu Nov 21 11:40:37 2019
+++ pkgsrc/www/ap2-python/Makefile      Thu May  7 05:41:33 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2019/11/21 11:40:37 leot Exp $
+# $NetBSD: Makefile,v 1.37 2020/05/07 05:41:33 rillig Exp $
 
 DISTNAME=      mod_python-3.5.0
 PKGNAME=       ${APACHE_PKG_PREFIX}-${PYPKGPREFIX}-${DISTNAME:S/mod_//}
@@ -19,6 +19,7 @@ USE_LIBTOOL=          yes
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --with-apxs=${APXS:Q}
 CONFIGURE_ARGS+=       --with-python=${PYTHONBIN:Q}
+CONFIGURE_ARGS.apache= # none (since --with-apxs2 is unknown)
 
 SUBST_CLASSES+=                        optimization
 SUBST_STAGE.optimization=      pre-configure

Index: pkgsrc/www/apache24/buildlink3.mk
diff -u pkgsrc/www/apache24/buildlink3.mk:1.12 pkgsrc/www/apache24/buildlink3.mk:1.13
--- pkgsrc/www/apache24/buildlink3.mk:1.12      Sat Jan 18 21:48:29 2020
+++ pkgsrc/www/apache24/buildlink3.mk   Thu May  7 05:41:33 2020
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2020/01/18 21:48:29 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2020/05/07 05:41:33 rillig Exp $
 
 BUILDLINK_TREE+=       apache
 
@@ -24,7 +24,7 @@ CONFIGURE_ENV+=               APR_LIBTOOL=${LIBTOOL:Q
 MAKE_ENV+=             APR_LIBTOOL=${LIBTOOL:Q}
 APXS?=                 ${BUILDLINK_PREFIX.apache}/bin/apxs
 .if defined(GNU_CONFIGURE)
-CONFIGURE_ARGS+=       --with-apxs2=${APXS:Q}
+CONFIGURE_ARGS+=       ${CONFIGURE_ARGS.apache:U--with-apxs2=${APXS:Q}}
 .endif
 
 .include "../../devel/apr/buildlink3.mk"