From owner-svn-ports-all@FreeBSD.ORG  Wed Feb 19 16:15:23 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@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 AEE92A38;
 Wed, 19 Feb 2014 16:15:23 +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 9B102177D;
 Wed, 19 Feb 2014 16:15:23 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1JGFN3a043581;
 Wed, 19 Feb 2014 16:15:23 GMT (envelope-from gahr@svn.freebsd.org)
Received: (from gahr@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1JGFNLl043580;
 Wed, 19 Feb 2014 16:15:23 GMT (envelope-from gahr@svn.freebsd.org)
Message-Id: <201402191615.s1JGFNLl043580@svn.freebsd.org>
From: Pietro Cerutti <gahr@FreeBSD.org>
Date: Wed, 19 Feb 2014 16:15:23 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r345108 - head/lang/ocaml
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.17
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: Wed, 19 Feb 2014 16:15:23 -0000

Author: gahr
Date: Wed Feb 19 16:15:23 2014
New Revision: 345108
URL: http://svnweb.freebsd.org/changeset/ports/345108
QAT: https://qat.redports.org/buildarchive/r345108/

Log:
  - Convert to USES=tk

Modified:
  head/lang/ocaml/Makefile

Modified: head/lang/ocaml/Makefile
==============================================================================
--- head/lang/ocaml/Makefile	Wed Feb 19 16:06:32 2014	(r345107)
+++ head/lang/ocaml/Makefile	Wed Feb 19 16:15:23 2014	(r345108)
@@ -35,19 +35,8 @@ MODOPT=		camlp4o camlp4r ocamlc ocamldep
 PATTERN=	[[:space:]]*(do|then)?[[:space:]]*)(\$$\(CP\)|cp)([[:space:]]
 
 NO_STAGE=	yes
-.include <bsd.port.pre.mk>
 
-.if ${ARCH} == powerpc
-ARCH=	power
-.endif
-
-.if ${ARCH} == power
-PLIST_SUB+=	PROF="@comment "
-.else
-PLIST_SUB+=	PROF=""
-.endif
-
-.include "${FILESDIR}/manfiles"
+.include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MTHREADS}
 PLIST_SUB+=	THREADS=""
@@ -80,15 +69,28 @@ CONFLICTS+=	ocaml-[0-9]* ocaml-nox11-[0-
 .endif
 CONFIGURE_ARGS+=-no-tk
 .else
-USE_TK=		84+
-INVALID_TK_VER =	86
+USES+=		tk:84,85
 .include "${PORTSDIR}/Mk/bsd.tcl.mk"
 PLIST_SUB+=	TK=""
 CONFLICTS+=	ocaml-nox11-[0-9]* ocaml-notk-[0-9]*
 CONFIGURE_ARGS+=	-tkdefs \
 			"-I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR} ${THR_CPP}" \
-			-tklibs "-L${LOCALBASE}/lib -ltk${TK_VER:S|.||} \
-			-ltcl${TCL_VER:S|.||} ${THR_LD}"
+			-tklibs "-L${LOCALBASE}/lib -ltk${TK_SHLIB_VER} \
+			-ltcl${TCL_SHLIB_VER} ${THR_LD}"
+.endif
+
+.include <bsd.port.pre.mk>
+
+.include "${FILESDIR}/manfiles"
+
+.if ${ARCH} == powerpc
+ARCH=	power
+.endif
+
+.if ${ARCH} == power
+PLIST_SUB+=	PROF="@comment "
+.else
+PLIST_SUB+=	PROF=""
 .endif
 
 .if ${ARCH} == sparc64