I noticed sdk's recent mail about jimtcl pulling in asciidoc and chain
of dependencies to rebuild the documentation and noticed that it's
already present in the downloaded archive so we can use it directly .
Then I noticed that there's a newer version upstream and thought I might
as well update while there.
mail/neomutt and devel/openocd still build ok, jimarc4random builds
and tests are ok. SEPARATE_BUILD is dropped because upstream's build
infrastructure doesn't directly support it, and it doesn't seem enough
of a win (except on larger ports) to be worth adding patches to make
that work.
Any comments? ok?
Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/jimtcl/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- Makefile 9 Jun 2021 19:50:08 -0000 1.22
+++ Makefile 1 Nov 2021 14:52:56 -0000
@@ -2,9 +2,11 @@
COMMENT = small footprint implementation of Tcl
-DISTNAME = jimtcl-0.77pl2
-REVISION = 0
-SHARED_LIBS = jim 2.5
+GH_ACCOUNT = msteveb
+GH_PROJECT = jimtcl
+GH_TAGNAME = 0.80
+
+SHARED_LIBS = jim 3.0
CATEGORIES = lang devel
HOMEPAGE = http://jim.tcl.tk/
MAINTAINER = Stuart Cassoff <stwo@users.sourceforge.net>
@@ -12,14 +14,11 @@ MAINTAINER = Stuart Cassoff <stwo@users
# BSD
PERMIT_PACKAGE = Yes
-WANTLIB = c crypto execinfo m sqlite3 ssl z
-
-MASTER_SITES = https://chiselapp.com/user/stwo/repository/tarballia/uv/
+WANTLIB = c crypto execinfo m sqlite3 ssl util z
MODULES = lang/tcl
-BUILD_DEPENDS = ${MODTCL_BUILD_DEPENDS} \
- textproc/asciidoc
+BUILD_DEPENDS = ${MODTCL_BUILD_DEPENDS}
LIB_DEPENDS = databases/sqlite3
@@ -32,21 +31,32 @@ FAKE_FLAGS = INSTALL_DATA_DIR='${INSTAL
INSTALL_PROGRAM='${INSTALL_PROGRAM}' \
INSTALL_SCRIPT='${INSTALL_SCRIPT}'
-SEPARATE_BUILD = Yes
CONFIGURE_STYLE = simple
CONFIGURE_SCRIPT = ${MODTCL_BIN} ${WRKSRC}/autosetup/autosetup
CONFIGURE_ARGS += --enable-shared \
--includedir='$${prefix}/include/jim' \
+ --disable-docs \
--docdir='$${prefix}/share/doc/jim' \
--full \
- --with-mod='sqlite3 zlib' \
+ --with-mod=sqlite3,zlib \
CCACHE=none
CONFIGURE_ENV += WRAPPER=${WRKSRC}/configure \
- CFLAGS="${CFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib"
+ CFLAGS="${CFLAGS}" \
+ CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
pre-configure:
- @${SUBST_CMD} ${WRKSRC}/{initjimsh.tcl,examples.{api,ext}/Makefile}
+ @cd ${WRKSRC}; ${SUBST_CMD} \
+ initjimsh.tcl examples.ext/Makefile examples.api/Makefile.in
+
+post-install:
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/jim
+ cd ${WRKSRC}; ${INSTALL_DATA} LICENSE \
+ README{,.extensions,.namespaces,.oo,.sqlite,.utf-8} \
+ ${PREFIX}/share/doc/jim/
+ ${INSTALL_DATA} ${WRKSRC}/Tcl_shipped.html \
+ ${PREFIX}/share/doc/jim/Tcl.html
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/lang/jimtcl/distinfo,v
retrieving revision 1.11
diff -u -p -r1.11 distinfo
--- distinfo 10 Jun 2018 03:13:20 -0000 1.11
+++ distinfo 1 Nov 2021 14:52:56 -0000
@@ -1,2 +1,2 @@
-SHA256 (jimtcl-0.77pl2.tar.gz) = C+3QQcKzRD7yjGB8eANCb+tXvyahBDqtdiiDBKZ8tTA=
-SIZE (jimtcl-0.77pl2.tar.gz) = 3069014
+SHA256 (jimtcl-0.80.tar.gz) = nnmpYN6SVVLutN9REh8OoBfjRAlWgRexrEYfTDBxKJ4=
+SIZE (jimtcl-0.80.tar.gz) = 3130592
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/lang/jimtcl/patches/patch-Makefile_in,v
retrieving revision 1.9
diff -u -p -r1.9 patch-Makefile_in
--- patches/patch-Makefile_in 10 Jun 2018 03:13:20 -0000 1.9
+++ patches/patch-Makefile_in 1 Nov 2021 14:52:56 -0000
@@ -5,7 +5,7 @@ Don't use soname when linking.
Index: Makefile.in
--- Makefile.in.orig
+++ Makefile.in
-@@ -25,7 +25,6 @@ STRIP = @STRIP@
+@@ -28,7 +28,6 @@ export CCACHE_DISABLE := 1
SH_CFLAGS ?= @SH_CFLAGS@
SH_LDFLAGS ?= @SH_LDFLAGS@
@if SH_SOPREFIX
@@ -13,7 +13,7 @@ Index: Makefile.in
@endif
SHOBJ_CFLAGS ?= @SHOBJ_CFLAGS@
@if JIM_STATICLIB
-@@ -75,6 +74,7 @@ JIMSH := jimsh@EXEEXT@
+@@ -78,6 +77,7 @@ JIMSH := jimsh@EXEEXT@
INSTALL_DATA_DIR ?= mkdir -p
INSTALL_DATA ?= cp
INSTALL_PROGRAM ?= cp
@@ -21,8 +21,8 @@ Index: Makefile.in
@endif
all: $(JIMSH) @C_EXT_SHOBJS@
-@@ -96,20 +96,25 @@ $(JIMSH): $(LIBJIM) jimsh.o initjimsh.o
- $(Q)$(JIMSH_CC) @SH_LINKFLAGS@ $(LDFLAGS) -o $@ jimsh.o initjimsh.o $(LIBJIM) $(LDLIBS) $(LIBS)
+@@ -99,20 +99,25 @@ $(JIMSH): $(LIBJIM) jimsh.o initjimsh.o
+ $(Q)$(JIMSH_CC) @SH_LINKRPATH_FLAGS@ @SH_LINKFLAGS@ $(LDFLAGS) -o $@ jimsh.o initjimsh.o $(LIBJIM) $(LDLIBS) $(LIBS)
@if JIM_INSTALL
-install: all @TCL_EXTS@ install-exec install-docs
@@ -51,12 +51,3 @@ Index: Makefile.in
install-exec: all
$(INSTALL_DATA_DIR) $(DESTDIR)@bindir@
$(INSTALL_PROGRAM) $(JIMSH) $(DESTDIR)@bindir@
-@@ -261,6 +266,8 @@ install-docs:
- install-docs: docs
- $(INSTALL_DATA_DIR) $(DESTDIR)$(docdir)
- $(INSTALL_DATA) Tcl.html $(DESTDIR)$(docdir)
-+ $(INSTALL_DATA) @srcdir@/LICENSE @srcdir@/README $(DESTDIR)$(docdir)
-+ $(INSTALL_DATA) @srcdir@/README.{extensions,namespaces,oo,sqlite,utf-8} $(DESTDIR)$(docdir)
- @endif
-
- @if INSTALL_DOCS == shipped
Index: patches/patch-build-jim-ext_in
===================================================================
RCS file: /cvs/ports/lang/jimtcl/patches/patch-build-jim-ext_in,v
retrieving revision 1.1
diff -u -p -r1.1 patch-build-jim-ext_in
--- patches/patch-build-jim-ext_in 10 Oct 2014 19:58:21 -0000 1.1
+++ patches/patch-build-jim-ext_in 1 Nov 2021 14:52:56 -0000
@@ -1,14 +1,16 @@
$OpenBSD: patch-build-jim-ext_in,v 1.1 2014/10/10 19:58:21 stu Exp $
---- build-jim-ext.in.orig Fri Oct 10 15:22:33 2014
-+++ build-jim-ext.in Fri Oct 10 15:23:01 2014
+
+Index: build-jim-ext.in
+--- build-jim-ext.in.orig
++++ build-jim-ext.in
@@ -106,8 +106,8 @@ if {$static} {
- }
puts "Building $target from $sources\n"
--# Now add the standard location after any user include paths
--lappend includepaths -I@prefix@/include
-+# Now add the Jim location after any user include paths
-+lappend includepaths -I@prefix@/include/jim
-
- set CPPFLAGS "-D_GNU_SOURCE"
+ if {!$cross} {
+- # If not cross compiling, add the standard location after any user include paths
+- lappend includepaths -I@prefix@/include
++ # If not cross compiling, add the Jim location after any user include paths
++ lappend includepaths -I@prefix@/include/jim
+ }
+ # Work around Tcl's strange behaviour of exec failing if stderr is produced
Index: patches/patch-examples_api_Makefile
===================================================================
RCS file: patches/patch-examples_api_Makefile
diff -N patches/patch-examples_api_Makefile
--- patches/patch-examples_api_Makefile 16 Sep 2014 15:41:15 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-examples_api_Makefile,v 1.1 2014/09/16 15:41:15 stu Exp $
---- examples.api/Makefile.orig Wed Sep 3 22:22:49 2014
-+++ examples.api/Makefile Wed Sep 3 22:23:27 2014
-@@ -1,6 +1,6 @@
- CFLAGS+= -Wall -g
--CFLAGS+= -I..
--LDLIBS += -L.. -ljim
-+CFLAGS+= -I${LOCALBASE}/include/jim
-+LDLIBS += -L${LOCALBASE}/lib -ljim
-
- EXAMPLES= \
- jim_command \
Index: patches/patch-examples_api_Makefile_in
===================================================================
RCS file: patches/patch-examples_api_Makefile_in
diff -N patches/patch-examples_api_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-examples_api_Makefile_in 1 Nov 2021 14:52:56 -0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+Index: examples.api/Makefile.in
+--- examples.api/Makefile.in.orig
++++ examples.api/Makefile.in
+@@ -1,6 +1,6 @@
+ CFLAGS+= -Wall -g
+-CFLAGS+= -I..
++CFLAGS+= -I${LOCALBASE}/include/jim
+ LDFLAGS += @LDFLAGS@
+ LDLIBS += -L.. -ljim @LDLIBS@
+
+ EXAMPLES= \
Index: patches/patch-examples_ext_Makefile
===================================================================
RCS file: /cvs/ports/lang/jimtcl/patches/patch-examples_ext_Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 patch-examples_ext_Makefile
--- patches/patch-examples_ext_Makefile 10 Oct 2014 19:58:21 -0000 1.2
+++ patches/patch-examples_ext_Makefile 1 Nov 2021 14:52:56 -0000
@@ -1,4 +1,5 @@
$OpenBSD: patch-examples_ext_Makefile,v 1.2 2014/10/10 19:58:21 stu Exp $
+
--- examples.ext/Makefile.orig Fri Oct 10 02:34:34 2014
+++ examples.ext/Makefile Fri Oct 10 15:43:42 2014
@@ -9,21 +9,20 @@
Index: patches/patch-initjimsh_tcl
===================================================================
RCS file: /cvs/ports/lang/jimtcl/patches/patch-initjimsh_tcl,v
retrieving revision 1.2
diff -u -p -r1.2 patch-initjimsh_tcl
--- patches/patch-initjimsh_tcl 10 Apr 2015 14:35:36 -0000 1.2
+++ patches/patch-initjimsh_tcl 1 Nov 2021 14:52:56 -0000
@@ -1,4 +1,5 @@
$OpenBSD: patch-initjimsh_tcl,v 1.2 2015/04/10 14:35:36 stu Exp $
+
--- initjimsh.tcl.orig Sun Apr 5 20:13:49 2015
+++ initjimsh.tcl Mon Apr 6 19:26:10 2015
@@ -22,7 +22,12 @@ proc _jimsh_init {} {
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/lang/jimtcl/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST
--- pkg/PLIST 23 Apr 2017 21:05:47 -0000 1.6
+++ pkg/PLIST 1 Nov 2021 14:52:56 -0000
@@ -8,9 +8,9 @@ include/jim/jim-subcmd.h
include/jim/jim-win32compat.h
include/jim/jim.h
lib/jim/
-lib/jim/sqlite3.so
+@so lib/jim/sqlite3.so
lib/jim/tcltest.tcl
-lib/jim/zlib.so
+@so lib/jim/zlib.so
@lib lib/libjim.so.${LIBjim_VERSION}
lib/pkgconfig/jimtcl.pc
share/doc/jim/
@@ -42,7 +42,6 @@ share/examples/jim/ext/Makefile
share/examples/jim/ext/README
share/examples/jim/ext/helloworld.c
share/examples/jim/jtclsh.tcl
-share/examples/jim/key.pem
share/examples/jim/metakit.tcl
share/examples/jim/ootest.tcl
share/examples/jim/parray.tcl
@@ -60,3 +59,7 @@ share/examples/jim/udp.server
share/examples/jim/udp2.client
share/examples/jim/udp6.client
share/examples/jim/udp6.server
+share/examples/jim/unix.client
+share/examples/jim/unix.dgram.client
+share/examples/jim/unix.dgram.server
+share/examples/jim/unix.server
No comments:
Post a Comment