cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 0.75.

Browse Source 
Gmake not needed.
Put include files in their own dir.
Install examples.
Install loadable sqlite3 extension.
Take maintainership with permission.

Thanks to Steve Havelka for distfile hosting.

ok landry@; thanks sthen@
This commit is contained in:
stu 2013-11-14 09:11:21 +00:00
parent a272a4886b
commit 3444f0050f
5 changed files with 107 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
lang/jimtcl/Makefile
View File

@ -1,40 +1,45 @@
# $OpenBSD: Makefile,v 1.6 2013/03/11 11:20:27 espie Exp $
# $OpenBSD: Makefile,v 1.7 2013/11/14 09:11:21 stu Exp $
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 <stwo@users.sourceforge.net>
# BSD
PERMIT_PACKAGE_CDROM= Yes
# Upstream has no real releases, so it's a git tag
MASTER_SITES= http://distfiles.nl/
# Git checkin fae001d74c06a6293798d6b27db874ff46610a42
MASTER_SITES= http://mirror.arieslabs.com/openbsd/
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>

4
lang/jimtcl/distinfo
View File

@ -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

94
lang/jimtcl/patches/patch-Makefile_in
View File

@ -1,47 +1,63 @@
$OpenBSD: patch-Makefile_in,v 1.3 2013/03/08 10:24:47 jasper Exp $
$OpenBSD: patch-Makefile_in,v 1.4 2013/11/14 09:11:21 stu 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.in Tue 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.in Sat 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
+ cp Tcl.html $(DESTDIR)$(prefix)/share/doc/jim
mkdir -p $(DESTDIR)$(prefix)/bin
cp build-jim-ext $(DESTDIR)$(prefix)/bin
@@ -117,7 +118,9 @@ $(LIBJIM): $(OBJS)
$(RANLIB) $@
+ $(INSTALL_DATA_DIR) $(DESTDIR)@datadir@/doc/jim
+ $(INSTALL_DATA) @srcdir@/README.extensions Tcl.html $(DESTDIR)@datadir@/doc/jim
@else
$(LIBJIM): $(OBJS)
- $(CC) $(CFLAGS) $(LDFLAGS) $(SH_LDFLAGS) -o $@ $(OBJS) $(LDLIBS)
+ $(CC) -shared -Wl,-soname -Wl,$@.$(SONAME_MAJOR).$(SONAME_MINOR) $(OBJS) $(SH_LDFLAGS) $(CFLAGS) $(LDLIBS) -o $@.$(SONAME_MAJOR).$(SONAME_MINOR)
+ ln -s $@.$(SONAME_MAJOR).$(SONAME_MINOR) $@.$(SONAME_MAJOR)
+ ln -s $@.$(SONAME_MAJOR).$(SONAME_MINOR) $@
install-docs:
@endif
@@ -77,20 +83,21 @@ $(JIMSH): $(LIBJIM) jimsh.o initjimsh.o
# Note that $> $^ is for compatibility with both GNU make and BSD make
@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@ $(DESTDIR)@libdir@/jim
- for i in @TCL_EXTS@; do cp @srcdir@/$$i $(DESTDIR)@libdir@/jim; done
- mkdir -p $(DESTDIR)@includedir@
- cp @srcdir@/jim.h @srcdir@/jim-eventloop.h @srcdir@/jim-signal.h \
+ $(INSTALL_DATA) $(LIBJIM) $(DESTDIR)@libdir@
+ $(INSTALL_DATA_DIR) $(DESTDIR)@libdir@/jim
+ $(INSTALL_DATA) @C_EXT_SHOBJS@ $(DESTDIR)@libdir@/jim
+ for i in @TCL_EXTS@; do $(INSTALL_DATA) @srcdir@/$$i $(DESTDIR)@libdir@/jim; done
+ $(INSTALL_DATA_DIR) $(DESTDIR)@includedir@
+ $(INSTALL_DATA) @srcdir@/jim.h @srcdir@/jim-eventloop.h @srcdir@/jim-signal.h \
@srcdir@/jim-subcmd.h @srcdir@/jim-win32compat.h $(DESTDIR)@includedir@
- cp jim-config.h $(DESTDIR)@includedir@
- mkdir -p $(DESTDIR)@bindir@
- cp build-jim-ext $(DESTDIR)@bindir@
+ $(INSTALL_DATA) jim-config.h $(DESTDIR)@includedir@
+ $(INSTALL_DATA_DIR) $(DESTDIR)@bindir@
+ $(INSTALL_DATA_DIR) $(DESTDIR)@datadir@/examples/jim
+ $(INSTALL_DATA) build-jim-ext @srcdir@/examples/* $(DESTDIR)@datadir@/examples/jim
install-exec: all
- mkdir -p $(DESTDIR)@bindir@
- cp $(JIMSH) $(DESTDIR)@bindir@
+ $(INSTALL_DATA_DIR) $(DESTDIR)@bindir@
+ $(INSTALL_PROGRAM) $(JIMSH) $(DESTDIR)@bindir@
uninstall:
rm -f $(DESTDIR)@bindir@/$(JIMSH)

15
lang/jimtcl/patches/patch-autosetup_cc-shared_tcl
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-autosetup_cc-shared_tcl,v 1.2 2013/03/08 10:24:47 jasper Exp $
--- autosetup/cc-shared.tcl.orig Tue Feb 12 23:01:14 2013
+++ autosetup/cc-shared.tcl Tue Feb 12 23:02:31 2013
@@ -66,9 +66,9 @@ switch -glob -- [get-define host] {
* {
# Generic Unix settings
define SH_LINKFLAGS -rdynamic
- define SH_CFLAGS -fpic
+ define SH_CFLAGS -fPIC
define SH_LDFLAGS -shared
- define SHOBJ_CFLAGS -fpic
+ define SHOBJ_CFLAGS -fPIC
define SHOBJ_LDFLAGS -shared
}
}

38
lang/jimtcl/pkg/PLIST
View File

@ -1,13 +1,35 @@
@comment $OpenBSD: PLIST,v 1.2 2013/03/08 10:24:47 jasper Exp $
bin/build-jim-ext
@comment $OpenBSD: PLIST,v 1.3 2013/11/14 09:11:21 stu Exp $
@bin bin/jimsh
include/jim-config.h
include/jim-eventloop.h
include/jim-signal.h
include/jim-subcmd.h
include/jim-win32compat.h
include/jim.h
include/jim/
include/jim/jim-config.h
include/jim/jim-eventloop.h
include/jim/jim-signal.h
include/jim/jim-subcmd.h
include/jim/jim-win32compat.h
include/jim/jim.h
lib/jim/
lib/jim/sqlite3.so
@lib lib/libjim.so.${LIBjim_VERSION}
share/doc/jim/
share/doc/jim/README.extensions
share/doc/jim/Tcl.html
share/examples/jim/
share/examples/jim/build-jim-ext
share/examples/jim/client-server.tcl
share/examples/jim/dns.tcl
share/examples/jim/dnstest.tcl
share/examples/jim/jtclsh.tcl
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/sqlite3test.tcl
share/examples/jim/tcp.client
share/examples/jim/tcp.server
share/examples/jim/timedread.tcl
share/examples/jim/udp.client
share/examples/jim/udp.server
share/examples/jim/udp2.client
share/examples/jim/udp6.client
share/examples/jim/udp6.server