subject:"UPDATE\: jimtcl"

Re: UPDATE: Jimtcl and OpenOCD

2014-09-16 Thread Stuart Cassoff

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@

Re: UPDATE: Jimtcl and OpenOCD

2014-09-16 Thread Stuart Henderson

On 2014/09/16 10:35, Stuart Cassoff wrote:
 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.

OK as far as I can test it, but I don't have a way to test openocd.

Re: UPDATE: Jimtcl and OpenOCD

2014-09-16 Thread Stuart Cassoff

On 09/16/14 11:18, Stuart Henderson wrote:
 On 2014/09/16 10:35, Stuart Cassoff wrote:
 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.
 
 OK as far as I can test it, but I don't have a way to test openocd.
 

Great, thanks.
I don't see how the newer Jim could be a problem for OpenOCD.
If something does go wrong I'll help fix it.

Re: UPDATE: Jimtcl and OpenOCD

2014-09-14 Thread Stuart Henderson

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.

Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--
|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  12 Sep 2014 21:47:20 -
--
Patching file patches/patch-Makefile_in using Plan A...
Hunk #1 failed at 1.
1 out of 1 hunks failed--saving rejects to patches/patch-Makefile_in.rej
done

 A typedef in Jim had a * removed so it has to be added to OpenOCD in a couple 
 of places.

That suggests a major bump rather than the minor bump you've included.

UPDATE: Jimtcl and OpenOCD

2014-09-12 Thread Stuart Cassoff

I'd like to update the Jimtcl port but that necessitates an update of OpenOCD.
A typedef in Jim had a * removed so it has to be added to OpenOCD in a couple 
of places.

I sent similar diffs to the OpenOCD maintainer last week but have yet to hear 
from him.
It's a simple change to OpenOCD, and although I'm not sure how to test it,
the build output with the new Jimtcl is the same as with the current Jimtcl.

The Jimtcl update also removes the RUN_DEPENDS on Tcl (Jim doesn't need Tcl),
improves Jim's auto_path and installs more docs and examples.

Fixed a bad bound bug in OpenOCD. OpenOCD shouldn't need Tcl either.

k?


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
+++ Makefile12 Sep 2014 21:47:20 -
@@ -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 1.2
 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
+++ distinfo12 Sep 2014 21:47:20 -
@@ -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   12 Sep 2014 21:47:20 -
@@ -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

Re: UPDATE: jimtcl

2013-11-11 Thread Stuart Cassoff

On 11/10/13 01:30, Stuart Cassoff wrote:
 Update to 0.75.

Updated diff.


Index: Makefile
===
RCS file: /cvs/ports/lang/jimtcl/Makefile,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 Makefile
--- Makefile11 Mar 2013 11:20:27 -  1.6
+++ Makefile12 Nov 2013 03:45:09 -
@@ -4,37 +4,42 @@ SHARED_ONLY=  Yes

 COMMENT=   small footprint implementation of Tcl

-DISTNAME=  jimtcl-0.73
-SHARED_LIBS=   jim 1.0
+DISTNAME=  jimtcl-0.75pl0
+SHARED_LIBS=   jim 1.1
 CATEGORIES=lang devel

 HOMEPAGE=  http://jim.tcl.tk/
+MAINTAINER =   Stuart Cassoff s...@users.sourceforge.net

 # BSD
 PERMIT_PACKAGE_CDROM=  Yes

-# Upstream has no real releases, so it's a git tag
+# Git checkin fae001d74c06a6293798d6b27db874ff46610a42
 MASTER_SITES=  http://distfiles.nl/

-WANTLIB=   c m
+WANTLIB=   c m sqlite3

 MODULES=   lang/tcl

 RUN_DEPENDS=   ${MODTCL_RUN_DEPENDS}
 BUILD_DEPENDS= ${MODTCL_BUILD_DEPENDS} \
textproc/asciidoc
-TEST_DEPENDS=  devel/gmake

-MAKE_ENV+= SONAME_MAJOR=${LIBjim_VERSION:R} \
-   SONAME_MINOR=${LIBjim_VERSION:E}
+MAKE_FLAGS =   LIBJIM=libjim.so.${LIBjim_VERSION} \
+   SH_CFLAGS=${PICFLAG} \
+   SHOBJ_CFLAGS=${PICFLAG} \
+   SH_LDFLAGS=-shared
+
+FAKE_FLAGS =   INSTALL_DATA_DIR='${INSTALL_DATA_DIR}' \
+   INSTALL_DATA='${INSTALL_DATA}' \
+   INSTALL_PROGRAM='${INSTALL_PROGRAM}'

+SEPARATE_BUILD =   Yes
 CONFIGURE_STYLE=   simple
 CONFIGURE_ARGS+=   ${CONFIGURE_SHARED} \
-   --full  # ipv6, math, utf8, binary, oo, tree
-
-# Only test requires gmake, so cheat a bit here instead of forcing it
-# as a build dependency.
-do-test:
-   cd ${WRKSRC}  ${SET_ENV} ${MAKE_ENV} ${LOCALBASE}/bin/gmake test
+   --includedir=${PREFIX}/include/jim \
+   --full \
+   --with-mod=sqlite3 \
+   CCACHE=none

 .include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/lang/jimtcl/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- distinfo8 Mar 2013 10:24:47 -   1.2
+++ distinfo12 Nov 2013 03:45:09 -
@@ -1,2 +1,2 @@
-SHA256 (jimtcl-0.73.tar.gz) = aoS1yzn/ffjkfuwS91Zm4RwypNRP+DDGX+Lml/2IGt4=
-SIZE (jimtcl-0.73.tar.gz) = 2196689
+SHA256 (jimtcl-0.75pl0.tar.gz) = hke0AsUyrgKYC86LhjmwIIfw+psdyFyT0oiWECuGUjA=
+SIZE (jimtcl-0.75pl0.tar.gz) = 2217434
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/lang/jimtcl/patches/patch-Makefile_in,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-Makefile_in
--- patches/patch-Makefile_in   8 Mar 2013 10:24:47 -   1.3
+++ patches/patch-Makefile_in   12 Nov 2013 03:45:09 -
@@ -1,47 +1,63 @@
 $OpenBSD: patch-Makefile_in,v 1.3 2013/03/08 10:24:47 jasper Exp $

-- Install docs into the right directory.
-- Add shared library versioning to libjim.
+Install everything nicely.

 Makefile.in.orig   Tue Feb 12 23:02:49 2013
-+++ Makefile.inTue Feb 12 23:04:36 2013
-@@ -33,6 +33,8 @@ VPATH := @srcdir@
- @if JIM_STATICLIB
- LIBJIM := libjim.a
- @else
-+SONAME_MAJOR?=0
-+SONAME_MINOR?=0
- LIBJIM := libjim.@LIBSOEXT@
- SH_LIBJIM := $(LIBJIM)
- CC += $(SH_CFLAGS)
-@@ -67,15 +69,14 @@ $(JIMSH): $(LIBJIM) jimsh.o initjimsh.o
+--- 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

- @if JIM_INSTALL
- install: all docs @TCL_EXTS@ install-exec
--  mkdir -p $(DESTDIR)$(prefix)/lib/jim
--  cp $(LIBJIM) $(DESTDIR)$(prefix)/lib
--  cp @srcdir@/README.extensions @C_EXT_SHOBJS@ @TCL_EXTS@ 
$(DESTDIR)$(prefix)/lib/jim
-+  mkdir -p $(DESTDIR)$(prefix)/share/doc/jim
-+  cp $(LIBJIM).$(SONAME_MAJOR).$(SONAME_MINOR) $(DESTDIR)$(prefix)/lib
-+  cp @srcdir@/README.extensions @C_EXT_SHOBJS@ @TCL_EXTS@ 
$(DESTDIR)$(prefix)/share/doc/jim/
-   mkdir -p $(DESTDIR)$(prefix)/include
-   cp @srcdir@/jim.h @srcdir@/jim-eventloop.h @srcdir@/jim-signal.h \
-   @srcdir@/jim-subcmd.h @srcdir@/jim-win32compat.h 
$(DESTDIR)$(prefix)/include
-   cp jim-config.h $(DESTDIR)$(prefix)/include
+ JIMSH := jimsh@EXEEXT@
+
++@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
+
+ @if JIM_DOCS
+ install-docs: docs
 -  mkdir -p $(DESTDIR)$(prefix)/doc/jim
 -  cp Tcl.html $(DESTDIR)$(prefix)/doc/jim
-+

Re: UPDATE: jimtcl

2013-11-10 Thread Landry Breuil

On Sun, Nov 10, 2013 at 01:30:11AM -0500, Stuart Cassoff wrote:
 Update to 0.75.
 
 Jimtcl picks up ccache if installed and won't build
 without USE_CCACHE=Yes, so I decided to force it.

I'd rather see it patched to not pick it up. Even if ccache is available
everywhere, i dont think it makes  much sense here.

 Remove the SONAME stuff, I don't see how it would be needed.
 
 There should no longer be a need to play with -fPIC.
 Patch removed. If needed, can be done in the port Makefile.

Did check that on several archs to make sure it wasnt needed ?

 Gmake not needed.
 Put include files in their own dir.
 Install examples.
 Install loadable sqlite3 extension.
 Take maintainership, with permission.
 Distfile at cvs:~stu

Jasper, can you host it ?

Landry

Re: UPDATE: jimtcl

2013-11-10 Thread Stuart Cassoff

On 11/10/13 04:00, Landry Breuil wrote:
 On Sun, Nov 10, 2013 at 01:30:11AM -0500, Stuart Cassoff wrote:
 Update to 0.75.

 Jimtcl picks up ccache if installed and won't build
 without USE_CCACHE=Yes, so I decided to force it.
 
 I'd rather see it patched to not pick it up. Even if ccache is available
 everywhere, i dont think it makes  much sense here.

Ok, I'll take it out.

 
 Remove the SONAME stuff, I don't see how it would be needed.

 There should no longer be a need to play with -fPIC.
 Patch removed. If needed, can be done in the port Makefile.
 
 Did check that on several archs to make sure it wasnt needed ?
 

Looking at config code, commit messages on the site and bsd.own.mk
it seems I'll have to make an adjustment for alpha.
Spark looks ok.


Stu

Re: UPDATE: jimtcl

2013-11-10 Thread Stuart Cassoff

On 11/10/13 04:24, Stuart Cassoff wrote:
 On 11/10/13 04:00, Landry Breuil wrote:
 On Sun, Nov 10, 2013 at 01:30:11AM -0500, Stuart Cassoff wrote:
 Update to 0.75.

 Jimtcl picks up ccache if installed and won't build
 without USE_CCACHE=Yes, so I decided to force it.

 I'd rather see it patched to not pick it up. Even if ccache is available
 everywhere, i dont think it makes  much sense here.
 
 Ok, I'll take it out.
 

 Remove the SONAME stuff, I don't see how it would be needed.

 There should no longer be a need to play with -fPIC.
 Patch removed. If needed, can be done in the port Makefile.

 Did check that on several archs to make sure it wasnt needed ?

 
 Looking at config code, commit messages on the site and bsd.own.mk
 it seems I'll have to make an adjustment for alpha.
 Spark looks ok.
 


Updated diff with those changes.


Index: Makefile
===
RCS file: /cvs/ports/lang/jimtcl/Makefile,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 Makefile
--- Makefile11 Mar 2013 11:20:27 -  1.6
+++ Makefile10 Nov 2013 09:46:52 -
@@ -4,37 +4,42 @@ SHARED_ONLY=  Yes

 COMMENT=   small footprint implementation of Tcl

-DISTNAME=  jimtcl-0.73
-SHARED_LIBS=   jim 1.0
+DISTNAME=  jimtcl-0.75
+SHARED_LIBS=   jim 1.1
 CATEGORIES=lang devel

 HOMEPAGE=  http://jim.tcl.tk/
+MAINTAINER =   Stuart Cassoff s...@users.sourceforge.net

 # BSD
 PERMIT_PACKAGE_CDROM=  Yes

-# Upstream has no real releases, so it's a git tag
+# Git snapshot fae001d74c06a6293798d6b27db874ff46610a42
 MASTER_SITES=  http://distfiles.nl/

-WANTLIB=   c m
+WANTLIB=   c m sqlite3

 MODULES=   lang/tcl

 RUN_DEPENDS=   ${MODTCL_RUN_DEPENDS}
 BUILD_DEPENDS= ${MODTCL_BUILD_DEPENDS} \
textproc/asciidoc
-TEST_DEPENDS=  devel/gmake

-MAKE_ENV+= SONAME_MAJOR=${LIBjim_VERSION:R} \
-   SONAME_MINOR=${LIBjim_VERSION:E}
+MAKE_FLAGS =   LIBJIM=libjim.so.${LIBjim_VERSION} \
+   SH_CFLAGS=${PICFLAG} \
+   SHOBJ_CFLAGS=${PICFLAG} \
+   SH_LDFLAGS=-shared
+
+FAKE_FLAGS =   INSTALL_DATA_DIR='${INSTALL_DATA_DIR}' \
+   INSTALL_DATA='${INSTALL_DATA}' \
+   INSTALL_PROGRAM='${INSTALL_PROGRAM}'

+SEPARATE_BUILD =   Yes
 CONFIGURE_STYLE=   simple
 CONFIGURE_ARGS+=   ${CONFIGURE_SHARED} \
-   --full  # ipv6, math, utf8, binary, oo, tree
-
-# Only test requires gmake, so cheat a bit here instead of forcing it
-# as a build dependency.
-do-test:
-   cd ${WRKSRC}  ${SET_ENV} ${MAKE_ENV} ${LOCALBASE}/bin/gmake test
+   --includedir=${PREFIX}/include/jim \
+   --full \
+   --with-mod=sqlite3 \
+   CCACHE=none

 .include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/lang/jimtcl/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- distinfo8 Mar 2013 10:24:47 -   1.2
+++ distinfo10 Nov 2013 09:46:52 -
@@ -1,2 +1,2 @@
-SHA256 (jimtcl-0.73.tar.gz) = aoS1yzn/ffjkfuwS91Zm4RwypNRP+DDGX+Lml/2IGt4=
-SIZE (jimtcl-0.73.tar.gz) = 2196689
+SHA256 (jimtcl-0.75.tar.gz) = mAKk+BxXNiqxWLAj2H7feD3XQfmtiK1HUWj+sPljldo=
+SIZE (jimtcl-0.75.tar.gz) = 2217469
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/lang/jimtcl/patches/patch-Makefile_in,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-Makefile_in
--- patches/patch-Makefile_in   8 Mar 2013 10:24:47 -   1.3
+++ patches/patch-Makefile_in   10 Nov 2013 09:46:52 -
@@ -1,47 +1,63 @@
 $OpenBSD: patch-Makefile_in,v 1.3 2013/03/08 10:24:47 jasper Exp $

-- Install docs into the right directory.
-- Add shared library versioning to libjim.
+Install everything nicely.

 Makefile.in.orig   Tue Feb 12 23:02:49 2013
-+++ Makefile.inTue Feb 12 23:04:36 2013
-@@ -33,6 +33,8 @@ VPATH := @srcdir@
- @if JIM_STATICLIB
- LIBJIM := libjim.a
- @else
-+SONAME_MAJOR?=0
-+SONAME_MINOR?=0
- LIBJIM := libjim.@LIBSOEXT@
- SH_LIBJIM := $(LIBJIM)
- CC += $(SH_CFLAGS)
-@@ -67,15 +69,14 @@ $(JIMSH): $(LIBJIM) jimsh.o initjimsh.o
+--- 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

- @if JIM_INSTALL
- install: all docs @TCL_EXTS@ install-exec
--  mkdir -p $(DESTDIR)$(prefix)/lib/jim
--  cp $(LIBJIM) $(DESTDIR)$(prefix)/lib
--  cp @srcdir@/README.extensions @C_EXT_SHOBJS@ @TCL_EXTS@ 
$(DESTDIR)$(prefix)/lib/jim
-+  mkdir -p $(DESTDIR)$(prefix)/share/doc/jim
-+  cp $(LIBJIM).$(SONAME_MAJOR).$(SONAME_MINOR)

Re: UPDATE: jimtcl

2013-11-10 Thread Stuart Cassoff

On 11/10/13 14:39, Stuart Henderson wrote:
 On 2013/11/10 10:00, Landry Breuil wrote:
 On Sun, Nov 10, 2013 at 01:30:11AM -0500, Stuart Cassoff wrote:
 Update to 0.75.

 Jimtcl picks up ccache if installed and won't build
 without USE_CCACHE=Yes, so I decided to force it.

 I'd rather see it patched to not pick it up. Even if ccache is available
 everywhere, i dont think it makes  much sense here.
 
 USE_CCACHE is described as 'user settings' in bsd.port.mk(5), these are
 just for the user to set (e.g. in mk.conf or on the command line)
 and mustn't be set in a port.
 

Thanks. I understand better now. It's been removed.


Stu

Re: UPDATE: jimtcl

2013-11-10 Thread Juan Francisco Cantero Hurtado

On Sun, Nov 10, 2013 at 04:24:12AM -0500, Stuart Cassoff wrote:
 On 11/10/13 04:00, Landry Breuil wrote:
  On Sun, Nov 10, 2013 at 01:30:11AM -0500, Stuart Cassoff wrote:
  Update to 0.75.
 
  Jimtcl picks up ccache if installed and won't build
  without USE_CCACHE=Yes, so I decided to force it.
  
  I'd rather see it patched to not pick it up. Even if ccache is available
  everywhere, i dont think it makes  much sense here.
 
 Ok, I'll take it out.

I've not reviewed the version 0.75 but you can disable ccache within the
file /usr/ports/pobj/jimtcl-0.73/jimtcl-0.73/autosetup/cc.tcl for the
version 0.73.

 
  
  Remove the SONAME stuff, I don't see how it would be needed.
 
  There should no longer be a need to play with -fPIC.
  Patch removed. If needed, can be done in the port Makefile.
  
  Did check that on several archs to make sure it wasnt needed ?
  
 
 Looking at config code, commit messages on the site and bsd.own.mk
 it seems I'll have to make an adjustment for alpha.
 Spark looks ok.
 
 
 Stu
 
 

-- 
Juan Francisco Cantero Hurtado http://juanfra.info

UPDATE: jimtcl

2013-11-09 Thread Stuart Cassoff

Update to 0.75.

Jimtcl picks up ccache if installed and won't build
without USE_CCACHE=Yes, so I decided to force it.

Remove the SONAME stuff, I don't see how it would be needed.

There should no longer be a need to play with -fPIC.
Patch removed. If needed, can be done in the port Makefile.

Gmake not needed.
Put include files in their own dir.
Install examples.
Install loadable sqlite3 extension.
Take maintainership, with permission.
Distfile at cvs:~stu


Stu


Index: Makefile
===
RCS file: /cvs/ports/lang/jimtcl/Makefile,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 Makefile
--- Makefile11 Mar 2013 11:20:27 -  1.6
+++ Makefile10 Nov 2013 06:00:14 -
@@ -4,37 +4,41 @@ SHARED_ONLY=  Yes

 COMMENT=   small footprint implementation of Tcl

-DISTNAME=  jimtcl-0.73
-SHARED_LIBS=   jim 1.0
+DISTNAME=  jimtcl-0.75
+SHARED_LIBS=   jim 1.1
 CATEGORIES=lang devel

 HOMEPAGE=  http://jim.tcl.tk/
+MAINTAINER =   Stuart Cassoff s...@users.sourceforge.net

 # BSD
 PERMIT_PACKAGE_CDROM=  Yes

-# Upstream has no real releases, so it's a git tag
+# Git snapshot fae001d74c06a6293798d6b27db874ff46610a42
 MASTER_SITES=  http://distfiles.nl/

-WANTLIB=   c m
+WANTLIB=   c m sqlite3

 MODULES=   lang/tcl

 RUN_DEPENDS=   ${MODTCL_RUN_DEPENDS}
 BUILD_DEPENDS= ${MODTCL_BUILD_DEPENDS} \
textproc/asciidoc
-TEST_DEPENDS=  devel/gmake

-MAKE_ENV+= SONAME_MAJOR=${LIBjim_VERSION:R} \
-   SONAME_MINOR=${LIBjim_VERSION:E}
+MAKE_FLAGS =   LIBJIM=libjim.so.${LIBjim_VERSION} \
+   SH_LDFLAGS=-shared

+FAKE_FLAGS =   INSTALL_DATA_DIR='${INSTALL_DATA_DIR}' \
+   INSTALL_DATA='${INSTALL_DATA}' \
+   INSTALL_PROGRAM='${INSTALL_PROGRAM}'
+
+SEPARATE_BUILD =   Yes
 CONFIGURE_STYLE=   simple
 CONFIGURE_ARGS+=   ${CONFIGURE_SHARED} \
-   --full  # ipv6, math, utf8, binary, oo, tree
+   --includedir=${PREFIX}/include/jim \
+   --full --with-mod=sqlite3

-# Only test requires gmake, so cheat a bit here instead of forcing it
-# as a build dependency.
-do-test:
-   cd ${WRKSRC}  ${SET_ENV} ${MAKE_ENV} ${LOCALBASE}/bin/gmake test
+# Jimtcl will pick up ccache if installed, so force it
+USE_CCACHE =   Yes

 .include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/lang/jimtcl/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- distinfo8 Mar 2013 10:24:47 -   1.2
+++ distinfo10 Nov 2013 06:00:14 -
@@ -1,2 +1,2 @@
-SHA256 (jimtcl-0.73.tar.gz) = aoS1yzn/ffjkfuwS91Zm4RwypNRP+DDGX+Lml/2IGt4=
-SIZE (jimtcl-0.73.tar.gz) = 2196689
+SHA256 (jimtcl-0.75.tar.gz) = mAKk+BxXNiqxWLAj2H7feD3XQfmtiK1HUWj+sPljldo=
+SIZE (jimtcl-0.75.tar.gz) = 2217469
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/lang/jimtcl/patches/patch-Makefile_in,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-Makefile_in
--- patches/patch-Makefile_in   8 Mar 2013 10:24:47 -   1.3
+++ patches/patch-Makefile_in   10 Nov 2013 06:00:14 -
@@ -1,47 +1,63 @@
 $OpenBSD: patch-Makefile_in,v 1.3 2013/03/08 10:24:47 jasper Exp $

-- Install docs into the right directory.
-- Add shared library versioning to libjim.
+Install everything nicely.

 Makefile.in.orig   Tue Feb 12 23:02:49 2013
-+++ Makefile.inTue Feb 12 23:04:36 2013
-@@ -33,6 +33,8 @@ VPATH := @srcdir@
- @if JIM_STATICLIB
- LIBJIM := libjim.a
- @else
-+SONAME_MAJOR?=0
-+SONAME_MINOR?=0
- LIBJIM := libjim.@LIBSOEXT@
- SH_LIBJIM := $(LIBJIM)
- CC += $(SH_CFLAGS)
-@@ -67,15 +69,14 @@ $(JIMSH): $(LIBJIM) jimsh.o initjimsh.o
+--- 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

- @if JIM_INSTALL
- install: all docs @TCL_EXTS@ install-exec
--  mkdir -p $(DESTDIR)$(prefix)/lib/jim
--  cp $(LIBJIM) $(DESTDIR)$(prefix)/lib
--  cp @srcdir@/README.extensions @C_EXT_SHOBJS@ @TCL_EXTS@ 
$(DESTDIR)$(prefix)/lib/jim
-+  mkdir -p $(DESTDIR)$(prefix)/share/doc/jim
-+  cp $(LIBJIM).$(SONAME_MAJOR).$(SONAME_MINOR) $(DESTDIR)$(prefix)/lib
-+  cp @srcdir@/README.extensions @C_EXT_SHOBJS@ @TCL_EXTS@ 
$(DESTDIR)$(prefix)/share/doc/jim/
-   mkdir -p $(DESTDIR)$(prefix)/include
-   cp @srcdir@/jim.h @srcdir@/jim-eventloop.h @srcdir@/jim-signal.h \
-   @srcdir@/jim-subcmd.h @srcdir@/jim-win32compat.h 
$(DESTDIR)$(prefix)/include
-   cp jim-config.h $(DESTDIR)$(prefix)/include
+ JIMSH := jimsh@EXEEXT@
+
++@if JIM_INSTALL
++INSTALL_DATA_DIR ?= mkdir -p

Re: UPDATE: Jimtcl and OpenOCD

Re: UPDATE: Jimtcl and OpenOCD

Re: UPDATE: Jimtcl and OpenOCD

Re: UPDATE: Jimtcl and OpenOCD

UPDATE: Jimtcl and OpenOCD

Re: UPDATE: jimtcl

Re: UPDATE: jimtcl

Re: UPDATE: jimtcl

Re: UPDATE: jimtcl

Re: UPDATE: jimtcl

Re: UPDATE: jimtcl

UPDATE: jimtcl

12 matches

Site Navigation

Mail list logo

Footer information