From owner-svn-ports-all@FreeBSD.ORG  Thu Mar 21 00:01:45 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 2F662E5F;
 Thu, 21 Mar 2013 00:01:45 +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 204C6BE5;
 Thu, 21 Mar 2013 00:01:45 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2L01jhj038564;
 Thu, 21 Mar 2013 00:01:45 GMT (envelope-from jgh@svn.freebsd.org)
Received: (from jgh@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2L01icj038563;
 Thu, 21 Mar 2013 00:01:44 GMT (envelope-from jgh@svn.freebsd.org)
Message-Id: <201303210001.r2L01icj038563@svn.freebsd.org>
From: Jason Helfman <jgh@FreeBSD.org>
Date: Thu, 21 Mar 2013 00:01:44 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r314779 - head/textproc/catdoc
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: Thu, 21 Mar 2013 00:01:45 -0000

Author: jgh
Date: Thu Mar 21 00:01:44 2013
New Revision: 314779
URL: http://svnweb.freebsd.org/changeset/ports/314779

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

Modified:
  head/textproc/catdoc/Makefile

Modified: head/textproc/catdoc/Makefile
==============================================================================
--- head/textproc/catdoc/Makefile	Wed Mar 20 23:56:59 2013	(r314778)
+++ head/textproc/catdoc/Makefile	Thu Mar 21 00:01:44 2013	(r314779)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	catdoc
-# Date created:				11 November 1997
-# Whom:					Brion Moss <brion@queeg.com>
-#
+# Created by: Brion Moss <brion@queeg.com>
 # $FreeBSD$
-#
 
 PORTNAME=	catdoc
 PORTVERSION=	0.94.2
@@ -21,7 +17,9 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 MAN1=		catdoc.1 xls2csv.1 catppt.1
 
-OPTIONS=	WORDVIEW	"Build Tcl/Tk document viewer" On
+OPTIONS_DEFINE=	WORDVIEW
+WORDVIEW_DESC=	Build Tcl/Tk document viewer
+OPTIONS_DEFAULT=	WORDVIEW
 
 .if !defined(LANG) || ${LANG} != ru_RU.KOI8-R
 # Remove the below line to get Cyrillic code page support instead
@@ -32,8 +30,9 @@ post-patch:
 	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' ${WRKSRC}/doc/catdoc.1.in
 
 .include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_WORDVIEW)
+.if ${PORT_OPTIONS:MWORDVIEW}
 USE_TK=			83+
 .include "${PORTSDIR}/Mk/bsd.tcl.mk"
 CONFIGURE_ARGS+=	--with-wish=${WISH}