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

Update to elctlsh 1.16. tested and ok rfreeman@

Browse Source
This commit is contained in:
matthieu 2018-05-20 10:49:38 +00:00
parent d2bda5c576
commit c2affa29b4
8 changed files with 64 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lang/eltclsh/Makefile
View File

@ -1,14 +1,13 @@
# $OpenBSD: Makefile,v 1.30 2017/10/23 17:10:51 sthen Exp $
# $OpenBSD: Makefile,v 1.31 2018/05/20 10:49:38 matthieu Exp $
COMMENT = Libedit interface to Tcl/Tk interpreters
DISTNAME = eltclsh-1.12
DISTNAME = eltclsh-1.16
CATEGORIES = lang x11
REVISION = 2
MASTER_SITES = http://www.openrobots.org/distfiles/eltclsh/
MASTER_SITES = https://www.openrobots.org/distfiles/eltclsh/
HOMEPAGE = http://www.openrobots.org/wiki/eltclsh
HOMEPAGE = https://git.openrobots.org/projects/eltclsh/
MAINTAINER = Matthieu Herrb <matthieu@openbsd.org>
@ -37,8 +36,8 @@ NO_TEST = Yes
LIB_DEPENDS += ${MODTK_LIB_DEPENDS}
post-install:
rm ${WRKINST}${MODTCL_TCLDIR}/eltcl/libeltclsh.la
rm ${WRKINST}${MODTCL_TCLDIR}/eltcl/libeltclsh.a
rm ${WRKINST}${MODTCL_TCLDIR}/libeltclsh.la
rm ${WRKINST}${MODTCL_TCLDIR}/libeltclsh.a
rm ${WRKINST}${MODTCL_TCLDIR}/pkgconfig/eltclsh.pc
rmdir ${WRKINST}${MODTCL_TCLDIR}/pkgconfig

4
lang/eltclsh/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (eltclsh-1.12.tar.gz) = 75GlppHX8BQ+hsez2tlw30WPGqPNhqo8evKx0QE6TGk=
SIZE (eltclsh-1.12.tar.gz) = 244359
SHA256 (eltclsh-1.16.tar.gz) = RHi2Ktwye/cvhv/EIDNaKCfU4xPKd/IthQy7SobwygM=
SIZE (eltclsh-1.16.tar.gz) = 357909

26
lang/eltclsh/patches/patch-configure
View File

@ -1,11 +1,15 @@
$OpenBSD: patch-configure,v 1.1 2012/10/10 22:09:29 stu Exp $
--- configure.orig Mon Apr 30 12:41:06 2012
+++ configure Mon Apr 30 12:41:39 2012
@@ -11462,6 +11462,7 @@ $as_echo "$as_me: tk support not found/disabled" >&6;}
file=${tk_prefix}/tkConfig.sh
. $file
eval TK_INCLUDE_SPEC="\"${TK_INCLUDE_SPEC} ${TK_XINCLUDES}\""
+ eval TK_LIB_SPEC="\"${TK_LIB_SPEC} ${TK_LIBS}\""
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tk headers" >&5
$as_echo_n "checking for tk headers... " >&6; }
$OpenBSD: patch-configure,v 1.2 2018/05/20 10:49:38 matthieu Exp $
Find X includes
Index: configure
--- configure.orig
+++ configure
@@ -643,6 +643,7 @@ TK_LIB_SPEC
TK_LIB_FLAG
TK_LIB_FILE
TK_INCLUDE_SPEC
+TK_XINCLUDES
TK_SRC_DIR
TK_BIN_DIR
TK_VERSION

34
lang/eltclsh/patches/patch-src_Makefile_in
View File

@ -1,12 +1,24 @@
$OpenBSD: patch-src_Makefile_in,v 1.1 2012/10/10 22:09:29 stu Exp $
--- src/Makefile.in.orig Tue Oct 9 01:01:16 2012
+++ src/Makefile.in Tue Oct 9 01:01:38 2012
@@ -104,7 +104,7 @@ $(ELWISH): $(elwishobjs) $(commonobjs)
#
lib$(ELPKG).la: $(pkgobjs)
$(LTLD) -avoid-version -o $@ $(CFLAGS) $(pkgobjs) \
- $(addprefix -XCClinker ,$(TCLSTUB_LDFLAGS)) \
+ $(TCLSTUB_LDFLAGS) \
-rpath $(datadir) $(LDFLAGS) $(EL_LDFLAGS)
$OpenBSD: patch-src_Makefile_in,v 1.2 2018/05/20 10:49:38 matthieu Exp $
Find X and Tcl includes
Index: src/Makefile.in
--- src/Makefile.in.orig
+++ src/Makefile.in
@@ -292,6 +292,7 @@ TCL_STUB_LIB_SPEC = @TCL_STUB_LIB_SPEC@
TCL_VERSION = @TCL_VERSION@
TK_BIN_DIR = @TK_BIN_DIR@
TK_INCLUDE_SPEC = @TK_INCLUDE_SPEC@
+TK_XINCLUDES = @TK_XINCLUDES@
TK_LIB_FILE = @TK_LIB_FILE@
TK_LIB_FLAG = @TK_LIB_FLAG@
TK_LIB_SPEC = @TK_LIB_SPEC@
@@ -377,7 +378,7 @@ AM_CPPFLAGS = ${TCL_INCLUDE_SPEC} -DELTCLSH_DATA='"${d
-DELTCLSH_VERSION='"${PACKAGE_VERSION}"'
eltclsh_LDFLAGS = ${RUNTIME_PATH}
eltclsh_LDADD = libcommon.la ${TCL_LIB_SPEC}
-elwish_CPPFLAGS = ${TK_INCLUDE_SPEC}
+elwish_CPPFLAGS = ${TK_XINCLUDES} ${TK_INCLUDE_SPEC} ${TCL_INCLUDE_SPEC}
elwish_LDFLAGS = ${RUNTIME_PATH}
elwish_LDADD = libcommon.la ${TK_LIB_SPEC} ${TCL_LIB_SPEC}
# object files

9
lang/eltclsh/patches/patch-src_elwish_c
View File

@ -1,7 +1,8 @@
$OpenBSD: patch-src_elwish_c,v 1.3 2012/10/10 22:09:29 stu Exp $
--- src/elwish.c.orig Thu Jun 16 11:17:42 2011
+++ src/elwish.c Mon Apr 30 14:32:18 2012
@@ -74,8 +74,6 @@ elWishAppInit(Tcl_Interp *interp)
$OpenBSD: patch-src_elwish_c,v 1.4 2018/05/20 10:49:38 matthieu Exp $
Index: src/elwish.c
--- src/elwish.c.orig
+++ src/elwish.c
@@ -73,8 +73,6 @@ elWishAppInit(Tcl_Interp *interp)
/* change the rc file */
Tcl_SetVar(interp, "tcl_rcFileName", "~/.elwishrc", TCL_GLOBAL_ONLY);

11
lang/eltclsh/patches/patch-src_loop_c
View File

@ -1,10 +1,11 @@
$OpenBSD: patch-src_loop_c,v 1.1 2012/10/10 22:09:29 stu Exp $
$OpenBSD: patch-src_loop_c,v 1.2 2018/05/20 10:49:38 matthieu Exp $
Adjust for OpenBSD-specific Tcl package path layout.
--- src/loop.c.orig Wed Oct 10 01:35:23 2012
+++ src/loop.c Wed Oct 10 01:37:23 2012
@@ -57,7 +57,7 @@ elTclshLoop(int argc, char **argv, ElTclAppInitProc ap
Index: src/loop.c
--- src/loop.c.orig
+++ src/loop.c
@@ -54,7 +54,7 @@ elTclshLoop(int argc, char **argv, ElTclAppInitProc ap
#endif /* TCL_VERSION */
{
Tcl_Interp *interp;
@ -13,7 +14,7 @@ Adjust for OpenBSD-specific Tcl package path layout.
#if TCL_MAJOR_VERSION >= 8 && TCL_MINOR_VERSION >= 4
const
#endif
@@ -106,12 +106,14 @@ elTclshLoop(int argc, char **argv, ElTclAppInitProc ap
@@ -103,12 +103,14 @@ elTclshLoop(int argc, char **argv, ElTclAppInitProc ap
}
/* configure standard path for packages */

12
lang/eltclsh/patches/patch-tcl_init_tcl
View File

@ -1,9 +1,10 @@
$OpenBSD: patch-tcl_init_tcl,v 1.1 2012/10/10 22:09:29 stu Exp $
$OpenBSD: patch-tcl_init_tcl,v 1.2 2018/05/20 10:49:38 matthieu Exp $
Adjust for OpenBSD-specific Tcl package path layout.
--- tcl/init.tcl.orig Thu Jun 16 11:17:42 2011
+++ tcl/init.tcl Wed Oct 10 01:40:07 2012
Index: tcl/init.tcl
--- tcl/init.tcl.orig
+++ tcl/init.tcl
@@ -30,10 +30,24 @@
#
@ -31,8 +32,3 @@ Adjust for OpenBSD-specific Tcl package path layout.
# Install default signal handlers (if the signal command exists)
if { [info command signal] != "" } { namespace eval el {
@@ -82,3 +96,4 @@ if {[info exists ::argv]} {
unset i
catch { unset pkgname }
}
+unset m

5
lang/eltclsh/pkg/PLIST
View File

@ -1,10 +1,11 @@
@comment $OpenBSD: PLIST,v 1.6 2016/04/04 16:09:09 naddy Exp $
@comment $OpenBSD: PLIST,v 1.7 2018/05/20 10:49:38 matthieu Exp $
@bin bin/eltclsh
@bin bin/elwish
lib/tcl/eltcl/
lib/tcl/eltcl/complete.tcl
lib/tcl/eltcl/init.tcl
lib/tcl/eltcl/libeltclsh.so
lib/tcl/eltcl/pkgIndex.tcl
lib/tcl/eltcl/tools.tcl
lib/tcl/eltcl/version.tcl
lib/tcl/libeltclsh.so
@man man/man1/eltclsh.1