Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 21 Nov 2012 23:23:25 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r307631 - head/textproc/htdig
Message-ID:  <201211212323.qALNNP4V051574@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201211212323.qALNNP4V051574>