From nobody@FreeBSD.org  Tue Oct  9 18:50:06 2012
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id E8BBEC2B
	for <freebsd-gnats-submit@FreeBSD.org>; Tue,  9 Oct 2012 18:50:06 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id D23E28FC16
	for <freebsd-gnats-submit@FreeBSD.org>; Tue,  9 Oct 2012 18:50:06 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.5/8.14.5) with ESMTP id q99Io6lg074551
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 9 Oct 2012 18:50:06 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.5/8.14.5/Submit) id q99Io6AI074550;
	Tue, 9 Oct 2012 18:50:06 GMT
	(envelope-from nobody)
Message-Id: <201210091850.q99Io6AI074550@red.freebsd.org>
Date: Tue, 9 Oct 2012 18:50:06 GMT
From: Gabor Pali <pgj@FreeBSD.org>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [www/bozohttpd] OptionsNG Conversion
X-Send-Pr-Version: www-3.1
X-GNATS-Notify: janos.mohacsi@bsd.hu

>Number:         172540
>Category:       ports
>Synopsis:       www/bozohttpd: OptionsNG Conversion
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pgj
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Oct 09 22:30:21 UTC 2012
>Closed-Date:    Sun Oct 28 20:10:53 UTC 2012
>Last-Modified:  Sun Oct 28 20:10:53 UTC 2012
>Originator:     Gabor Pali
>Release:        n/a
>Organization:
The FreeBSD Project
>Environment:
n/a
>Description:
- Convert options to OptionsNG format

>How-To-Repeat:

>Fix:
See the attached patch.


Patch attached with submission follows:

diff --git a/www/bozohttpd/Makefile b/www/bozohttpd/Makefile
index 84a7b1c..4bae18f 100644
--- a/www/bozohttpd/Makefile
+++ b/www/bozohttpd/Makefile
@@ -20,34 +20,38 @@ USE_BZIP2=	YES
 USE_RC_SUBR=	bozohttpd
 
 #options handling
-OPTIONS=	HTPASSWD_SUPPORT	"Enable htpassord support" 	off \
-		SSL			"Enable SSL support"		on \
-		CGI			"Enable CGI support"		on
+OPTIONS_DEFINE=		HTPASSWD SSL CGI
+OPTIONS_DEFAULT=	SSL CGI
+
+HTPASSWD_DESC=		Enable htpassword support
+SSL_DESC=		Enable SSL support
+CGI_DESC=		Enable CGI support
 
 #make happy portlint
-.if defined(WITHOUT_SSL)
+.if empty(PORT_OPTIONS:MSSL)
 .else
 USE_OPENSSL=	yes
 .endif
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_HTPASSWD_SUPPORT)
+.if ${PORT_OPTIONS:MHTPASSWD}
 CFLAGS+=	-DDO_HTPASSWD
 MAKE_ARGS+=	'LDFLAGS+= -lcrypt'
+.else
+CFLAGS+=	-UDO_HTPASSWD
 .endif
 
-.if defined(WITHOUT_SSL)
-CFLAGS+=	-DNO_SSL_SUPPORT
-.else
-#USE_OPENSSL=	yes
+.if ${PORT_OPTIONS:MSSL}
 CFLAGS+=	-UNO_SSL_SUPPORT
+.else
+CFLAGS+=	-DNO_SSL_SUPPORT
 .endif
 
-.if defined(WITHOUT_CGI)
-CFLAGS+=	-DNO_CGIBIN_SUPPORT
-.else
+.if ${PORT_OPTIONS:MCGI}
 CFLAGS+=	-UNO_CGIBIN_SUPPORT
+.else
+CFLAGS+=	-DNO_CGIBIN_SUPPORT
 .endif
 
 MAN8=		bozohttpd.8
@@ -57,4 +61,4 @@ PLIST_FILES=	libexec/bozohttpd
 post-patch:
 	@${REINPLACE_CMD} -e 's|@@PREFIX@@|${PREFIX}|g' ${WRKSRC}/bozohttpd.8
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Tue Oct 9 22:38:57 UTC 2012 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

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

From: Edwin Groothuis <edwin@FreeBSD.org>
To: janos.mohacsi@bsd.hu
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/172540: [www/bozohttpd] OptionsNG Conversion
Date: Tue, 9 Oct 2012 22:38:57 UT

 Maintainer of www/bozohttpd,
 
 Please note that PR ports/172540 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/172540
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org
Responsible-Changed-From-To: freebsd-ports-bugs->pgj 
Responsible-Changed-By: pgj 
Responsible-Changed-When: Fri Oct 26 08:48:15 UTC 2012 
Responsible-Changed-Why:  
"Submitter is a committer." 

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

From: Mohacsi Janos <janos.mohacsi@bsd.hu>
To: bug-followup@FreeBSD.org, pgj@FreeBSD.org
Cc:  
Subject: Re: ports/172540: www/bozohttpd: OptionsNG Conversion
Date: Fri, 26 Oct 2012 11:16:59 +0200

 Approved.
State-Changed-From-To: feedback->closed 
State-Changed-By: pgj 
State-Changed-When: Sun Oct 28 20:10:40 UTC 2012 
State-Changed-Why:  
Committed. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=172540 
>Unformatted:
