From owner-svn-ports-head@FreeBSD.ORG  Wed Nov 21 23:23:25 2012
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id CCE01D21;
 Wed, 21 Nov 2012 23:23:25 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id B1DA28FC18;
 Wed, 21 Nov 2012 23:23:25 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qALNNPft051575;
 Wed, 21 Nov 2012 23:23:25 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qALNNP4V051574;
 Wed, 21 Nov 2012 23:23:25 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201211212323.qALNNP4V051574@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Wed, 21 Nov 2012 23:23:25 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r307631 - head/textproc/htdig
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Nov 2012 23:23:25 -0000

Author: bapt
Date: Wed Nov 21 23:23:25 2012
New Revision: 307631
URL: http://svnweb.freebsd.org/changeset/ports/307631

Log:
  Convert to new options framework
  
  Feature safe:	yes

Modified:
  head/textproc/htdig/Makefile

Modified: head/textproc/htdig/Makefile
==============================================================================
--- head/textproc/htdig/Makefile	Wed Nov 21 23:01:58 2012	(r307630)
+++ head/textproc/htdig/Makefile	Wed Nov 21 23:23:25 2012	(r307631)
@@ -1,5 +1,4 @@
 # Created by: Bill Fumerola <billf@chc-chimes.com>
-#
 # $FreeBSD$
 
 PORTNAME=	htdig
@@ -31,11 +30,12 @@ MAN1=		htdig.1 htdig-pdfparser.1 htdump.
 
 MAN8=		htdigconfig.8
 
-OPTIONS=	APACHE "Include ${APACHE_PORT} as a dependency" on
+OPTIONS_DEFINE=	APACHE DOCS
+OPTIONS_DEFAULT=	APACHE
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_APACHE)
+.if ${PORT_OPTIONS:MAPACHE}
 USE_APACHE=	22+
 CONFIGURE_ARGS+=	--with-apache=${LOCALBASE}/sbin
 .include "${PORTSDIR}/Mk/bsd.apache.mk"
@@ -55,7 +55,7 @@ post-install:
 .if exists(${PREFIX}/etc/htdig/htdig.conf.old)
 	${MV} ${PREFIX}/etc/htdig/htdig.conf.old ${PREFIX}/etc/htdig/htdig.conf
 .endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}/html
 .for f in ChangeLog ChangeLog.0 README STATUS
 	@${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}/
@@ -65,4 +65,4 @@ post-install:
 .endfor
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>