Builds, runs and quick-tests fine with Tcl/Tk 8.5/8.6 on amd64/i386.

Here are small tweaks for WANTLIB, style, and MODTK_VERSION.

Setting MODTK_VERSION is needed for the port to easily weather the
ports system's eventual move to Tcl/Tk 8.6 by default.

Patches inlined for 8.5 and 8.6.
8.6 is preferred but my use of CFLAGS/LDFLAGS may be hacky.
Your port, your call. :)


Thanks,

Stu


Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/eltclsh/Makefile,v
retrieving revision 1.31
diff -u -p -u -p -r1.31 Makefile
--- Makefile    20 May 2018 10:49:38 -0000      1.31
+++ Makefile    9 Aug 2018 11:45:06 -0000
@@ -2,7 +2,7 @@
 
 COMMENT =      Libedit interface to Tcl/Tk interpreters
 
-DISTNAME =     eltclsh-1.16
+DISTNAME =     eltclsh-1.17
 CATEGORIES =   lang x11
 
 MASTER_SITES = https://www.openrobots.org/distfiles/eltclsh/
@@ -14,11 +14,11 @@ MAINTAINER =        Matthieu Herrb <matthieu@op
 # BSD
 PERMIT_PACKAGE_CDROM =  Yes
 
-WANTLIB += ${MODTK_WANTLIB}
-WANTLIB += X11 Xext Xft Xrender Xss c edit expat fontconfig freetype m
-WANTLIB += termcap xcb z
+WANTLIB =              X11 Xext Xft Xrender Xss c curses edit expat \
+                       fontconfig freetype m pthread xcb z ${MODTK_WANTLIB}
 
-MODULES +=     x11/tk
+MODULES =              x11/tk
+MODTK_VERSION =                8.6
 
 SEPARATE_BUILD =       Yes
 CONFIGURE_STYLE =      gnu
@@ -34,6 +34,9 @@ FAKE_FLAGS =          ELTCL_LIBRARY=${WRKINST}${
 NO_TEST =              Yes
 
 LIB_DEPENDS +=         ${MODTK_LIB_DEPENDS}
+
+CFLAGS +=              -pthread
+LDFLAGS +=             -lpthread
 
 post-install:
        rm ${WRKINST}${MODTCL_TCLDIR}/libeltclsh.la
Index: distinfo
===================================================================
RCS file: /cvs/ports/lang/eltclsh/distinfo,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 distinfo
--- distinfo    20 May 2018 10:49:38 -0000      1.8
+++ distinfo    9 Aug 2018 11:45:06 -0000
@@ -1,2 +1,2 @@
-SHA256 (eltclsh-1.16.tar.gz) = RHi2Ktwye/cvhv/EIDNaKCfU4xPKd/IthQy7SobwygM=
-SIZE (eltclsh-1.16.tar.gz) = 357909
+SHA256 (eltclsh-1.17.tar.gz) = yPsVPiopVSkwqyQYyGM2slGfEWnYVRXKSNIjpY4ob5Q=
+SIZE (eltclsh-1.17.tar.gz) = 378482
Index: patches/patch-src_Makefile_in
===================================================================
RCS file: /cvs/ports/lang/eltclsh/patches/patch-src_Makefile_in,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-src_Makefile_in
--- patches/patch-src_Makefile_in       20 May 2018 10:49:38 -0000      1.2
+++ patches/patch-src_Makefile_in       9 Aug 2018 11:45:06 -0000
@@ -5,7 +5,7 @@ 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@
+@@ -303,6 +303,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@
@@ -13,7 +13,7 @@ Index: src/Makefile.in
  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
+@@ -389,7 +390,7 @@ AM_CPPFLAGS = ${TCL_INCLUDE_SPEC} -DELTCLSH_DATA='"${d
        -DELTCLSH_VERSION='"${PACKAGE_VERSION}"'
  eltclsh_LDFLAGS = ${RUNTIME_PATH}
  eltclsh_LDADD = libcommon.la ${TCL_LIB_SPEC}




Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/eltclsh/Makefile,v
retrieving revision 1.31
diff -u -p -u -p -r1.31 Makefile
--- Makefile    20 May 2018 10:49:38 -0000      1.31
+++ Makefile    9 Aug 2018 11:45:25 -0000
@@ -2,7 +2,7 @@
 
 COMMENT =      Libedit interface to Tcl/Tk interpreters
 
-DISTNAME =     eltclsh-1.16
+DISTNAME =     eltclsh-1.17
 CATEGORIES =   lang x11
 
 MASTER_SITES = https://www.openrobots.org/distfiles/eltclsh/
@@ -14,11 +14,11 @@ MAINTAINER =        Matthieu Herrb <matthieu@op
 # BSD
 PERMIT_PACKAGE_CDROM =  Yes
 
-WANTLIB += ${MODTK_WANTLIB}
-WANTLIB += X11 Xext Xft Xrender Xss c edit expat fontconfig freetype m
-WANTLIB += termcap xcb z
+WANTLIB =              X11 Xext Xft Xrender Xss c curses edit expat \
+                       fontconfig freetype m xcb z ${MODTK_WANTLIB}
 
-MODULES +=     x11/tk
+MODULES =              x11/tk
+MODTK_VERSION =                8.5
 
 SEPARATE_BUILD =       Yes
 CONFIGURE_STYLE =      gnu
Index: distinfo
===================================================================
RCS file: /cvs/ports/lang/eltclsh/distinfo,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 distinfo
--- distinfo    20 May 2018 10:49:38 -0000      1.8
+++ distinfo    9 Aug 2018 11:45:25 -0000
@@ -1,2 +1,2 @@
-SHA256 (eltclsh-1.16.tar.gz) = RHi2Ktwye/cvhv/EIDNaKCfU4xPKd/IthQy7SobwygM=
-SIZE (eltclsh-1.16.tar.gz) = 357909
+SHA256 (eltclsh-1.17.tar.gz) = yPsVPiopVSkwqyQYyGM2slGfEWnYVRXKSNIjpY4ob5Q=
+SIZE (eltclsh-1.17.tar.gz) = 378482
Index: patches/patch-src_Makefile_in
===================================================================
RCS file: /cvs/ports/lang/eltclsh/patches/patch-src_Makefile_in,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-src_Makefile_in
--- patches/patch-src_Makefile_in       20 May 2018 10:49:38 -0000      1.2
+++ patches/patch-src_Makefile_in       9 Aug 2018 11:45:25 -0000
@@ -5,7 +5,7 @@ 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@
+@@ -303,6 +303,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@
@@ -13,7 +13,7 @@ Index: src/Makefile.in
  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
+@@ -389,7 +390,7 @@ AM_CPPFLAGS = ${TCL_INCLUDE_SPEC} -DELTCLSH_DATA='"${d
        -DELTCLSH_VERSION='"${PACKAGE_VERSION}"'
  eltclsh_LDFLAGS = ${RUNTIME_PATH}
  eltclsh_LDADD = libcommon.la ${TCL_LIB_SPEC}





> ---------- Original Message ----------
> From: Matthieu Herrb <[email protected]>
> Date: August 9, 2018 at 3:12 AM
> 
> 
> Hi,
> 
> Update eltclsh to recently released version 1.17
> 
> ok?
> 
> Index: Makefile
> ===================================================================
> RCS file: /cvs/OpenBSD/ports/lang/eltclsh/Makefile,v
> retrieving revision 1.31
> diff -u -p -u -r1.31 Makefile
> --- Makefile  20 May 2018 10:49:38 -0000      1.31
> +++ Makefile  9 Aug 2018 07:07:49 -0000
> @@ -2,7 +2,7 @@
>  
>  COMMENT =    Libedit interface to Tcl/Tk interpreters
>  
> -DISTNAME =   eltclsh-1.16
> +DISTNAME =   eltclsh-1.17
>  CATEGORIES = lang x11
>  
>  MASTER_SITES =       https://www.openrobots.org/distfiles/eltclsh/
> Index: distinfo
> ===================================================================
> RCS file: /cvs/OpenBSD/ports/lang/eltclsh/distinfo,v
> retrieving revision 1.8
> diff -u -p -u -r1.8 distinfo
> --- distinfo  20 May 2018 10:49:38 -0000      1.8
> +++ distinfo  9 Aug 2018 07:08:49 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (eltclsh-1.16.tar.gz) = RHi2Ktwye/cvhv/EIDNaKCfU4xPKd/IthQy7SobwygM=
> -SIZE (eltclsh-1.16.tar.gz) = 357909
> +SHA256 (eltclsh-1.17.tar.gz) = yPsVPiopVSkwqyQYyGM2slGfEWnYVRXKSNIjpY4ob5Q=
> +SIZE (eltclsh-1.17.tar.gz) = 378482
> Index: patches/patch-src_Makefile_in
> ===================================================================
> RCS file: /cvs/OpenBSD/ports/lang/eltclsh/patches/patch-src_Makefile_in,v
> retrieving revision 1.2
> diff -u -p -u -r1.2 patch-src_Makefile_in
> --- patches/patch-src_Makefile_in     20 May 2018 10:49:38 -0000      1.2
> +++ patches/patch-src_Makefile_in     9 Aug 2018 07:09:12 -0000
> @@ -5,7 +5,7 @@ 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@
> +@@ -303,6 +303,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@
> @@ -13,7 +13,7 @@ Index: src/Makefile.in
>   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
> +@@ -389,7 +390,7 @@ AM_CPPFLAGS = ${TCL_INCLUDE_SPEC} -DELTCLSH_DATA='"${d
>       -DELTCLSH_VERSION='"${PACKAGE_VERSION}"'
>   eltclsh_LDFLAGS = ${RUNTIME_PATH}
>   eltclsh_LDADD = libcommon.la ${TCL_LIB_SPEC}
> 
> -- 
> Matthieu Herrb
>

Reply via email to