Update to latest.

This commit is contained in:
stu 2015-12-22 16:36:23 +00:00
parent 6815cf2de0
commit 96394db172
3 changed files with 18 additions and 20 deletions

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.11 2015/04/10 14:35:36 stu Exp $
# $OpenBSD: Makefile,v 1.12 2015/12/22 16:36:23 stu Exp $
SHARED_ONLY = Yes
COMMENT = small footprint implementation of Tcl
DISTNAME = jimtcl-0.76pl0
SHARED_LIBS = jim 2.1
DISTNAME = jimtcl-0.76pl1
SHARED_LIBS = jim 2.2
CATEGORIES = lang devel
HOMEPAGE = http://jim.tcl.tk/
MAINTAINER = Stuart Cassoff <stwo@users.sourceforge.net>
@ -17,7 +17,7 @@ WANTLIB = c m sqlite3
GH_ACCOUNT = msteveb
GH_PROJECT = jimtcl
GH_COMMIT = af59339f008ae4eff13b0fea0eeff21a9d1e8b6c
GH_COMMIT = 20fb65ac241531c216aff64cd158cd8797128d49
MODULES = lang/tcl
@ -38,7 +38,8 @@ CONFIGURE_STYLE = simple
CONFIGURE_SCRIPT = ${MODTCL_BIN} ${WRKSRC}/autosetup/autosetup
CONFIGURE_ARGS += ${CONFIGURE_SHARED} \
--includedir=${PREFIX}/include/jim \
--includedir='$${prefix}/include/jim' \
--docdir='$${prefix}/share/doc/jim' \
--full \
--with-mod=sqlite3 \
CCACHE=none

View File

@ -1,2 +1,2 @@
SHA256 (jimtcl-0.76pl0.tar.gz) = SSesNg/BEJbI8MDi0sokPtdE3Y5qfndaxz5DUHbSc6c=
SIZE (jimtcl-0.76pl0.tar.gz) = 2235509
SHA256 (jimtcl-0.76pl1.tar.gz) = En2AYlsIU2mLnva3u9jTQ6nqdHsUmvxXZ80kOmDvSFs=
SIZE (jimtcl-0.76pl1.tar.gz) = 2235549

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-Makefile_in,v 1.6 2015/04/10 14:35:36 stu Exp $
$OpenBSD: patch-Makefile_in,v 1.7 2015/12/22 16:36:23 stu Exp $
Don't use soname when linking.
--- Makefile.in.orig Sun Apr 5 20:13:49 2015
+++ Makefile.in Mon Apr 6 01:20:58 2015
--- Makefile.in.orig Mon Oct 5 21:40:31 2015
+++ Makefile.in Tue Dec 22 09:42:51 2015
@@ -10,7 +10,6 @@ STRIP = @STRIP@
SH_CFLAGS ?= @SH_CFLAGS@
SH_LDFLAGS ?= @SH_LDFLAGS@
@ -12,7 +12,7 @@ Don't use soname when linking.
@endif
SHOBJ_CFLAGS ?= @SHOBJ_CFLAGS@
@if JIM_STATICLIB
@@ -59,6 +58,7 @@ JIMSH := jimsh@EXEEXT@
@@ -60,6 +59,7 @@ JIMSH := jimsh@EXEEXT@
INSTALL_DATA_DIR ?= mkdir -p
INSTALL_DATA ?= cp
INSTALL_PROGRAM ?= cp
@ -20,19 +20,16 @@ Don't use soname when linking.
@endif
all: $(JIMSH) @C_EXT_SHOBJS@
@@ -73,8 +73,9 @@ docs: Tcl.html
@if JIM_DOCS
@@ -76,6 +76,8 @@ docs: Tcl.html
install-docs: docs
- $(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@/LICENSE @srcdir@/README Tcl.html $(DESTDIR)@datadir@/doc/jim
+ $(INSTALL_DATA) @srcdir@/README.{extensions,namespaces,oo,sqlite,utf-8} $(DESTDIR)@datadir@/doc/jim
$(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)
@else
install-docs:
@endif
@@ -83,17 +84,22 @@ $(JIMSH): $(LIBJIM) jimsh.o initjimsh.o
@@ -84,17 +86,22 @@ $(JIMSH): $(LIBJIM) jimsh.o initjimsh.o
$(JIMSH_CC) @SH_LINKFLAGS@ $(LDFLAGS) -o $@ jimsh.o initjimsh.o $(LIBJIM) $(LDLIBS) $(LIBS)
@if JIM_INSTALL