Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 21 Aug 2015 16:00:11 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r394971 - head/textproc/catdoc
Message-ID:  <201508211600.t7LG0BXN050377@repo.freebsd.org>

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



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