ports/172540: [www/bozohttpd] OptionsNG Conversion

[Gabor Pali]

>Number:         172540
>Category:       ports
>Synopsis:       [www/bozohttpd] OptionsNG Conversion
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Oct 09 22:30:21 UTC 2012
>Closed-Date:
>Last-Modified:
>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:
>Unformatted: