Tue Sep 1 08:26:05 2015 UTC ()
Add mod_session_crypto if apr-util is built with ssl.


(jperkin)
diff -r1.37 -r1.38 pkgsrc/www/apache24/Makefile
diff -r1.18 -r1.19 pkgsrc/www/apache24/PLIST
cvs diff -r1.37 -r1.38 pkgsrc/www/apache24/Makefile (expand / switch to unified diff)

--- pkgsrc/www/apache24/Makefile 2015/07/20 00:08:35 1.37
+++ pkgsrc/www/apache24/Makefile 2015/09/01 08:26:05 1.38
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.37 2015/07/20 00:08:35 taca Exp $ 1# $NetBSD: Makefile,v 1.38 2015/09/01 08:26:05 jperkin Exp $
2 2
3DISTNAME= httpd-2.4.16 3DISTNAME= httpd-2.4.16
4PKGNAME= ${DISTNAME:S/httpd/apache/} 4PKGNAME= ${DISTNAME:S/httpd/apache/}
5CATEGORIES= www 5CATEGORIES= www
6MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/} \ 6MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/} \
7 http://archive.apache.org/dist/httpd/ \ 7 http://archive.apache.org/dist/httpd/ \
8 http://archive.eu.apache.org/dist/httpd/ 8 http://archive.eu.apache.org/dist/httpd/
9EXTRACT_SUFX= .tar.bz2 9EXTRACT_SUFX= .tar.bz2
10 10
11MAINTAINER= ryoon@NetBSD.org 11MAINTAINER= ryoon@NetBSD.org
12HOMEPAGE= http://httpd.apache.org/ 12HOMEPAGE= http://httpd.apache.org/
13COMMENT= Apache HTTP (Web) server, version 2.4 13COMMENT= Apache HTTP (Web) server, version 2.4
14LICENSE= apache-2.0 14LICENSE= apache-2.0
@@ -51,26 +51,31 @@ APACHE_MODULES?= ${DFLT_APACHE_MODULES} @@ -51,26 +51,31 @@ APACHE_MODULES?= ${DFLT_APACHE_MODULES}
51 51
52.include "options.mk" 52.include "options.mk"
53 53
54FIND_PREFIX:= APRDIR=apr 54FIND_PREFIX:= APRDIR=apr
55.include "../../mk/find-prefix.mk" 55.include "../../mk/find-prefix.mk"
56 56
57# LDAP support 57# LDAP support
58PLIST_VARS+= ldap 58PLIST_VARS+= ldap
59.if exists(${APRDIR}/lib/apr-util-1/apr_ldap.la) 59.if exists(${APRDIR}/lib/apr-util-1/apr_ldap.la)
60DFLT_APACHE_MODULES+= ldap authnz_ldap 60DFLT_APACHE_MODULES+= ldap authnz_ldap
61PLIST.ldap= yes 61PLIST.ldap= yes
62.endif 62.endif
63 63
 64PLIST_VARS+= ssl
 65.if !empty(PKG_BUILD_OPTIONS.apr-util:Mssl)
 66PLIST.ssl= yes
 67.endif
 68
64APACHE_USER?= www 69APACHE_USER?= www
65APACHE_GROUP?= www 70APACHE_GROUP?= www
66PKG_GROUPS= ${APACHE_GROUP} 71PKG_GROUPS= ${APACHE_GROUP}
67PKG_USERS= ${APACHE_USER}:${APACHE_GROUP} 72PKG_USERS= ${APACHE_USER}:${APACHE_GROUP}
68PKG_GROUPS_VARS= APACHE_GROUP 73PKG_GROUPS_VARS= APACHE_GROUP
69PKG_USERS_VARS= APACHE_USER 74PKG_USERS_VARS= APACHE_USER
70 75
71PKG_SYSCONFVAR= apache 76PKG_SYSCONFVAR= apache
72PKG_SYSCONFSUBDIR?= httpd 77PKG_SYSCONFSUBDIR?= httpd
73EGDIR= ${PREFIX}/share/examples/httpd 78EGDIR= ${PREFIX}/share/examples/httpd
74SBINDIR= ${PREFIX}/sbin 79SBINDIR= ${PREFIX}/sbin
75CONF_FILES+= ${EGDIR}/httpd.conf ${PKG_SYSCONFDIR}/httpd.conf 80CONF_FILES+= ${EGDIR}/httpd.conf ${PKG_SYSCONFDIR}/httpd.conf
76.for f in autoindex dav default info languages manual mpm \ 81.for f in autoindex dav default info languages manual mpm \
cvs diff -r1.18 -r1.19 pkgsrc/www/apache24/PLIST (expand / switch to unified diff)

--- pkgsrc/www/apache24/PLIST 2015/06/26 19:25:12 1.18
+++ pkgsrc/www/apache24/PLIST 2015/09/01 08:26:05 1.19
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.18 2015/06/26 19:25:12 ryoon Exp $ 1@comment $NetBSD: PLIST,v 1.19 2015/09/01 08:26:05 jperkin Exp $
2bin/ab 2bin/ab
3bin/apxs 3bin/apxs
4bin/dbmmanage 4bin/dbmmanage
5bin/htdbm 5bin/htdbm
6bin/htdigest 6bin/htdigest
7bin/htpasswd 7bin/htpasswd
8bin/httxt2dbm 8bin/httxt2dbm
9bin/logresolve 9bin/logresolve
10bin/mkcert 10bin/mkcert
11include/httpd/ap_compat.h 11include/httpd/ap_compat.h
12include/httpd/ap_config.h 12include/httpd/ap_config.h
13include/httpd/ap_config_auto.h 13include/httpd/ap_config_auto.h
14include/httpd/ap_config_layout.h 14include/httpd/ap_config_layout.h
@@ -149,26 +149,27 @@ lib/httpd/mod_proxy_fdpass.so @@ -149,26 +149,27 @@ lib/httpd/mod_proxy_fdpass.so
149lib/httpd/mod_proxy_ftp.so 149lib/httpd/mod_proxy_ftp.so
150lib/httpd/mod_proxy_http.so 150lib/httpd/mod_proxy_http.so
151lib/httpd/mod_proxy_scgi.so 151lib/httpd/mod_proxy_scgi.so
152lib/httpd/mod_proxy_wstunnel.so 152lib/httpd/mod_proxy_wstunnel.so
153lib/httpd/mod_ratelimit.so 153lib/httpd/mod_ratelimit.so
154lib/httpd/mod_reflector.so 154lib/httpd/mod_reflector.so
155lib/httpd/mod_remoteip.so 155lib/httpd/mod_remoteip.so
156lib/httpd/mod_reqtimeout.so 156lib/httpd/mod_reqtimeout.so
157lib/httpd/mod_request.so 157lib/httpd/mod_request.so
158lib/httpd/mod_rewrite.so 158lib/httpd/mod_rewrite.so
159lib/httpd/mod_sed.so 159lib/httpd/mod_sed.so
160lib/httpd/mod_session.so 160lib/httpd/mod_session.so
161lib/httpd/mod_session_cookie.so 161lib/httpd/mod_session_cookie.so
 162${PLIST.ssl}lib/httpd/mod_session_crypto.so
162lib/httpd/mod_session_dbd.so 163lib/httpd/mod_session_dbd.so
163lib/httpd/mod_setenvif.so 164lib/httpd/mod_setenvif.so
164lib/httpd/mod_slotmem_plain.so 165lib/httpd/mod_slotmem_plain.so
165lib/httpd/mod_slotmem_shm.so 166lib/httpd/mod_slotmem_shm.so
166lib/httpd/mod_socache_dbm.so 167lib/httpd/mod_socache_dbm.so
167lib/httpd/mod_socache_memcache.so 168lib/httpd/mod_socache_memcache.so
168lib/httpd/mod_socache_shmcb.so 169lib/httpd/mod_socache_shmcb.so
169lib/httpd/mod_speling.so 170lib/httpd/mod_speling.so
170lib/httpd/mod_ssl.so 171lib/httpd/mod_ssl.so
171lib/httpd/mod_status.so 172lib/httpd/mod_status.so
172lib/httpd/mod_substitute.so 173lib/httpd/mod_substitute.so
173${PLIST.suexec}lib/httpd/mod_suexec.so 174${PLIST.suexec}lib/httpd/mod_suexec.so
174lib/httpd/mod_unique_id.so 175lib/httpd/mod_unique_id.so