[Midnightbsd-cvs] mports [17369] trunk/www/apache24: cleanup port

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Fri Sep 19 17:34:42 EDT 2014 

Revision: 17369
          http://svnweb.midnightbsd.org/mports/?rev=17369
Author:   laffer1
Date:     2014-09-19 17:34:31 -0400 (Fri, 19 Sep 2014)
Log Message:
-----------
cleanup port

Modified Paths:
--------------
    trunk/www/apache24/Makefile
    trunk/www/apache24/Makefile.options
    trunk/www/apache24/Makefile.options.desc
    trunk/www/apache24/files/patch-support__Makefile.in

Modified: trunk/www/apache24/Makefile
===================================================================
--- trunk/www/apache24/Makefile	2014-09-19 21:29:54 UTC (rev 17368)
+++ trunk/www/apache24/Makefile	2014-09-19 21:34:31 UTC (rev 17369)
@@ -2,6 +2,7 @@
 
 PORTNAME=	apache24
 PORTVERSION=	2.4.10
+PORTREVISION=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD}
 DISTNAME=	httpd-${PORTVERSION}
@@ -12,14 +13,12 @@
 
 LICENSE=	apache2
 
-LIB_DEPENDS=	expat:${PORTSDIR}/textproc/expat2 \
-		apr-1:${PORTSDIR}/devel/apr \
-		pcre:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2 \
+		libapr-1.so:${PORTSDIR}/devel/apr \
+		libpcre.so:${PORTSDIR}/devel/pcre
 
-LATEST_LINK=	apache24
+CONFLICTS=	apache-*-2.2.* apache22-*
 
-CONFLICTS=	apache-2.0.* apache-*-2.0.* apache-*-2.2.*
-
 SCRIPTS_ENV+=		LIBTOOL=${LIBTOOL} LIBTOOLIZE=${LIBTOOLIZE} \
 			LIBTOOL_VERSION=${LIBTOOL_VERSION} AUTOCONF=${AUTOCONF} \
 			LIBTOOL_M4=${LIBTOOL_M4} \
@@ -26,7 +25,7 @@
 			AUTOHEADER=${AUTOHEADER}
 
 USE_APACHE=	common24
-USES=		iconv tar:bzip2
+USES=		iconv tar:bzip2 cpe
 USE_AUTOTOOLS=	autoconf libtool
 USE_PERL5=	yes
 USE_PYTHON=	yes
@@ -33,6 +32,9 @@
 USE_RC_SUBR=	apache24 htcacheclean
 LIBTOOLFILES=	configure.in
 
+CPE_VENDOR=	apache
+CPE_PRODUCT=	http_server
+
 PORTDOCS=	*
 
 USERS=		www
@@ -106,8 +108,7 @@
 		--with-apr=${APR_CONFIG} \
 		--with-apr-util=${APU_CONFIG}
 
-CONFIGURE_ENV=	\
-		CONFIG_SHELL="${SH}" \
+CONFIGURE_ENV=	CONFIG_SHELL="${SH}" \
 		LOCALBASE="${LOCALBASE}"
 
 MAKE_ENV+=	EXPR_COMPAT=yes \

Modified: trunk/www/apache24/Makefile.options
===================================================================
--- trunk/www/apache24/Makefile.options	2014-09-19 21:29:54 UTC (rev 17368)
+++ trunk/www/apache24/Makefile.options	2014-09-19 21:34:31 UTC (rev 17369)
@@ -1,4 +1,4 @@
-# $FreeBSD$
+# $MidnightBSD$
 
 # ===========================================================
 # The list of modules are no longer classified in CATEGORIES.
@@ -18,10 +18,9 @@
 
 # SESSION_CRYPTO need APR build with crypto (EVP support in APR)
 SESSION_ENABLED_MODULES= \
-	SESSION_COOKIE SESSION_CRYPTO
+	SESSION_COOKIE SESSION_CRYPTO SESSION_DBD
 
-SESSION_DISABLED_MODULES= \
-	SESSION_DBD
+SESSION_DISABLED_MODULES=
 
 HEARTBEAT_MODULES= \
 	HEARTBEAT HEARTMONITOR LBMETHOD_HEARTBEAT
@@ -40,7 +39,7 @@
 	AUTHZ_OWNER AUTHZ_USER \
 	AUTH_BASIC AUTH_DIGEST AUTH_FORM AUTOINDEX \
 	BUFFER \
-	CACHE CACHE_DISK CACHE_SOCACHE CERN_META CGI CGID \
+	CACHE CACHE_DISK CACHE_SOCACHE CGI CGID \
 	DAV DAV_FS DBD DEFLATE DIR DUMPIO \
 	ENV EXPIRES EXT_FILTER \
 	FILE_CACHE FILTER \
@@ -51,14 +50,14 @@
 	MACRO MIME MIME_MAGIC \
 	NEGOTIATION \
 	RATELIMIT REMOTEIP REQTIMEOUT REQUEST REWRITE \
-	SED SETENVIF SOCACHE_DBM SOCACHE_MEMCACHE SOCACHE_SHMCB SPELING \
+	SED SETENVIF SLOTMEM_SHM SOCACHE_DBM SOCACHE_MEMCACHE SOCACHE_SHMCB SPELING \
 	SSL STATUS SUBSTITUTE \
 	UNIQUE_ID USERDIR \
 	VERSION VHOST_ALIAS
 
 MOST_DISABLED_MODULES:= \
-	AUTHNZ_LDAP LDAP CHARSET_LITE DATA DAV_LOCK DIALUP IDENT LOG_FORENSIC \
-	LUA REFLECTOR SLOTMEM_PLAIN SLOTMEM_SHM SOCACHE_DC SUEXEC USERTRACK \
+	AUTHNZ_LDAP AUTHNZ_FCGI LDAP CERN_META CHARSET_LITE DATA DAV_LOCK DIALUP IDENT \
+	LOG_FORENSIC LUA REFLECTOR SLOTMEM_PLAIN SOCACHE_DC SUEXEC USERTRACK \
 	XML2ENC WATCHDOG ${HEARTBEAT_MODULES} ${EXAMPLE_MODULES} ${DEV_MODULES}
 
 #MULTI_MODULES:=	${OPTIONS_MULTI}

Modified: trunk/www/apache24/Makefile.options.desc
===================================================================
--- trunk/www/apache24/Makefile.options.desc	2014-09-19 21:29:54 UTC (rev 17368)
+++ trunk/www/apache24/Makefile.options.desc	2014-09-19 21:34:31 UTC (rev 17369)
@@ -36,12 +36,13 @@
 
 # =====================================
 # modules
-# deprecated: ACCESS_COMPAT
-ACCESS_COMPAT_DESC=		Old group authorizations based on host (name or IP), deprecated by mod_authz_host
+# DESC from modules/*/config.m4 files
+ACCESS_COMPAT_DESC=		mod_access compatibility
 ACTIONS_DESC=			Action triggering on requests
 ALIAS_DESC=			Mapping of requests to different filesystem parts
-ALLOWMETHODS_DESC=		Easily restrict what HTTP methods can be used on the server
+ALLOWMETHODS_DESC=		Restrict allowed HTTP methods
 ASIS_DESC=			Sends files that contain their own HTTP headers
+AUTHNZ_FCGI_DESC=		FastCGI authorizer-based authentication and authorization
 AUTHNZ_LDAP_DESC=		LDAP based authentication
 AUTHN_ANON_DESC=		Anonymous user authentication control
 AUTHN_CORE_DESC=		Core authentication module
@@ -52,21 +53,21 @@
 AUTHZ_CORE_DESC=		Core authorization provider vector module
 AUTHZ_DBD_DESC=			SQL based authorization and Login/Session support
 AUTHZ_DBM_DESC=			DBM-based authorization control
-AUTHZ_GROUPFILE_DESC=		Group authorization using plaintext files
+AUTHZ_GROUPFILE_DESC=		"require group" authorization control
 AUTHZ_HOST_DESC=		Host-based authorization control
-AUTHZ_OWNER_DESC=		Authorization based on file ownership
-AUTHZ_USER_DESC=		User Authorization
+AUTHZ_OWNER_DESC=		"require file-owner" authorization control
+AUTHZ_USER_DESC=		"require user" authorization control
 AUTH_BASIC_DESC=		Basic authentication
 AUTH_DIGEST_DESC=		RFC2617 Digest authentication
 AUTH_FORM_DESC=			Form authentication
 AUTOINDEX_DESC=			Directory listing
 
-BUCKETEER_DESC=			(dev) buckets manipulation filter, useful only for developers and testing purposes
+BUCKETEER_DESC=			(dev) buckets manipulation filter
 BUFFER_DESC=			Filter Buffering
 
 CACHE_DESC=			Dynamic file caching
 CACHE_DISK_DESC=		Disk caching module
-CACHE_SOCACHE_DESC=		Shared object cache (socache) based storage module for the HTTP caching filter
+CACHE_SOCACHE_DESC=		Shared object cacheing module
 CASE_FILTER_DESC=		(dev) example uppercase conversion filter
 CASE_FILTER_IN_DESC=		(dev) example uppercase conversion input filter
 CERN_META_DESC=			CERN-type meta files
@@ -85,9 +86,9 @@
 DUMPIO_DESC=			I/O dump filter
 
 ECHO_DESC=			(dev) example echo server
-ENV_DESC=			Modifies environment passed to CGI/SSI pages
-EXAMPLE_HOOKS_DESC=		(dev) example hook module
-EXAMPLE_IPC_DESC=		(dev) example IPC module
+ENV_DESC=			Clearing/setting of ENV vars
+EXAMPLE_HOOKS_DESC=		(dev) example hook callback handler module
+EXAMPLE_IPC_DESC=		(dev) Example of shared memory and mutex usage
 EXPIRES_DESC=			Expires header control
 EXT_FILTER_DESC=		External filter module
 
@@ -114,7 +115,7 @@
 LOG_FORENSIC_DESC=		Forensic logging
 LUA_DESC=			Apache Lua Framework
 
-MACRO_DESC=			Provides usage of macros within apache runtime configuration files
+MACRO_DESC=			Define and use macros in configuration files
 MIME_DESC=			Mapp file-ext. to MIME (recommended)
 MIME_MAGIC_DESC=		Automagically determining MIME type
 
@@ -136,7 +137,7 @@
 PROXY_HTML_DESC=		Fix HTML Links in a Reverse Proxy
 PROXY_HTTP_DESC=		HTTP support module for mod_proxy
 PROXY_SCGI_DESC=		SCGI gateway module for mod_proxy
-PROXY_WSTUNNEL_DESC=		Websockets support module for mod_proxy
+PROXY_WSTUNNEL_DESC=		Websockets Tunnel module for mod_proxy
 
 RATELIMIT_DESC=			Output Bandwidth Limiting
 REFLECTOR_DESC=			Reflect request through the output filter stack

Modified: trunk/www/apache24/files/patch-support__Makefile.in
===================================================================
--- trunk/www/apache24/files/patch-support__Makefile.in	2014-09-19 21:29:54 UTC (rev 17368)
+++ trunk/www/apache24/files/patch-support__Makefile.in	2014-09-19 21:34:31 UTC (rev 17369)
@@ -1,11 +1,10 @@
 --- ./support/Makefile.in.orig	2012-12-11 11:37:25.000000000 +0100
-+++ ./support/Makefile.in	2013-03-22 18:55:53.000000000 +0100
-@@ -17,23 +17,23 @@
++++ ./support/Makefile.in	2013-10-26 19:29:20.000000000 +0200
+@@ -17,10 +17,10 @@
  	@test -d $(DESTDIR)$(sbindir) || $(MKINSTALLDIRS) $(DESTDIR)$(sbindir)
  	@test -d $(DESTDIR)$(libexecdir) || $(MKINSTALLDIRS) $(DESTDIR)$(libexecdir)
  	@cp -p $(top_builddir)/server/httpd.exp $(DESTDIR)$(libexecdir)
 -	@for i in apxs dbmmanage; do \
-+	@chown root:wheel $(DESTDIR)$(libexecdir)/httpd.exp
 +	@for i in apxs dbmmanage split-logfile; do \
  	    if test -f "$(builddir)/$$i"; then \
 -	        cp -p $$i $(DESTDIR)$(bindir); \
@@ -12,14 +11,10 @@
 -	        chmod 755 $(DESTDIR)$(bindir)/$$i; \
 +	        cp -p $$i $(DESTDIR)$(sbindir); \
 +	        chmod 755 $(DESTDIR)$(sbindir)/$$i; \
-+		chown root:wheel $(DESTDIR)$(sbindir)/$$i; \
  	    fi ; \
  	done
  	@for i in apachectl; do \
- 	    if test -f "$(builddir)/$$i"; then \
- 	        cp -p $$i $(DESTDIR)$(sbindir); \
- 	        chmod 755 $(DESTDIR)$(sbindir)/$$i; \
-+		chown root:wheel $(DESTDIR)$(sbindir)/$$i; \
+@@ -30,10 +30,7 @@
  	    fi ; \
  	done
  	@if test -f "$(builddir)/envvars-std"; then \

More information about the Midnightbsd-cvs mailing list