From 2f226363aaee9a3a83820174e0ad3eb501aa6c3a Mon Sep 17 00:00:00 2001 From: tron Date: Tue, 24 Jun 2003 14:09:53 +0000 Subject: Fix package list for system where "ocaml" with compiled with threading support. Bump package revision to reflect change. --- x11/lablgtk/Makefile | 11 ++++++++--- x11/lablgtk/PLIST | 4 +++- x11/lablgtk/PLIST.noopt | 4 +++- 3 files changed, 14 insertions(+), 5 deletions(-) (limited to 'x11') diff --git a/x11/lablgtk/Makefile b/x11/lablgtk/Makefile index 0ad96c9240a..2a2d4d7ddcf 100644 --- a/x11/lablgtk/Makefile +++ b/x11/lablgtk/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.5 2003/05/02 11:57:27 wiz Exp $ -# +# $NetBSD: Makefile,v 1.6 2003/06/24 14:09:53 tron Exp $ DISTNAME= lablgtk-1.2.5 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= x11 MASTER_SITES= http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/ @@ -24,6 +23,12 @@ MAKE_ENV+= CAMLOPT=${CAMLOPT} PLIST_SRC= ${PKGDIR}/PLIST.noopt .endif +.if exists(${LOCALBASE}/lib/ocaml/libthreadsnat.a) +PLIST_SUBST+= NATIVE_THREADS= +.else +PLIST_SUBST+= NATIVE_THREADS="@comment " +.endif + do-configure: cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} \ configure USE_DOTOPT=${USE_DOTOPT} USE_CC=1 CC=${CC} diff --git a/x11/lablgtk/PLIST b/x11/lablgtk/PLIST index 2d9d417f5f5..64fd5c55ced 100644 --- a/x11/lablgtk/PLIST +++ b/x11/lablgtk/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2002/10/16 17:24:46 dillo Exp $ +@comment $NetBSD: PLIST,v 1.3 2003/06/24 14:09:53 tron Exp $ bin/lablgtk lib/ocaml/lablgtk/gBin.cmi lib/ocaml/lablgtk/gBin.cmx @@ -149,8 +149,10 @@ lib/ocaml/lablgtk/gtkThInit.cmo lib/ocaml/lablgtk/gtkThInit.ml lib/ocaml/lablgtk/gtkThread.cmi lib/ocaml/lablgtk/gtkThread.cmo +${NATIVE_THREADS}lib/ocaml/lablgtk/gtkThread.cmx lib/ocaml/lablgtk/gtkThread.ml lib/ocaml/lablgtk/gtkThread.mli +${NATIVE_THREADS}lib/ocaml/lablgtk/gtkThread.o lib/ocaml/lablgtk/gtkTree.cmi lib/ocaml/lablgtk/gtkTree.cmx lib/ocaml/lablgtk/gtkTree.ml diff --git a/x11/lablgtk/PLIST.noopt b/x11/lablgtk/PLIST.noopt index 2d68725962f..52d0795d861 100644 --- a/x11/lablgtk/PLIST.noopt +++ b/x11/lablgtk/PLIST.noopt @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.noopt,v 1.1 2003/03/17 11:56:22 dmcmahill Exp $ +@comment $NetBSD: PLIST.noopt,v 1.2 2003/06/24 14:09:53 tron Exp $ bin/lablgtk lib/ocaml/lablgtk/gBin.cmi lib/ocaml/lablgtk/gBin.ml @@ -109,8 +109,10 @@ lib/ocaml/lablgtk/gtkThInit.cmo lib/ocaml/lablgtk/gtkThInit.ml lib/ocaml/lablgtk/gtkThread.cmi lib/ocaml/lablgtk/gtkThread.cmo +${NATIVE_THREADS}lib/ocaml/lablgtk/gtkThread.cmx lib/ocaml/lablgtk/gtkThread.ml lib/ocaml/lablgtk/gtkThread.mli +${NATIVE_THREADS}lib/ocaml/lablgtk/gtkThread.o lib/ocaml/lablgtk/gtkTree.cmi lib/ocaml/lablgtk/gtkTree.ml lib/ocaml/lablgtk/gtkWindow.cmi -- cgit v1.2.3