pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/x11/lablgtk Fix some issues:



details:   https://anonhg.NetBSD.org/pkgsrc/rev/e4a1317a7a4d
branches:  trunk
changeset: 473641:e4a1317a7a4d
user:      tron <tron%pkgsrc.org@localhost>
date:      Thu Apr 22 09:20:31 2004 +0000

description:
Fix some issues:
- add a full dependence on the "ocaml" package because this packages shares
  its directory structure
- remove support for handling "ocaml" package without threading support,
  because it is no longer necessary
Bump package revision because of these changes.

diffstat:

 x11/lablgtk/Makefile |  11 ++++-------
 x11/lablgtk/PLIST    |   6 +++---
 2 files changed, 7 insertions(+), 10 deletions(-)

diffs (56 lines):

diff -r f6a44fd9da34 -r e4a1317a7a4d x11/lablgtk/Makefile
--- a/x11/lablgtk/Makefile      Thu Apr 22 09:18:34 2004 +0000
+++ b/x11/lablgtk/Makefile      Thu Apr 22 09:20:31 2004 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2004/03/04 16:13:35 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2004/04/22 09:20:31 tron Exp $
 
 DISTNAME=      lablgtk-1.2.6
+PKGREVISION=   1
 CATEGORIES=    x11
 MASTER_SITES=  http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/
 
@@ -11,6 +12,8 @@
 USE_BUILDLINK3=        YES
 USE_GNU_TOOLS+=        make
 
+BUILDLINK_DEPMETHOD.ocaml=     full
+
 .include "../../mk/bsd.prefs.mk"
 
 # currently ocamlopt is only available on i386
@@ -22,12 +25,6 @@
 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 -r f6a44fd9da34 -r e4a1317a7a4d x11/lablgtk/PLIST
--- a/x11/lablgtk/PLIST Thu Apr 22 09:18:34 2004 +0000
+++ b/x11/lablgtk/PLIST Thu Apr 22 09:20:31 2004 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2003/06/24 14:09:53 tron Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/04/22 09:20:31 tron Exp $
 bin/lablgtk
 lib/ocaml/lablgtk/gBin.cmi
 lib/ocaml/lablgtk/gBin.cmx
@@ -149,10 +149,10 @@
 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.cmx
 lib/ocaml/lablgtk/gtkThread.ml
 lib/ocaml/lablgtk/gtkThread.mli
-${NATIVE_THREADS}lib/ocaml/lablgtk/gtkThread.o
+lib/ocaml/lablgtk/gtkThread.o
 lib/ocaml/lablgtk/gtkTree.cmi
 lib/ocaml/lablgtk/gtkTree.cmx
 lib/ocaml/lablgtk/gtkTree.ml



Home | Main Index | Thread Index | Old Index