Date: Thu, 20 Feb 2014 10:34:08 +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: r345210 - head/lang/metaocaml Message-ID: <201402201034.s1KAY8V2095612@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402201034.s1KAY8V2095612>