CVS commit: pkgsrc/www

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

Module Name:    pkgsrc
Committed By:   rillig
Date:           Mon May 25 05:54:06 UTC 2020

Modified Files:
        pkgsrc/www/ap2-jk: Makefile
        pkgsrc/www/ap2-subversion: Makefile
        pkgsrc/www/ap2-upload: Makefile

Log Message:
www/ap2-*: remove unknown configure option


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/www/ap2-jk/Makefile
cvs rdiff -u -r1.90 -r1.91 pkgsrc/www/ap2-subversion/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/www/ap2-upload/Makefile

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-jk/Makefile
diff -u pkgsrc/www/ap2-jk/Makefile:1.15 pkgsrc/www/ap2-jk/Makefile:1.16
--- pkgsrc/www/ap2-jk/Makefile:1.15     Sat May 16 17:31:52 2020
+++ pkgsrc/www/ap2-jk/Makefile  Mon May 25 05:54:05 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2020/05/16 17:31:52 rillig Exp $
+# $NetBSD: Makefile,v 1.16 2020/05/25 05:54:05 rillig Exp $
 
 DISTNAME=      tomcat-connectors-${JK_VERSION}-src
 PKGNAME=       ${APACHE_PKG_PREFIX}-jk-${JK_VERSION}
@@ -47,7 +47,7 @@ SUBST_SED.jk-shlt=    -e "s|^\\(SH_LIBTOOL 
 SUBST_MESSAGE.jk-shlt= Fixing libtool references in install script.
 SUBST_NOOP_OK.jk-shlt= yes
 
-# XXX The standard --with-apxs2 when using apache2 doesn't work
+GNU_CONFIGURE_APXS2=   no
 CONFIGURE_ARGS+=       --with-apxs=${APXS:Q}
 
 .if defined(JK_ENABLE_JNI)

Index: pkgsrc/www/ap2-subversion/Makefile
diff -u pkgsrc/www/ap2-subversion/Makefile:1.90 pkgsrc/www/ap2-subversion/Makefile:1.91
--- pkgsrc/www/ap2-subversion/Makefile:1.90     Sat Jan 18 21:51:04 2020
+++ pkgsrc/www/ap2-subversion/Makefile  Mon May 25 05:54:06 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.90 2020/01/18 21:51:04 jperkin Exp $
+# $NetBSD: Makefile,v 1.91 2020/05/25 05:54:06 rillig Exp $
 
 PKGNAME=       ${APACHE_PKG_PREFIX}-subversion-${SVNVER}
 PKGREVISION=   1
@@ -6,6 +6,7 @@ COMMENT=        WebDAV server (Apache module) f
 
 .include "../../devel/subversion/Makefile.common"
 
+GNU_CONFIGURE_APXS2=   no
 CONFIGURE_ARGS+=       --with-apxs=${APXS:Q}
 CONFIGURE_ARGS+=       --disable-mod-activation
 CONFIGURE_ARGS+=       --with-apache-libexecdir

Index: pkgsrc/www/ap2-upload/Makefile
diff -u pkgsrc/www/ap2-upload/Makefile:1.5 pkgsrc/www/ap2-upload/Makefile:1.6
--- pkgsrc/www/ap2-upload/Makefile:1.5  Mon Dec  9 14:20:56 2019
+++ pkgsrc/www/ap2-upload/Makefile      Mon May 25 05:54:06 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2019/12/09 14:20:56 taca Exp $
+# $NetBSD: Makefile,v 1.6 2020/05/25 05:54:06 rillig Exp $
 
 DISTNAME=      mod_upload-0.8
 PKGNAME=       ${APACHE_PKG_PREFIX}-${DISTNAME:S/mod_//}
@@ -14,6 +14,7 @@ LICENSE=      gnu-gpl-v2
 APACHE_MODULE_NAME=    ${DISTNAME:C/-.*//}.la
 
 GNU_CONFIGURE=         yes
+GNU_CONFIGURE_APXS2=   no
 CONFIGURE_ARGS+=       --with-apxs=${APXS}
 CONFIGURE_ARGS+=       --with-php-config=${BUILDLINK_PREFIX.php}/bin/php-config
 USE_LIBTOOL=           yes