From owner-svn-ports-head@FreeBSD.ORG  Wed Jan 29 14:33:32 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 107FEA63;
 Wed, 29 Jan 2014 14:33:32 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id F113D1FBE;
 Wed, 29 Jan 2014 14:33:31 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0TEXVrb089099;
 Wed, 29 Jan 2014 14:33:31 GMT (envelope-from gahr@svn.freebsd.org)
Received: (from gahr@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0TEXVoO089097;
 Wed, 29 Jan 2014 14:33:31 GMT (envelope-from gahr@svn.freebsd.org)
Message-Id: <201401291433.s0TEXVoO089097@svn.freebsd.org>
From: Pietro Cerutti <gahr@FreeBSD.org>
Date: Wed, 29 Jan 2014 14:33:31 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r341740 - head/databases/metakit
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.17
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/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: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Jan 2014 14:33:32 -0000

Author: gahr
Date: Wed Jan 29 14:33:31 2014
New Revision: 341740
URL: http://svnweb.freebsd.org/changeset/ports/341740
QAT: https://qat.redports.org/buildarchive/r341740/

Log:
  - Convert to USES=tcl

Modified:
  head/databases/metakit/Makefile

Modified: head/databases/metakit/Makefile
==============================================================================
--- head/databases/metakit/Makefile	Wed Jan 29 14:19:31 2014	(r341739)
+++ head/databases/metakit/Makefile	Wed Jan 29 14:33:31 2014	(r341740)
@@ -34,13 +34,10 @@ PLIST_SUB+=	WITH_PYTHON="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MTCL}
+USES+=		tcl:84
 CATEGORIES+=	tcl
-USE_TCL=	84+
-.endif
-
-.if defined(USE_TCL)
-CONFIGURE_ARGS+=	--with-tcl=${TCL_INCLUDEDIR}
-CONFIGURE_ENV+=		TCL_LIBDIR=${TCL_LIBDIR}
+CONFIGURE_ARGS+=--with-tcl=${TCL_INCLUDEDIR}
+CONFIGURE_ENV+=	TCL_LIBDIR=${TCL_LIBDIR}
 PLIST_SUB+=	TCL_V="${TCL_VER}"
 PLIST_SUB+=	WITH_TCL=""
 .else
@@ -49,14 +46,10 @@ PLIST_SUB+=	WITH_TCL="@comment "
 
 pre-patch:
 	${REINPLACE_CMD} -e "s=doc/==" ${WRKSRC}/../Metakit.html
-.if defined(USE_TCL)
-	${REINPLACE_CMD} -e "s/= tclsh/=tclsh${TCL_VER}/" \
+	${REINPLACE_CMD} -e "s|= tclsh|=${TCLSH}|" \
 		${WRKSRC}/../unix/Makefile.in
-.endif
-.if ${PORT_OPTIONS:MPYTHON}
 	${REINPLACE_CMD} -e "s=python2.[0-9]=${PYTHON_VERSION}=" \
 		${WRKSRC}/../unix/Makefile.in ${WRKSRC}/../unix/configure
-.endif
 
 post-build:
 .if ${PORT_OPTIONS:MPYTHON}
@@ -82,7 +75,7 @@ post-install:
 test:
 	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} test)
-.if defined(USE_TCL)
+.if ${PORT_OPTIONS:MTCL}
 	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} test-tcl)
 .endif