From owner-svn-ports-head@FreeBSD.ORG  Wed Feb 19 16:30:02 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 22410D8;
 Wed, 19 Feb 2014 16:30:02 +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 0DEE518BB;
 Wed, 19 Feb 2014 16:30:02 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1JGU1Aj052601;
 Wed, 19 Feb 2014 16:30:01 GMT (envelope-from gahr@svn.freebsd.org)
Received: (from gahr@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1JGU1f9052599;
 Wed, 19 Feb 2014 16:30:01 GMT (envelope-from gahr@svn.freebsd.org)
Message-Id: <201402191630.s1JGU1f9052599@svn.freebsd.org>
From: Pietro Cerutti <gahr@FreeBSD.org>
Date: Wed, 19 Feb 2014 16:30:01 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r345110 - head/graphics/ocaml-lablgl
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, 19 Feb 2014 16:30:02 -0000

Author: gahr
Date: Wed Feb 19 16:30:01 2014
New Revision: 345110
URL: http://svnweb.freebsd.org/changeset/ports/345110
QAT: https://qat.redports.org/buildarchive/r345110/

Log:
  - Convert to USES=gmake tk
  - Fix LICENSE

Modified:
  head/graphics/ocaml-lablgl/Makefile

Modified: head/graphics/ocaml-lablgl/Makefile
==============================================================================
--- head/graphics/ocaml-lablgl/Makefile	Wed Feb 19 16:20:49 2014	(r345109)
+++ head/graphics/ocaml-lablgl/Makefile	Wed Feb 19 16:30:01 2014	(r345110)
@@ -12,12 +12,12 @@ PKGNAMEPREFIX=	ocaml-
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	OpenGL interface for Objective Caml
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
 WRKSRC=		${WRKDIR}/lablGL
+USES=		gmake
 USE_XORG=	x11 xext xmu
 USE_GL=		glut
-USE_GMAKE=	yes
 USE_OCAML=	yes
 USE_OCAML_WASH=	yes
 ALL_TARGET=	all opt
@@ -38,13 +38,11 @@ CONFLICTS=	ocaml-notk-[0-9]* ocaml-nox11
 NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
-USE_TK=		84+
-INVALID_TK_VER =	86
+USES+=		tk:84,85
 .if ${PORT_OPTIONS:MTHREADS}
 THR_CPP=	${PTHREAD_CFLAGS}
 THR_LD =	${PTHREAD_LIBS}
 .endif
-.include "${PORTSDIR}/Mk/bsd.tcl.mk"
 
 post-extract:
 	@${CP} ${WRKSRC}/Makefile.config.freebsd ${WRKSRC}/Makefile.config
@@ -58,7 +56,7 @@ post-patch:
 		-e "s,^#\(DLLDIR[ \t]*=\).*,\1${PREFIX}/lib/ocaml/stublibs,g" \
 		-e "/^TKINCLUDES/s,=.*$$,= -I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR}," \
 		-e "/^TKLIBS/s,=.*$$,= -L${LOCALBASE}/lib -ltk${TK_VER:S/.//}\
-		-ltcl${TCL_VER:S/.//} ${THR_LD}," \
+		-ltcl${TCL_SHLIB_VER} ${THR_LD}," \
 		${WRKSRC}/Makefile.config
 
 	@${REINPLACE_CMD} \