CVS commit: pkgsrc/x11/lablgtk1

["David A. Holland" <dholland%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   dholland
Date:           Sun Sep 10 01:59:12 UTC 2017

Modified Files:
        pkgsrc/x11/lablgtk1: distinfo
        pkgsrc/x11/lablgtk1/patches: patch-aa

Log Message:
In ocaml-land, linking with the same library twice causes the roof of the
dungeon to fall in. So avoid doing that.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/x11/lablgtk1/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/lablgtk1/patches/patch-aa

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/lablgtk1/distinfo
diff -u pkgsrc/x11/lablgtk1/distinfo:1.5 pkgsrc/x11/lablgtk1/distinfo:1.6
--- pkgsrc/x11/lablgtk1/distinfo:1.5    Wed Nov  4 03:28:44 2015
+++ pkgsrc/x11/lablgtk1/distinfo        Sun Sep 10 01:59:12 2017
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2015/11/04 03:28:44 agc Exp $
+$NetBSD: distinfo,v 1.6 2017/09/10 01:59:12 dholland Exp $
 
 SHA1 (lablgtk-1.2.7.tar.gz) = fe43512efdc7ab4e0dafb7dc8254a784857a1ade
 RMD160 (lablgtk-1.2.7.tar.gz) = 27be7ff29fe4370bc9a1bbef8c0fa0db590f27c4
 SHA512 (lablgtk-1.2.7.tar.gz) = ba35d3034836bd016b17835120aeb5bca9030e7fae0a76f1425d7ffda7118f9627aa24d95c2644f66ddc55d7dd72ee36c9db9ad69df01e29f62af244cb8643df
 Size (lablgtk-1.2.7.tar.gz) = 468443 bytes
-SHA1 (patch-aa) = 409f983195d41d4712688a0c03b693f0a9641096
+SHA1 (patch-aa) = 54b570d7fee4b5808cd669a9a45e79c9230ee6d8
 SHA1 (patch-src_gList.ml) = 38e37e3b8b5279eaa627299cbc9b9c552c1e5a89

Index: pkgsrc/x11/lablgtk1/patches/patch-aa
diff -u pkgsrc/x11/lablgtk1/patches/patch-aa:1.3 pkgsrc/x11/lablgtk1/patches/patch-aa:1.4
--- pkgsrc/x11/lablgtk1/patches/patch-aa:1.3    Sat Apr  9 08:58:51 2011
+++ pkgsrc/x11/lablgtk1/patches/patch-aa        Sun Sep 10 01:59:12 2017
@@ -1,8 +1,12 @@
-$NetBSD: patch-aa,v 1.3 2011/04/09 08:58:51 obache Exp $
+$NetBSD: patch-aa,v 1.4 2017/09/10 01:59:12 dholland Exp $
 
---- src/Makefile.orig  2003-05-15 16:17:53.000000000 +0200
+- build with PIC
+- don't link with unix.cma twice; it doesn't work
+- DESTDIR support
+
+--- src/Makefile.orig  2003-05-15 14:17:53.000000000 +0000
 +++ src/Makefile
-@@ -38,7 +38,7 @@ CFLAGS = -g $(GTKCFLAGS)
+@@ -38,11 +38,12 @@ CFLAGS = -g $(GTKCFLAGS)
  MLLINK += -cclib -lcamlrund
  MLFLAGS = -g
  else
@@ -11,7 +15,22 @@ $NetBSD: patch-aa,v 1.3 2011/04/09 08:58
  endif
  
  THFLAGS = -thread
-@@ -137,32 +137,39 @@ testcc: lablgladecc lablgtktop
+-THLINK = unix.cma threads.cma
++#THLINK = unix.cma threads.cma $(MLLINK)  # duplicates unix.cma and fails
++THLINK = unix.cma threads.cma str.cma
+ 
+ ifdef USE_CC
+ CCOMPILER = $(CC) -c -I$(LIBDIR) $(CFLAGS)
+@@ -115,7 +116,7 @@ lablgtktop: $(MLLIBS) $(INITOBJS)
+       $(TOPLEVEL) -o $@ $(MLLINK) -I . $(MLLIBS) $(INITOBJS)
+ 
+ lablgtktop_t: $(MLLIBS) $(THOBJS) $(INITOBJS) $(THINITOBJS)
+-      $(TOPLEVEL) $(THFLAGS) -o $@ $(THLINK) $(MLLINK) \
++      $(TOPLEVEL) $(THFLAGS) -o $@ $(THLINK) \
+          -I . $(MLLIBS) $(THOBJS) $(INITOBJS) $(THINITOBJS)
+ 
+ lablgtk: Makefile $(CONFIG) lablgtk.in
+@@ -137,32 +138,39 @@ testcc: lablgladecc lablgtktop
        rm -f testcc.ml
  
  install: