From owner-svn-ports-head@freebsd.org  Fri Aug 21 16:00:11 2015
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 910189BF3F3;
 Fri, 21 Aug 2015 16:00:11 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 76A1712DD;
 Fri, 21 Aug 2015 16:00:11 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7LG0BmC050379;
 Fri, 21 Aug 2015 16:00:11 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7LG0BXN050377;
 Fri, 21 Aug 2015 16:00:11 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201508211600.t7LG0BXN050377@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to
 amdmi3@FreeBSD.org using -f
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Fri, 21 Aug 2015 16:00:11 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r394971 - 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-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 21 Aug 2015 16:00:11 -0000

Author: amdmi3
Date: Fri Aug 21 16:00:10 2015
New Revision: 394971
URL: https://svnweb.freebsd.org/changeset/ports/394971

Log:
  - Switch to options helpers

Modified:
  head/textproc/catdoc/Makefile

Modified: head/textproc/catdoc/Makefile
==============================================================================
--- head/textproc/catdoc/Makefile	Fri Aug 21 16:00:04 2015	(r394970)
+++ head/textproc/catdoc/Makefile	Fri Aug 21 16:00:10 2015	(r394971)
@@ -25,20 +25,15 @@ OPTIONS_SUB=	yes
 
 WORDVIEW_DESC=	Build Tcl/Tk document viewer
 
+WORDVIEW_USES=	tk
+WORDVIEW_CONFIGURE_ON=	--with-wish=${WISH}
+WORDVIEW_CONFIGURE_OFF=	--disable-wordview
+
 .if !defined(LANG) || ${LANG} != ru_RU.KOI8-R
 # Remove the below line to get Cyrillic code page support instead
 CFLAGS+=	-DLATIN1=1
 .endif
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MWORDVIEW}
-USES+=			tk
-CONFIGURE_ARGS+=	--with-wish=${WISH}
-.else
-CONFIGURE_ARGS+=	--disable-wordview
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' ${WRKSRC}/doc/catdoc.1.in