From owner-svn-ports-all@FreeBSD.ORG  Sun Oct 28 19:57:44 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 7E66AA96;
 Sun, 28 Oct 2012 19:57:44 +0000 (UTC) (envelope-from pgj@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id 48CDE8FC08;
 Sun, 28 Oct 2012 19:57:44 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9SJvidJ087647;
 Sun, 28 Oct 2012 19:57:44 GMT (envelope-from pgj@svn.freebsd.org)
Received: (from pgj@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9SJvioQ087645;
 Sun, 28 Oct 2012 19:57:44 GMT (envelope-from pgj@svn.freebsd.org)
Message-Id: <201210281957.q9SJvioQ087645@svn.freebsd.org>
From: Gabor Pali <pgj@FreeBSD.org>
Date: Sun, 28 Oct 2012 19:57:44 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r306565 - head/www/bozohttpd
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 28 Oct 2012 19:57:44 -0000

Author: pgj
Date: Sun Oct 28 19:57:43 2012
New Revision: 306565
URL: http://svn.freebsd.org/changeset/ports/306565

Log:
  - Convert options to the new format
  
  PR:		ports/172540
  Submitted by:	pgj
  Approved by:	maintainer
  Feature safe:	yes

Modified:
  head/www/bozohttpd/Makefile

Modified: head/www/bozohttpd/Makefile
==============================================================================
--- head/www/bozohttpd/Makefile	Sun Oct 28 19:54:57 2012	(r306564)
+++ head/www/bozohttpd/Makefile	Sun Oct 28 19:57:43 2012	(r306565)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    bozohttpd
-# Date created:         21.03.2002
-# Whom:                 Janos.Mohacsi@bsd.hu
-#
+# Created by: Janos.Mohacsi@bsd.hu
 # $FreeBSD$
-#
 
 PORTNAME=	bozohttpd
 PORTVERSION=	20100920
@@ -20,34 +16,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 +57,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>