CVS commit: pkgsrc/x11/ocaml-lablgtk

["Jaap Boender" <jaapb%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jaapb
Date:           Thu Jul 13 11:53:16 UTC 2017

Modified Files:
        pkgsrc/x11/ocaml-lablgtk: Makefile distinfo
        pkgsrc/x11/ocaml-lablgtk/patches: patch-src_Makefile
Added Files:
        pkgsrc/x11/ocaml-lablgtk/patches: patch-configure

Log Message:
Updated package to deal with changes to ocamlfind wrapper


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 pkgsrc/x11/ocaml-lablgtk/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/x11/ocaml-lablgtk/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/ocaml-lablgtk/patches/patch-configure
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/ocaml-lablgtk/patches/patch-src_Makefile

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

Modified files:

Index: pkgsrc/x11/ocaml-lablgtk/Makefile
diff -u pkgsrc/x11/ocaml-lablgtk/Makefile:1.25 pkgsrc/x11/ocaml-lablgtk/Makefile:1.26
--- pkgsrc/x11/ocaml-lablgtk/Makefile:1.25      Tue Jul 11 14:19:23 2017
+++ pkgsrc/x11/ocaml-lablgtk/Makefile   Thu Jul 13 11:53:15 2017
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2017/07/11 14:19:23 jaapb Exp $
+# $NetBSD: Makefile,v 1.26 2017/07/13 11:53:15 jaapb Exp $
 
 DISTNAME=      lablgtk-2.18.5
 PKGNAME=       ocaml-${DISTNAME}
-PKGREVISION=   6
+PKGREVISION=   7
 CATEGORIES=    x11
 MASTER_SITES=  https://forge.ocamlcore.org/frs/download.php/1627/
 
@@ -26,6 +26,8 @@ BUILDLINK_DEPMETHOD.ocaml=    full
 CONFLICTS=     lablgtk-[0-9]*
 SUPERSEDES=    lablgtk-[0-9]*
 
+CONFIGURE_ENV+=        OCAML_SITELIBDIR="${OCAML_SITELIBDIR}"
+
 .include "../../mk/bsd.prefs.mk"
 
 # Stub libraries for functions missing from base system.

Index: pkgsrc/x11/ocaml-lablgtk/distinfo
diff -u pkgsrc/x11/ocaml-lablgtk/distinfo:1.7 pkgsrc/x11/ocaml-lablgtk/distinfo:1.8
--- pkgsrc/x11/ocaml-lablgtk/distinfo:1.7       Wed Aug 24 10:51:53 2016
+++ pkgsrc/x11/ocaml-lablgtk/distinfo   Thu Jul 13 11:53:15 2017
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.7 2016/08/24 10:51:53 wiz Exp $
+$NetBSD: distinfo,v 1.8 2017/07/13 11:53:15 jaapb Exp $
 
 SHA1 (lablgtk-2.18.5.tar.gz) = 8e0a64ba9c194a8affb03856a6acf6fcd06ad1e4
 RMD160 (lablgtk-2.18.5.tar.gz) = c9dcdff500a67b02b32ac8d2d965bd1bde6eaba3
 SHA512 (lablgtk-2.18.5.tar.gz) = 7b6ba1a4dfa82cc3bbc502082ff4fccc23cc06ee4f30d01a2e423f3f99e945a4befe450d230b5aa19c5b810e9f46f2838655099d49da2db7c8a2e52eac213024
 Size (lablgtk-2.18.5.tar.gz) = 808005 bytes
-SHA1 (patch-src_Makefile) = a24fafdbc273863e110d4becb79f849053ec9a9c
+SHA1 (patch-configure) = 8863e7bb0597e472063021f01c307e8e14c9b3b0
+SHA1 (patch-src_Makefile) = 79d133a88af4ee3efd668ebeff1767eae1a0ca76

Index: pkgsrc/x11/ocaml-lablgtk/patches/patch-src_Makefile
diff -u pkgsrc/x11/ocaml-lablgtk/patches/patch-src_Makefile:1.1 pkgsrc/x11/ocaml-lablgtk/patches/patch-src_Makefile:1.2
--- pkgsrc/x11/ocaml-lablgtk/patches/patch-src_Makefile:1.1     Fri Oct 10 08:37:49 2014
+++ pkgsrc/x11/ocaml-lablgtk/patches/patch-src_Makefile Thu Jul 13 11:53:16 2017
@@ -1,18 +1,17 @@
-$NetBSD: patch-src_Makefile,v 1.1 2014/10/10 08:37:49 jaapb Exp $
+$NetBSD: patch-src_Makefile,v 1.2 2017/07/13 11:53:16 jaapb Exp $
 
 Do not create an ld.conf, this is done afterwards through the PLIST
---- src/Makefile.orig  2013-10-01 08:31:50.000000000 +0000
+--- src/Makefile.orig  2016-08-10 03:33:56.000000000 +0000
 +++ src/Makefile
-@@ -395,10 +395,10 @@ findlib-install:
+@@ -402,10 +402,7 @@ findlib-install:
          exit 2; fi
        mkdir -p "$(BINDIR)"
        mkdir -p "$(DESTDIR)$(FINDLIBDIR)"
 -      @if test -f "$(DESTDIR)$(OCAMLLDCONF)"; then :; else \
-+#     @if test -f "$(DESTDIR)$(OCAMLLDCONF)"; then :; else \
-         touch "$(DESTDIR)$(OCAMLLDCONF)"; fi
-       $(OCAMLFIND) install -destdir "$(DESTDIR)$(FINDLIBDIR)" \
+-        touch "$(DESTDIR)$(OCAMLLDCONF)"; fi
+-      $(OCAMLFIND) install -destdir "$(DESTDIR)$(FINDLIBDIR)" \
 -        -ldconf "$(DESTDIR)$(OCAMLLDCONF)" \
-+        -ldconf ignore \
++      $(OCAMLFIND) install \
      lablgtk2 ../META \
      build.ml \
      $(CLIBS) \

Added files:

Index: pkgsrc/x11/ocaml-lablgtk/patches/patch-configure
diff -u /dev/null pkgsrc/x11/ocaml-lablgtk/patches/patch-configure:1.1
--- /dev/null   Thu Jul 13 11:53:16 2017
+++ pkgsrc/x11/ocaml-lablgtk/patches/patch-configure    Thu Jul 13 11:53:16 2017
@@ -0,0 +1,14 @@
+$NetBSD: patch-configure,v 1.1 2017/07/13 11:53:16 jaapb Exp $
+
+The ocamlfind wrapper now includes DESTDIR, so do not use it
+--- configure.orig     2016-08-10 03:33:56.000000000 +0000
++++ configure
+@@ -2679,7 +2679,7 @@ if test "$OCAMLFIND" = no; then
+ FINDLIBDIR=""
+ OCAMLLDCONF=""
+ else
+-FINDLIBDIR="`ocamlfind printconf destdir | tr -d '\\r'`"
++FINDLIBDIR="${PREFIX}/${OCAML_SITELIBDIR}"
+ echo "$OCAMLFIND library path is $FINDLIBDIR"
+ OCAMLLDCONF="`ocamlfind printconf ldconf | tr -d '\\r'`"
+ echo "$OCAMLFIND ldconf path is $OCAMLLDCONF"