On 09/14/14 06:04, Stuart Henderson wrote:
On 2014/09/12 17:50, Stuart Cassoff wrote:
I'd like to update the Jimtcl port but that necessitates an update of
OpenOCD.
Your patch doesn't apply cleanly; specifically patch-Makefile_in in jimtcl.
Urgh. Ok, I should have Thunderbird tamed by now. Here they are again, with the
major bump.
Thanks.
Index: Makefile
===
RCS file: /cvs/ports/lang/jimtcl/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile11 Sep 2014 03:49:27 - 1.8
+++ Makefile16 Sep 2014 14:32:28 -
@@ -4,8 +4,8 @@ SHARED_ONLY = Yes
COMMENT = small footprint implementation of Tcl
-DISTNAME = jimtcl-0.75pl0
-SHARED_LIBS = jim 1.1
+DISTNAME = jimtcl-0.75pl1
+SHARED_LIBS = jim 2.0
CATEGORIES = lang devel
HOMEPAGE = http://jim.tcl.tk/
MAINTAINER = Stuart Cassoff s...@users.sourceforge.net
@@ -15,11 +15,10 @@ PERMIT_PACKAGE_CDROM = Yes
WANTLIB = c m sqlite3
-# Git checkin 2013/11/09 fae001d74c06a6293798d6b27db874ff46610a42
+# Git checkin 2014/09/01 c4d4bf8bc104733db1f5992a27d88fbfca9ba882
MASTER_SITES = http://mirror.arieslabs.com/openbsd/
MODULES = lang/tcl
-RUN_DEPENDS = ${MODTCL_RUN_DEPENDS}
BUILD_DEPENDS =${MODTCL_BUILD_DEPENDS} \
textproc/asciidoc
@@ -31,7 +30,8 @@ MAKE_FLAGS = LIBJIM=libjim.so.${LIBjim_
FAKE_FLAGS = INSTALL_DATA_DIR='${INSTALL_DATA_DIR}' \
INSTALL_DATA='${INSTALL_DATA}' \
- INSTALL_PROGRAM='${INSTALL_PROGRAM}'
+ INSTALL_PROGRAM='${INSTALL_PROGRAM}' \
+ INSTALL_SCRIPT='${INSTALL_SCRIPT}'
SEPARATE_BUILD = Yes
CONFIGURE_STYLE = simple
@@ -41,5 +41,8 @@ CONFIGURE_ARGS += ${CONFIGURE_SHARED} \
--full \
--with-mod=sqlite3 \
CCACHE=none
+
+pre-configure:
+ @${SUBST_CMD} ${WRKSRC}/examples.{api,ext}/Makefile
.include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/lang/jimtcl/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo14 Nov 2013 09:11:21 - 1.3
+++ distinfo16 Sep 2014 14:32:28 -
@@ -1,2 +1,2 @@
-SHA256 (jimtcl-0.75pl0.tar.gz) = hke0AsUyrgKYC86LhjmwIIfw+psdyFyT0oiWECuGUjA=
-SIZE (jimtcl-0.75pl0.tar.gz) = 2217434
+SHA256 (jimtcl-0.75pl1.tar.gz) = P0IpuMohJOHD79LznqEpaVlbligXbJ04z9tcfY2C8TM=
+SIZE (jimtcl-0.75pl1.tar.gz) = 2227650
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/lang/jimtcl/patches/patch-Makefile_in,v
retrieving revision 1.4
diff -u -p -r1.4 patch-Makefile_in
--- patches/patch-Makefile_in 14 Nov 2013 09:11:21 - 1.4
+++ patches/patch-Makefile_in 16 Sep 2014 14:32:28 -
@@ -1,63 +1,50 @@
$OpenBSD: patch-Makefile_in,v 1.4 2013/11/14 09:11:21 stu Exp $
-
-Install everything nicely.
-
Makefile.in.orig Sat Nov 9 00:49:42 2013
-+++ Makefile.inSat Nov 9 10:04:48 2013
-@@ -54,6 +54,12 @@ OBJS := _load-static-exts.o jim-subcmd.o jim-interacti
-
- JIMSH := jimsh@EXEEXT@
+--- Makefile.in.orig Thu Aug 7 21:59:27 2014
Makefile.inThu Sep 4 00:51:06 2014
+@@ -59,6 +59,7 @@ JIMSH := jimsh@EXEEXT@
+ INSTALL_DATA_DIR ?= mkdir -p
+ INSTALL_DATA ?= cp
+ INSTALL_PROGRAM ?= cp
++INSTALL_SCRIPT ?= cp
+ @endif
-+@if JIM_INSTALL
-+INSTALL_DATA_DIR ?= mkdir -p
-+INSTALL_DATA ?= cp
-+INSTALL_PROGRAM ?= cp
-+@endif
-+
all: $(JIMSH) @C_EXT_SHOBJS@
-
- # Create C extensions from pure Tcl extensions
-@@ -66,8 +72,8 @@ docs: Tcl.html
+@@ -73,8 +74,9 @@ docs: Tcl.html
@if JIM_DOCS
install-docs: docs
-- mkdir -p $(DESTDIR)$(prefix)/doc/jim
-- cp Tcl.html $(DESTDIR)$(prefix)/doc/jim
+- $(INSTALL_DATA_DIR) $(DESTDIR)$(prefix)/doc/jim
+- $(INSTALL_DATA) Tcl.html $(DESTDIR)$(prefix)/doc/jim
+ $(INSTALL_DATA_DIR) $(DESTDIR)@datadir@/doc/jim
-+ $(INSTALL_DATA) @srcdir@/README.extensions Tcl.html
$(DESTDIR)@datadir@/doc/jim
++ $(INSTALL_DATA) @srcdir@/LICENSE @srcdir@/README Tcl.html
$(DESTDIR)@datadir@/doc/jim
++ $(INSTALL_DATA) @srcdir@/README.{extensions,namespaces,oo,sqlite,utf-8}
$(DESTDIR)@datadir@/doc/jim
@else
install-docs:
@endif
-@@ -77,20 +83,21 @@ $(JIMSH): $(LIBJIM) jimsh.o initjimsh.o
+@@ -83,17 +85,22 @@ $(JIMSH): $(LIBJIM) jimsh.o initjimsh.o
+ $(JIMSH_CC) @SH_LINKFLAGS@ $(LDFLAGS) -o $@ jimsh.o initjimsh.o
$(LIBJIM) $(LDLIBS) $(LIBS)
@if JIM_INSTALL
- install: all @TCL_EXTS@ install-exec install-docs
-- mkdir -p $(DESTDIR)@libdir@/jim
-- cp $(LIBJIM) $(DESTDIR)@libdir@
-- cp @srcdir@/README.extensions @C_EXT_SHOBJS@
