UPDATE: lang/elctlsh 1.16

Ok ?

Index: Makefile
===================================================================
RCS file: /cvs/OpenBSD/ports/lang/eltclsh/Makefile,v
retrieving revision 1.30
diff -u -p -u -r1.30 Makefile
--- Makefile 23 Oct 2017 17:10:51 -0000 1.30
+++ Makefile 28 Apr 2018 18:47:46 -0000
@@ -2,13 +2,12 @@

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

Index: distinfo
===================================================================
RCS file: /cvs/OpenBSD/ports/lang/eltclsh/distinfo,v
retrieving revision 1.7
diff -u -p -u -r1.7 distinfo
--- distinfo 10 Oct 2012 22:09:29 -0000 1.7
+++ distinfo 28 Apr 2018 18:47:46 -0000
@@ -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
Index: patches/patch-configure
===================================================================
RCS file: /cvs/OpenBSD/ports/lang/eltclsh/patches/patch-configure,v
retrieving revision 1.1
diff -u -p -u -r1.1 patch-configure
--- patches/patch-configure 10 Oct 2012 22:09:29 -0000 1.1
+++ patches/patch-configure 28 Apr 2018 18:47:46 -0000
@@ -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$
+
+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
Index: patches/patch-src_Makefile_in
===================================================================
RCS file: /cvs/OpenBSD/ports/lang/eltclsh/patches/patch-src_Makefile_in,v
retrieving revision 1.1
diff -u -p -u -r1.1 patch-src_Makefile_in
--- patches/patch-src_Makefile_in 10 Oct 2012 22:09:29 -0000 1.1
+++ patches/patch-src_Makefile_in 28 Apr 2018 18:47:46 -0000
@@ -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$
+
+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
Index: patches/patch-src_elwish_c
===================================================================
RCS file: /cvs/OpenBSD/ports/lang/eltclsh/patches/patch-src_elwish_c,v
retrieving revision 1.3
diff -u -p -u -r1.3 patch-src_elwish_c
--- patches/patch-src_elwish_c 10 Oct 2012 22:09:29 -0000 1.3
+++ patches/patch-src_elwish_c 28 Apr 2018 18:47:46 -0000
@@ -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)
+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);

Index: patches/patch-src_loop_c
===================================================================
RCS file: /cvs/OpenBSD/ports/lang/eltclsh/patches/patch-src_loop_c,v
retrieving revision 1.1
diff -u -p -u -r1.1 patch-src_loop_c
--- patches/patch-src_loop_c 10 Oct 2012 22:09:29 -0000 1.1
+++ patches/patch-src_loop_c 28 Apr 2018 18:47:46 -0000
@@ -2,9 +2,10 @@ $OpenBSD: patch-src_loop_c,v 1.1 2012/10

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