pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11/labltk labltk: update to 8.06.12.
details: https://anonhg.NetBSD.org/pkgsrc/rev/745c611144cf
branches: trunk
changeset: 380300:745c611144cf
user: wiz <wiz%pkgsrc.org@localhost>
date: Fri Jun 03 08:51:22 2022 +0000
description:
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
diffstat:
x11/labltk/Makefile | 13 +-
x11/labltk/PLIST | 3 +-
x11/labltk/PLIST.opt | 3 +-
x11/labltk/distinfo | 15 +-
x11/labltk/patches/patch-browser-Makefile.shared | 11 +-
x11/labltk/patches/patch-configure | 107 -----------------------
x11/labltk/patches/patch-lib-Makefile | 3 +-
x11/labltk/patches/patch-suppert-Makefile | 18 ---
x11/labltk/patches/patch-support-Makefile | 19 ++++
9 files changed, 42 insertions(+), 150 deletions(-)
diffs (281 lines):
diff -r 2d2b62e02e24 -r 745c611144cf x11/labltk/Makefile
--- a/x11/labltk/Makefile Fri Jun 03 08:49:21 2022 +0000
+++ b/x11/labltk/Makefile Fri Jun 03 08:51:22 2022 +0000
@@ -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 @@
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'`"
diff -r 2d2b62e02e24 -r 745c611144cf x11/labltk/PLIST
--- a/x11/labltk/PLIST Fri Jun 03 08:49:21 2022 +0000
+++ b/x11/labltk/PLIST Fri Jun 03 08:51:22 2022 +0000
@@ -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/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
diff -r 2d2b62e02e24 -r 745c611144cf x11/labltk/PLIST.opt
--- a/x11/labltk/PLIST.opt Fri Jun 03 08:49:21 2022 +0000
+++ b/x11/labltk/PLIST.opt Fri Jun 03 08:51:22 2022 +0000
@@ -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/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
diff -r 2d2b62e02e24 -r 745c611144cf x11/labltk/distinfo
--- a/x11/labltk/distinfo Fri Jun 03 08:49:21 2022 +0000
+++ b/x11/labltk/distinfo Fri Jun 03 08:51:22 2022 +0000
@@ -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
diff -r 2d2b62e02e24 -r 745c611144cf x11/labltk/patches/patch-browser-Makefile.shared
--- a/x11/labltk/patches/patch-browser-Makefile.shared Fri Jun 03 08:49:21 2022 +0000
+++ b/x11/labltk/patches/patch-browser-Makefile.shared Fri Jun 03 08:51:22 2022 +0000
@@ -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
diff -r 2d2b62e02e24 -r 745c611144cf x11/labltk/patches/patch-configure
--- a/x11/labltk/patches/patch-configure Fri Jun 03 08:49:21 2022 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,107 +0,0 @@
-$NetBSD: patch-configure,v 1.1 2014/11/16 18:08:36 hiramatsu Exp $
-
-- Take X11 location from confgure arguments,
- instead of ${LOCALBASE}/lib/ocaml/Makefile.config.
-- $has_tk is always true.
-
---- configure.orig 2014-09-18 13:08:33.000000000 +0900
-+++ configure 2014-11-04 13:23:58.000000000 +0900
-@@ -63,6 +63,10 @@
- tk_libs=$2; shift;;
- -tk-no-x11|--tk-no-x11)
- tk_x11=no;;
-+ -x11include*|--x11include*)
-+ x11_include_dir=$2; shift;;
-+ -x11lib*|--x11lib*)
-+ x11_lib_dir=$2; shift;;
- -use-findlib|--use-findlib)
- use_findlib=yes;;
- -verbose|--verbose)
-@@ -134,8 +138,8 @@
- ocamlc_where=`ocamlc -where 2> /dev/null`
- ocamlc_ver=`ocamlc -version 2> /dev/null`
- ocamlc_opt_ver=`ocamlc.opt -version 2> /dev/null`
--ocamlopt_ver=`$ocamlopt -version 2> /dev/null`
--ocamlopt_opt_ver=`$ocamlopt.opt -version 2> /dev/null`
-+#ocamlopt_ver=`$ocamlopt -version 2> /dev/null`
-+#ocamlopt_opt_ver=`$ocamlopt.opt -version 2> /dev/null`
- if test x"$where" = x"$ocamlc_where" \
- && test -n "$ocamlc_opt_ver" && test x"$ocamlc_opt_ver" = x"$ocamlc_ver" \
- && (test -z "$ocamlopt_ver" || test x"$ocamlopt_ver" = x"$ocamlopt_opt_ver")
-@@ -164,7 +168,7 @@
-
- if test $has_tk = true; then
- tcl_version=''
-- tcl_version=`sh ./runtest $tk_defs $tk_x11_include tclversion.c`
-+ tcl_version=`sh ./runtest $tk_defs $tk_x11_include_dir tclversion.c`
- for tk_incs in \
- "-I/usr/local/include" \
- "-I/opt/local/include" \
-@@ -183,7 +187,7 @@
- "-I/usr/include/tcl8.2 -I/usr/include/tk8.2"
- do if test -z "$tcl_version"; then
- tk_defs="$tk_incs"
-- tcl_version=`sh ./runtest $tk_defs $tk_x11_include tclversion.c`
-+ tcl_version=`sh ./runtest $tk_defs $tk_x11_include_dir tclversion.c`
- fi; done
- if test -n "$tcl_version" && test "x$tcl_version" != "xnone"; then
- inf "tcl.h and tk.h version $tcl_version found with \"$tk_defs\"."
-@@ -204,9 +208,8 @@
- has_tk=false
- fi
- fi
--
-+has_tk=true
- system=`cat $where/Makefile.config | grep '^SYSTEM=' | sed -e 's/^SYSTEM=//'`
--
- if test $has_tk = true && test -z "$tk_libs"; then
- tklibdir=""
- if test -n "$tk_defs"; then
-@@ -229,7 +232,6 @@
- tk
- fi
- fi
--
- tkauxlibs="$cclibs"
- if test $has_tk = true; then
- if test -n "$tk_libs" && \
-@@ -253,7 +255,7 @@
- has_tk=false
- fi
- fi
--
-+has_tk=true
- if test $has_tk = true; then
- if sh ./hasgot $tk_libs $tk_x11_libs $tkauxlibs Tk_SetGrid; then
- inf "Tcl/Tk libraries found."
-@@ -280,10 +282,17 @@
- fi
- fi
-
-+if test -z "$x11_include_dir" -a -z "$x11_lib_dir"; then
-+ if pkg-config --exists x11 2>/dev/null; then
-+ x11_include_dir=`pkg-config --cflags x11`
-+ x11_lib_dir=`pkg-config --libs x11`
-+ fi
-+fi
-+
- if test $has_tk = true; then
- if test $tk_x11 = yes; then
-- echo "TK_DEFS=$tk_defs "'$(X11_INCLUDES)' >> Makefile
-- echo "TK_LINK=$tk_libs "'$(X11_LINK)' >> Makefile
-+ echo "TK_DEFS=$tk_defs $(x11_include_dir)" >> Makefile
-+ echo "TK_LINK=$tk_libs $(x11_lib_dir)" >> Makefile
- else
- echo "TK_DEFS=$tk_defs" >> Makefile
- echo "TK_LINK=$tk_libs" >> Makefile
-@@ -304,8 +313,8 @@
- if test $has_tk = true; then
- inf "Configuration for the \"labltk\" library:"
- inf " use tcl/tk version ....... $tcl_version"
--inf " options for compiling .... $tk_defs $tk_x11_include"
--inf " options for linking ...... $tk_libs $tk_x11_libs"
-+inf " options for compiling .... $tk_defs $x11_include_dir"
-+inf " options for linking ...... $tk_libs $x11_lib_dir"
- inf " use native compilers ..... $optcomps"
- else
- inf "The \"labltk\" library: not supported"
diff -r 2d2b62e02e24 -r 745c611144cf x11/labltk/patches/patch-lib-Makefile
--- a/x11/labltk/patches/patch-lib-Makefile Fri Jun 03 08:49:21 2022 +0000
+++ b/x11/labltk/patches/patch-lib-Makefile Fri Jun 03 08:51:22 2022 +0000
@@ -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 @@
diff -r 2d2b62e02e24 -r 745c611144cf x11/labltk/patches/patch-suppert-Makefile
--- a/x11/labltk/patches/patch-suppert-Makefile Fri Jun 03 08:49:21 2022 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-$NetBSD: patch-suppert-Makefile,v 1.1 2014/11/16 18:08:36 hiramatsu Exp $
-
-Install into DESTDIR.
---- support/Makefile.orig 2014-09-18 13:08:33.000000000 +0900
-+++ support/Makefile 2014-11-05 00:20:36.000000000 +0900
-@@ -43,9 +43,10 @@
-
- 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 \
diff -r 2d2b62e02e24 -r 745c611144cf x11/labltk/patches/patch-support-Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/labltk/patches/patch-support-Makefile Fri Jun 03 08:51:22 2022 +0000
@@ -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) \
Home |
Main Index |
Thread Index |
Old Index