From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Oct 9 22:30:22 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3ABBD333 for ; Tue, 9 Oct 2012 22:30:22 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [8.8.178.135]) by mx1.freebsd.org (Postfix) with ESMTP id 1337D8FC1F for ; Tue, 9 Oct 2012 22:30:22 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q99MULA9043578 for ; Tue, 9 Oct 2012 22:30:21 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q99MULdX043577; Tue, 9 Oct 2012 22:30:21 GMT (envelope-from gnats) Resent-Date: Tue, 9 Oct 2012 22:30:21 GMT Resent-Message-Id: <201210092230.q99MULdX043577@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Gabor Pali Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E8BBEC2B for ; 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 ; 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 ; 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 To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/172540: [www/bozohttpd] OptionsNG Conversion X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Oct 2012 22:30:22 -0000 >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 +.include -.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 +.include >Release-Note: >Audit-Trail: >Unformatted: