CVS commit: pkgsrc/x11/labltk

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/x11/labltk
From: "Thomas Klausner" <wiz%netbsd.org@localhost>
Date: Fri, 3 Jun 2022 08:51:23 +0000

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Jun  3 08:51:22 UTC 2022

Modified Files:
        pkgsrc/x11/labltk: Makefile PLIST PLIST.opt distinfo
        pkgsrc/x11/labltk/patches: patch-browser-Makefile.shared
            patch-lib-Makefile
Added Files:
        pkgsrc/x11/labltk/patches: patch-support-Makefile
Removed Files:
        pkgsrc/x11/labltk/patches: patch-configure patch-suppert-Makefile

Log Message:
labltk: update to 8.06.12.

Fix some pkglint.

Changes:

LablTk 8.06.12 with OCamlBrowser

Compatibility release to make OCamlBrowser work with OCaml 4.14 (and only this version)

LablTk 8.06.11 with OCamlBrowser

This is a bug fix release of LablTk and OCamlBrowser.
It also makes OCamlBrowser work on OCaml 4.13 (and only this version).

    Disable -warn-error for users, add all-devel target for developers
    Add ommitted labels
    Update ocamlbrowser for ocaml 4.13

LablTk 8.06.10 with OCamlBrowser

This is a bug fix release of LablTk and OCamlBrowser.
It also makes OCamlBrowser work on OCaml 4.12 (and only this version).

    Fix bugs in ocamlbrowser that prevented exploring types in source files
    Install camltkwrap.{cmi,cmx} (report by Pascal Raymond)

LablTk 8.06.9 with OCamlBrowser 4.11.0

New release of LablTk and OCamlBrowser

    LablTk is compatible with ocaml 4.07 and newer
    OCamlBrowser is compatible with ocaml 4.11

Fixes a configuration error with clang 12 (observed on MacOS).

LablTk 8.06.8 with OCamlBrowser 4.10.0

New release of LablTk and OCamlBrowser

    LablTk is compatible with ocaml 4.07 and newer
    OCamlBrowser is compatible with ocaml 4.10

Fixes a number of bugs in OCamlBrowser, particularly concerning the file selection window.

LablTk 8.06.7

New release fixing compatibility problems for ocaml 4.09.

    still compatible with ocaml 4.07
    ocamlbrowser compatible with ocaml 4.08 and 4.09

opam packages should be labltk.8.06.7 and ocamlbrowser.4.08.1

LablTk 8.06.6

New release for ocaml 4.08.

    compatible with ocaml 4.08.0 (required for ocamlbrowser)
    compiles and installs without ocamlbrowser (use make library opt rather than make all opt).

Using opam, two packages are provided: labltk.8.06.6 and ocamlbrowser.4.08.0


To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 pkgsrc/x11/labltk/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/x11/labltk/PLIST
cvs rdiff -u -r1.5 -r1.6 pkgsrc/x11/labltk/PLIST.opt
cvs rdiff -u -r1.6 -r1.7 pkgsrc/x11/labltk/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/x11/labltk/patches/patch-browser-Makefile.shared
cvs rdiff -u -r1.1 -r0 pkgsrc/x11/labltk/patches/patch-configure \
    pkgsrc/x11/labltk/patches/patch-suppert-Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/labltk/patches/patch-lib-Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/labltk/patches/patch-support-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/labltk/Makefile
diff -u pkgsrc/x11/labltk/Makefile:1.40 pkgsrc/x11/labltk/Makefile:1.41
--- pkgsrc/x11/labltk/Makefile:1.40     Tue May 24 18:51:57 2022
+++ pkgsrc/x11/labltk/Makefile  Fri Jun  3 08:51:22 2022
@@ -1,13 +1,11 @@
-# $NetBSD: Makefile,v 1.40 2022/05/24 18:51:57 jaapb Exp $
+# $NetBSD: Makefile,v 1.41 2022/06/03 08:51:22 wiz Exp $
 
-DISTNAME=      labltk-8.06.3
-PKGREVISION=   8
+DISTNAME=      labltk-8.06.12
 CATEGORIES=    x11
-# caution: it's the 1701, not the filename, that identifies the download
-MASTER_SITES=  http://forge.ocamlcore.org/frs/download.php/1701/
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=garrigue/}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      https://forge.ocamlcore.org/projects/labltk/
+HOMEPAGE=      https://github.com/garrigue/labltk/
 COMMENT=       Tk bindings for ocaml
 LICENSE=       gnu-lgpl-v2.1
 
@@ -15,10 +13,7 @@ USE_TOOLS+=  gmake
 MAKE_JOBS_SAFE=        no
 MAKE_ENV+=     BYTECC='cc  -fPIC'
 
-
 HAS_CONFIGURE=         yes
-CONFIGURE_ARGS+=       -x11include ${X11BASE}/include
-CONFIGURE_ARGS+=       -x11lib ${X11BASE}/lib
 CONFIGURE_ARGS+=       -use-findlib
 CONFIGURE_ARGS+=       -tkdefs "-I${BUILDLINK_PREFIX.tk}/include  -I${BUILDLINK_PREFIX.tcl}/include"
 CONFIGURE_ARGS+=       -tklibs "`${SH} -c '. ${TCLCONFIG_SH}; . ${TKCONFIG_SH}; ${ECHO} $$TK_LD_FLAGS $$TCL_LD_FLAGS $$TK_LIBS $$TCL_LIBS'`"

Index: pkgsrc/x11/labltk/PLIST
diff -u pkgsrc/x11/labltk/PLIST:1.7 pkgsrc/x11/labltk/PLIST:1.8
--- pkgsrc/x11/labltk/PLIST:1.7 Sun Nov 16 18:08:36 2014
+++ pkgsrc/x11/labltk/PLIST     Fri Jun  3 08:51:22 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2014/11/16 18:08:36 hiramatsu Exp $
+@comment $NetBSD: PLIST,v 1.8 2022/06/03 08:51:22 wiz Exp $
 bin/labltk
 bin/ocamlbrowser
 lib/ocaml/site-lib/labltk/META
@@ -86,6 +86,7 @@ lib/ocaml/site-lib/labltk/cWinfo.mli
 lib/ocaml/site-lib/labltk/cWm.cmi
 lib/ocaml/site-lib/labltk/cWm.mli
 lib/ocaml/site-lib/labltk/camltk.cmi
+lib/ocaml/site-lib/labltk/camltkwrap.cmi
 lib/ocaml/site-lib/labltk/canvas.cmi
 lib/ocaml/site-lib/labltk/canvas.mli
 lib/ocaml/site-lib/labltk/checkbutton.cmi

Index: pkgsrc/x11/labltk/PLIST.opt
diff -u pkgsrc/x11/labltk/PLIST.opt:1.5 pkgsrc/x11/labltk/PLIST.opt:1.6
--- pkgsrc/x11/labltk/PLIST.opt:1.5     Sun Nov 16 18:08:36 2014
+++ pkgsrc/x11/labltk/PLIST.opt Fri Jun  3 08:51:22 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.opt,v 1.5 2014/11/16 18:08:36 hiramatsu Exp $
+@comment $NetBSD: PLIST.opt,v 1.6 2022/06/03 08:51:22 wiz Exp $
 lib/ocaml/site-lib/labltk/balloon.cmx
 lib/ocaml/site-lib/labltk/bell.cmx
 lib/ocaml/site-lib/labltk/button.cmx
@@ -42,6 +42,7 @@ lib/ocaml/site-lib/labltk/cToplevel.cmx
 lib/ocaml/site-lib/labltk/cWinfo.cmx
 lib/ocaml/site-lib/labltk/cWm.cmx
 lib/ocaml/site-lib/labltk/camltk.cmx
+lib/ocaml/site-lib/labltk/camltkwrap.cmx
 lib/ocaml/site-lib/labltk/canvas.cmx
 lib/ocaml/site-lib/labltk/checkbutton.cmx
 lib/ocaml/site-lib/labltk/clipboard.cmx

Index: pkgsrc/x11/labltk/distinfo
diff -u pkgsrc/x11/labltk/distinfo:1.6 pkgsrc/x11/labltk/distinfo:1.7
--- pkgsrc/x11/labltk/distinfo:1.6      Tue Oct 26 11:34:04 2021
+++ pkgsrc/x11/labltk/distinfo  Fri Jun  3 08:51:22 2022
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.6 2021/10/26 11:34:04 nia Exp $
+$NetBSD: distinfo,v 1.7 2022/06/03 08:51:22 wiz Exp $
 
-BLAKE2s (labltk-8.06.3.tar.gz) = cfe50b9af4423b61f822acfd384db3203694b727252937d050f2b425d4bb83e8
-SHA512 (labltk-8.06.3.tar.gz) = c2002d519c1fcfdd2b13ae6d5836880273dac2660f07f6ee0e7bb932e3fec6f5cc959202efdf712758a17d24dbe50c3f6697c7b125e3123fa8153130d7ece979
-Size (labltk-8.06.3.tar.gz) = 369924 bytes
-SHA1 (patch-browser-Makefile.shared) = c974757b4c05207bc0ad0ad70dc668e10bfa8396
+BLAKE2s (labltk-8.06.12.tar.gz) = 01a9ba1e0cfa2c442fd9547bf0347c08b4a5aa5de82713a68d2a3c6867039d6e
+SHA512 (labltk-8.06.12.tar.gz) = e1564ab2d8922276bd8ad586b37308d60ca2dd563bac3cdd992d8a6ba4de26e5499350a62a1d4cb2bbb9a5b7aff609b5187aad5fba118eb55d1b4c8355d2979a
+Size (labltk-8.06.12.tar.gz) = 372215 bytes
+SHA1 (patch-browser-Makefile.shared) = 93d9e762ffb9067315f16f3dffea738903b8178a
 SHA1 (patch-compiler-Makefile) = 779820cb01ff728c27ce7a803d5631d2686f8568
-SHA1 (patch-configure) = ff33df4575e3722bc7bb3e5108886fdf5aacbb43
-SHA1 (patch-lib-Makefile) = 0bab4c0ce4a5961a52a6091375bc7e06776a4521
-SHA1 (patch-suppert-Makefile) = f622059399c32488892b006b55828d0b5ab0fd84
+SHA1 (patch-lib-Makefile) = cdf2bb0b9a27041e259ec57376577278f468f622
+SHA1 (patch-support-Makefile) = 6c25604244b588157712423e86e1b486ae555a90

Index: pkgsrc/x11/labltk/patches/patch-browser-Makefile.shared
diff -u pkgsrc/x11/labltk/patches/patch-browser-Makefile.shared:1.2 pkgsrc/x11/labltk/patches/patch-browser-Makefile.shared:1.3
--- pkgsrc/x11/labltk/patches/patch-browser-Makefile.shared:1.2 Sun Sep 10 02:36:08 2017
+++ pkgsrc/x11/labltk/patches/patch-browser-Makefile.shared     Fri Jun  3 08:51:22 2022
@@ -1,16 +1,17 @@
-$NetBSD: patch-browser-Makefile.shared,v 1.2 2017/09/10 02:36:08 dholland Exp $
+$NetBSD: patch-browser-Makefile.shared,v 1.3 2022/06/03 08:51:22 wiz Exp $
 
 Install into DESTDIR.
 
---- browser/Makefile.shared.orig       2017-07-19 03:52:11.000000000 +0000
+--- browser/Makefile.shared.orig       2022-03-30 02:19:07.000000000 +0000
 +++ browser/Makefile.shared
-@@ -60,7 +60,8 @@ help.ml:
+@@ -60,8 +60,9 @@ help.ml:
        echo '";;' >> $@
  
  install:
--      cp ocamlbrowser$(EXE) $(INSTALLBINDIR)
 +      $(BSD_INSTALL_SCRIPT_DIR) $(DESTDIR)$(INSTALLBINDIR)
-+      $(BSD_INSTALL_SCRIPT) ocamlbrowser$(EXE) $(DESTDIR)$(INSTALLBINDIR)
+       if test -f ocamlbrowser$(EXE); then \
+-         cp ocamlbrowser$(EXE) $(INSTALLBINDIR); fi
++         $(BSD_INSTALL_SCRIPT) ocamlbrowser$(EXE) $(DESTDIR)$(INSTALLBINDIR); fi
  
  clean:
        rm -f *.cm? ocamlbrowser$(EXE) dummy.ml *~ *.orig *.$(O) help.ml

Index: pkgsrc/x11/labltk/patches/patch-lib-Makefile
diff -u pkgsrc/x11/labltk/patches/patch-lib-Makefile:1.1 pkgsrc/x11/labltk/patches/patch-lib-Makefile:1.2
--- pkgsrc/x11/labltk/patches/patch-lib-Makefile:1.1    Sun Nov 16 18:08:36 2014
+++ pkgsrc/x11/labltk/patches/patch-lib-Makefile        Fri Jun  3 08:51:22 2022
@@ -1,6 +1,7 @@
-$NetBSD: patch-lib-Makefile,v 1.1 2014/11/16 18:08:36 hiramatsu Exp $
+$NetBSD: patch-lib-Makefile,v 1.2 2022/06/03 08:51:22 wiz Exp $
 
 Install into DESTDIR.
+
 --- lib/Makefile.orig  2014-09-18 13:08:33.000000000 +0900
 +++ lib/Makefile       2014-11-03 20:55:51.000000000 +0900
 @@ -78,16 +78,17 @@

Added files:

Index: pkgsrc/x11/labltk/patches/patch-support-Makefile
diff -u /dev/null pkgsrc/x11/labltk/patches/patch-support-Makefile:1.1
--- /dev/null   Fri Jun  3 08:51:23 2022
+++ pkgsrc/x11/labltk/patches/patch-support-Makefile    Fri Jun  3 08:51:22 2022
@@ -0,0 +1,19 @@
+$NetBSD: patch-support-Makefile,v 1.1 2022/06/03 08:51:22 wiz Exp $
+
+Install into DESTDIR.
+
+--- support/Makefile.orig      2022-03-30 02:19:07.000000000 +0000
++++ support/Makefile
+@@ -45,9 +45,10 @@ PUBX= $(PUBMLI:.mli=.cmx) camltkwrap.cmx
+ 
+ ifeq ($(USE_FINDLIB),yes)
+ install:
+-      ocamlfind install labltk META $(PUB) lib$(LIBNAME).$(A) \
+-        -optional dll$(LIBNAME)$(EXT_DLL)
++      ocamlfind install labltk META $(PUB) lib$(LIBNAME).$(A)
+       $(RANLIB) lib$(LIBNAME).$(A)
++      $(BSD_INSTALL_LIB_DIR) $(DESTDIR)$(STUBLIBDIR)
++      $(BSD_INSTALL_LIB) dll$(LIBNAME)$(EXT_DLL) $(DESTDIR)$(STUBLIBDIR)
+ 
+ installopt:
+       ocamlfind install labltk -add $(PUBX) \

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index