summaryrefslogtreecommitdiff
path: root/shells
diff options
context:
space:
mode:
Diffstat (limited to 'shells')
-rw-r--r--shells/eltclsh/Makefile13
-rw-r--r--shells/eltclsh/PLIST4
-rw-r--r--shells/eltclsh/distinfo9
-rw-r--r--shells/eltclsh/patches/patch-aa13
-rw-r--r--shells/eltclsh/patches/patch-ab6
5 files changed, 17 insertions, 28 deletions
diff --git a/shells/eltclsh/Makefile b/shells/eltclsh/Makefile
index ec68680144f..72472a7cca7 100644
--- a/shells/eltclsh/Makefile
+++ b/shells/eltclsh/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2007/02/22 19:01:24 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2008/08/22 07:42:52 obache Exp $
-DISTNAME= eltclsh-1.6
-PKGREVISION= 1
+DISTNAME= eltclsh-1.9
CATEGORIES= shells
MASTER_SITES= http://softs.laas.fr/openrobots/php/download.php/
@@ -9,14 +8,18 @@ MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= https://softs.laas.fr/openrobots/wiki/eltclsh
COMMENT= Interactive TCL shell with editline facilities
+PKG_DESTDIR_SUPPORT= user-destdir
+
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_PREFIX.tcl}/lib
-CONFIGURE_ARGS+= --with-tk=${BUILDLINK_PREFIX.tk}/lib
USE_LANGUAGES= c
USE_LIBTOOL= yes
USE_TOOLS+= gmake
+.include "options.mk"
+
+INSTALL_ENV+= ELTCL_LIBRARY=${DESTDIR}${PREFIX}/share/eltcl
+
.include "../../lang/tcl/buildlink3.mk"
-.include "../../x11/tk/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/shells/eltclsh/PLIST b/shells/eltclsh/PLIST
index 51cba421a0b..d7d55da58b6 100644
--- a/shells/eltclsh/PLIST
+++ b/shells/eltclsh/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2006/11/30 18:02:28 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2008/08/22 07:42:52 obache Exp $
bin/eltclsh
-bin/elwish
+${PLIST.tk}bin/elwish
man/man1/eltclsh.1
share/eltcl/complete.tcl
share/eltcl/init.tcl
diff --git a/shells/eltclsh/distinfo b/shells/eltclsh/distinfo
index 25874ece7e3..c5779f2a163 100644
--- a/shells/eltclsh/distinfo
+++ b/shells/eltclsh/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.2 2006/11/30 18:02:28 joerg Exp $
+$NetBSD: distinfo,v 1.3 2008/08/22 07:42:52 obache Exp $
-SHA1 (eltclsh-1.6.tar.gz) = 159d79c265ed6cf3efd1c926f58c6705c630ed4e
-RMD160 (eltclsh-1.6.tar.gz) = daf83a9f509015e0c6d405f57ae6940e0f129d06
-Size (eltclsh-1.6.tar.gz) = 328626 bytes
-SHA1 (patch-aa) = 77ed0d9200df1b533997e4d0147d4bd3e3226108
+SHA1 (eltclsh-1.9.tar.gz) = 4c85fc6927c3fc4359316e9265460a8747972a0d
+RMD160 (eltclsh-1.9.tar.gz) = 8bee0288bc458845b5384272164df48e2e7e0b03
+Size (eltclsh-1.9.tar.gz) = 342659 bytes
SHA1 (patch-ab) = b6e3474302a6db10fd527072cd184f5775b0c89b
diff --git a/shells/eltclsh/patches/patch-aa b/shells/eltclsh/patches/patch-aa
deleted file mode 100644
index e9c76f6a32e..00000000000
--- a/shells/eltclsh/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2006/11/21 15:27:42 obache Exp $
-
---- src/loop.c.orig 2005-10-04 07:29:20.000000000 +0000
-+++ src/loop.c
-@@ -301,7 +301,7 @@ elTclshLoop(int argc, char **argv, ElTcl
- */
-
- done:
-- if (iinfo->command != NULL) Tcl_DecrRefCount(iinfo->command);
-+ if (iinfo->command != NULL) {Tcl_DecrRefCount(iinfo->command);}
- snprintf(buffer, sizeof(buffer), "exit %d", exitCode);
- Tcl_Eval(iinfo->interp, buffer);
- }
diff --git a/shells/eltclsh/patches/patch-ab b/shells/eltclsh/patches/patch-ab
index 419b81c1ba6..4d07ac8e310 100644
--- a/shells/eltclsh/patches/patch-ab
+++ b/shells/eltclsh/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1 2006/11/30 18:02:28 joerg Exp $
+$NetBSD: patch-ab,v 1.2 2008/08/22 07:42:52 obache Exp $
---- Makefile.in.orig 2006-11-30 17:57:09.000000000 +0000
+--- Makefile.in.orig 2008-08-08 14:15:11.000000000 +0000
+++ Makefile.in
-@@ -63,7 +63,7 @@ all depends: $(config_files) $(config_he
+@@ -65,7 +65,7 @@ all depends: $(config_files) $(config_he
clean:
$(make_subdirs)