Bug 171336 - [maintainer update] www/mod_spdy: OptionsNG
Summary: [maintainer update] www/mod_spdy: OptionsNG
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Steve Wills
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2012-09-05 06:40 UTC by Masaki TAGAWA
Modified: 2012-09-06 07:20 UTC (History)
1 user (show)

See Also:


Attachments
mod_spdy.patch (1.71 KB, patch)
2012-09-05 06:40 UTC, Masaki TAGAWA
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Masaki TAGAWA 2012-09-05 06:40:09 UTC
* Convert to OptionsNG
Comment 1 Edwin Groothuis freebsd_committer 2012-09-05 06:40:23 UTC
Responsible Changed
From-To: freebsd-ports-bugs->swills

swills@ wants his PRs (via the GNATS Auto Assign Tool)
Comment 2 Steve Wills freebsd_committer 2012-09-06 07:12:39 UTC
State Changed
From-To: open->closed

Committed. Thanks!
Comment 3 dfilter service freebsd_committer 2012-09-06 07:12:42 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"