From masaki@rosetta.club.kyutech.ac.jp  Wed Sep  5 05:37:02 2012
Return-Path: <masaki@rosetta.club.kyutech.ac.jp>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 8AF711065676
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  5 Sep 2012 05:37:02 +0000 (UTC)
	(envelope-from masaki@rosetta.club.kyutech.ac.jp)
Received: from rosetta.club.kyutech.ac.jp (rosetta.club.kyutech.ac.jp [131.206.108.15])
	by mx1.freebsd.org (Postfix) with ESMTP id 26F588FC15
	for <FreeBSD-gnats-submit@freebsd.org>; Wed,  5 Sep 2012 05:37:01 +0000 (UTC)
Received: from rosetta.club.kyutech.ac.jp (localhost [127.0.0.1])
	by rosetta.club.kyutech.ac.jp (8.14.5/8.14.5) with ESMTP id q855b0Pe093648;
	Wed, 5 Sep 2012 14:37:00 +0900 (JST)
	(envelope-from masaki@rosetta.club.kyutech.ac.jp)
Received: (from masaki@localhost)
	by rosetta.club.kyutech.ac.jp (8.14.5/8.14.5/Submit) id q855b0oO093647;
	Wed, 5 Sep 2012 14:37:00 +0900 (JST)
	(envelope-from masaki)
Message-Id: <201209050537.q855b0oO093647@rosetta.club.kyutech.ac.jp>
Date: Wed, 5 Sep 2012 14:37:00 +0900 (JST)
From: Masaki TAGAWA <masaki@club.kyutech.ac.jp>
Reply-To: Masaki TAGAWA <masaki@club.kyutech.ac.jp>
To: FreeBSD-gnats-submit@freebsd.org
Cc: masaki@club.kyutech.ac.jp
Subject: [maintainer update] www/mod_spdy: OptionsNG
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         171336
>Category:       ports
>Synopsis:       [maintainer update] www/mod_spdy: OptionsNG
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    swills
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Sep 05 05:40:09 UTC 2012
>Closed-Date:    Thu Sep 06 06:12:42 UTC 2012
>Last-Modified:  Thu Sep  6 06:20:01 UTC 2012
>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@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:
Responsible-Changed-From-To: freebsd-ports-bugs->swills 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Wed Sep 5 05:40:23 UTC 2012 
Responsible-Changed-Why:  
swills@ wants his PRs (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=171336 
State-Changed-From-To: open->closed 
State-Changed-By: swills 
State-Changed-When: Thu Sep 6 06:12:39 UTC 2012 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=171336 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/171336: commit references a PR
Date: Thu,  6 Sep 2012 06:12:42 +0000 (UTC)

 Author: swills
 Date: Thu Sep  6 06:12:30 2012
 New Revision: 303745
 URL: http://svn.freebsd.org/changeset/ports/303745
 
 Log:
   - Convert to OptionsNG
   
   PR:		ports/171336
   Submitted by:	Masaki TAGAWA <masaki@club.kyutech.ac.jp> (maintainer)
 
 Modified:
   head/www/mod_spdy/Makefile
 
 Modified: head/www/mod_spdy/Makefile
 ==============================================================================
 --- head/www/mod_spdy/Makefile	Thu Sep  6 06:10:41 2012	(r303744)
 +++ head/www/mod_spdy/Makefile	Thu Sep  6 06:12:30 2012	(r303745)
 @@ -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 @@ GYP_DEFINES+=	\
  		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
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
