ports/171336: [maintainer update] www/mod_spdy: OptionsNG

[Masaki TAGAWA]

>Number:         171336
>Category:       ports
>Synopsis:       [maintainer update] www/mod_spdy: OptionsNG
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Sep 05 05:40:09 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Masaki TAGAWA
>Release:        FreeBSD 9.0-STABLE amd64
>Organization:
WIDE Project
Kyushu Institute of Technology
>Environment:
System: FreeBSD rosetta.club.kyutech.ac.jp 9.0-STABLE FreeBSD 9.0-STABLE #8: Mon Jul 2 11:36:08 JST 2012 root at rosetta.club.kyutech.ac.jp:/usr/obj/usr/src/sys/CLUBVMKERNEL amd64
>Description:
* Convert to OptionsNG
>How-To-Repeat:
	
>Fix:

	

--- mod_spdy.patch begins here ---
diff -ruN /usr/ports/www/mod_spdy/Makefile mod_spdy/Makefile
--- /usr/ports/www/mod_spdy/Makefile	2012-08-29 22:29:16.000000000 +0900
+++ mod_spdy/Makefile	2012-09-05 14:29:05.796486715 +0900
@@ -7,6 +7,7 @@
 
 PORTNAME=	mod_spdy
 PORTVERSION=	0.9.2.2
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.club.kyutech.ac.jp/~masaki/ports/:mod_spdy \
 		${MASTER_SITE_APACHE_HTTPD}:apache22 \
@@ -44,41 +45,33 @@
 		system_include_path_execinfo=${LOCALBASE}/include \
 		include_dirs=${LOCALBASE}/include
 
-OPTIONS=	CLANG	"Build with Clang"	on \
-		GCC46	"Build with GCC 4.6+"	off \
-		DEBUG   "Compile with debug symbols and verbose output" off
+OPTIONS_DEFINE=	CLANG DEBUG
+CLANG_DESC=	Build with Clang instead of GCC 4.6+
+DEBUG_DESC=	Compile with debug symbols and verbose output
+
+OPTIONS_DEFAULT=	CLANG
 
 .include <bsd.port.options.mk>
 
-.if ${OSVERSION} < 900033 || defined(WITH_GCC46)
+.if ${OSVERSION} < 900033 || ! ${PORT_OPTIONS:MCLANG}
 BUILD_DEPENDS+=	${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
 CONFIGURE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
 MAKE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
 .endif
 
-.if !defined(WITH_GCC46) && !defined(WITH_CLANG)
-IGNORE=	does not compile with base gcc
-.endif
-
-.if defined(WITH_GCC46) && defined(WITH_CLANG)
-IGNORE=	conflicting options (CLANG and GCC46)
-.endif
-
-.if defined(WITH_GCC46)
-USE_GCC?=	4.6+
-.endif
-
-.if defined(WITH_CLANG)
+.if ${PORT_OPTIONS:MCLANG}
 .if ${OSVERSION} < 900033
 BUILD_DEPENDS+=	clang:${PORTSDIR}/lang/clang
 .endif
 CC=	clang
 CXX=	clang++
-CPP=	clang-cpp
 GYP_DEFINES+=	clang=1
+.else
+USE_GCC?=	4.6+
+GYP_DEFINES+=	gcc_version=${CXX:S/g++//}
 .endif
 
-.if !defined(WITH_DEBUG)
+.if ${PORT_OPTIONS:MDEBUG}
 BUILDTYPE=	Release
 .else
 MAKE_ENV+=	V=1
--- mod_spdy.patch ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: