Mon May 25 05:54:06 2020 UTC ()
www/ap2-*: remove unknown configure option


(rillig)
diff -r1.15 -r1.16 pkgsrc/www/ap2-jk/Makefile
diff -r1.90 -r1.91 pkgsrc/www/ap2-subversion/Makefile
diff -r1.5 -r1.6 pkgsrc/www/ap2-upload/Makefile
cvs diff -r1.15 -r1.16 pkgsrc/www/ap2-jk/Makefile (expand / switch to unified diff)

--- pkgsrc/www/ap2-jk/Makefile 2020/05/16 17:31:52 1.15
+++ pkgsrc/www/ap2-jk/Makefile 2020/05/25 05:54:05 1.16
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.15 2020/05/16 17:31:52 rillig Exp $ 1# $NetBSD: Makefile,v 1.16 2020/05/25 05:54:05 rillig Exp $
2 2
3DISTNAME= tomcat-connectors-${JK_VERSION}-src 3DISTNAME= tomcat-connectors-${JK_VERSION}-src
4PKGNAME= ${APACHE_PKG_PREFIX}-jk-${JK_VERSION} 4PKGNAME= ${APACHE_PKG_PREFIX}-jk-${JK_VERSION}
5JK_VERSION= 1.2.43 5JK_VERSION= 1.2.43
6CATEGORIES= www java 6CATEGORIES= www java
7MASTER_SITES= ${MASTER_SITE_APACHE:=tomcat/tomcat-connectors/jk/} 7MASTER_SITES= ${MASTER_SITE_APACHE:=tomcat/tomcat-connectors/jk/}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://tomcat.apache.org/connectors-doc/ 10HOMEPAGE= https://tomcat.apache.org/connectors-doc/
11COMMENT= Apache connector for accessing Jakarta Tomcat 11COMMENT= Apache connector for accessing Jakarta Tomcat
12LICENSE= apache-2.0 12LICENSE= apache-2.0
13 13
14CONFLICTS= ap-jk-[0-9]* 14CONFLICTS= ap-jk-[0-9]*
@@ -37,27 +37,27 @@ SUBST_CLASSES+= jk-lt @@ -37,27 +37,27 @@ SUBST_CLASSES+= jk-lt
37SUBST_STAGE.jk-lt= post-configure 37SUBST_STAGE.jk-lt= post-configure
38SUBST_FILES.jk-lt= Makefile common/Makefile apache-2.0/Makefile 38SUBST_FILES.jk-lt= Makefile common/Makefile apache-2.0/Makefile
39SUBST_SED.jk-lt= -e "s|^\\(LIBTOOL *=\\).*\$$|\\1 \$$(SHELL) \$$(top_builddir)/libtool|g" 39SUBST_SED.jk-lt= -e "s|^\\(LIBTOOL *=\\).*\$$|\\1 \$$(SHELL) \$$(top_builddir)/libtool|g"
40SUBST_MESSAGE.jk-lt= Fixing libtool references. 40SUBST_MESSAGE.jk-lt= Fixing libtool references.
41SUBST_NOOP_OK.jk-lt= yes 41SUBST_NOOP_OK.jk-lt= yes
42 42
43SUBST_CLASSES+= jk-shlt 43SUBST_CLASSES+= jk-shlt
44SUBST_STAGE.jk-shlt= post-configure 44SUBST_STAGE.jk-shlt= post-configure
45SUBST_FILES.jk-shlt= scripts/build/instdso.s 45SUBST_FILES.jk-shlt= scripts/build/instdso.s
46SUBST_SED.jk-shlt= -e "s|^\\(SH_LIBTOOL *=\\).*\$$|\\1 \$$(SHELL) \$$(top_builddir)/libtool|g" 46SUBST_SED.jk-shlt= -e "s|^\\(SH_LIBTOOL *=\\).*\$$|\\1 \$$(SHELL) \$$(top_builddir)/libtool|g"
47SUBST_MESSAGE.jk-shlt= Fixing libtool references in install script. 47SUBST_MESSAGE.jk-shlt= Fixing libtool references in install script.
48SUBST_NOOP_OK.jk-shlt= yes 48SUBST_NOOP_OK.jk-shlt= yes
49 49
50# XXX The standard --with-apxs2 when using apache2 doesn't work 50GNU_CONFIGURE_APXS2= no
51CONFIGURE_ARGS+= --with-apxs=${APXS:Q} 51CONFIGURE_ARGS+= --with-apxs=${APXS:Q}
52 52
53.if defined(JK_ENABLE_JNI) 53.if defined(JK_ENABLE_JNI)
54USE_JAVA= yes 54USE_JAVA= yes
55CONFIGURE_ARGS+= --enable-jni 55CONFIGURE_ARGS+= --enable-jni
56CONFIGURE_ARGS+= --with-java-home=${JAVA_HOME:Q} 56CONFIGURE_ARGS+= --with-java-home=${JAVA_HOME:Q}
57SUBST_FILES.jk-lt+= jni/Makefile 57SUBST_FILES.jk-lt+= jni/Makefile
58.endif 58.endif
59 59
60.if defined(JK_ENABLE_JNI) 60.if defined(JK_ENABLE_JNI)
61.include "../../mk/java-vm.mk" 61.include "../../mk/java-vm.mk"
62.endif 62.endif
63 63
cvs diff -r1.90 -r1.91 pkgsrc/www/ap2-subversion/Makefile (expand / switch to unified diff)

--- pkgsrc/www/ap2-subversion/Makefile 2020/01/18 21:51:04 1.90
+++ pkgsrc/www/ap2-subversion/Makefile 2020/05/25 05:54:06 1.91
@@ -1,21 +1,22 @@ @@ -1,21 +1,22 @@
1# $NetBSD: Makefile,v 1.90 2020/01/18 21:51:04 jperkin Exp $ 1# $NetBSD: Makefile,v 1.91 2020/05/25 05:54:06 rillig Exp $
2 2
3PKGNAME= ${APACHE_PKG_PREFIX}-subversion-${SVNVER} 3PKGNAME= ${APACHE_PKG_PREFIX}-subversion-${SVNVER}
4PKGREVISION= 1 4PKGREVISION= 1
5COMMENT= WebDAV server (Apache module) for Subversion 5COMMENT= WebDAV server (Apache module) for Subversion
6 6
7.include "../../devel/subversion/Makefile.common" 7.include "../../devel/subversion/Makefile.common"
8 8
 9GNU_CONFIGURE_APXS2= no
9CONFIGURE_ARGS+= --with-apxs=${APXS:Q} 10CONFIGURE_ARGS+= --with-apxs=${APXS:Q}
10CONFIGURE_ARGS+= --disable-mod-activation 11CONFIGURE_ARGS+= --disable-mod-activation
11CONFIGURE_ARGS+= --with-apache-libexecdir 12CONFIGURE_ARGS+= --with-apache-libexecdir
12 13
13APACHE_MODULE= YES 14APACHE_MODULE= YES
14 15
15BUILD_TARGET= apache-mod 16BUILD_TARGET= apache-mod
16INSTALL_TARGET= install-mods-shared 17INSTALL_TARGET= install-mods-shared
17 18
18CFLAGS.SunOS+= -D__EXTENSIONS__ 19CFLAGS.SunOS+= -D__EXTENSIONS__
19 20
20post-patch: 21post-patch:
21 ${RM} ${WRKSRC}/build-outputs.mk 22 ${RM} ${WRKSRC}/build-outputs.mk
cvs diff -r1.5 -r1.6 pkgsrc/www/ap2-upload/Makefile (expand / switch to unified diff)

--- pkgsrc/www/ap2-upload/Makefile 2019/12/09 14:20:56 1.5
+++ pkgsrc/www/ap2-upload/Makefile 2020/05/25 05:54:06 1.6
@@ -1,29 +1,30 @@ @@ -1,29 +1,30 @@
1# $NetBSD: Makefile,v 1.5 2019/12/09 14:20:56 taca Exp $ 1# $NetBSD: Makefile,v 1.6 2020/05/25 05:54:06 rillig Exp $
2 2
3DISTNAME= mod_upload-0.8 3DISTNAME= mod_upload-0.8
4PKGNAME= ${APACHE_PKG_PREFIX}-${DISTNAME:S/mod_//} 4PKGNAME= ${APACHE_PKG_PREFIX}-${DISTNAME:S/mod_//}
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= www 6CATEGORIES= www
7MASTER_SITES= https://ftp.espci.fr/pub/mod_upload/ 7MASTER_SITES= https://ftp.espci.fr/pub/mod_upload/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://ftp.espci.fr/pub/mod_upload/ 10HOMEPAGE= https://ftp.espci.fr/pub/mod_upload/
11COMMENT= High performance file upload helper for PHP 11COMMENT= High performance file upload helper for PHP
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14APACHE_MODULE_NAME= ${DISTNAME:C/-.*//}.la 14APACHE_MODULE_NAME= ${DISTNAME:C/-.*//}.la
15 15
16GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
 17GNU_CONFIGURE_APXS2= no
17CONFIGURE_ARGS+= --with-apxs=${APXS} 18CONFIGURE_ARGS+= --with-apxs=${APXS}
18CONFIGURE_ARGS+= --with-php-config=${BUILDLINK_PREFIX.php}/bin/php-config 19CONFIGURE_ARGS+= --with-php-config=${BUILDLINK_PREFIX.php}/bin/php-config
19USE_LIBTOOL= yes 20USE_LIBTOOL= yes
20 21
21DOC_DIR= share/doc/${DISTNAME:C/-.*//} 22DOC_DIR= share/doc/${DISTNAME:C/-.*//}
22INSTALLATION_DIRS+= lib/httpd ${DOC_DIR} 23INSTALLATION_DIRS+= lib/httpd ${DOC_DIR}
23PLIST_SUBST+= DOC_DIR=${DOC_DIR} 24PLIST_SUBST+= DOC_DIR=${DOC_DIR}
24 25
25do-build: 26do-build:
26 cd ${WRKSRC} && ${MAKE} 27 cd ${WRKSRC} && ${MAKE}
27 28
28post-install: 29post-install:
29 ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/${DOC_DIR} 30 ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/${DOC_DIR}