From owner-svn-ports-head@FreeBSD.ORG  Thu Feb 20 10:34:08 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 8AA8DD3E;
 Thu, 20 Feb 2014 10:34:08 +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 76ADF1E4F;
 Thu, 20 Feb 2014 10:34:08 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1KAY8j7095614;
 Thu, 20 Feb 2014 10:34:08 GMT (envelope-from gahr@svn.freebsd.org)
Received: (from gahr@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1KAY8V2095612;
 Thu, 20 Feb 2014 10:34:08 GMT (envelope-from gahr@svn.freebsd.org)
Message-Id: <201402201034.s1KAY8V2095612@svn.freebsd.org>
From: Pietro Cerutti <gahr@FreeBSD.org>
Date: Thu, 20 Feb 2014 10:34:08 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r345210 - head/lang/metaocaml
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: Thu, 20 Feb 2014 10:34:08 -0000

Author: gahr
Date: Thu Feb 20 10:34:07 2014
New Revision: 345210
URL: http://svnweb.freebsd.org/changeset/ports/345210
QAT: https://qat.redports.org/buildarchive/r345210/

Log:
  - Convert to USES=tk
  - Fix typo OPTION name

Modified:
  head/lang/metaocaml/Makefile

Modified: head/lang/metaocaml/Makefile
==============================================================================
--- head/lang/metaocaml/Makefile	Thu Feb 20 10:26:22 2014	(r345209)
+++ head/lang/metaocaml/Makefile	Thu Feb 20 10:34:07 2014	(r345210)
@@ -21,7 +21,7 @@ CONFIGURE_ARGS=	-prefix ${PREFIX} -cc "$
 		-bindir ${PREFIX}/lib/metaocaml/bin \
 		-mandir ${DATADIR}/man
 
-USE_GMAKE=	yes
+USES=		gmake
 ALL_TARGET=	world opt metaocamlopt opt.opt
 STRIP=
 
@@ -56,8 +56,8 @@ MLINKS=		ocamlc.1 ocamlc.opt.1 ocamlopt.
 		camlp4.1 camlp4o.opt.1 camlp4.1 camlp4r.opt.1 \
 		camlp4.1 ocpp.1
 
-OPTIONS_DEFINE=	X11 LABELTK
-OPTIONS_DEFAULT=	X11 LABELTK
+OPTIONS_DEFINE=	X11 LABLTK
+OPTIONS_DEFAULT=	X11 LABLTK
 LABLTK_DESC=	build the LablTk library
 
 PLISTDIR=	${PREFIX}/lib/metaocaml \
@@ -80,11 +80,9 @@ PLIST_SUB+=	X11=""
 PLIST_SUB+=	X11="@comment "
 .endif
 
-# We would like to use bsd.tcl.mk here, but we can't USE_TCL after including
-# bsd.port.pre.mk and we can't test WITH_LABLTK before including bsd.port.pre.mk
 .if ${PORT_OPTIONS:MLABLTK}
-LIB_DEPENDS+=	tk84.1:${PORTSDIR}/x11-toolkits/tk84
-CONFIGURE_ARGS+=-tkdefs "-I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include/tk8.4"
+USES+=		tk
+CONFIGURE_ARGS+=-tkdefs "-I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR}"
 CONFIGURE_ARGS+=-tklibs "-L${LOCALBASE}/lib"
 PLIST_SUB+=	LABLTK=""
 .if ! ${PORT_OPTIONS:MX11}