openbsd/ports
1
0
Fork 0
mirror of https://github.com/openbsd/ports.git synced 2026-06-17 23:13:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to 0.81.

Browse Source 
MULTI_PACKAGES=-main -redis -sdl -sqlite
SEPARATE_BUILD=Yes
MODTCL_VERSION=8.6

devel/openocd 0.12.0 wants lang/jimtcl >= 0.81.


ok and help from sthen@
This commit is contained in:
stu
2025-11-29 10:30:21 +00:00
parent e6f38a694f
commit 15b54e0abb
12 changed files with 61 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lang/jimtcl/Makefile
+27 -8
View File
@@ -1,10 +1,15 @@
COMMENT = small footprint implementation of Tcl
COMMENT-main = small footprint implementation of Tcl
COMMENT-redis = REDIS extension for Jimtcl
COMMENT-sdl = SDL extension for Jimtcl
COMMENT-sqlite = SQLite extension for Jimtcl
MULTI_PACKAGES = -main -redis -sdl -sqlite
GH_ACCOUNT = msteveb
GH_PROJECT = jimtcl
GH_TAGNAME = 0.80
GH_TAGNAME = 0.81
SHARED_LIBS = jim 3.0
SHARED_LIBS = jim 4.0
CATEGORIES = lang devel
HOMEPAGE = http://jim.tcl.tk/
MAINTAINER = Stuart Cassoff <stwo@users.sourceforge.net>
@@ -12,13 +17,25 @@ MAINTAINER = Stuart Cassoff <stwo@users.sourceforge.net>
# BSD
PERMIT_PACKAGE = Yes
WANTLIB = c crypto execinfo m sqlite3 ssl util z
WANTLIB-main = c crypto execinfo m ssl util z
WANTLIB-redis = jim hiredis
WANTLIB-sdl = jim SDL2 SDL2_gfx-1.0 SDL2_ttf
WANTLIB-sqlite = jim sqlite3
MODULES = lang/tcl
MODTCL_VERSION = 8.6
BUILD_DEPENDS = ${MODTCL_BUILD_DEPENDS}
LIB_DEPENDS = databases/sqlite3
LIB_DEPENDS-redis = lang/jimtcl,-main \
databases/libhiredis
LIB_DEPENDS-sdl = lang/jimtcl,-main \
devel/sdl2-gfx \
devel/sdl2-ttf
LIB_DEPENDS-sqlite = lang/jimtcl,-main \
databases/sqlite3
MAKE_FLAGS = LIBJIM=libjim.so.${LIBjim_VERSION} \
SH_CFLAGS=${PICFLAG} \
@@ -29,18 +46,20 @@ FAKE_FLAGS = INSTALL_DATA_DIR='${INSTALL_DATA_DIR}' \
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 \
CONFIGURE_ARGS = --enable-shared \
--includedir='$${prefix}/include/jim' \
--disable-docs \
--docdir='$${prefix}/share/doc/jim' \
--full \
--with-mod=sqlite3,zlib \
--compat \
--with-mod=redis,sdl,sqlite3 \
CCACHE=none
CONFIGURE_ENV += WRAPPER=${WRKSRC}/configure \
CONFIGURE_ENV = WRAPPER=${WRKSRC}/configure \
CFLAGS="${CFLAGS}" \
CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
lang/jimtcl/distinfo
+2 -2
View File
@@ -1,2 +1,2 @@
SHA256 (jimtcl-0.80.tar.gz) = nnmpYN6SVVLutN9REh8OoBfjRAlWgRexrEYfTDBxKJ4=
SIZE (jimtcl-0.80.tar.gz) = 3130592
SHA256 (jimtcl-0.81.tar.gz) = q36zaAug0W9KnrHgW3/Lt9I0OOJRhUYsVc0DKhlUqYU=
SIZE (jimtcl-0.81.tar.gz) = 3977705
lang/jimtcl/patches/patch-Makefile_in
+11 -5
View File
@@ -11,7 +11,7 @@ Index: Makefile.in
@endif
SHOBJ_CFLAGS ?= @SHOBJ_CFLAGS@
@if JIM_STATICLIB
@@ -78,6 +77,7 @@ JIMSH := jimsh@EXEEXT@
@@ -79,6 +78,7 @@ JIMSH := jimsh@EXEEXT@
INSTALL_DATA_DIR ?= mkdir -p
INSTALL_DATA ?= cp
INSTALL_PROGRAM ?= cp
@@ -19,7 +19,7 @@ Index: Makefile.in
@endif
all: $(JIMSH) @C_EXT_SHOBJS@
@@ -99,20 +99,25 @@ $(JIMSH): $(LIBJIM) jimsh.o initjimsh.o
@@ -100,24 +100,30 @@ $(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
@@ -41,11 +41,17 @@ Index: Makefile.in
+install-exas:
+ $(INSTALL_DATA_DIR) $(DESTDIR)@datadir@/examples/jim{,/api,/ext}
+ $(INSTALL_SCRIPT) build-jim-ext $(DESTDIR)@datadir@/examples/jim
+ $(INSTALL_DATA) @srcdir@/examples/* $(DESTDIR)@datadir@/examples/jim
+ $(INSTALL_DATA) @srcdir@/examples.api/{README,Makefile,*.c,*.tcl} $(DESTDIR)@datadir@/examples/jim/api
+ $(INSTALL_SCRIPT) build-jim-ext $(DESTDIR)@datadir@/examples/jim
+ $(INSTALL_DATA) @srcdir@/examples/* $(DESTDIR)@datadir@/examples/jim
+ $(INSTALL_DATA) @srcdir@/examples.ext/{README,Makefile,*.c} $(DESTDIR)@datadir@/examples/jim/ext
+ $(INSTALL_DATA) @srcdir@/examples.api/{README,*.c,*.tcl} $(DESTDIR)@datadir@/examples/jim/api
+ $(INSTALL_DATA) examples.api/Makefile $(DESTDIR)@datadir@/examples/jim/api
+
install-exec: all
$(INSTALL_DATA_DIR) $(DESTDIR)@bindir@
$(INSTALL_PROGRAM) $(JIMSH) $(DESTDIR)@bindir@
- $(INSTALL_PROGRAM) @srcdir@/jimdb $(DESTDIR)@bindir@
+ $(INSTALL_SCRIPT) @srcdir@/jimdb $(DESTDIR)@bindir@
uninstall:
rm -f $(DESTDIR)@bindir@/$(JIMSH)
lang/jimtcl/patches/patch-examples_api_Makefile_in
+1 -2
View File
@@ -1,11 +1,10 @@
Index: examples.api/Makefile.in
--- examples.api/Makefile.in.orig
+++ examples.api/Makefile.in
@@ -1,6 +1,6 @@
@@ -1,5 +1,5 @@
CFLAGS+= -Wall -g
-CFLAGS+= -I..
+CFLAGS+= -I${LOCALBASE}/include/jim
LDFLAGS += @LDFLAGS@
LDLIBS += -L.. -ljim @LDLIBS@
EXAMPLES= \
lang/jimtcl/pkg/DESCR → lang/jimtcl/pkg/DESCR-main
View File
lang/jimtcl/pkg/DESCR-redis
+1
View File
@@ -0,0 +1 @@
REDIS extension for Jimtcl.
lang/jimtcl/pkg/DESCR-sdl
+1
View File
@@ -0,0 +1 @@
SDL extension for Jimtcl.
lang/jimtcl/pkg/DESCR-sqlite
+1
View File
@@ -0,0 +1 @@
SQLite extension for Jimtcl.
lang/jimtcl/pkg/PLIST → lang/jimtcl/pkg/PLIST-main
+13 -2
View File
@@ -1,3 +1,5 @@
@pkgpath lang/jimtcl
bin/jimdb
@bin bin/jimsh
include/jim/
include/jim/jim-config.h
@@ -7,9 +9,7 @@ include/jim/jim-subcmd.h
include/jim/jim-win32compat.h
include/jim/jim.h
lib/jim/
@so lib/jim/sqlite3.so
lib/jim/tcltest.tcl
@so lib/jim/zlib.so
@lib lib/libjim.so.${LIBjim_VERSION}
lib/pkgconfig/jimtcl.pc
share/doc/jim/
@@ -22,6 +22,8 @@ share/doc/jim/README.sqlite
share/doc/jim/README.utf-8
share/doc/jim/Tcl.html
share/examples/jim/
share/examples/jim/COPYING.FreeSans.ttf
share/examples/jim/FreeSans.ttf
share/examples/jim/api/
share/examples/jim/api/Makefile
share/examples/jim/api/README
@@ -34,18 +36,27 @@ share/examples/jim/api/print.tcl
share/examples/jim/build-jim-ext
share/examples/jim/certificate.pem
share/examples/jim/client-server.tcl
share/examples/jim/dbgtest.tcl
share/examples/jim/dns.tcl
share/examples/jim/dnstest.tcl
share/examples/jim/ext/
share/examples/jim/ext/Makefile
share/examples/jim/ext/README
share/examples/jim/ext/helloworld.c
share/examples/jim/jcov
share/examples/jim/jtclsh.tcl
share/examples/jim/jtime
share/examples/jim/jtrace
share/examples/jim/metakit.tcl
share/examples/jim/ootest.tcl
share/examples/jim/parray.tcl
share/examples/jim/pipe.tcl
share/examples/jim/popen.tcl
share/examples/jim/redis-pubsub.tcl
share/examples/jim/redis.tcl
share/examples/jim/sdlcircles.tcl
share/examples/jim/sdlevents.tcl
share/examples/jim/sdltest.tcl
share/examples/jim/sqlite3test.tcl
share/examples/jim/ssl.client
share/examples/jim/ssl.server
lang/jimtcl/pkg/PLIST-redis
+1
View File
@@ -0,0 +1 @@
@so lib/jim/redis.so
lang/jimtcl/pkg/PLIST-sdl
+1
View File
@@ -0,0 +1 @@
@so lib/jim/sdl.so
lang/jimtcl/pkg/PLIST-sqlite
+2
View File
@@ -0,0 +1,2 @@
@conflict jimtcl-<0.81
@so lib/jim/sqlite3.so