svn commit: r405408 - in head/devel/critcl: . files

Pietro Cerutti gahr at FreeBSD.org
Thu Jan 7 10:14:46 UTC 2016 

Author: gahr
Date: Thu Jan  7 10:14:44 2016
New Revision: 405408
URL: https://svnweb.freebsd.org/changeset/ports/405408

Log:
  devel/critcl - update to 3.1.15

Added:
  head/devel/critcl/files/patch-lib_critcl_critcl.tcl   (contents, props changed)
  head/devel/critcl/files/patch-test_cconst.test   (contents, props changed)
Deleted:
  head/devel/critcl/files/patch-tests
Modified:
  head/devel/critcl/Makefile
  head/devel/critcl/distinfo
  head/devel/critcl/pkg-plist

Modified: head/devel/critcl/Makefile
==============================================================================
--- head/devel/critcl/Makefile	Thu Jan  7 10:13:49 2016	(r405407)
+++ head/devel/critcl/Makefile	Thu Jan  7 10:14:44 2016	(r405408)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	critcl
-PORTVERSION=	3.1.12
-PORTREVISION=	3
+PORTVERSION=	3.1.15
 CATEGORIES=	devel
 
 MAINTAINER=	tcltk at FreeBSD.org
@@ -17,10 +16,12 @@ LICENSE_PERMS=	dist-mirror dist-sell pkg
 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>

Modified: head/devel/critcl/distinfo
==============================================================================
--- head/devel/critcl/distinfo	Thu Jan  7 10:13:49 2016	(r405407)
+++ head/devel/critcl/distinfo	Thu Jan  7 10:14:44 2016	(r405408)
@@ -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

Added: head/devel/critcl/files/patch-lib_critcl_critcl.tcl
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/critcl/files/patch-lib_critcl_critcl.tcl	Thu Jan  7 10:14:44 2016	(r405408)
@@ -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

Added: head/devel/critcl/files/patch-test_cconst.test
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/critcl/files/patch-test_cconst.test	Thu Jan  7 10:14:44 2016	(r405408)
@@ -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
+ }
+ 
+ # -------------------------------------------------------------------------

Modified: head/devel/critcl/pkg-plist
==============================================================================
--- head/devel/critcl/pkg-plist	Thu Jan  7 10:13:49 2016	(r405407)
+++ head/devel/critcl/pkg-plist	Thu Jan  7 10:14:44 2016	(r405408)
@@ -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/Xu
 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/Xu
 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

More information about the svn-ports-head mailing list