[pkgsrc/trunk]: pkgsrc Move www/apache/module.mk to mk/apache.module.mk and a...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc Move www/apache/module.mk to mk/apache.module.mk and a...
From: joerg <joerg%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 16:01:36 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/456f0e9f8222
branches:  trunk
changeset: 635802:456f0e9f8222
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Wed Jun 11 12:57:22 2014 +0000

description:
Move www/apache/module.mk to mk/apache.module.mk and adjust it to use
mk/apache.mk.

diffstat:

 mk/apache.module.mk               |  54 +++++++++++++++++++++++++++++++++++++++
 www/ap-geoip2/Makefile            |   6 +--
 www/ap-rpaf/Makefile              |   6 +--
 www/ap-scgi/Makefile              |   6 +--
 www/ap2-auth-external/Makefile    |   6 +--
 www/ap2-auth-ntlm/Makefile        |   6 +--
 www/ap2-auth-pgsql/Makefile       |   7 +---
 www/ap2-auth-radius/Makefile      |   8 ++---
 www/ap2-authn-otp/Makefile        |   6 +--
 www/ap2-bw/Makefile               |   5 +--
 www/ap2-chroot/Makefile           |   5 +--
 www/ap22-authn-sasl/Makefile      |   4 +-
 www/ap22-authnz-external/Makefile |   6 +--
 www/apache/module.mk              |  54 ---------------------------------------
 14 files changed, 79 insertions(+), 100 deletions(-)

diffs (truncated from 392 to 300 lines):

diff -r e16c1c1d4b07 -r 456f0e9f8222 mk/apache.module.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mk/apache.module.mk       Wed Jun 11 12:57:22 2014 +0000
@@ -0,0 +1,54 @@
+# $NetBSD: apache.module.mk,v 1.1 2014/06/11 12:57:22 joerg Exp $
+#
+# This Makefile fragment is intended to be included by packages that build
+# and install apache modules.
+#
+# The following targets are provided by this file:
+#
+# do-build             builds the module using APXS.
+#
+# do-install           installs the module using APXS.
+#
+# The following variables may be set prior to including this file:
+#
+# APACHE_MODULE_NAME   the name of this module, including the .so suffix.
+#
+# APACHE_MODULE_SRCDIR the location of the source files for this module,
+#                      defaults to WRKSRC.
+#
+# APACHE_MODULE_SRC    the source files to be compiled for this
+#                      module, defaults to *.c.
+#
+
+.if !defined(_APACHE_MODULE_MK)
+_APACHE_MODULE_MK=     # defined
+
+APACHE_MODULE=         yes
+
+.include "../../mk/apache.mk"
+
+APACHE_MODULE_SRCDIR?= ${WRKSRC}
+APACHE_MODULE_SRC?=    *.c
+APACHE_MODULE_DESTDIR= ${DESTDIR}${PREFIX}/lib/httpd
+
+.PHONY: apache-module-build
+apache-module-build:
+       ${RUN} \
+       cd ${APACHE_MODULE_SRCDIR} && \
+               ${SETENV} PATH=${PATH:Q} \
+               ${APXS} ${CPPFLAGS} ${LDFLAGS} \
+                       -c -o ${APACHE_MODULE_NAME} ${APACHE_MODULE_SRC}
+
+do-build: apache-module-build
+
+.PHONY: apache-module-install
+apache-module-install:
+       ${INSTALL_LIB_DIR} ${APACHE_MODULE_DESTDIR}
+       ${PREFIX}/share/httpd/build/instdso.sh \
+           SH_LIBTOOL=${PREFIX}/share/httpd/build/libtool \
+           ${APACHE_MODULE_SRCDIR}/${APACHE_MODULE_NAME} \
+           ${APACHE_MODULE_DESTDIR}
+
+do-install: apache-module-install
+
+.endif # _APACHE_MODULE_MK
diff -r e16c1c1d4b07 -r 456f0e9f8222 www/ap-geoip2/Makefile
--- a/www/ap-geoip2/Makefile    Wed Jun 11 12:52:49 2014 +0000
+++ b/www/ap-geoip2/Makefile    Wed Jun 11 12:57:22 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2014/06/10 15:22:15 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2014/06/11 12:57:22 joerg Exp $
 #
 
 DISTNAME=      mod_geoip2_1.2.5
@@ -11,8 +11,6 @@
 COMMENT=       Apache module to interact with the MaxMind geoip database
 LICENSE=       apache-1.1
 
-.include "../../mk/apache.mk"
-APACHE_MODULE= yes
 APACHE_MODULE_NAME=    mod_geoip.so
 PKG_APACHE_ACCEPTED=   apache22
 NO_CONFIGURE=  yes
@@ -22,6 +20,6 @@
 pre-install:
        cp ${WRKDIR}/${DISTNAME}/.libs/mod_geoip.so ${WRKDIR}/${DISTNAME}/
 
-.include "../../www/apache/module.mk"
+.include "../../mk/apache.module.mk"
 .include "../../net/GeoIP/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r e16c1c1d4b07 -r 456f0e9f8222 www/ap-rpaf/Makefile
--- a/www/ap-rpaf/Makefile      Wed Jun 11 12:52:49 2014 +0000
+++ b/www/ap-rpaf/Makefile      Wed Jun 11 12:57:22 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2014/06/10 15:22:16 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2014/06/11 12:57:22 joerg Exp $
 #
 
 DISTNAME=              mod_rpaf-0.5
@@ -18,8 +18,6 @@
 # does not compile with apache24
 PKG_APACHE_ACCEPTED=   apache22
 
-.include "../../mk/apache.mk"
-
 APACHE_MODULE_NAME=    mod_rpaf.${MODULE_EXT}
 APACHE_MODULE_SRC=     mod_rpaf.c
 
@@ -33,5 +31,5 @@
        ${RM} -f ${WRKSRC}/mod_rpaf.c
        ${CP} -f ${WRKSRC}/mod_rpaf-2.0.c ${WRKSRC}/mod_rpaf.c
 
-.include "../../www/apache/module.mk"
+.include "../../mk/apache.module.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r e16c1c1d4b07 -r 456f0e9f8222 www/ap-scgi/Makefile
--- a/www/ap-scgi/Makefile      Wed Jun 11 12:52:49 2014 +0000
+++ b/www/ap-scgi/Makefile      Wed Jun 11 12:57:22 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2014/06/10 15:22:16 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2014/06/11 12:57:23 joerg Exp $
 #
 
 PKGNAME=       ${APACHE_PKG_PREFIX}-${DISTNAME}
@@ -15,9 +15,6 @@
 
 PYTHON_VERSIONS_INCOMPATIBLE=  33 34 # py-quixote via py-scgi
 
-.include "../../mk/apache.mk"
-.include "../../www/apache/module.mk"
-
 MODULE_EXT=    la
 APACHE_MODULE_SRCDIR=  ${WRKDIR}/${DISTNAME}/apache2
 
@@ -25,4 +22,5 @@
 APACHE_MODULE_SRC=     mod_scgi.c
 
 .include "../../lang/python/pyversion.mk"
+.include "../../mk/apache.module.mk"
 .include "../../www/py-scgi/Makefile.common"
diff -r e16c1c1d4b07 -r 456f0e9f8222 www/ap2-auth-external/Makefile
--- a/www/ap2-auth-external/Makefile    Wed Jun 11 12:52:49 2014 +0000
+++ b/www/ap2-auth-external/Makefile    Wed Jun 11 12:57:22 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2014/06/10 15:22:16 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2014/06/11 12:57:23 joerg Exp $
 #
 
 DISTNAME=      mod_auth_external-${DISTVERS}
@@ -13,13 +13,11 @@
 
 PKG_APACHE_ACCEPTED=   apache22
 
-.include "../../mk/apache.mk"
-
 APACHE_MODULE_NAME=    mod_auth_external.${MODULE_EXT}
 
 DISTVERS=      2.2.11
 MODULE_EXT=    la
 MESSAGE_SUBST+=        MODULE_NAME=auth_external_module
 
-.include "../../www/apache/module.mk"
+.include "../../mk/apache.module.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r e16c1c1d4b07 -r 456f0e9f8222 www/ap2-auth-ntlm/Makefile
--- a/www/ap2-auth-ntlm/Makefile        Wed Jun 11 12:52:49 2014 +0000
+++ b/www/ap2-auth-ntlm/Makefile        Wed Jun 11 12:57:22 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2014/06/10 15:22:17 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2014/06/11 12:57:23 joerg Exp $
 #
 
 DISTNAME=      ntlm2
@@ -12,8 +12,6 @@
 
 PKG_APACHE_ACCEPTED=   apache22
 
-.include "../../mk/apache.mk"
-
 APACHE_MODULE_NAME=    mod_ntlm.${MODULE_EXT}
 
 WRKSRC=                ${WRKDIR}
@@ -31,5 +29,5 @@
 post-install:
        ${INSTALL_DATA} ${WRKSRC}/ntlm.conf ${DESTDIR}${EGDIR}
 
-.include "../../www/apache/module.mk"
+.include "../../mk/apache.module.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r e16c1c1d4b07 -r 456f0e9f8222 www/ap2-auth-pgsql/Makefile
--- a/www/ap2-auth-pgsql/Makefile       Wed Jun 11 12:52:49 2014 +0000
+++ b/www/ap2-auth-pgsql/Makefile       Wed Jun 11 12:57:22 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2014/06/10 15:22:17 joerg Exp $
+# $NetBSD: Makefile,v 1.26 2014/06/11 12:57:23 joerg Exp $
 
 DISTNAME=              mod_auth_pgsql-2.0.3
 PKGNAME=               ${APACHE_PKG_PREFIX}-auth-pgsql-2.0.3
@@ -17,13 +17,10 @@
 
 PKG_APACHE_ACCEPTED=   apache22
 
-.include "../../mk/apache.mk"
-.include "../../www/apache/module.mk"
-
 CPPFLAGS+=     -I${PGSQL_PREFIX}/include/postgresql
 LDFLAGS+=      -L${LOCALBASE}/lib \
                ${COMPILER_RPATH_FLAG}${LOCALBASE}/lib -lpq
 
-.include "../../mk/apache.mk"
+.include "../../mk/apache.module.mk"
 .include "../../mk/pgsql.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r e16c1c1d4b07 -r 456f0e9f8222 www/ap2-auth-radius/Makefile
--- a/www/ap2-auth-radius/Makefile      Wed Jun 11 12:52:49 2014 +0000
+++ b/www/ap2-auth-radius/Makefile      Wed Jun 11 12:57:22 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2014/06/10 15:22:17 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2014/06/11 12:57:23 joerg Exp $
 
 DISTNAME=      mod_auth_radius
 PKGNAME=       ${APACHE_PKG_PREFIX}-auth-radius-1.5.7
@@ -19,10 +19,6 @@
 USE_LIBTOOL=           YES
 
 PKG_APACHE_ACCEPTED=   apache22
-.include "../../mk/apache.mk"
-.include "../../www/apache/module.mk"
-
-.include "../../security/openssl/buildlink3.mk"
 
 post-extract:
        ${MV} ${WRKSRC}/mod_auth_radius.c ${WRKSRC}/mod_auth_radius-1.0.c
@@ -39,4 +35,6 @@
        ${INSTALL_DATA} ${WRKSRC}/httpd.conf \
            ${DESTDIR}${PREFIX}/share/examples/mod_auth_radius
 
+.include "../../security/openssl/buildlink3.mk"
+.include "../../mk/apache.module.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r e16c1c1d4b07 -r 456f0e9f8222 www/ap2-authn-otp/Makefile
--- a/www/ap2-authn-otp/Makefile        Wed Jun 11 12:52:49 2014 +0000
+++ b/www/ap2-authn-otp/Makefile        Wed Jun 11 12:57:22 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2014/02/12 23:18:43 tron Exp $
+# $NetBSD: Makefile,v 1.7 2014/06/11 12:57:23 joerg Exp $
 
 DISTNAME=      mod_authn_otp-${DISTVERS}
 PKGNAME=       ${APACHE_PKG_PREFIX}-authn-otp-${DISTVERS}
@@ -13,14 +13,12 @@
 
 PKG_APACHE_ACCEPTED=   apache22
 
-.include "../../mk/apache.mk"
-
 APACHE_MODULE_NAME=    mod_authn_otp.${MODULE_EXT}
 
 DISTVERS=      1.1.4
 MODULE_EXT=    la
 MESSAGE_SUBST+=        MODULE_NAME=authn_otp_module
 
-.include "../../www/apache/module.mk"
+.include "../../mk/apache.module.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r e16c1c1d4b07 -r 456f0e9f8222 www/ap2-bw/Makefile
--- a/www/ap2-bw/Makefile       Wed Jun 11 12:52:49 2014 +0000
+++ b/www/ap2-bw/Makefile       Wed Jun 11 12:57:22 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2014/06/10 15:22:17 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2014/06/11 12:57:23 joerg Exp $
 #
 
 DISTNAME=              bw_mod-0.6
@@ -24,6 +24,5 @@
 post-install:
        ${INSTALL_DATA} ${WRKSRC}/${DISTNAME}.txt ${DESTDIR}${PREFIX}/share/doc/apache_mod_bw.txt
 
-.include "../../mk/apache.mk"
-.include "../../www/apache/module.mk"
+.include "../../mk/apache.module.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r e16c1c1d4b07 -r 456f0e9f8222 www/ap2-chroot/Makefile
--- a/www/ap2-chroot/Makefile   Wed Jun 11 12:52:49 2014 +0000
+++ b/www/ap2-chroot/Makefile   Wed Jun 11 12:57:22 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2012/10/28 06:30:07 asau Exp $
+# $NetBSD: Makefile,v 1.13 2014/06/11 12:57:23 joerg Exp $
 
 DISTNAME=      mod_chroot-0.5
 PKGNAME=       ${DISTNAME:S/mod_/${APACHE_PKG_PREFIX}-/}
@@ -23,6 +23,5 @@
 post-install:
        ${INSTALL_DATA} ${WRKSRC}/[A-Z]* ${DESTDIR}${PREFIX}/share/doc/mod_chroot/
 
-.include "../../mk/apache.mk"
-.include "../../www/apache/module.mk"
+.include "../../mk/apache.module.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r e16c1c1d4b07 -r 456f0e9f8222 www/ap22-authn-sasl/Makefile
--- a/www/ap22-authn-sasl/Makefile      Wed Jun 11 12:52:49 2014 +0000
+++ b/www/ap22-authn-sasl/Makefile      Wed Jun 11 12:57:22 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2012/12/16 01:52:37 obache Exp $
+# $NetBSD: Makefile,v 1.5 2014/06/11 12:57:23 joerg Exp $
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc Updated devel/libbson to 0.8.2
Next by Date: [pkgsrc/trunk]: pkgsrc/net/net6/patches Remove patch-encrypt.cpp, removed fro...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc Updated devel/libbson to 0.8.2
Next by Thread: [pkgsrc/trunk]: pkgsrc/net/net6/patches Remove patch-encrypt.cpp, removed fro...
Indexes:
Home | Main Index | Thread Index | Old Index