[Midnightbsd-cvs] mports [16094] Apache 2.4.9

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sat Mar 22 23:18:38 EDT 2014 

Revision: 16094
          http://svnweb.midnightbsd.org/mports/?rev=16094
Author:   laffer1
Date:     2014-03-22 23:18:37 -0400 (Sat, 22 Mar 2014)
Log Message:
-----------
Apache 2.4.9

Modified Paths:
--------------
    trunk/www/apache24/Makefile
    trunk/www/apache24/Makefile.modules
    trunk/www/apache24/Makefile.options
    trunk/www/apache24/distinfo
    trunk/www/apache24/pkg-message
    trunk/www/apache24/pkg-plist

Property Changed:
----------------
    trunk/www/apache24/Makefile.modules
    trunk/www/apache24/Makefile.options
    trunk/www/apache24/Makefile.options.desc
    trunk/www/apache24/pkg-descr
    trunk/www/apache24/pkg-message

Modified: trunk/www/apache24/Makefile
===================================================================
--- trunk/www/apache24/Makefile	2014-03-23 03:03:40 UTC (rev 16093)
+++ trunk/www/apache24/Makefile	2014-03-23 03:18:37 UTC (rev 16094)
@@ -1,7 +1,7 @@
 # $MidnightBSD$
 
 PORTNAME=	apache24
-PORTVERSION=	2.4.6
+PORTVERSION=	2.4.9
 CATEGORIES=	www ipv6
 MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD}
 DISTNAME=	httpd-${PORTVERSION}
@@ -16,7 +16,6 @@
 		apr-1:${PORTSDIR}/devel/apr \
 		pcre:${PORTSDIR}/devel/pcre
 
-MAKE_JOBS_SAFE=	yes
 LATEST_LINK=	apache24
 
 CONFLICTS=	apache-2.0.* apache-*-2.0.* apache-*-2.2.*
@@ -34,9 +33,6 @@
 USE_RC_SUBR=	apache24 htcacheclean
 LIBTOOLFILES=	configure.in
 
-MAN1=		ab.1 apxs.1 dbmmanage.1
-MAN8=		apachectl.8 fcgistarter.8 htcacheclean.8 httpd.8
-
 PORTDOCS=	*
 
 USERS=		www
@@ -55,8 +51,30 @@
 .include "${APACHEDIR}/Makefile.options"
 .include "${APACHEDIR}/Makefile.options.desc"
 
+AUTHNZ_LDAP_CONFIGURE_ON=	--enable-authnz-ldap
+
+# http://httpd.apache.org/docs/2.4/bind.html
+IPV4_MAPPED_CONFIGURE_OFF=	--disable-v4-mapped
+IPV4_MAPPED_CONFIGURE_ON=	--enable-v4-mapped
+
+LDAP_CONFIGURE_ON=		--enable-ldap=shared
+
+LUAJIT_LIB_DEPENDS=		luajit:${PORTSDIR}/lang/luajit
+LUA_CONFIGURE_OFF=		--without-lua
+LUA_CONFIGURE_ON=		--with-lua=${LOCALBASE}
+
+SOCACHE_DC_CONFIGURE_ON=	--with-distcache=${LOCALBASE}
+SOCACHE_DC_LIB_DEPENDS=		distcache:${PORTSDIR}/security/distcache
+
+SSL_CFLAGS=			-I${OPENSSLINC}
+SSL_CONFIGURE_ON=		--with-ssl=${OPENSSLBASE}
+SSL_LDFLAGS=			-L${OPENSSLLIB}
+SSL_USE=			OPENSSL=yes
+
 .include <bsd.mport.options.mk>
 
+ETC_SUBDIRS=		Includes envvars.d extra modules.d
+
 .if ! ${PORT_OPTIONS:MDOCS}
 MAKE_ENV+=	NOPORTDOCS=yes
 .endif
@@ -76,13 +94,13 @@
 
 PREFIX_RELDEST=	${PREFIX:S,^${DESTDIR},,}
 
-CONFIGURE_ARGS=	--prefix=${PREFIX_RELDEST} \
+CONFIGURE_ARGS+=--prefix=${PREFIX_RELDEST} \
 		--enable-layout=FreeBSD \
 		--with-perl=${PERL5} \
 		--with-port=${WITH_HTTP_PORT} \
 		--with-sslport=${WITH_SSL_PORT} \
 		--with-expat=${LOCALBASE} \
-		--with-iconv=${LOCALBASE} \
+		--with-iconv=${ICONV_PREFIX} \
 		--enable-http \
 		--with-pcre=${LOCALBASE} \
 		--with-apr=${APR_CONFIG} \
@@ -100,29 +118,17 @@
 # CONFIGURE_ARGS will be handled in Makefile.modules,
 # here we do only OPTIONS fixups
 
-.if ${PORT_OPTIONS:MSSL}
-USE_OPENSSL=	yes
-.endif
-
-.if ${PORT_OPTIONS:MSOCACHE_DC}
-LIB_DEPENDS+=	distcache:${PORTSDIR}/security/distcache
-.endif
-
 .if ${PORT_OPTIONS:MLUA}
 USE_LUA=	5.1+
 LUA_COMPS=	lua
 .endif
 
-.if ${PORT_OPTIONS:MLUAJIT}
-LIB_DEPENDS+=   luajit:${PORTSDIR}/lang/luajit
-.endif
-
 .if ${PORT_OPTIONS:MPROXY_HTML} || ${PORT_OPTIONS:MXML2ENC}
 USE_GNOME=	libxml2
 .endif
 
+.include <bsd.port.pre.mk>
 .include "${APACHEDIR}/Makefile.modules"
-.include <bsd.port.pre.mk>
 
 pre-configure::
 	@${ECHO_MSG}	""
@@ -132,6 +138,8 @@
 post-extract:
 # remove possible leftover .svn directories in the sources
 	@${FIND} ${WRKSRC} -type d -name .svn -print | ${XARGS} ${RM} -rf
+# limit grep results ...
+	@${FIND} ${WRKSRC} -type f \( -name 'NWGNU*' -o -name '*.ds?' -o -name '*.dep' -o -name '*.mak' -o -name '*.win' \) -delete
 
 post-patch:
 	@${REINPLACE_CMD} -e 's," PLATFORM ",MidnightBSD,' ${WRKSRC}/server/core.c
@@ -138,6 +146,7 @@
 # IPv4_mapping fix: https://issues.apache.org/bugzilla/show_bug.cgi?id=53824
 	@${REINPLACE_CMD} -e 's|freebsd5|freebsd|' ${WRKSRC}/configure.in ${WRKSRC}/configure
 	@${RM} -f ${WRKSRC}/docs/docroot/*.bak
+	@${INSTALL_DATA} ${WRKSRC}/NOTICE ${WRKSRC}/docs/manual
 
 post-configure:
 	@FTPUSERS=`${EGREP} -v '^#' /etc/ftpusers| ${TR} -s "\n" " "` ;\
@@ -146,19 +155,21 @@
 	@${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX}," ${WRKSRC}/support/envvars-std
 
 post-install:
-	@${MKDIR} ${ETCDIR}/envvars.d
-	@${MKDIR} ${ETCDIR}/Includes
-	@${INSTALL_DATA} ${FILESDIR}/no-accf.conf ${ETCDIR}/Includes/
+	${MKDIR} ${ETCDIR}/Includes
+	${MKDIR} ${ETCDIR}/modules.d
+	${INSTALL_DATA} ${FILESDIR}/no-accf.conf ${ETCDIR}/Includes/
 
 .if ${PORT_OPTIONS:MLOG_FORENSIC}
 	@${INSTALL_SCRIPT} ${WRKSRC}/support/check_forensic ${PREFIX}/sbin
 .endif
 
-.if ${PORT_OPTIONS:MDOCS}
-.  for dir in style/lang style/xsl/util style/xsl
-	${MKDIR} ${DOCSDIR}/${dir}
-	[ -d ${DOCSDIR}/${dir}/ ] && ${TOUCH} ${DOCSDIR}/${dir}/.keepme
-.  endfor
-.endif
+# maintainer only, check for new modules
+modlist: extract
+	@${AWK} '/: checking whether to enable mod_/ \
+		{printf "%%%%%s%%%%libexec/apache24/%s.so\n", \
+		toupper($$8), $$8}' ${WRKSRC}/configure \
+		| ${TR} -d '"' \
+		| ${SORT} -u \
+		| ${GREP} -E -v '^%%MOD_(HTTP|ISAPI|LOG_CONFIG|PRIVILEGES|SO|UNIXD)%%'
 
 .include <bsd.port.post.mk>

Modified: trunk/www/apache24/Makefile.modules
===================================================================
--- trunk/www/apache24/Makefile.modules	2014-03-23 03:03:40 UTC (rev 16093)
+++ trunk/www/apache24/Makefile.modules	2014-03-23 03:18:37 UTC (rev 16094)
@@ -1,6 +1,11 @@
-# $MidnightBSD: mports/www/apache24/Makefile.modules,v 1.2 2013/08/30 12:22:46 laffer1 Exp $
+# $MidnightBSD$
+# $FreeBSD: head/www/apache24/Makefile.modules 331790 2013-10-27 17:54:39Z ohauer $
+#
+# Note by Clement Laforet: (to generate PLIST_SUB entries for modules)
+#	gsed 's/^\(.*\)mod\(.*\)\.so/%%\MOD\U\2%%\L\1mod\2\.so/' pkg-plist > tmp
+#	mv tmp pkg-plist
+#
 
-
 # =============================================
 # Maintainer note for OPTION handling:
 # To set additional option use
@@ -54,8 +59,19 @@
 #.  endif
 .endif	# exists APU_CONFIG
 
-# XXX LATEST_LINK overwrites OPTIONSFILE ...
-# maybe use NO_LATEST_LINK in future
+# =============================================
+# if build with shared MPM the last module will be activated
+# see apache issue 53882
+
+# XXX in case we use OPTIONS for MPM 
+# we do not have a WITH_MPM variable
+.if ${PORT_OPTIONS:MMPM_SHARED}
+PLIST_SUB+=		MPM_SHARED=""
+CONFIGURE_ARGS+=	--enable-mpms-shared=all
+.else
+PLIST_SUB+=		MPM_SHARED="@comment "
+.endif
+
 .if ${PORT_OPTIONS:MMPM_PREFORK}
 CONFIGURE_ARGS+=	--with-mpm=prefork
 .elif ${PORT_OPTIONS:MMPM_WORKER}
@@ -131,22 +147,6 @@
 .  endif
 .endif
 
-.if ${PORT_OPTIONS:MSSL}
-CFLAGS+=	-I${OPENSSLINC}
-LDFLAGS+=	-L${OPENSSLLIB}
-CONFIGURE_ARGS+=	--with-ssl=${OPENSSLBASE}
-.endif
-
-.if ${PORT_OPTIONS:MSOCACHE_DC}
-CONFIGURE_ARGS+=	--with-distcache=${LOCALBASE}
-.endif
-
-.if ${PORT_OPTIONS:MLUA}
-CONFIGURE_ARGS+=	--with-lua=${LOCALBASE}
-.else
-CONFIGURE_ARGS+=	--without-lua
-.endif
-
 .if ${PORT_OPTIONS:MXML2ENC} || ${PORT_OPTIONS:MPROXY_HTML}
 CONFIGURE_ARGS+=	--with-libxml2=${LOCALBASE}/include/libxml2
 .else
@@ -153,14 +153,6 @@
 CONFIGURE_ARGS+=	--without-libxml2
 .endif
 
-.if ${PORT_OPTIONS:MAUTHNZ_LDAP}
-CONFIGURE_ARGS+=	--enable-authnz-ldap
-.endif
-
-.if ${PORT_OPTIONS:MLDAP}
-CONFIGURE_ARGS+=	--enable-ldap=shared
-.endif
-
 .if defined(APR_HAS_THREADS)
 CFLAGS+=	${PTHREAD_CFLAGS}
 LDFLAGS+=	${PTHREAD_LIBS}
@@ -170,11 +162,4 @@
 .  endif
 .endif
 
-# http://httpd.apache.org/docs/2.4/bind.html
-.if ${PORT_OPTIONS:MIPV4_MAPPED}
-CONFIGURE_ARGS+=	--enable-v4-mapped
-.else
-CONFIGURE_ARGS+=	--disable-v4-mapped
-.endif
-
 .endif	# _PREMKINCLUDED


Property changes on: trunk/www/apache24/Makefile.modules
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.3
\ No newline at end of property
Modified: trunk/www/apache24/Makefile.options
===================================================================
--- trunk/www/apache24/Makefile.options	2014-03-23 03:03:40 UTC (rev 16093)
+++ trunk/www/apache24/Makefile.options	2014-03-23 03:18:37 UTC (rev 16094)
@@ -86,6 +86,9 @@
 OPTIONS_MULTI_PROXY:=	${PROXY_ENABLED_MODULES} ${PROXY_DISABLED_MODULES}
 OPTIONS_MULTI_SESSION:=	${SESSION_ENABLED_MODULES} ${SESSION_DISABLED_MODULES}
 
+OPTIONS_RADIO=			SHARED_MPM
+OPTIONS_RADIO_SHARED_MPM=	MPM_SHARED
+
 OPTIONS_SINGLE=			DEFAULT_MPM
 OPTIONS_SINGLE_DEFAULT_MPM=	MPM_PREFORK MPM_WORKER MPM_EVENT
 


Property changes on: trunk/www/apache24/Makefile.options
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.3
\ No newline at end of property
Index: trunk/www/apache24/Makefile.options.desc
===================================================================
--- trunk/www/apache24/Makefile.options.desc	2014-03-23 03:03:40 UTC (rev 16093)
+++ trunk/www/apache24/Makefile.options.desc	2014-03-23 03:18:37 UTC (rev 16094)

Property changes on: trunk/www/apache24/Makefile.options.desc
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/www/apache24/distinfo
===================================================================
--- trunk/www/apache24/distinfo	2014-03-23 03:03:40 UTC (rev 16093)
+++ trunk/www/apache24/distinfo	2014-03-23 03:18:37 UTC (rev 16094)
@@ -1,2 +1,2 @@
-SHA256 (apache24/httpd-2.4.6.tar.gz) = b704d6ae3d17f7c56dd49d617f7fde0ade34fa913e78dd14ebaab0992efbc9cf
-SIZE (apache24/httpd-2.4.6.tar.gz) = 6700153
+SHA256 (apache24/httpd-2.4.9.tar.gz) = a6b20feaf827558105c95f16a9364bbb732d6fb0ad586feb7c79977f5ac7b07c
+SIZE (apache24/httpd-2.4.9.tar.gz) = 6784016

Index: trunk/www/apache24/pkg-descr
===================================================================
--- trunk/www/apache24/pkg-descr	2014-03-23 03:03:40 UTC (rev 16093)
+++ trunk/www/apache24/pkg-descr	2014-03-23 03:18:37 UTC (rev 16094)

Property changes on: trunk/www/apache24/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/www/apache24/pkg-message
===================================================================
--- trunk/www/apache24/pkg-message	2014-03-23 03:03:40 UTC (rev 16093)
+++ trunk/www/apache24/pkg-message	2014-03-23 03:18:37 UTC (rev 16094)
@@ -2,5 +2,5 @@
 in your /etc/rc.conf. Extra options can be found in startup script.
 
 Your hostname must be resolvable using at least 1 mechanism in
-/etc/nsswitch typically DNS or /etc/hosts or apache might
+/etc/nsswitch.conf typically DNS or /etc/hosts or apache might
 have issues starting depending on the modules you are using.


Property changes on: trunk/www/apache24/pkg-message
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Modified: trunk/www/apache24/pkg-plist
===================================================================
--- trunk/www/apache24/pkg-plist	2014-03-23 03:03:40 UTC (rev 16093)
+++ trunk/www/apache24/pkg-plist	2014-03-23 03:18:37 UTC (rev 16094)
@@ -1,7 +1,13 @@
- at comment keep the next three lines on top
- at exec mkdir -p %D/%%ETCDIR%%/envvars.d 2> /dev/null || true
- at exec mkdir -p %D/%%ETCDIR%%/extra 2> /dev/null || true
- at exec mkdir -p %D/%%ETCDIR%%/Includes 2> /dev/null || true
+ at comment keep the next three lines on top (only required for old pkg_... tools)
+ at exec mkdir -p %D/%%ETCDIR%%/envvars.d
+ at exec mkdir -p %D/%%ETCDIR%%/extra
+ at exec mkdir -p %D/%%ETCDIR%%/Includes
+bin/ab
+bin/htdbm
+bin/htdigest
+bin/htpasswd
+bin/httxt2dbm
+bin/logresolve
 %%ETCDIR%%/Includes/no-accf.conf
 include/apache24/ap_compat.h
 include/apache24/ap_config.h
@@ -136,6 +142,9 @@
 %%MOD_MACRO%%libexec/apache24/mod_macro.so
 %%MOD_MIME%%libexec/apache24/mod_mime.so
 %%MOD_MIME_MAGIC%%libexec/apache24/mod_mime_magic.so
+ at comment %%MPM_SHARED%%libexec/apache24/mod_mpm_event.so
+%%MPM_SHARED%%libexec/apache24/mod_mpm_prefork.so
+%%MPM_SHARED%%libexec/apache24/mod_mpm_worker.so
 %%MOD_NEGOTIATION%%libexec/apache24/mod_negotiation.so
 %%MOD_OPTIONAL_FN_EXPORT%%libexec/apache24/mod_optional_fn_export.so
 %%MOD_OPTIONAL_FN_IMPORT%%libexec/apache24/mod_optional_fn_import.so
@@ -184,17 +193,25 @@
 %%MOD_VHOST_ALIAS%%libexec/apache24/mod_vhost_alias.so
 %%MOD_WATCHDOG%%libexec/apache24/mod_watchdog.so
 %%MOD_XML2ENC%%libexec/apache24/mod_xml2enc.so
-bin/ab
+man/man1/ab.1.gz
+man/man1/apxs.1.gz
+man/man1/dbmmanage.1.gz
+man/man1/htdbm.1.gz
+man/man1/htdigest.1.gz
+man/man1/htpasswd.1.gz
+man/man1/httxt2dbm.1.gz
+man/man1/logresolve.1.gz
+man/man8/apachectl.8.gz
+man/man8/fcgistarter.8.gz
+man/man8/htcacheclean.8.gz
+man/man8/httpd.8.gz
+man/man8/rotatelogs.8.gz
+man/man8/suexec.8.gz
+sbin/apachectl
 sbin/apxs
+%%FORENSIC%%sbin/check_forensic
+sbin/checkgid
 sbin/dbmmanage
-bin/htdbm
-bin/htdigest
-bin/htpasswd
-bin/httxt2dbm
-bin/logresolve
-sbin/apachectl
-sbin/checkgid
-%%FORENSIC%%sbin/check_forensic
 sbin/envvars
 sbin/fcgistarter
 sbin/htcacheclean
@@ -261,9 +278,9 @@
 %%EXAMPLESDIR%%/mime.types
 @exec [ -f %D/%%ETCDIR%%/mime.types ] || cp %D/%%EXAMPLESDIR%%/mime.types %D/%%ETCDIR%%/mime.types
 %%WWWDIR%%/cgi-bin/printenv
+%%WWWDIR%%/cgi-bin/printenv.vbs
+%%WWWDIR%%/cgi-bin/printenv.wsf
 %%WWWDIR%%/cgi-bin/test-cgi
-%%WWWDIR%%/cgi-bin/printenv.wsf
-%%WWWDIR%%/cgi-bin/printenv.vbs
 %%WWWDIR%%/error/HTTP_BAD_GATEWAY.html.var
 %%WWWDIR%%/error/HTTP_BAD_REQUEST.html.var
 %%WWWDIR%%/error/HTTP_FORBIDDEN.html.var
@@ -540,8 +557,8 @@
 @dirrmtry libexec/apache24
 @dirrmtry include/apache24
 @unexec rm -f %D/%%ETCDIR%%/httpd.conf.bak 2> /dev/null || true
+ at dirrmtry %%ETCDIR%%/modules.d
 @dirrmtry %%ETCDIR%%/extra
 @dirrmtry %%ETCDIR%%/envvars.d
 @dirrmtry %%ETCDIR%%/Includes
 @dirrmtry %%ETCDIR%%
- at exec mkdir -p %D/%%DOCSDIR%%

More information about the Midnightbsd-cvs mailing list