From owner-svn-ports-head@FreeBSD.ORG  Thu Mar 21 00:04:43 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 920BCF59;
 Thu, 21 Mar 2013 00:04:43 +0000 (UTC) (envelope-from jgh@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 832C4BFB;
 Thu, 21 Mar 2013 00:04:43 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2L04hKk039111;
 Thu, 21 Mar 2013 00:04:43 GMT (envelope-from jgh@svn.freebsd.org)
Received: (from jgh@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2L04hou039110;
 Thu, 21 Mar 2013 00:04:43 GMT (envelope-from jgh@svn.freebsd.org)
Message-Id: <201303210004.r2L04hou039110@svn.freebsd.org>
From: Jason Helfman <jgh@FreeBSD.org>
Date: Thu, 21 Mar 2013 00:04:43 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r314780 - head/textproc/htmldoc
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: Thu, 21 Mar 2013 00:04:43 -0000

Author: jgh
Date: Thu Mar 21 00:04:42 2013
New Revision: 314780
URL: http://svnweb.freebsd.org/changeset/ports/314780

Log:
  - adopt optionsNG
  - trim historical header
  
  Approved by:	portmgr (miwi)

Modified:
  head/textproc/htmldoc/Makefile

Modified: head/textproc/htmldoc/Makefile
==============================================================================
--- head/textproc/htmldoc/Makefile	Thu Mar 21 00:01:44 2013	(r314779)
+++ head/textproc/htmldoc/Makefile	Thu Mar 21 00:04:42 2013	(r314780)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   htmldoc
-# Date created:        12 June 2001
-# Whom:                Glenn Trewitt <glenn@trewitt.org>
-#
+# Created by: Glenn Trewitt <glenn@trewitt.org>
 # $FreeBSD$
-#
 
 PORTNAME=	htmldoc
 PORTVERSION=	1.8.27
@@ -19,7 +15,8 @@ COMMENT=	Converts HTML to PDF and/or Pos
 LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg	\
 		png15:${PORTSDIR}/graphics/png
 
-OPTIONS=	HTMLDOCGUI "Build GUI front-end" off
+OPTIONS_DEFINE=	HTMLDOCGUI
+HTMLDOCGUI_DESC=	Build GUI front-end
 # .bz2 file is available since Aug 2, but we don't want to
 # start mirroring _in addition to_ the .gz variant. When the
 # vendor's release is updated again, we should switch to .bz2
@@ -47,8 +44,9 @@ post-configure:
 	    's|../png/libpng.a ../zlib/libz.a ../jpeg/libjpeg.a|-ljpeg -lpng -lz|' ${WRKSRC}/Makedefs
 
 .include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_HTMLDOCGUI)
+.if ${PORT_OPTIONS:MHTMLDOCGUI}
 LIB_DEPENDS+=	fltk:${PORTSDIR}/x11-toolkits/fltk
 CONFIGURE_ARGS+=--with-gui=yes
 .else