Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 19 Feb 2014 16:30:01 +0000 (UTC)
From:      Pietro Cerutti <gahr@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r345110 - head/graphics/ocaml-lablgl
Message-ID:  <201402191630.s1JGU1f9052599@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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} \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402191630.s1JGU1f9052599>