diff options
| -rw-r--r-- | lang/jimtcl/Makefile | 5 | ||||
| -rw-r--r-- | lang/jimtcl/PLIST | 3 | ||||
| -rw-r--r-- | lang/jimtcl/distinfo | 12 | ||||
| -rw-r--r-- | lang/jimtcl/patches/patch-auto.def | 24 | ||||
| -rw-r--r-- | lang/jimtcl/patches/patch-autosetup_cc.tcl | 54 |
5 files changed, 9 insertions, 89 deletions
diff --git a/lang/jimtcl/Makefile b/lang/jimtcl/Makefile index f0eb2a0969c..63d1b188108 100644 --- a/lang/jimtcl/Makefile +++ b/lang/jimtcl/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.4 2017/09/16 19:26:58 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2021/02/01 10:38:24 fcambus Exp $ -DISTNAME= jimtcl-0.77 -PKGREVISION= 1 +DISTNAME= jimtcl-0.80 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_GITHUB:=msteveb/} diff --git a/lang/jimtcl/PLIST b/lang/jimtcl/PLIST index ce385ef857d..30d5b09b2aa 100644 --- a/lang/jimtcl/PLIST +++ b/lang/jimtcl/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2016/10/31 01:15:12 kamil Exp $ +@comment $NetBSD: PLIST,v 1.4 2021/02/01 10:38:24 fcambus Exp $ bin/build-jim-ext bin/jimsh include/jim-config.h @@ -10,4 +10,5 @@ include/jim.h lib/jim/README.extensions lib/jim/tcltest.tcl lib/libjim.so.${PKGVERSION} +lib/pkgconfig/jimtcl.pc share/doc/jimtcl/Tcl.html diff --git a/lang/jimtcl/distinfo b/lang/jimtcl/distinfo index 1879ce7b309..1f8c5830e13 100644 --- a/lang/jimtcl/distinfo +++ b/lang/jimtcl/distinfo @@ -1,8 +1,6 @@ -$NetBSD: distinfo,v 1.4 2016/10/31 01:15:12 kamil Exp $ +$NetBSD: distinfo,v 1.5 2021/02/01 10:38:24 fcambus Exp $ -SHA1 (jimtcl-0.77.tar.gz) = 12f921997c140593b2dc82885fb15c2dad8012f0 -RMD160 (jimtcl-0.77.tar.gz) = d6004a841d8032b23a81d72b849c37ff3682a1e8 -SHA512 (jimtcl-0.77.tar.gz) = 47c50abcb06917ec85c19c3ff553bfc635c9fcc4e9ec707d8454adffade071e1f0051ee24b9a9d1dc7b83f5794229629b2de4eb37d0e3e8d6a1ba6bd72564901 -Size (jimtcl-0.77.tar.gz) = 2925776 bytes -SHA1 (patch-auto.def) = 80ceb87a43873cd159486a04256efa60757bca85 -SHA1 (patch-autosetup_cc.tcl) = 690c50dc850d09655f002fa72f0a2299a560fa65 +SHA1 (jimtcl-0.80.tar.gz) = 3ac6f9ab9c2a6b1203dcfc14e7840b9f6c839226 +RMD160 (jimtcl-0.80.tar.gz) = 5348b1849e3244b670dd392c64b5116ffef50101 +SHA512 (jimtcl-0.80.tar.gz) = 37f14263f2101caaa632acf5e426dd7f1d6f75143875359c1daed59a039a9c64bbdf7941ce12b76bf9b209521b3967fd2b1d94a6afde7b2a8dd173d160858225 +Size (jimtcl-0.80.tar.gz) = 3130592 bytes diff --git a/lang/jimtcl/patches/patch-auto.def b/lang/jimtcl/patches/patch-auto.def deleted file mode 100644 index b157be43d2d..00000000000 --- a/lang/jimtcl/patches/patch-auto.def +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-auto.def,v 1.1 2016/10/31 01:15:12 kamil Exp $ - -Backport upstream patch: - -From b7efe69818d2d12c0f004a5aaca70cd2ed2f388a Mon Sep 17 00:00:00 2001 -From: Steve Bennett <steveb@workware.net.au> -Date: Wed, 26 Oct 2016 19:50:35 +1000 -Subject: [PATCH] build: On NetBSD backtrace is in -lexecinfo - -Signed-off-by: Steve Bennett <steveb@workware.net.au> - ---- auto.def.orig 2016-10-31 01:07:00.830631530 +0000 -+++ auto.def -@@ -106,6 +106,10 @@ cc-check-functions regcomp waitpid sigac - cc-check-functions syslog opendir readlink sleep usleep pipe getaddrinfo utimes - cc-check-functions shutdown socketpair isinf isnan link symlink fsync dup - -+if {[cc-check-function-in-lib backtrace execinfo]} { -+ define-append LDLIBS [get-define lib_backtrace] -+} -+ - if {[cc-check-functions sysinfo]} { - cc-with {-includes sys/sysinfo.h} { - cc-check-members "struct sysinfo.uptime" diff --git a/lang/jimtcl/patches/patch-autosetup_cc.tcl b/lang/jimtcl/patches/patch-autosetup_cc.tcl deleted file mode 100644 index 60bf26737d0..00000000000 --- a/lang/jimtcl/patches/patch-autosetup_cc.tcl +++ /dev/null @@ -1,54 +0,0 @@ -$NetBSD: patch-autosetup_cc.tcl,v 1.1 2016/10/31 01:15:12 kamil Exp $ - -Backport upstream patch: - -From 7d5a6e3b6f19a5c9260c131f428711320da452a0 Mon Sep 17 00:00:00 2001 -From: Steve Bennett <steveb@workware.net.au> -Date: Wed, 26 Oct 2016 19:52:06 +1000 -Subject: [PATCH] build: update autosetup for LIBS/LDFLAGS fix - - 343be844 cc tests should use LIBS and LDFLAGS - -Signed-off-by: Steve Bennett <steveb@workware.net.au> - ---- autosetup/cc.tcl.orig 2016-09-04 04:14:05.000000000 +0000 -+++ autosetup/cc.tcl -@@ -210,7 +210,7 @@ proc cc-check-members {args} { - # - # If the function is found, the feature is defined and lib_$function is defined - # to -l$lib where the function was found, or "" if no library required. --# In addition, -l$lib is added to the LIBS define. -+# In addition, -l$lib is prepended to the LIBS define. - # - # If additional libraries may be needed for linking, they should be specified - # as $extralibs as "-lotherlib1 -lotherlib2". -@@ -232,7 +232,8 @@ proc cc-check-function-in-lib {function - if {[cctest_function $function]} { - msg-result -l$lib - define lib_$function -l$lib -- define-append LIBS -l$lib -+ # prepend to LIBS -+ define LIBS "-l$lib [get-define LIBS]" - incr found - break - } -@@ -498,13 +499,17 @@ proc cctest {args} { - } - } - -- if {!$opts(-link)} { -+ if {$opts(-link)} { -+ lappend cmdline {*}[get-define LDFLAGS] -+ } else { - set tmp conftest__.o - lappend cmdline -c - } - lappend cmdline {*}$opts(-cflags) {*}[get-define cc-default-debug ""] -- - lappend cmdline $src -o $tmp {*}$opts(-libs) -+ if {$opts(-link)} { -+ lappend cmdline {*}[get-define LIBS] -+ } - - # At this point we have the complete command line and the - # complete source to be compiled. Get the result from cache if |