- USE_APACHE= s/22+/22/

- adopt new Makefile header

Port build fails on local exp-run with apache24 with
 error: 'conn_rec' has no member named 'remote_ip'

or various other apache22 specific functions/parameters

with hat apache@

1 files changed, 47 insertions, 29 deletions

diff --git a/www/cas/Makefile b/www/cas/Makefile
index 80e909270ab..33185bdb9ee 100644
--- a/www/cas/Makefile
+++ b/www/cas/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	cas
-# Date created:				24 Nov 2011
-# Whom:					Alexander Lunkov <lunkov@gmail.com>
-#
+# Created by: Alexander Lunkov <lunkov@gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	cas
 PORTVERSION=	3.5.5
@@ -22,29 +18,51 @@ USE_LDCONFIG=	yes
 USE_ICONV=	yes
 WITHOUT_NLS=	yes
 
-OPTIONS=	DEBUG_MODE			"Enable debug output"			off \
-		ENABLE_OPTIMIZATION		"Enable optimization"			on  \
-		BUILD_APACHE2X_MODULE		"Build Apache 2.x module"		on  \
-		BUILD_CURL_XMLRPC_CLIENT	"Build cURL-based XMLRPC client"	on  \
-		INSTALL_EXAMPLE_MODULES 	"Install example modules"		off \
-		INSTALL_CAS_LIBRARY		"Install CAS library (libcas)"		on  \
-		INSTALL_CAS_MODULES		"Install CAS modules"			on  \
-		INSTALL_CAS_HEADERS		"Install CAS headers"			on  \
-		INSTALL_CAS_CONFIGS		"Install CAS configuration files"	on  \
-		INSTALL_CAS_BINARIES		"Install CAS binaries"			on  \
-		INSTALL_CAS_DATA		"Install CAS data files"		on
+OPTIONS_DEFINE=	DEBUG_MODE \
+		ENABLE_OPTIMIZATION \
+		BUILD_APACHE2X_MODULE \
+		BUILD_CURL_XMLRPC_CLIENT \
+		INSTALL_EXAMPLE_MODULES \
+		INSTALL_CAS_LIBRARY \
+		INSTALL_CAS_MODULES \
+		INSTALL_CAS_HEADERS \
+		INSTALL_CAS_CONFIGS \
+		INSTALL_CAS_BINARIES \
+		INSTALL_CAS_DATA
+
+OPTIONS_DEFAULT=ENABLE_OPTIMIZATION \
+		BUILD_APACHE2X_MODULE \
+		BUILD_CURL_XMLRPC_CLIENT \
+		INSTALL_CAS_LIBRARY \
+		INSTALL_CAS_MODULES \
+		INSTALL_CAS_HEADERS \
+		INSTALL_CAS_CONFIGS \
+		INSTALL_CAS_BINARIES \
+		INSTALL_CAS_DATA
+
+DEBUG_MODE_DESC=		Enable debug output
+ENABLE_OPTIMIZATION_DESC=	Enable optimization
+BUILD_APACHE2X_MODULE_DESC=	Build Apache 2.x module
+BUILD_CURL_XMLRPC_CLIENT_DESC=	Build cURL-based XMLRPC client
+INSTALL_EXAMPLE_MODULES_DESC= 	Install example modules
+INSTALL_CAS_LIBRARY_DESC=	Install CAS library (libcas)
+INSTALL_CAS_MODULES_DESC=	Install CAS modules
+INSTALL_CAS_HEADERS_DESC=	Install CAS headers
+INSTALL_CAS_CONFIGS_DESC=	Install CAS configuration files
+INSTALL_CAS_BINARIES_DESC=	Install CAS binaries
+INSTALL_CAS_DATA_DESC=		Install CAS data files
 
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_DEBUG_MODE)
+.if ${PORT_OPTIONS:MDEBUG_MODE}
 CMAKE_ARGS+=	-DDEBUG_MODE=ON
 .else
 CMAKE_ARGS+=	-DDEBUG_MODE=OFF
 .endif
 
-.if defined(WITH_ENABLE_OPTIMIZATION)
+.if ${PORT_OPTIONS:MENABLE_OPTIMIZATION}
 CMAKE_ARGS+=	-DENABLE_OPTIMIZATION=ON
 .else
 CMAKE_ARGS+=	-DENABLE_OPTIMIZATION=OFF
@@ -52,7 +70,7 @@ CMAKE_ARGS+=	-DENABLE_OPTIMIZATION=OFF
 
 # XXX apache13 was removed from portstree
 # XXX
-##.if defined(WITH_BUILD_APACHE13_MODULE)
+##.if ${PORT_OPTIONS:MBUILD_APACHE13_MODULE}
 ##CMAKE_ARGS+=	-DBUILD_APACHE13_MODULE=ON
 ##USE_APACHE=	13
 ##PLIST_SUB+=	APACHE13_MODULE=""
@@ -61,8 +79,8 @@ CMAKE_ARGS+=	-DBUILD_APACHE13_MODULE=OFF
 PLIST_SUB+=	APACHE13_MODULE="@comment "
 ##.endif
 
-.if defined(WITH_BUILD_APACHE2X_MODULE)
-USE_APACHE=	22+
+.if ${PORT_OPTIONS:MBUILD_APACHE2X_MODULE}
+USE_APACHE=	22
 CMAKE_ARGS+=	-DBUILD_APACHE2X_MODULE=ON
 PLIST_SUB+=	APACHE2X_MODULE=""
 .else
@@ -70,7 +88,7 @@ CMAKE_ARGS+=	-DBUILD_APACHE2X_MODULE=OFF
 PLIST_SUB+=	APACHE2X_MODULE="@comment "
 .endif
 
-.if defined(WITH_BUILD_CURL_XMLRPC_CLIENT)
+.if ${PORT_OPTIONS:MBUILD_CURL_XMLRPC_CLIENT}
 LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
 CMAKE_ARGS+=	-DBUILD_CURL_XMLRPC_CLIENT=ON
 PLIST_SUB+=	CURL_XMLRPC_CLIENT=""
@@ -79,7 +97,7 @@ CMAKE_ARGS+=	-DBUILD_CURL_XMLRPC_CLIENT=OFF
 PLIST_SUB+=	CURL_XMLRPC_CLIENT="@comment "
 .endif
 
-.if defined(WITH_INSTALL_EXAMPLE_MODULES)
+.if ${PORT_OPTIONS:MINSTALL_EXAMPLE_MODULES}
 CMAKE_ARGS+=	-DINSTALL_EXAMPLE_MODULES=ON
 PLIST_SUB+=	EXAMPLE_MODULES=""
 .else
@@ -87,7 +105,7 @@ CMAKE_ARGS+=	-DINSTALL_EXAMPLE_MODULES=OFF
 PLIST_SUB+=	EXAMPLE_MODULES="@comment "
 .endif
 
-.if defined(WITH_INSTALL_CAS_LIBRARY)
+.if ${PORT_OPTIONS:MINSTALL_CAS_LIBRARY}
 CMAKE_ARGS+=	-DINSTALL_CAS_LIBRARY=ON
 PLIST_SUB+=	CAS_LIBRARY=""
 .else
@@ -95,7 +113,7 @@ CMAKE_ARGS+=	-DINSTALL_CAS_LIBRARY=OFF
 PLIST_SUB+=	CAS_LIBRARY="@comment "
 .endif
 
-.if defined(WITH_INSTALL_CAS_MODULES)
+.if ${PORT_OPTIONS:MINSTALL_CAS_MODULES}
 CMAKE_ARGS+=	-DINSTALL_CAS_MODULES=ON
 PLIST_SUB+=	CAS_MODULES=""
 .else
@@ -103,7 +121,7 @@ CMAKE_ARGS+=	-DINSTALL_CAS_MODULES=OFF
 PLIST_SUB+=	CAS_MODULES="@comment "
 .endif
 
-.if defined(WITH_INSTALL_CAS_HEADERS)
+.if ${PORT_OPTIONS:MINSTALL_CAS_HEADERS}
 CMAKE_ARGS+=	-DINSTALL_CAS_HEADERS=ON
 PLIST_SUB+=	CAS_HEADERS=""
 .else
@@ -111,7 +129,7 @@ CMAKE_ARGS+=	-DINSTALL_CAS_HEADERS=OFF
 PLIST_SUB+=	CAS_HEADERS="@comment "
 .endif
 
-.if defined(WITH_INSTALL_CAS_CONFIGS)
+.if ${PORT_OPTIONS:MINSTALL_CAS_CONFIGS}
 CMAKE_ARGS+=	-DINSTALL_CAS_CONFIGS=ON
 PLIST_SUB+=	CAS_CONFIGS=""
 .else
@@ -119,7 +137,7 @@ CMAKE_ARGS+=	-DINSTALL_CAS_CONFIGS=OFF
 PLIST_SUB+=	CAS_CONFIGS="@comment "
 .endif
 
-.if defined(WITH_INSTALL_CAS_BINARIES)
+.if ${PORT_OPTIONS:MINSTALL_CAS_BINARIES}
 CMAKE_ARGS+=	-DINSTALL_CAS_BINARIES=ON
 PLIST_SUB+=	CAS_BINARIES=""
 .else
@@ -127,7 +145,7 @@ CMAKE_ARGS+=	-DINSTALL_CAS_BINARIES=OFF
 PLIST_SUB+=	CAS_BINARIES="@comment "
 .endif
 
-.if defined(WITH_INSTALL_CAS_DATA)
+.if ${PORT_OPTIONS:MINSTALL_CAS_DATA}
 CMAKE_ARGS+=	-DINSTALL_CAS_DATA=ON
 PLIST_SUB+=	CAS_DATA=""
 .else