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

Update to eltclsh-1.12.

Browse Source 
ok matthieu@
This commit is contained in:
stu 2012-10-10 22:09:29 +00:00
parent 3c6d10db8f
commit 02783054e0
11 changed files with 129 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lang/eltclsh/Makefile
View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.24 2012/04/28 20:20:15 matthieu Exp $
# $OpenBSD: Makefile,v 1.25 2012/10/10 22:09:29 stu Exp $
COMMENT = Libedit interface to Tcl/Tk interpreters
DISTNAME = eltclsh-1.9
REVISION= 6
DISTNAME = eltclsh-1.12
CATEGORIES = lang x11
MASTER_SITES = http://www.openrobots.org/distfiles/eltclsh/
@ -19,17 +18,20 @@ PERMIT_DISTFILES_CDROM = Yes
PERMIT_DISTFILES_FTP = Yes
MODULES += x11/tk
WANTLIB += X11 Xau Xdmcp Xext Xft Xrender Xss c edit expat fontconfig
WANTLIB += freetype m pthread-stubs termcap xcb z
WANTLIB += X11 Xext Xft Xrender Xss c edit expat fontconfig freetype
WANTLIB += m termcap xcb z
SEPARATE_BUILD = Yes
CONFIGURE_STYLE = gnu
CONFIGURE_ARGS = --with-tcl=${MODTCL_LIBDIR} \
--with-tk=${MODTK_LIBDIR}
CONFIGURE_ENV = MKDEP=/bin/false
--with-tk=${MODTK_LIBDIR} \
--libdir=\$${prefix}/lib/tcl \
--datadir=\$${prefix}/lib/tcl
USE_GMAKE = Yes
USE_LIBTOOL = Yes
FAKE_FLAGS = "ELTCL_LIBRARY=${WRKINST}${PREFIX}/share/eltcl"
FAKE_FLAGS = ELTCL_LIBRARY=${WRKINST}${MODTCL_TCLDIR}/eltcl
NO_REGRESS = Yes
@ -37,4 +39,10 @@ LIB_DEPENDS += ${MODTK_LIB_DEPENDS}
WANTLIB += ${MODTK_WANTLIB}
post-install:
rm ${WRKINST}${MODTCL_TCLDIR}/eltcl/libeltclsh.la
rm ${WRKINST}${MODTCL_TCLDIR}/eltcl/libeltclsh.a
rm ${WRKINST}${MODTCL_TCLDIR}/pkgconfig/eltclsh.pc
rmdir ${WRKINST}${MODTCL_TCLDIR}/pkgconfig
.include <bsd.port.mk>

7
lang/eltclsh/distinfo
View File

@ -1,5 +1,2 @@
MD5 (eltclsh-1.9.tar.gz) = /kN/So5a0QIZd42sYIa9XA==
RMD160 (eltclsh-1.9.tar.gz) = i+4CiLxFiEW1OEJyFk30ji5+CwM=
SHA1 (eltclsh-1.9.tar.gz) = TIX8aSfD/ENZMW6SZUYKh0eXKg0=
SHA256 (eltclsh-1.9.tar.gz) = jzPI91FKVdQB8Tv0OdBGVc0GeMdbdsnvcRKXK74R0cY=
SIZE (eltclsh-1.9.tar.gz) = 342659
SHA256 (eltclsh-1.12.tar.gz) = 75GlppHX8BQ+hsez2tlw30WPGqPNhqo8evKx0QE6TGk=
SIZE (eltclsh-1.12.tar.gz) = 244359

21
lang/eltclsh/patches/patch-Makefile_in
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-Makefile_in,v 1.1 2010/10/23 21:49:06 naddy Exp $
--- Makefile.in.orig Sat Oct 23 19:50:38 2010
+++ Makefile.in Sat Oct 23 19:51:16 2010
@@ -65,7 +65,7 @@ all depends: $(config_files) $(config_headers) doc
clean:
$(make_subdirs)
-install: $(config_files) install-doc install-catdoc
+install: $(config_files) install-doc
$(make_subdirs)
@@ -74,7 +74,7 @@ install: $(config_files) install-doc install-catdoc
MAN= eltclsh.1
CATMAN= ${MAN:=.cat}
-doc: ${CATMAN}
+doc:
%.cat: %
@if test "X${GROFF}" != "X"; then \

11
lang/eltclsh/patches/patch-configure Normal file
View File

@ -0,0 +1,11 @@
$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; }

12
lang/eltclsh/patches/patch-src_Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$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)
# object files

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

@ -1,13 +1,12 @@
$OpenBSD: patch-src_elwish_c,v 1.2 2004/04/03 09:30:22 matthieu Exp $
--- src/elwish.c.orig 2003-09-27 19:14:21.000000000 +0200
+++ src/elwish.c 2004-04-03 11:23:11.000000000 +0200
@@ -77,9 +77,6 @@ elWishAppInit(ElTclInterpInfo *iinfo)
$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)
/* change the rc file */
Tcl_SetVar(iinfo->interp, "tcl_rcFileName", ".elwishrc", TCL_GLOBAL_ONLY);
Tcl_SetVar(interp, "tcl_rcFileName", "~/.elwishrc", TCL_GLOBAL_ONLY);
- /* I hate that stupid empty window you get after Tk_Init() */
- Tcl_Eval(iinfo->interp, "wm withdraw .");
-
- Tcl_Eval(interp, "wm withdraw .");
return TCL_OK;
}

30
lang/eltclsh/patches/patch-src_loop_c Normal file
View File

@ -0,0 +1,30 @@
$OpenBSD: patch-src_loop_c,v 1.1 2012/10/10 22:09:29 stu 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
#endif /* TCL_VERSION */
{
Tcl_Interp *interp;
- Tcl_Obj *resultPtr, *obj;
+ Tcl_Obj *resultPtr;
#if TCL_MAJOR_VERSION >= 8 && TCL_MINOR_VERSION >= 4
const
#endif
@@ -106,12 +106,14 @@ elTclshLoop(int argc, char **argv, ElTclAppInitProc ap
}
/* configure standard path for packages */
+/*
obj = Tcl_GetVar2Ex(interp, "auto_path", NULL, TCL_GLOBAL_ONLY);
if (!obj) obj = Tcl_NewListObj(0, NULL);
Tcl_ListObjAppendElement(interp, obj, Tcl_NewStringObj(ELTCLSH_DATA, -1));
Tcl_SetVar2Ex(interp, "auto_path", NULL, obj, TCL_GLOBAL_ONLY);
+*/
/* require eltclsh extension. In case this fails (typically during install,
* before pkgIndex.tcl is built), print the error message but don't give up

38
lang/eltclsh/patches/patch-tcl_init_tcl Normal file
View File

@ -0,0 +1,38 @@
$OpenBSD: patch-tcl_init_tcl,v 1.1 2012/10/10 22:09:29 stu 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
@@ -30,10 +30,24 @@
#
# Make packages in that directory available
-eval lappend auto_path $eltcl_pkgPath
+set na {}
+foreach p $auto_path {
+ lappend na [file normalize $p]
+}
+foreach p $eltcl_pkgPath {
+ if {[set np [file normalize $p]] ni $na} {
+ lappend auto_path $p
+ lappend na $np
+ }
+}
if { [info exists env(ELTCLLIBPATH)] } {
- eval lappend auto_path $env(ELTCLLIBPATH)
+ foreach p $env(ELTCLLIBPATH) {
+ if {[file normalize $p] ni $na} {
+ lappend auto_path $p
+ }
+ }
}
+unset na p np
# 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

6
lang/eltclsh/pkg/DESCR
View File

@ -1,9 +1,9 @@
eltclsh (editline tcl shell) is an interactive shell for the TCL
eltclsh (editline tcl shell) is an interactive shell for the Tcl
programming language. It provides command line editing, history
browsing as well as variables and command completion thanks to
editline features. The completion engine is programmable in a way
similar to tcsh, and comes with an intelligent completion for the full
tcl language by default.
similar to tcsh, and comes with an intelligent completion for the
full Tcl language by default.
The package also provides elwish, an interactive interpreter for the
Tk toolkit.

2
lang/eltclsh/pkg/PFRAG.shared Normal file
View File

@ -0,0 +1,2 @@
@comment $OpenBSD: PFRAG.shared,v 1.1 2012/10/10 22:09:29 stu Exp $
lib/tcl/eltcl/libeltclsh.so

14
lang/eltclsh/pkg/PLIST
View File

@ -1,9 +1,11 @@
@comment $OpenBSD: PLIST,v 1.4 2010/10/23 21:49:06 naddy Exp $
@comment $OpenBSD: PLIST,v 1.5 2012/10/10 22:09:29 stu Exp $
%%SHARED%%
@bin bin/eltclsh
@bin bin/elwish
lib/tcl/
lib/tcl/eltcl/
lib/tcl/eltcl/complete.tcl
lib/tcl/eltcl/init.tcl
lib/tcl/eltcl/pkgIndex.tcl
lib/tcl/eltcl/tools.tcl
@man man/man1/eltclsh.1
share/eltcl/
share/eltcl/complete.tcl
share/eltcl/init.tcl
share/eltcl/pkgIndex.tcl
share/eltcl/tools.tcl