From owner-svn-ports-all@FreeBSD.ORG  Fri Oct 12 16:50:41 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 6E042D43;
 Fri, 12 Oct 2012 16:50:41 +0000 (UTC) (envelope-from wxs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id 576728FC12;
 Fri, 12 Oct 2012 16:50:41 +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 q9CGofKk039965;
 Fri, 12 Oct 2012 16:50:41 GMT (envelope-from wxs@svn.freebsd.org)
Received: (from wxs@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9CGofto039963;
 Fri, 12 Oct 2012 16:50:41 GMT (envelope-from wxs@svn.freebsd.org)
Message-Id: <201210121650.q9CGofto039963@svn.freebsd.org>
From: Wesley Shields <wxs@FreeBSD.org>
Date: Fri, 12 Oct 2012 16:50:41 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r305786 - head/lang/tcl84
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: Fri, 12 Oct 2012 16:50:41 -0000

Author: wxs
Date: Fri Oct 12 16:50:40 2012
New Revision: 305786
URL: http://svn.freebsd.org/changeset/ports/305786

Log:
  Convert to new options.
  
  PR:		ports/172419
  Submitted by:	Chris Petrik <c.petrik.sosa@gmail.com> (maintainer)
  Feature safe:	yes

Modified:
  head/lang/tcl84/Makefile   (contents, props changed)

Modified: head/lang/tcl84/Makefile
==============================================================================
--- head/lang/tcl84/Makefile	Fri Oct 12 16:39:23 2012	(r305785)
+++ head/lang/tcl84/Makefile	Fri Oct 12 16:50:40 2012	(r305786)
@@ -31,7 +31,8 @@ PLIST_SUB=	TCL_VER="${TCL_VER}" SHORT_TC
 EXTRACT_AFTER_ARGS=|${TAR} -xpf - --exclude compat/
 
 .if !defined(BUILDING_TCL_THREADS)
-OPTIONS=	TCL84_MAN "Install tcl 8.4 function manpages" off
+OPTIONS_DEFINE=	TCL84_MAN
+TCL84_MAN_DESC=	Install tcl 8.4 function manpages
 .else
 USE_TCL=	${SHORT_TCL_VER}
 PLIST=		${PKGDIR}/pkg-plist.threads
@@ -53,7 +54,7 @@ CONFIGURE_ENV+=		PTHREAD_LIBS="${PTHREAD
 .else
 CONFIGURE_ARGS+=	--disable-threads
 
-.if !defined(NO_INSTALL_MANPAGES) && defined(WITH_TCL84_MAN)
+.if !defined(NO_INSTALL_MANPAGES) && ${PORT_OPTIONS:MTCL84_MAN}
 
 MAN3=	Access.3 AddErrInfo.3 Alloc.3 AllowExc.3 AppInit.3 AssocData.3 \
 	Async.3 BackgdErr.3 Backslash.3 BoolObj.3 ByteArrObj.3 CallDel.3 \
@@ -661,14 +662,14 @@ post-install:
 .if !defined(NO_INSTALL_MANPAGES)
 	${MKDIR} ${MANPREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/../doc/tclsh.1 ${MANPREFIX}/man/man1/tclsh${TCL_VER}${THREADS_SUFFIX}.1
-.if !defined(BUILDING_TCL_THREADS) && defined(WITH_TCL84_MAN)
+.if !defined(BUILDING_TCL_THREADS) && ${PORT_OPTIONS:MTCL84_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_TCL_THREADS) && defined(WITH_TCL84_MAN)
+.endif # !defined(BUILDING_TCL_THREADS) && ${PORT_OPTIONS:MTCL84_MAN}
 
 .endif # !defined(NO_INSTALL_MANPAGES)