CVS commit: pkgsrc/www

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

Module Name:    pkgsrc
Committed By:   rillig
Date:           Thu May 21 07:41:37 UTC 2020

Modified Files:
        pkgsrc/www/ap-auth-kerb: Makefile
        pkgsrc/www/apache24: buildlink3.mk

Log Message:
www/ap-auth-kerb: remove unknown configure option

This allows the package to be built with GNU_CONFIGURE_STRICT=yes.

Since other Apache modules may still need this option, use an opt-out
here.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/www/ap-auth-kerb/Makefile
cvs rdiff -u -r1.13 -r1.14 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/ap-auth-kerb/Makefile
diff -u pkgsrc/www/ap-auth-kerb/Makefile:1.16 pkgsrc/www/ap-auth-kerb/Makefile:1.17
--- pkgsrc/www/ap-auth-kerb/Makefile:1.16       Fri Mar 20 11:58:33 2020
+++ pkgsrc/www/ap-auth-kerb/Makefile    Thu May 21 07:41:37 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2020/03/20 11:58:33 nia Exp $
+# $NetBSD: Makefile,v 1.17 2020/05/21 07:41:37 rillig Exp $
 
 DISTNAME=      mod_auth_kerb-5.4
 PKGNAME=       ${DISTNAME:S/mod/${APACHE_PKG_PREFIX}/:S/_/-/g}
@@ -13,6 +13,7 @@ LICENSE=      modified-bsd
 CONFLICTS=     ap-auth-kerb-[0-9]*
 
 GNU_CONFIGURE=         yes
+GNU_CONFIGURE_APXS2=   no
 CONFIGURE_ARGS+=       --without-krb4
 CONFIGURE_ARGS+=       --with-apache=${BUILDLINK_PREFIX.apache}
 CONFIGURE_ARGS+=       APXS=${APXS}

Index: pkgsrc/www/apache24/buildlink3.mk
diff -u pkgsrc/www/apache24/buildlink3.mk:1.13 pkgsrc/www/apache24/buildlink3.mk:1.14
--- pkgsrc/www/apache24/buildlink3.mk:1.13      Thu May  7 05:41:33 2020
+++ pkgsrc/www/apache24/buildlink3.mk   Thu May 21 07:41:37 2020
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2020/05/07 05:41:33 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2020/05/21 07:41:37 rillig Exp $
 
 BUILDLINK_TREE+=       apache
 
@@ -23,7 +23,7 @@ USE_TOOLS+=           perl                    # for "apxs"
 CONFIGURE_ENV+=                APR_LIBTOOL=${LIBTOOL:Q}        # make apxs use the libtool we specify
 MAKE_ENV+=             APR_LIBTOOL=${LIBTOOL:Q}
 APXS?=                 ${BUILDLINK_PREFIX.apache}/bin/apxs
-.if defined(GNU_CONFIGURE)
+.if defined(GNU_CONFIGURE) && ${GNU_CONFIGURE_APXS2:Uyes} == yes
 CONFIGURE_ARGS+=       ${CONFIGURE_ARGS.apache:U--with-apxs2=${APXS:Q}}
 .endif