From owner-svn-ports-head@FreeBSD.ORG  Fri Aug  3 09:20:40 2012
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 4191F106567C;
	Fri,  3 Aug 2012 09:20:40 +0000 (UTC) (envelope-from mm@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 130BE8FC19;
	Fri,  3 Aug 2012 09:20:40 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q739KdlK094252;
	Fri, 3 Aug 2012 09:20:39 GMT (envelope-from mm@svn.freebsd.org)
Received: (from mm@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q739Kdcj094250;
	Fri, 3 Aug 2012 09:20:39 GMT (envelope-from mm@svn.freebsd.org)
Message-Id: <201208030920.q739Kdcj094250@svn.freebsd.org>
From: Martin Matuska <mm@FreeBSD.org>
Date: Fri, 3 Aug 2012 09:20:39 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r301944 - head/x11-toolkits/tk85
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Fri, 03 Aug 2012 09:20:40 -0000

Author: mm
Date: Fri Aug  3 09:20:39 2012
New Revision: 301944
URL: http://svn.freebsd.org/changeset/ports/301944

Log:
  Fix OPTIONS knobs to match new options framework

Modified:
  head/x11-toolkits/tk85/Makefile

Modified: head/x11-toolkits/tk85/Makefile
==============================================================================
--- head/x11-toolkits/tk85/Makefile	Fri Aug  3 09:17:41 2012	(r301943)
+++ head/x11-toolkits/tk85/Makefile	Fri Aug  3 09:20:39 2012	(r301944)
@@ -57,14 +57,14 @@ SUB_LIST+=	THREADS_SUFFIX="${THREADS_SUF
 
 DATADIR=	${PREFIX}/share/${PORTNAME}${TCL_VER}
 
-.if !defined(WITHOUT_XFT)
+.if ${PORT_OPTIONS:MXFT}
 CONFIGURE_ARGS+=	--enable-xft
 LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/libXft
 .else
 CONFIGURE_ARGS+=	--disable-xft
 .endif
 
-.if !defined(NO_INSTALL_MANPAGES)
+.if ${PORT_OPTIONS:MDOCS}
 MAN1=	wish${TCL_VER}${THREADS_SUFFIX}.1
 .endif
 
@@ -80,14 +80,14 @@ CONFIGURE_ARGS+=	--disable-threads --wit
 
 SUB_LIST+=		TK_PROVIDE=""
 
-.if defined(WITH_DEMOS)
+.if ${PORT_OPTIONS:MDEMOS}
 INSTALL_TARGET+=	install install-demos
 PLIST_SUB+=	DEMOS=""
 .else
 PLIST_SUB+=	DEMOS="@comment "
 .endif
 
-.if !defined(NO_INSTALL_MANPAGES) && defined(WITH_TK85_MAN)
+.if ${PORT_OPTIONS:MDOCS} && ${PORT_OPTIONS:MTK85_MAN}
 
 MAN3=	3DBorder.3 AddOption.3 BindTable.3 CanvPsY.3 CanvTkwin.3 \
 	CanvTxtInfo.3 Clipboard.3 ClrSelect.3 ConfigWidg.3 ConfigWind.3 \
@@ -403,7 +403,7 @@ MLINKS=	3DBorder.3 Tk_Alloc3DBorderFromO
 	text.n tk_textCut.n \
 	text.n tk_textPaste.n
 
-.endif	#!defined(NO_INSTALL_MANPAGES) && defined(WITH_TK85_MAN)
+.endif	# ${PORT_OPTIONS:MDOCS} && ${PORT_OPTIONS:MTK85_MAN}
 
 .endif	# defined(BUILDING_TK_THREADS)
 
@@ -453,18 +453,18 @@ post-install:
 	${INSTALL_DATA} ${WRKDIR}/pkgIndex.tcl ${PREFIX}/lib/tk${TK_VER}${THREADS_SUFFIX}/
 	${MKDIR} ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/../doc/man.macros ${DATADIR}
-.if !defined(NO_INSTALL_MANPAGES)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${MANPREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/../doc/wish.1 ${MANPREFIX}/man/man1/wish${TCL_VER}${THREADS_SUFFIX}.1
-.if !defined(BUILDING_TK_THREADS) && defined(WITH_TK85_MAN)
+.if !defined(BUILDING_TK_THREADS) && ${PORT_OPTIONS:MTK85_MAN}
 . for mp in ${MAN3} ${MANN}
 	@${REINPLACE_CMD} -e 's|^.so man.macros|.so ${DATADIR}/man.macros|'	\
 		${WRKSRC}/../doc/${mp}
 . endfor
 	@cd ${WRKSRC} && ${MAKE} -f Makefile install-doc ${MAKE_ENV}
-.endif # !defined(BUILDING_TK_THREADS) && defined(WITH_TK85_MAN)
+.endif # !defined(BUILDING_TK_THREADS) && ${PORT_OPTIONS:MTK85_MAN}
 
-.endif # !defined(NO_INSTALL_MANPAGES)
+.endif # ${PORT_OPTIONS:MDOCS}
 
 regression-test:	build
 	cd ${WRKSRC}; ${MAKE} test