mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-02 01:20:54 +00:00
Code Issues Releases Activity

devel/critcl - update to 3.1.15

Browse Source
This commit is contained in:
Pietro Cerutti 2016-01-07 10:14:44 +00:00
parent edd6461233
commit dcfac1d412
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=405408
6 changed files with 57 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
devel/critcl/Makefile
View File

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= critcl
PORTVERSION= 3.1.12
PORTREVISION= 3
PORTVERSION= 3.1.15
CATEGORIES= devel
MAINTAINER= tcltk@FreeBSD.org
@ -17,10 +16,12 @@ LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
RUN_DEPENDS= ${LOCALBASE}/lib/Trf/pkgIndex.tcl:${PORTSDIR}/devel/tcl-trf \
${LOCALBASE}/lib/tcllib/cmdline/pkgIndex.tcl:${PORTSDIR}/devel/tcllib
USES+= tcl
USES+= tcl:85+
USE_GITHUB= yes
GH_ACCOUNT= andreas-kupries
TEST_TARGET= test
PLIST_SUB+= VER=${PORTVERSION}
PORTDOCS= *
@ -31,13 +32,14 @@ NO_BUILD= yes
post-patch:
${REINPLACE_CMD} -e 's|dtplite|${LOCALBASE}/bin/dtplite|g' ${WRKSRC}/build.tcl
${REINPLACE_CMD} -e 's|%%CC%%|${CC}|g' ${WRKSRC}/lib/critcl/Config
${REINPLACE_CMD} -e '/^#line/d' ${WRKSRC}/test/cconst/*
do-install:
(cd ${WRKSRC} && ${TCLSH} build.tcl install ${STAGEDIR}${PREFIX}/lib)
${INSTALL_MAN} ${WRKSRC}/embedded/man/files/critcl_*.n \
${STAGEDIR}${MANPREFIX}/man/mann/
test check regression-test: build
test: build
(cd ${WRKSRC} && ${TCLSH} test/all.tcl)
.include <bsd.port.mk>

4
devel/critcl/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (andreas-kupries-critcl-3.1.12_GH0.tar.gz) = 7be0cff46d5632ea57108d0aef8eab4503232429ae1fa6ad130764671f46c7a5
SIZE (andreas-kupries-critcl-3.1.12_GH0.tar.gz) = 1678397
SHA256 (andreas-kupries-critcl-3.1.15_GH0.tar.gz) = d93facfc2f1407941ee22157f08add2fdfbc5a48b9a5e1a1b8665a0af32d4ff7
SIZE (andreas-kupries-critcl-3.1.15_GH0.tar.gz) = 1678961

24
devel/critcl/files/patch-lib_critcl_critcl.tcl Normal file
View File

@ -0,0 +1,24 @@
--- lib/critcl/critcl.tcl.orig 2015-05-28 04:45:02 UTC
+++ lib/critcl/critcl.tcl
@@ -604,7 +604,8 @@ proc ::critcl::cconst {name rtype rvalue
# funciton body.
SkipIgnored [set file [This]]
- AbortWhenCalledAfterBuild
+ # https://github.com/andreas-kupries/critcl/commit/4f20732
+ HandleDeclAfterBuild
# A void result does not make sense for constants.
if {$rtype eq "void"} {
@@ -4514,7 +4515,10 @@ proc ::critcl::Cat {path} {
# Easier to write our own copy than requiring fileutil and then
# using fileutil::cat.
- set fd [open $path r]
+ # https://github.com/andreas-kupries/critcl/pull/61
+ if {[catch {set fd [open $path r]} err]} {
+ return
+ }
set data [read $fd]
close $fd
return $data

13
devel/critcl/files/patch-test_cconst.test Normal file
View File

@ -0,0 +1,13 @@
--- test/cconst.test.orig 2015-05-28 04:45:02 UTC
+++ test/cconst.test
@@ -23,6 +23,10 @@ support {
}
testing {
useLocal lib/critcl/critcl.tcl critcl
+
+ # Note: The next command does not influence the standard argument-
+ # and result-types.
+ critcl::config lines 0
}
# -------------------------------------------------------------------------

151
devel/critcl/files/patch-tests
View File

@ -1,151 +0,0 @@
diff --git test/ccommand.test test/ccommand.test
index 06e35eb..e0f9242 100644
--- test/ccommand.test
+++ test/ccommand.test
@@ -34,7 +34,7 @@ test critcl-ccommand-1.0 {ccommand, wrong\#args} -setup {
} -body {
critcl::ccommand
} -cleanup {
-} -returnCodes error -result {wrong # args: should be "critcl::ccommand name anames ..."}
+} -returnCodes error -result {wrong # args: should be "critcl::ccommand name anames ?arg ...?"}
# -------------------------------------------------------------------------
## Go through the various knobs we can use to configure the definition and output
diff --git test/cproc.test test/cproc.test
index 13a6d6f..454554a 100644
--- test/cproc.test
+++ test/cproc.test
@@ -36,7 +36,7 @@ test critcl-cproc-1.0 {cproc, wrong\#args} -setup {
} -body {
critcl::cproc
} -cleanup {
-} -returnCodes error -result {wrong # args: should be "critcl::cproc name adefs rtype ?body? ..."}
+} -returnCodes error -result {wrong # args: should be "critcl::cproc name adefs rtype ?body? ?arg ...?"}
# -------------------------------------------------------------------------
## Go through the various knobs we can use to configure the definition and output
diff --git test/cproc/2.0 test/cproc/2.0
index 919c469..98258df 100644
--- test/cproc/2.0
+++ test/cproc/2.0
@@ -18,6 +18,6 @@ tcl__aproc0(ClientData cd, Tcl_Interp *interp, int oc, Tcl_Obj *CONST ov[])
/* Call - - -- --- ----- -------- */
c__aproc0();
-#line 4785 "critcl.tcl"
+#line 4786 "critcl.tcl"
return TCL_OK;
}
diff --git test/cproc/2.1 test/cproc/2.1
index 7b286a4..840fcf7 100644
--- test/cproc/2.1
+++ test/cproc/2.1
@@ -18,6 +18,6 @@ tcl__the_aproc0(ClientData cd, Tcl_Interp *interp, int oc, Tcl_Obj *CONST ov[])
/* Call - - -- --- ----- -------- */
c__the_aproc0();
-#line 4785 "critcl.tcl"
+#line 4786 "critcl.tcl"
return TCL_OK;
}
diff --git test/cproc/2.2 test/cproc/2.2
index 25a8818..d32df4d 100644
--- test/cproc/2.2
+++ test/cproc/2.2
@@ -18,6 +18,6 @@ tcl__aproc_beta0(ClientData cd, Tcl_Interp *interp, int oc, Tcl_Obj *CONST ov[])
/* Call - - -- --- ----- -------- */
c__aproc_beta0();
-#line 4785 "critcl.tcl"
+#line 4786 "critcl.tcl"
return TCL_OK;
}
diff --git test/cproc/2.3 test/cproc/2.3
index fa65bc4..fde9cdb 100644
--- test/cproc/2.3
+++ test/cproc/2.3
@@ -17,6 +17,6 @@ snafu(ClientData cd, Tcl_Interp *interp, int oc, Tcl_Obj *CONST ov[])
/* Call - - -- --- ----- -------- */
c_snafu();
-#line 4785 "critcl.tcl"
+#line 4786 "critcl.tcl"
return TCL_OK;
}
diff --git test/cproc/2.4 test/cproc/2.4
index 719843b..21ffd59 100644
--- test/cproc/2.4
+++ test/cproc/2.4
@@ -18,6 +18,6 @@ tcl__aproc0(ClientData cd, Tcl_Interp *interp, int oc, Tcl_Obj *CONST ov[])
/* Call - - -- --- ----- -------- */
c__aproc0(cd);
-#line 4785 "critcl.tcl"
+#line 4786 "critcl.tcl"
return TCL_OK;
}
diff --git test/cproc/2.5 test/cproc/2.5
index f342f2c..4dfb5ba 100644
--- test/cproc/2.5
+++ test/cproc/2.5
@@ -18,6 +18,6 @@ tcl__aproc0(ClientData cd, Tcl_Interp *interp, int oc, Tcl_Obj *CONST ov[])
/* Call - - -- --- ----- -------- */
c__aproc0();
-#line 4785 "critcl.tcl"
+#line 4786 "critcl.tcl"
return TCL_OK;
}
diff --git test/cproc/2.6 test/cproc/2.6
index abf4d4f..e3fe32f 100644
--- test/cproc/2.6
+++ test/cproc/2.6
@@ -18,12 +18,12 @@ tcl__aproc0(ClientData cd, Tcl_Interp *interp, int oc, Tcl_Obj *CONST ov[])
/* (int anargument) - - -- --- ----- -------- */
{
-#line 4699 "critcl.tcl"
+#line 4700 "critcl.tcl"
if (Tcl_GetIntFromObj(interp, ov[1], &_anargument) != TCL_OK) return TCL_ERROR; }
/* Call - - -- --- ----- -------- */
c__aproc0(_anargument);
-#line 4785 "critcl.tcl"
+#line 4786 "critcl.tcl"
return TCL_OK;
}
diff --git test/cproc/2.7 test/cproc/2.7
index f8c438d..c7e6878 100644
--- test/cproc/2.7
+++ test/cproc/2.7
@@ -21,7 +21,7 @@ tcl__aproc0(ClientData cd, Tcl_Interp *interp, int oc, Tcl_Obj *CONST ov[])
idx_ = 1;
if (oc > 1) {
{
-#line 4699 "critcl.tcl"
+#line 4700 "critcl.tcl"
if (Tcl_GetIntFromObj(interp, ov[idx_], &_anargument) != TCL_OK) return TCL_ERROR; }
idx_++;
} else {
@@ -31,6 +31,6 @@ tcl__aproc0(ClientData cd, Tcl_Interp *interp, int oc, Tcl_Obj *CONST ov[])
/* Call - - -- --- ----- -------- */
c__aproc0(_anargument);
-#line 4785 "critcl.tcl"
+#line 4786 "critcl.tcl"
return TCL_OK;
}
diff --git test/cproc/2.9 test/cproc/2.9
index f11ca08..001a5c8 100644
--- test/cproc/2.9
+++ test/cproc/2.9
@@ -18,7 +18,7 @@ tcl__aproc0(ClientData cd, Tcl_Interp *interp, int oc, Tcl_Obj *CONST ov[])
/* Call - - -- --- ----- -------- */
rv = c__aproc0();
-#line 4793 "critcl.tcl"
+#line 4794 "critcl.tcl"
Tcl_SetObjResult(interp, Tcl_NewIntObj(rv));
return TCL_OK;
}

21
devel/critcl/pkg-plist
View File

@ -14,19 +14,23 @@ lib/critcl-bitmap1.0.1/pkgIndex.tcl
lib/critcl-class1.0.6/class.h
lib/critcl-class1.0.6/class.tcl
lib/critcl-class1.0.6/pkgIndex.tcl
lib/critcl-enum1/enum.tcl
lib/critcl-enum1/pkgIndex.tcl
lib/critcl-iassoc1.0.1/iassoc.h
lib/critcl-iassoc1.0.1/iassoc.tcl
lib/critcl-iassoc1.0.1/pkgIndex.tcl
lib/critcl-emap1/emap.tcl
lib/critcl-emap1/pkgIndex.tcl
lib/critcl-enum1.0.1/enum.tcl
lib/critcl-enum1.0.1/pkgIndex.tcl
lib/critcl-iassoc1.0.2/iassoc.h
lib/critcl-iassoc1.0.2/iassoc.tcl
lib/critcl-iassoc1.0.2/pkgIndex.tcl
lib/critcl-literals1.1/literals.tcl
lib/critcl-literals1.1/pkgIndex.tcl
lib/critcl-platform/pkgIndex.tcl
lib/critcl-platform/platform.tcl
lib/critcl-platform/shell.tcl
lib/critcl-util1/pkgIndex.tcl
lib/critcl-util1/util.tcl
lib/critcl-util1.1/pkgIndex.tcl
lib/critcl-util1.1/util.tcl
lib/critcl%%VER%%/Config
lib/critcl%%VER%%/Config.bak
lib/critcl%%VER%%/Config.orig
lib/critcl%%VER%%/critcl.tcl
lib/critcl%%VER%%/critcl_c/cdata.c
lib/critcl%%VER%%/critcl_c/header.c
@ -59,7 +63,6 @@ lib/critcl%%VER%%/critcl_c/tcl8.5/X11/Xutil.h
lib/critcl%%VER%%/critcl_c/tcl8.5/X11/cursorfont.h
lib/critcl%%VER%%/critcl_c/tcl8.5/X11/keysym.h
lib/critcl%%VER%%/critcl_c/tcl8.5/X11/keysymdef.h
lib/critcl%%VER%%/critcl_c/tcl8.5/X11/tk.h
lib/critcl%%VER%%/critcl_c/tcl8.5/X11/tkIntXlibDecls.h
lib/critcl%%VER%%/critcl_c/tcl8.5/tcl.h
lib/critcl%%VER%%/critcl_c/tcl8.5/tclDecls.h
@ -75,7 +78,6 @@ lib/critcl%%VER%%/critcl_c/tcl8.6/X11/Xutil.h
lib/critcl%%VER%%/critcl_c/tcl8.6/X11/cursorfont.h
lib/critcl%%VER%%/critcl_c/tcl8.6/X11/keysym.h
lib/critcl%%VER%%/critcl_c/tcl8.6/X11/keysymdef.h
lib/critcl%%VER%%/critcl_c/tcl8.6/X11/tk.h
lib/critcl%%VER%%/critcl_c/tcl8.6/X11/tkIntXlibDecls.h
lib/critcl%%VER%%/critcl_c/tcl8.6/tcl.h
lib/critcl%%VER%%/critcl_c/tcl8.6/tclDecls.h
@ -106,6 +108,7 @@ man/mann/critcl_apppkg.n.gz
man/mann/critcl_bitmap.n.gz
man/mann/critcl_class.n.gz
man/mann/critcl_devguide.n.gz
man/mann/critcl_emap.n.gz
man/mann/critcl_enum.n.gz
man/mann/critcl_iassoc.n.gz
man/mann/critcl_installer.n.gz