Wed Jun 11 12:57:23 2014 UTC ()
Move www/apache/module.mk to mk/apache.module.mk and adjust it to use
mk/apache.mk.


(joerg)
diff -r0 -r1.1 pkgsrc/mk/apache.module.mk
diff -r1.4 -r1.5 pkgsrc/www/ap-geoip2/Makefile
diff -r1.10 -r1.11 pkgsrc/www/ap-rpaf/Makefile
diff -r1.13 -r1.14 pkgsrc/www/ap-scgi/Makefile
diff -r1.6 -r1.7 pkgsrc/www/ap2-auth-external/Makefile
diff -r1.6 -r1.7 pkgsrc/www/ap2-auth-ntlm/Makefile
diff -r1.25 -r1.26 pkgsrc/www/ap2-auth-pgsql/Makefile
diff -r1.14 -r1.15 pkgsrc/www/ap2-auth-radius/Makefile
diff -r1.6 -r1.7 pkgsrc/www/ap2-authn-otp/Makefile
diff -r1.11 -r1.12 pkgsrc/www/ap2-bw/Makefile
diff -r1.12 -r1.13 pkgsrc/www/ap2-chroot/Makefile
diff -r1.4 -r1.5 pkgsrc/www/ap22-authn-sasl/Makefile
diff -r1.6 -r1.7 pkgsrc/www/ap22-authnz-external/Makefile
diff -r1.14 -r0 pkgsrc/www/apache/module.mk
File Added: pkgsrc/mk/apache.module.mk
# $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
cvs diff -r1.4 -r1.5 pkgsrc/www/ap-geoip2/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/www/ap-geoip2/Attic/Makefile 2014/06/10 15:22:15 1.4
+++ pkgsrc/www/ap-geoip2/Attic/Makefile 2014/06/11 12:57:22 1.5
@@ -1,27 +1,25 @@ @@ -1,27 +1,25 @@
1# $NetBSD: Makefile,v 1.4 2014/06/10 15:22:15 joerg Exp $ 1# $NetBSD: Makefile,v 1.5 2014/06/11 12:57:22 joerg Exp $
2# 2#
3 3
4DISTNAME= mod_geoip2_1.2.5 4DISTNAME= mod_geoip2_1.2.5
5PKGNAME= ${DISTNAME:S/mod_/${APACHE_PKG_PREFIX}-/:S/_/-/} 5PKGNAME= ${DISTNAME:S/mod_/${APACHE_PKG_PREFIX}-/:S/_/-/}
6CATEGORIES= www 6CATEGORIES= www
7MASTER_SITES= http://geolite.maxmind.com/download/geoip/api/mod_geoip2/ 7MASTER_SITES= http://geolite.maxmind.com/download/geoip/api/mod_geoip2/
8 8
9MAINTAINER= msporleder@gmail.com 9MAINTAINER= msporleder@gmail.com
10HOMEPAGE= http://www.maxmind.com/app/mod_geoip 10HOMEPAGE= http://www.maxmind.com/app/mod_geoip
11COMMENT= Apache module to interact with the MaxMind geoip database 11COMMENT= Apache module to interact with the MaxMind geoip database
12LICENSE= apache-1.1 12LICENSE= apache-1.1
13 13
14.include "../../mk/apache.mk" 
15APACHE_MODULE= yes 
16APACHE_MODULE_NAME= mod_geoip.so 14APACHE_MODULE_NAME= mod_geoip.so
17PKG_APACHE_ACCEPTED= apache22 15PKG_APACHE_ACCEPTED= apache22
18NO_CONFIGURE= yes 16NO_CONFIGURE= yes
19CPPFLAGS+= -I${DESTDIR}/include 17CPPFLAGS+= -I${DESTDIR}/include
20LDFLAGS+= -L${DESTDIR}/lib -lGeoIP 18LDFLAGS+= -L${DESTDIR}/lib -lGeoIP
21 19
22pre-install: 20pre-install:
23 cp ${WRKDIR}/${DISTNAME}/.libs/mod_geoip.so ${WRKDIR}/${DISTNAME}/ 21 cp ${WRKDIR}/${DISTNAME}/.libs/mod_geoip.so ${WRKDIR}/${DISTNAME}/
24 22
25.include "../../www/apache/module.mk" 23.include "../../mk/apache.module.mk"
26.include "../../net/GeoIP/buildlink3.mk" 24.include "../../net/GeoIP/buildlink3.mk"
27.include "../../mk/bsd.pkg.mk" 25.include "../../mk/bsd.pkg.mk"
cvs diff -r1.10 -r1.11 pkgsrc/www/ap-rpaf/Makefile (expand / switch to unified diff)

--- pkgsrc/www/ap-rpaf/Makefile 2014/06/10 15:22:16 1.10
+++ pkgsrc/www/ap-rpaf/Makefile 2014/06/11 12:57:22 1.11
@@ -1,37 +1,35 @@ @@ -1,37 +1,35 @@
1# $NetBSD: Makefile,v 1.10 2014/06/10 15:22:16 joerg Exp $ 1# $NetBSD: Makefile,v 1.11 2014/06/11 12:57:22 joerg Exp $
2# 2#
3 3
4DISTNAME= mod_rpaf-0.5 4DISTNAME= mod_rpaf-0.5
5PKGNAME= ${APACHE_PKG_PREFIX}-rpaf-0.5 5PKGNAME= ${APACHE_PKG_PREFIX}-rpaf-0.5
6CATEGORIES= www 6CATEGORIES= www
7MASTER_SITES= http://stderr.net/apache/rpaf/download/ 7MASTER_SITES= http://stderr.net/apache/rpaf/download/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://stderr.net/apache/rpaf/ 10HOMEPAGE= http://stderr.net/apache/rpaf/
11COMMENT= Remaps reverse-proxied connections to "real" requesting IPs 11COMMENT= Remaps reverse-proxied connections to "real" requesting IPs
12 12
13CONFLICTS= ap-rpaf-[0-9]* 13CONFLICTS= ap-rpaf-[0-9]*
14 14
15APACHE_MODULE= yes 15APACHE_MODULE= yes
16INSTALLATION_DIRS= share/doc 16INSTALLATION_DIRS= share/doc
17 17
18# does not compile with apache24 18# does not compile with apache24
19PKG_APACHE_ACCEPTED= apache22 19PKG_APACHE_ACCEPTED= apache22
20 20
21.include "../../mk/apache.mk" 
22 
23APACHE_MODULE_NAME= mod_rpaf.${MODULE_EXT} 21APACHE_MODULE_NAME= mod_rpaf.${MODULE_EXT}
24APACHE_MODULE_SRC= mod_rpaf.c 22APACHE_MODULE_SRC= mod_rpaf.c
25 23
26INSTALLATION_DIRS+= share/doc/mod_rpaf 24INSTALLATION_DIRS+= share/doc/mod_rpaf
27 25
28post-install: 26post-install:
29 ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/mod_rpaf.txt 27 ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/mod_rpaf.txt
30 28
31MODULE_EXT= la 29MODULE_EXT= la
32do-configure: 30do-configure:
33 ${RM} -f ${WRKSRC}/mod_rpaf.c 31 ${RM} -f ${WRKSRC}/mod_rpaf.c
34 ${CP} -f ${WRKSRC}/mod_rpaf-2.0.c ${WRKSRC}/mod_rpaf.c 32 ${CP} -f ${WRKSRC}/mod_rpaf-2.0.c ${WRKSRC}/mod_rpaf.c
35 33
36.include "../../www/apache/module.mk" 34.include "../../mk/apache.module.mk"
37.include "../../mk/bsd.pkg.mk" 35.include "../../mk/bsd.pkg.mk"
cvs diff -r1.13 -r1.14 pkgsrc/www/ap-scgi/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/www/ap-scgi/Attic/Makefile 2014/06/10 15:22:16 1.13
+++ pkgsrc/www/ap-scgi/Attic/Makefile 2014/06/11 12:57:23 1.14
@@ -1,28 +1,26 @@ @@ -1,28 +1,26 @@
1# $NetBSD: Makefile,v 1.13 2014/06/10 15:22:16 joerg Exp $ 1# $NetBSD: Makefile,v 1.14 2014/06/11 12:57:23 joerg Exp $
2# 2#
3 3
4PKGNAME= ${APACHE_PKG_PREFIX}-${DISTNAME} 4PKGNAME= ${APACHE_PKG_PREFIX}-${DISTNAME}
5PKGREVISION= 2 5PKGREVISION= 2
6 6
7COMMENT= Simple Common Gateway Interface for Apache 7COMMENT= Simple Common Gateway Interface for Apache
8 8
9DEPENDS+= ${PYPKGPREFIX}-scgi-[0-9]*:../../www/py-scgi 9DEPENDS+= ${PYPKGPREFIX}-scgi-[0-9]*:../../www/py-scgi
10 10
11APACHE_MODULE= yes 11APACHE_MODULE= yes
12 12
13# does not compile with apache24 13# does not compile with apache24
14PKG_APACHE_ACCEPTED= apache22 14PKG_APACHE_ACCEPTED= apache22
15 15
16PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # py-quixote via py-scgi 16PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # py-quixote via py-scgi
17 17
18.include "../../mk/apache.mk" 
19.include "../../www/apache/module.mk" 
20 
21MODULE_EXT= la 18MODULE_EXT= la
22APACHE_MODULE_SRCDIR= ${WRKDIR}/${DISTNAME}/apache2 19APACHE_MODULE_SRCDIR= ${WRKDIR}/${DISTNAME}/apache2
23 20
24APACHE_MODULE_NAME= mod_scgi.${MODULE_EXT} 21APACHE_MODULE_NAME= mod_scgi.${MODULE_EXT}
25APACHE_MODULE_SRC= mod_scgi.c 22APACHE_MODULE_SRC= mod_scgi.c
26 23
27.include "../../lang/python/pyversion.mk" 24.include "../../lang/python/pyversion.mk"
 25.include "../../mk/apache.module.mk"
28.include "../../www/py-scgi/Makefile.common" 26.include "../../www/py-scgi/Makefile.common"
cvs diff -r1.6 -r1.7 pkgsrc/www/ap2-auth-external/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/www/ap2-auth-external/Attic/Makefile 2014/06/10 15:22:16 1.6
+++ pkgsrc/www/ap2-auth-external/Attic/Makefile 2014/06/11 12:57:23 1.7
@@ -1,25 +1,23 @@ @@ -1,25 +1,23 @@
1# $NetBSD: Makefile,v 1.6 2014/06/10 15:22:16 joerg Exp $ 1# $NetBSD: Makefile,v 1.7 2014/06/11 12:57:23 joerg Exp $
2# 2#
3 3
4DISTNAME= mod_auth_external-${DISTVERS} 4DISTNAME= mod_auth_external-${DISTVERS}
5PKGREVISION= 2 5PKGREVISION= 2
6PKGNAME= ${APACHE_PKG_PREFIX}-auth-external-${DISTVERS} 6PKGNAME= ${APACHE_PKG_PREFIX}-auth-external-${DISTVERS}
7CATEGORIES= www 7CATEGORIES= www
8MASTER_SITES= http://mod-auth-external.googlecode.com/files/ 8MASTER_SITES= http://mod-auth-external.googlecode.com/files/
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://code.google.com/p/mod-auth-external/ 11HOMEPAGE= http://code.google.com/p/mod-auth-external/
12COMMENT= Apache module for external program authentication 12COMMENT= Apache module for external program authentication
13 13
14PKG_APACHE_ACCEPTED= apache22 14PKG_APACHE_ACCEPTED= apache22
15 15
16.include "../../mk/apache.mk" 
17 
18APACHE_MODULE_NAME= mod_auth_external.${MODULE_EXT} 16APACHE_MODULE_NAME= mod_auth_external.${MODULE_EXT}
19 17
20DISTVERS= 2.2.11 18DISTVERS= 2.2.11
21MODULE_EXT= la 19MODULE_EXT= la
22MESSAGE_SUBST+= MODULE_NAME=auth_external_module 20MESSAGE_SUBST+= MODULE_NAME=auth_external_module
23 21
24.include "../../www/apache/module.mk" 22.include "../../mk/apache.module.mk"
25.include "../../mk/bsd.pkg.mk" 23.include "../../mk/bsd.pkg.mk"
cvs diff -r1.6 -r1.7 pkgsrc/www/ap2-auth-ntlm/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/www/ap2-auth-ntlm/Attic/Makefile 2014/06/10 15:22:17 1.6
+++ pkgsrc/www/ap2-auth-ntlm/Attic/Makefile 2014/06/11 12:57:23 1.7
@@ -1,35 +1,33 @@ @@ -1,35 +1,33 @@
1# $NetBSD: Makefile,v 1.6 2014/06/10 15:22:17 joerg Exp $ 1# $NetBSD: Makefile,v 1.7 2014/06/11 12:57:23 joerg Exp $
2# 2#
3 3
4DISTNAME= ntlm2 4DISTNAME= ntlm2
5PKGNAME= ${APACHE_PKG_PREFIX}-auth-ntlm-${DISTVERS} 5PKGNAME= ${APACHE_PKG_PREFIX}-auth-ntlm-${DISTVERS}
6CATEGORIES= www 6CATEGORIES= www
7MASTER_SITES= http://www.jamiekerwick.co.uk/modntlm/ 7MASTER_SITES= http://www.jamiekerwick.co.uk/modntlm/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://modntlm.sourceforge.net/ 10HOMEPAGE= http://modntlm.sourceforge.net/
11COMMENT= Apache module for NTLM authentication 11COMMENT= Apache module for NTLM authentication
12 12
13PKG_APACHE_ACCEPTED= apache22 13PKG_APACHE_ACCEPTED= apache22
14 14
15.include "../../mk/apache.mk" 
16 
17APACHE_MODULE_NAME= mod_ntlm.${MODULE_EXT} 15APACHE_MODULE_NAME= mod_ntlm.${MODULE_EXT}
18 16
19WRKSRC= ${WRKDIR} 17WRKSRC= ${WRKDIR}
20 18
21DISTVERS= 0.2 19DISTVERS= 0.2
22MODULE_EXT= la 20MODULE_EXT= la
23 21
24MESSAGE_SUBST+= MODULE_NAME=ntlm_module 22MESSAGE_SUBST+= MODULE_NAME=ntlm_module
25MESSAGE_SUBST+= EGDIR=${EGDIR} 23MESSAGE_SUBST+= EGDIR=${EGDIR}
26 24
27EGDIR= ${PREFIX}/share/examples/mod_ntlm 25EGDIR= ${PREFIX}/share/examples/mod_ntlm
28 26
29INSTALLATION_DIRS+= ${EGDIR} 27INSTALLATION_DIRS+= ${EGDIR}
30 28
31post-install: 29post-install:
32 ${INSTALL_DATA} ${WRKSRC}/ntlm.conf ${DESTDIR}${EGDIR} 30 ${INSTALL_DATA} ${WRKSRC}/ntlm.conf ${DESTDIR}${EGDIR}
33 31
34.include "../../www/apache/module.mk" 32.include "../../mk/apache.module.mk"
35.include "../../mk/bsd.pkg.mk" 33.include "../../mk/bsd.pkg.mk"
cvs diff -r1.25 -r1.26 pkgsrc/www/ap2-auth-pgsql/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/www/ap2-auth-pgsql/Attic/Makefile 2014/06/10 15:22:17 1.25
+++ pkgsrc/www/ap2-auth-pgsql/Attic/Makefile 2014/06/11 12:57:23 1.26
@@ -1,29 +1,26 @@ @@ -1,29 +1,26 @@
1# $NetBSD: Makefile,v 1.25 2014/06/10 15:22:17 joerg Exp $ 1# $NetBSD: Makefile,v 1.26 2014/06/11 12:57:23 joerg Exp $
2 2
3DISTNAME= mod_auth_pgsql-2.0.3 3DISTNAME= mod_auth_pgsql-2.0.3
4PKGNAME= ${APACHE_PKG_PREFIX}-auth-pgsql-2.0.3 4PKGNAME= ${APACHE_PKG_PREFIX}-auth-pgsql-2.0.3
5PKGREVISION= 8 5PKGREVISION= 8
6CATEGORIES= www databases 6CATEGORIES= www databases
7MASTER_SITES= http://www.giuseppetanzilli.it/mod_auth_pgsql2/dist/ 7MASTER_SITES= http://www.giuseppetanzilli.it/mod_auth_pgsql2/dist/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.giuseppetanzilli.it/mod_auth_pgsql2/ 10HOMEPAGE= http://www.giuseppetanzilli.it/mod_auth_pgsql2/
11COMMENT= Allows users to use PostgreSQL databases for user authentication 11COMMENT= Allows users to use PostgreSQL databases for user authentication
12 12
13CONFLICTS= ap-auth-postgresql-* 13CONFLICTS= ap-auth-postgresql-*
14 14
15APACHE_MODULE= yes 15APACHE_MODULE= yes
16APACHE_MODULE_NAME= mod_auth_pgsql.la 16APACHE_MODULE_NAME= mod_auth_pgsql.la
17 17
18PKG_APACHE_ACCEPTED= apache22 18PKG_APACHE_ACCEPTED= apache22
19 19
20.include "../../mk/apache.mk" 
21.include "../../www/apache/module.mk" 
22 
23CPPFLAGS+= -I${PGSQL_PREFIX}/include/postgresql 20CPPFLAGS+= -I${PGSQL_PREFIX}/include/postgresql
24LDFLAGS+= -L${LOCALBASE}/lib \ 21LDFLAGS+= -L${LOCALBASE}/lib \
25 ${COMPILER_RPATH_FLAG}${LOCALBASE}/lib -lpq 22 ${COMPILER_RPATH_FLAG}${LOCALBASE}/lib -lpq
26 23
27.include "../../mk/apache.mk" 24.include "../../mk/apache.module.mk"
28.include "../../mk/pgsql.buildlink3.mk" 25.include "../../mk/pgsql.buildlink3.mk"
29.include "../../mk/bsd.pkg.mk" 26.include "../../mk/bsd.pkg.mk"
cvs diff -r1.14 -r1.15 pkgsrc/www/ap2-auth-radius/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/www/ap2-auth-radius/Attic/Makefile 2014/06/10 15:22:17 1.14
+++ pkgsrc/www/ap2-auth-radius/Attic/Makefile 2014/06/11 12:57:23 1.15
@@ -1,42 +1,40 @@ @@ -1,42 +1,40 @@
1# $NetBSD: Makefile,v 1.14 2014/06/10 15:22:17 joerg Exp $ 1# $NetBSD: Makefile,v 1.15 2014/06/11 12:57:23 joerg Exp $
2 2
3DISTNAME= mod_auth_radius 3DISTNAME= mod_auth_radius
4PKGNAME= ${APACHE_PKG_PREFIX}-auth-radius-1.5.7 4PKGNAME= ${APACHE_PKG_PREFIX}-auth-radius-1.5.7
5PKGREVISION= 5 5PKGREVISION= 5
6CATEGORIES= www databases 6CATEGORIES= www databases
7MASTER_SITES= ftp://ftp.freeradius.org/pub/radius/ 7MASTER_SITES= ftp://ftp.freeradius.org/pub/radius/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.freeradius.org/mod_auth_radius/ 10HOMEPAGE= http://www.freeradius.org/mod_auth_radius/
11COMMENT= Module to allow apache2 authentication against a RADIUS server 11COMMENT= Module to allow apache2 authentication against a RADIUS server
12 12
13WRKSRC= ${WRKDIR}/${DISTNAME}-1.5.7 13WRKSRC= ${WRKDIR}/${DISTNAME}-1.5.7
14EXTRACT_SUFX= .tar 14EXTRACT_SUFX= .tar
15NO_CONFIGURE= YES 15NO_CONFIGURE= YES
16APACHE_MODULE= YES 16APACHE_MODULE= YES
17APACHE_MODULE_NAME= mod_auth_radius.la 17APACHE_MODULE_NAME= mod_auth_radius.la
18APACHE_MODULE_SRC= mod_auth_radius.c 18APACHE_MODULE_SRC= mod_auth_radius.c
19USE_LIBTOOL= YES 19USE_LIBTOOL= YES
20 20
21PKG_APACHE_ACCEPTED= apache22 21PKG_APACHE_ACCEPTED= apache22
22.include "../../mk/apache.mk" 
23.include "../../www/apache/module.mk" 
24 
25.include "../../security/openssl/buildlink3.mk" 
26 22
27post-extract: 23post-extract:
28 ${MV} ${WRKSRC}/mod_auth_radius.c ${WRKSRC}/mod_auth_radius-1.0.c 24 ${MV} ${WRKSRC}/mod_auth_radius.c ${WRKSRC}/mod_auth_radius-1.0.c
29 ${MV} ${WRKSRC}/mod_auth_radius-2.0.c ${WRKSRC}/mod_auth_radius.c 25 ${MV} ${WRKSRC}/mod_auth_radius-2.0.c ${WRKSRC}/mod_auth_radius.c
30 26
31INSTALLATION_DIRS+= share/doc/mod_auth_radius share/examples/mod_auth_radius 27INSTALLATION_DIRS+= share/doc/mod_auth_radius share/examples/mod_auth_radius
32 28
33post-install: 29post-install:
34 ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/mod_auth_radius 30 ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/mod_auth_radius
35 ${INSTALL_DATA} ${WRKSRC}/index.html ${DESTDIR}${PREFIX}/share/doc/mod_auth_radius 31 ${INSTALL_DATA} ${WRKSRC}/index.html ${DESTDIR}${PREFIX}/share/doc/mod_auth_radius
36 32
37 ${INSTALL_DATA} ${WRKSRC}/htaccess \ 33 ${INSTALL_DATA} ${WRKSRC}/htaccess \
38 ${DESTDIR}${PREFIX}/share/examples/mod_auth_radius 34 ${DESTDIR}${PREFIX}/share/examples/mod_auth_radius
39 ${INSTALL_DATA} ${WRKSRC}/httpd.conf \ 35 ${INSTALL_DATA} ${WRKSRC}/httpd.conf \
40 ${DESTDIR}${PREFIX}/share/examples/mod_auth_radius 36 ${DESTDIR}${PREFIX}/share/examples/mod_auth_radius
41 37
 38.include "../../security/openssl/buildlink3.mk"
 39.include "../../mk/apache.module.mk"
42.include "../../mk/bsd.pkg.mk" 40.include "../../mk/bsd.pkg.mk"
cvs diff -r1.6 -r1.7 pkgsrc/www/ap2-authn-otp/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/www/ap2-authn-otp/Attic/Makefile 2014/02/12 23:18:43 1.6
+++ pkgsrc/www/ap2-authn-otp/Attic/Makefile 2014/06/11 12:57:23 1.7
@@ -1,26 +1,24 @@ @@ -1,26 +1,24 @@
1# $NetBSD: Makefile,v 1.6 2014/02/12 23:18:43 tron Exp $ 1# $NetBSD: Makefile,v 1.7 2014/06/11 12:57:23 joerg Exp $
2 2
3DISTNAME= mod_authn_otp-${DISTVERS} 3DISTNAME= mod_authn_otp-${DISTVERS}
4PKGNAME= ${APACHE_PKG_PREFIX}-authn-otp-${DISTVERS} 4PKGNAME= ${APACHE_PKG_PREFIX}-authn-otp-${DISTVERS}
5PKGREVISION= 2 5PKGREVISION= 2
6CATEGORIES= www 6CATEGORIES= www
7MASTER_SITES= http://mod-authn-otp.googlecode.com/files/ 7MASTER_SITES= http://mod-authn-otp.googlecode.com/files/
8LICENSE= apache-2.0 8LICENSE= apache-2.0
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://mod-authn-otp.googlecode.com/ 11HOMEPAGE= http://mod-authn-otp.googlecode.com/
12COMMENT= Apache module for one-time password authentication 12COMMENT= Apache module for one-time password authentication
13 13
14PKG_APACHE_ACCEPTED= apache22 14PKG_APACHE_ACCEPTED= apache22
15 15
16.include "../../mk/apache.mk" 
17 
18APACHE_MODULE_NAME= mod_authn_otp.${MODULE_EXT} 16APACHE_MODULE_NAME= mod_authn_otp.${MODULE_EXT}
19 17
20DISTVERS= 1.1.4 18DISTVERS= 1.1.4
21MODULE_EXT= la 19MODULE_EXT= la
22MESSAGE_SUBST+= MODULE_NAME=authn_otp_module 20MESSAGE_SUBST+= MODULE_NAME=authn_otp_module
23 21
24.include "../../www/apache/module.mk" 22.include "../../mk/apache.module.mk"
25.include "../../security/openssl/buildlink3.mk" 23.include "../../security/openssl/buildlink3.mk"
26.include "../../mk/bsd.pkg.mk" 24.include "../../mk/bsd.pkg.mk"
cvs diff -r1.11 -r1.12 pkgsrc/www/ap2-bw/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/www/ap2-bw/Attic/Makefile 2014/06/10 15:22:17 1.11
+++ pkgsrc/www/ap2-bw/Attic/Makefile 2014/06/11 12:57:23 1.12
@@ -1,29 +1,28 @@ @@ -1,29 +1,28 @@
1# $NetBSD: Makefile,v 1.11 2014/06/10 15:22:17 joerg Exp $ 1# $NetBSD: Makefile,v 1.12 2014/06/11 12:57:23 joerg Exp $
2# 2#
3 3
4DISTNAME= bw_mod-0.6 4DISTNAME= bw_mod-0.6
5PKGNAME= ${APACHE_PKG_PREFIX}-bw-${DISTNAME:S/bw_mod-//} 5PKGNAME= ${APACHE_PKG_PREFIX}-bw-${DISTNAME:S/bw_mod-//}
6PKGREVISION= 2 6PKGREVISION= 2
7CATEGORIES= www 7CATEGORIES= www
8MASTER_SITES= http://ivn.cl/apache/ 8MASTER_SITES= http://ivn.cl/apache/
9EXTRACT_SUFX= .tgz 9EXTRACT_SUFX= .tgz
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://ivn.cl/apache/ 12HOMEPAGE= http://ivn.cl/apache/
13COMMENT= Class-based bandwidth limiting module for Apache 2 13COMMENT= Class-based bandwidth limiting module for Apache 2
14 14
15APACHE_MODULE= # defined 15APACHE_MODULE= # defined
16INSTALLATION_DIRS= share/doc 16INSTALLATION_DIRS= share/doc
17 17
18PKG_APACHE_ACCEPTED= apache22 18PKG_APACHE_ACCEPTED= apache22
19 19
20APACHE_MODULE_NAME= mod_bw.la 20APACHE_MODULE_NAME= mod_bw.la
21 21
22INSTALLATION_DIRS+= share/doc 22INSTALLATION_DIRS+= share/doc
23 23
24post-install: 24post-install:
25 ${INSTALL_DATA} ${WRKSRC}/${DISTNAME}.txt ${DESTDIR}${PREFIX}/share/doc/apache_mod_bw.txt 25 ${INSTALL_DATA} ${WRKSRC}/${DISTNAME}.txt ${DESTDIR}${PREFIX}/share/doc/apache_mod_bw.txt
26 26
27.include "../../mk/apache.mk" 27.include "../../mk/apache.module.mk"
28.include "../../www/apache/module.mk" 
29.include "../../mk/bsd.pkg.mk" 28.include "../../mk/bsd.pkg.mk"
cvs diff -r1.12 -r1.13 pkgsrc/www/ap2-chroot/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/www/ap2-chroot/Attic/Makefile 2012/10/28 06:30:07 1.12
+++ pkgsrc/www/ap2-chroot/Attic/Makefile 2014/06/11 12:57:23 1.13
@@ -1,28 +1,27 @@ @@ -1,28 +1,27 @@
1# $NetBSD: Makefile,v 1.12 2012/10/28 06:30:07 asau Exp $ 1# $NetBSD: Makefile,v 1.13 2014/06/11 12:57:23 joerg Exp $
2 2
3DISTNAME= mod_chroot-0.5 3DISTNAME= mod_chroot-0.5
4PKGNAME= ${DISTNAME:S/mod_/${APACHE_PKG_PREFIX}-/} 4PKGNAME= ${DISTNAME:S/mod_/${APACHE_PKG_PREFIX}-/}
5CATEGORIES= www security 5CATEGORIES= www security
6MASTER_SITES= http://core.segfault.pl/~hobbit/mod_chroot/dist/ 6MASTER_SITES= http://core.segfault.pl/~hobbit/mod_chroot/dist/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://core.segfault.pl/~hobbit/mod_chroot/ 9HOMEPAGE= http://core.segfault.pl/~hobbit/mod_chroot/
10COMMENT= Module to easily run Apache in a chroot environment 10COMMENT= Module to easily run Apache in a chroot environment
11LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
12 12
13# functional conflict, apache>=2.2.10 has builtin ChrootDir directive support. 13# functional conflict, apache>=2.2.10 has builtin ChrootDir directive support.
14CONFLICTS+= apache>=2.2.10 14CONFLICTS+= apache>=2.2.10
15 15
16APACHE_MODULE= yes 16APACHE_MODULE= yes
17APACHE_MODULE_NAME= mod_chroot.la 17APACHE_MODULE_NAME= mod_chroot.la
18NO_CONFIGURE= yes 18NO_CONFIGURE= yes
19 19
20PKG_APACHE_ACCEPTED= apache2 20PKG_APACHE_ACCEPTED= apache2
21INSTALLATION_DIRS+= share/doc/mod_chroot 21INSTALLATION_DIRS+= share/doc/mod_chroot
22 22
23post-install: 23post-install:
24 ${INSTALL_DATA} ${WRKSRC}/[A-Z]* ${DESTDIR}${PREFIX}/share/doc/mod_chroot/ 24 ${INSTALL_DATA} ${WRKSRC}/[A-Z]* ${DESTDIR}${PREFIX}/share/doc/mod_chroot/
25 25
26.include "../../mk/apache.mk" 26.include "../../mk/apache.module.mk"
27.include "../../www/apache/module.mk" 
28.include "../../mk/bsd.pkg.mk" 27.include "../../mk/bsd.pkg.mk"
cvs diff -r1.4 -r1.5 pkgsrc/www/ap22-authn-sasl/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/www/ap22-authn-sasl/Attic/Makefile 2012/12/16 01:52:37 1.4
+++ pkgsrc/www/ap22-authn-sasl/Attic/Makefile 2014/06/11 12:57:23 1.5
@@ -1,27 +1,27 @@ @@ -1,27 +1,27 @@
1# $NetBSD: Makefile,v 1.4 2012/12/16 01:52:37 obache Exp $ 1# $NetBSD: Makefile,v 1.5 2014/06/11 12:57:23 joerg Exp $
2 2
3DISTNAME= mod_authn_sasl-${DISTVERS} 3DISTNAME= mod_authn_sasl-${DISTVERS}
4#PKGREVISION= 1 4#PKGREVISION= 1
5PKGNAME= ${APACHE_PKG_PREFIX}-authn-sasl-${DISTVERS} 5PKGNAME= ${APACHE_PKG_PREFIX}-authn-sasl-${DISTVERS}
6PKGREVISION= 1 6PKGREVISION= 1
7CATEGORIES= www 7CATEGORIES= www
8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mod-authn-sasl/} 8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mod-authn-sasl/}
9EXTRACT_SUFX= .tar.bz2 9EXTRACT_SUFX= .tar.bz2
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://mod-authn-sasl.sourceforge.net/ 12HOMEPAGE= http://mod-authn-sasl.sourceforge.net/
13COMMENT= Apache module for SASL authentication 13COMMENT= Apache module for SASL authentication
14 14
15PKG_APACHE_ACCEPTED= apache22 15PKG_APACHE_ACCEPTED= apache22
16 16
17.include "../../mk/apache.mk" 17.include "../../mk/apache.mk"
18 18
19APACHE_MODULE_NAME= mod_authn_sasl.${MODULE_EXT} 19APACHE_MODULE_NAME= mod_authn_sasl.${MODULE_EXT}
20 20
21DISTVERS= 1.0.2 21DISTVERS= 1.0.2
22MODULE_EXT= la 22MODULE_EXT= la
23MESSAGE_SUBST+= MODULE_NAME=authn_sasl_module 23MESSAGE_SUBST+= MODULE_NAME=authn_sasl_module
24 24
25.include "../../security/cyrus-sasl/buildlink3.mk" 25.include "../../security/cyrus-sasl/buildlink3.mk"
26.include "../../www/apache/module.mk" 26.include "../../mk/apache.module.mk"
27.include "../../mk/bsd.pkg.mk" 27.include "../../mk/bsd.pkg.mk"
cvs diff -r1.6 -r1.7 pkgsrc/www/ap22-authnz-external/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/www/ap22-authnz-external/Attic/Makefile 2012/10/28 06:30:08 1.6
+++ pkgsrc/www/ap22-authnz-external/Attic/Makefile 2014/06/11 12:57:23 1.7
@@ -1,39 +1,37 @@ @@ -1,39 +1,37 @@
1# $NetBSD: Makefile,v 1.6 2012/10/28 06:30:08 asau Exp $ 1# $NetBSD: Makefile,v 1.7 2014/06/11 12:57:23 joerg Exp $
2# 2#
3 3
4DISTNAME= mod_authnz_external-${DISTVERS} 4DISTNAME= mod_authnz_external-${DISTVERS}
5PKGNAME= ${APACHE_PKG_PREFIX}-authnz-external-${DISTVERS} 5PKGNAME= ${APACHE_PKG_PREFIX}-authnz-external-${DISTVERS}
6PKGREVISION= 1 6PKGREVISION= 1
7CATEGORIES= www 7CATEGORIES= www
8MASTER_SITES= http://mod-auth-external.googlecode.com/files/ 8MASTER_SITES= http://mod-auth-external.googlecode.com/files/
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://code.google.com/p/mod-auth-external/ 11HOMEPAGE= http://code.google.com/p/mod-auth-external/
12COMMENT= Apache module for external program authentication 12COMMENT= Apache module for external program authentication
13 13
14PKG_APACHE_ACCEPTED= apache22 14PKG_APACHE_ACCEPTED= apache22
15 15
16.include "../../mk/apache.mk" 
17 
18APACHE_MODULE_NAME= mod_authnz_external.${MODULE_EXT} 16APACHE_MODULE_NAME= mod_authnz_external.${MODULE_EXT}
19 17
20DISTVERS= 3.2.3 18DISTVERS= 3.2.3
21MODULE_EXT= la 19MODULE_EXT= la
22MESSAGE_SUBST+= MODULE_NAME=authnz_external_module 20MESSAGE_SUBST+= MODULE_NAME=authnz_external_module
23 21
24INSTALLATION_DIRS+= share/doc/authnz-external 22INSTALLATION_DIRS+= share/doc/authnz-external
25 23
26post-install: 24post-install:
27 ${INSTALL_DATA} ${WRKSRC}/AUTHENTICATORS \ 25 ${INSTALL_DATA} ${WRKSRC}/AUTHENTICATORS \
28 ${DESTDIR}${PREFIX}/share/doc/authnz-external 26 ${DESTDIR}${PREFIX}/share/doc/authnz-external
29 ${INSTALL_DATA} ${WRKSRC}/INSTALL \ 27 ${INSTALL_DATA} ${WRKSRC}/INSTALL \
30 ${DESTDIR}${PREFIX}/share/doc/authnz-external 28 ${DESTDIR}${PREFIX}/share/doc/authnz-external
31 ${INSTALL_DATA} ${WRKSRC}/INSTALL.HARDCODE \ 29 ${INSTALL_DATA} ${WRKSRC}/INSTALL.HARDCODE \
32 ${DESTDIR}${PREFIX}/share/doc/authnz-external 30 ${DESTDIR}${PREFIX}/share/doc/authnz-external
33 ${INSTALL_DATA} ${WRKSRC}/TODO \ 31 ${INSTALL_DATA} ${WRKSRC}/TODO \
34 ${DESTDIR}${PREFIX}/share/doc/authnz-external 32 ${DESTDIR}${PREFIX}/share/doc/authnz-external
35 ${INSTALL_DATA} ${WRKSRC}/UPGRADE \ 33 ${INSTALL_DATA} ${WRKSRC}/UPGRADE \
36 ${DESTDIR}${PREFIX}/share/doc/authnz-external 34 ${DESTDIR}${PREFIX}/share/doc/authnz-external
37 35
38.include "../../www/apache/module.mk" 36.include "../../mk/apache.module.mk"
39.include "../../mk/bsd.pkg.mk" 37.include "../../mk/bsd.pkg.mk"
File Deleted: pkgsrc/www/apache/Attic/module.mk