Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (59986b6134f15143d8571fe7a0a58925fe1d78aa)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (59986b6134f15143d8571fe7a0a58925fe1d78aa)
  • Date: Sun, 6 Sep 2009 05:11:41 -0500

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

dev/null |binary
devel/autoconf/HISTORY | 3
devel/autoconf/INSTALL | 4
devel/expect/BUILD | 17 -
devel/expect/DEPENDS | 6
devel/expect/DETAILS | 9
devel/expect/FINAL | 7
devel/expect/HISTORY | 6
devel/expect/INSTALL | 3
devel/expect/PRE_BUILD | 24 +
devel/expect/expect-5.43.0-spawn-1.patch | 217
++++++++++++++++++
devel/expect/expect-5.43.0-tcl_8.5.5_fix-1.patch | 125 ++++++++++
devel/tcl/HISTORY | 3
devel/tcl/INSTALL | 9
devel/tk/BUILD | 9
devel/tk/DEPENDS | 5
devel/tk/DETAILS | 15 -
devel/tk/FINAL | 2
devel/tk/HISTORY | 9
devel/tk/INSTALL | 7
devel/tk/PRE_BUILD | 7
devel/tk/tcl8.6a3-src.tar.gz.sig | 0
x11/nx/BUILD | 32 +-
x11/nx/DEPENDS | 28 +-
x11/nx/DETAILS | 23 -
x11/nx/HISTORY | 14 +
x11/nx/INSTALL | 30 +-
x11/nx/PRE_BUILD | 27 +-
x11/nx/nx-X11-1.5.0-21.tar.gz.sig | 0
x11/nx/nx-X11-3.3.0-7.tar.gz.sig |binary
x11/nx/nxagent-1.5.0-112.tar.gz.sig | 0
x11/nx/nxagent-3.3.0-18.tar.gz.sig |binary
x11/nx/nxauth-1.5.0-1.tar.gz.sig | 0
x11/nx/nxauth-3.3.0-1.tar.gz.sig |binary
x11/nx/nxcomp-1.5.0-80.tar.gz.sig | 0
x11/nx/nxcomp-3.3.0-4.tar.gz.sig |binary
x11/nx/nxcompext-1.5.0-20.tar.gz.sig | 0
x11/nx/nxcompext-3.3.0-4.tar.gz.sig |binary
x11/nx/nxcompshad-3.3.0-3.tar.gz.sig |binary
x11/nx/nxdesktop-1.5.0-78.tar.gz.sig | 0
x11/nx/nxproxy-1.5.0-9.tar.gz.sig | 0
x11/nx/nxproxy-3.3.0-2.tar.gz.sig |binary
x11/nx/nxviewer-1.5.0-15.tar.gz.sig | 0
x11/nx/patches/nx-2.1.0-deprecated-headers.patch | 111 +++++++++
x11/nx/patches/nx-2.1.0-invalid-options.patch | 38 +++
x11/nx/patches/nx-3.1.0-gcc-4.3.patch | 24 +
x11/nx/patches/nx-3.2.0-nxproxy_read_from_stdin.patch | 68 +++++
x11/nx/patches/nx-3.3.0-cflags.patch | 54 ++++
x11/nx/patches/nx-3.3.0-nxcomp-glibc2.10.patch | 11
x11/nx/patches/nx-x11-1.5.0-tmp-exec.patch | 11
x11/nx/patches/nxcomp-1.5.0-pic.patch | 20 +
51 files changed, 863 insertions(+), 115 deletions(-)

New commits:
commit 59986b6134f15143d8571fe7a0a58925fe1d78aa
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

x11/freenx-server, x11/freenx: re-renamed the spell I accidentally
renamed

commit 13e6606fe318e894623936b02174f85efb7dc757
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

devel/tk: use only tk source, not tcl as well

commit c9babee30e2bb03c168fd94418c32d91d6d6fb61
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

x11/nx: updated to 3.3.0

commit 303a480bce694b8358cb94497c44b436370a2dec
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

devel/expect: added patches to make it build with our version of tcl and
tk

commit 5210362b5fb109235c79b39405d4b0a762da1087
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

devel/autoconf: install config.{sub,guess}

commit 41daf8f64d729b4ba405561241372c064f47871a
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

devel/tk: corrected SOURCE_DIRECTORY in INSTALL

commit 209442f45b601498f4de8d406d1a3f15e25bc9c7
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

devel/tk: install private headers as well

commit d674baae4991b98b64c33af10cd904e0e2506cc6
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

devel/tcl: install private headers as well

diff --git a/devel/autoconf/HISTORY b/devel/autoconf/HISTORY
index 79c3f9d..b8b9508 100644
--- a/devel/autoconf/HISTORY
+++ b/devel/autoconf/HISTORY
@@ -1,3 +1,6 @@
+2009-09-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * INSTALL: install config.{sub,guess}
+
2009-07-27 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.64

diff --git a/devel/autoconf/INSTALL b/devel/autoconf/INSTALL
new file mode 100755
index 0000000..c5d8a3f
--- /dev/null
+++ b/devel/autoconf/INSTALL
@@ -0,0 +1,4 @@
+default_install &&
+mkdir -p ${INSTALL_ROOT}/usr/share/misc &&
+cp ${SOURCE_DIRECTORY}/build-aux/config.{sub,guess} \
+ ${INSTALL_ROOT}/usr/share/misc
diff --git a/devel/expect/BUILD b/devel/expect/BUILD
index 68f8889..f9a43ca 100755
--- a/devel/expect/BUILD
+++ b/devel/expect/BUILD
@@ -1,9 +1,16 @@
-if echo ${OPTS} | grep -q tk; then
- export LDFLAGS="$LDFLAGS -L /usr/X11R6/lib"
-fi &&
+local TCLVERSION="$(echo 'puts [set tcl_version]' | tclsh)" &&
+local TCLHDIR="${INSTALL_ROOT}/usr/lib/tcl${TCLVERSION}/include" &&

-OPTS="--with-tcl=/usr/lib \
+OPTS="--with-tcl=${INSTALL_ROOT}/usr/lib \
+ --with-tclinclude=${TCLHDIR} \
${OPTS}" &&
+OPTS="--enable-shared $OPTS" &&

+CFLAGS="${CFLAGS} -I${TCLHDIR}/generic -I${TCLHDIR}/unix" &&
+
+message "${MESSAGE_COLOR}running configure${DEFAULT_COLOR}" &&
+default_build_configure &&
+message "${MESSAGE_COLOR}running make${DEFAULT_COLOR}" &&
make_single &&
-default_build
+default_build_make TCLHDIRDASHI="-I${TCLHDIR}/generic -I${TCLHDIR}/unix" &&
+make_normal
diff --git a/devel/expect/DEPENDS b/devel/expect/DEPENDS
index c2d039d..4c7f82a 100755
--- a/devel/expect/DEPENDS
+++ b/devel/expect/DEPENDS
@@ -1,2 +1,4 @@
-depends tcl &&
-optional_depends "tk" "--with-tk=/usr/lib" "" "for support of GUI
programs"
+depends tcl &&
+depends autoconf &&
+optional_depends "tk" "--with-tk=${INSTALL_ROOT}/usr/lib" \
+ "" "for support of GUI programs"
diff --git a/devel/expect/DETAILS b/devel/expect/DETAILS
index c78977e..1c29efa 100755
--- a/devel/expect/DETAILS
+++ b/devel/expect/DETAILS
@@ -1,18 +1,9 @@
SPELL=expect
VERSION=5.43
- VERSION2=8.4.5
SOURCE=$SPELL-$VERSION.0.tar.gz
- SOURCE2=tcl$VERSION2-src.tar.gz
- SOURCE3=tk$VERSION2-src.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-SOURCE2_DIRECTORY=$BUILD_DIRECTORY/tcl$VERSION2
-SOURCE3_DIRECTORY=$BUILD_DIRECTORY/tk$VERSION2
SOURCE_URL[0]=http://expect.nist.gov/src/$SOURCE
- SOURCE2_URL[0]=$SOURCEFORGE_URL/tcl/$SOURCE2
- SOURCE3_URL[0]=$SOURCEFORGE_URL/tcl/$SOURCE3

SOURCE_HASH=sha512:692ceac0eea5f2e8f75c42217fab3b2e2c202b0c460a06d5986f56a81789fbe895032a1c50b7e7fb96fb0a3d3f52f8383e706cbd0b81aa0fe03fdcc8b3ae4143
-
SOURCE2_HASH=sha512:d7d669a79219bc559083974508eeddc640e1738a56b8d14a4c6d65c9672684190efc2b1ed461141a2d170376581782ed7ffc540bb2d009921a1d1a08e96c6815
-
SOURCE3_HASH=sha512:561b96df5e54642323e07ba5fb521dbe144e7c217dab8572be556c92161524ea7bb2f8519d543bd0bd3af2ccac6b7c482e2927c6b63279da5bab1c5906edda88
WEB_SITE=http://expect.nist.gov
ENTERED=20020307
UPDATED=20040226
diff --git a/devel/expect/FINAL b/devel/expect/FINAL
deleted file mode 100755
index 8f9fb7a..0000000
--- a/devel/expect/FINAL
+++ /dev/null
@@ -1,7 +0,0 @@
-cd / &&
-rm_source_dir $SOURCE_DIRECTORY &&
-rm_source_dir $SOURCE2_DIRECTORY &&
-
-if echo ${OPTS} | grep -q tk; then
- rm_source_dir $SOURCE3_DIRECTORY
-fi
diff --git a/devel/expect/HISTORY b/devel/expect/HISTORY
index 519da60..0a99cae 100644
--- a/devel/expect/HISTORY
+++ b/devel/expect/HISTORY
@@ -1,3 +1,9 @@
+2009-09-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD, DEPENDS, DETAILS, expect-5.43.0-spawn-1.patch,
+ expect-5.43.0-tcl_8.5.5_fix-1.patch, INSTALL, PRE_BUILD:
+ use system tcl and tk during build, added patches from linux
+ from scratch to make expect build with our version of tcl and tk
+
2007-03-04 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: fixed SOURCE_HASH [Bug 10714]

diff --git a/devel/expect/INSTALL b/devel/expect/INSTALL
new file mode 100755
index 0000000..e93e9cc
--- /dev/null
+++ b/devel/expect/INSTALL
@@ -0,0 +1,3 @@
+make_single &&
+default_install &&
+make_normal
diff --git a/devel/expect/PRE_BUILD b/devel/expect/PRE_BUILD
index 163b2ed..4ad5210 100755
--- a/devel/expect/PRE_BUILD
+++ b/devel/expect/PRE_BUILD
@@ -1,10 +1,18 @@
-mk_source_dir $SOURCE_DIRECTORY &&
-unpack_file &&
+default_pre_build &&

-mk_source_dir $SOURCE2_DIRECTORY &&
-unpack_file 2 &&
+cd ${SOURCE_DIRECTORY} &&

-if echo ${OPTS} | grep -q tk; then
- mk_source_dir $SOURCE3_DIRECTORY &&
- unpack_file 3
-fi
+patch -p1 < ${SCRIPT_DIRECTORY}/expect-5.43.0-spawn-1.patch
&&
+patch -p1 < ${SCRIPT_DIRECTORY}/expect-5.43.0-tcl_8.5.5_fix-1.patch
&&
+
+sedit '/^install:/s/install-libraries //' Makefile.in
&&
+sedit 's/^SCRIPTS_MANPAGES = /_&/' Makefile.in
&&
+sedit 's:/usr/local/bin:/usr/bin:' expect.man
&&
+sedit 's:/usr/local/bin:/usr/bin:' expectk.man
&&
+sedit 's/^#include "tcl.h"/#include "tclInt.h"/' exp_inter.c
&&
+sedit 's/^#include "tcl.h"/#include "tclInt.h"/' exp_command.c
&&
+sedit 's/^\(#include <stdio\.h>\)/\1\n#include "expect_cf.h"/' Dbg.c
&&
+sedit 's:AC_CONFIG_SUBDIRS(testsuite)::' configure.in
&&
+
+cp ${INSTALL_ROOT}/usr/share/misc/config.{sub,guess} ${SOURCE_DIRECTORY}
&&
+autoconf
diff --git a/devel/expect/expect-5.43.0-spawn-1.patch
b/devel/expect/expect-5.43.0-spawn-1.patch
new file mode 100644
index 0000000..c2033c0
--- /dev/null
+++ b/devel/expect/expect-5.43.0-spawn-1.patch
@@ -0,0 +1,217 @@
+Submitted By: LFS Book <lfs-book AT linuxfromscratch.org>
+Date: 2003-10-05
+Initial Package Version: 5.38
+Origin: Redhat RPM (Patch by HJ Lu)
+Description: NA
+diff -uNr expect-5.38.orig/exp_chan.c expect-5.38/exp_chan.c
+--- expect-5.38.orig/exp_chan.c 2002-02-12 13:00:55.000000000 +1100
++++ expect-5.38/exp_chan.c 2003-03-01 10:36:18.000000000 +1100
+@@ -519,6 +519,7 @@
+ esPtr->buffer = Tcl_NewStringObj("",0);
+ Tcl_IncrRefCount(esPtr->buffer);
+ esPtr->umsize = exp_default_match_max;
++ esPtr->umsize_changed = exp_default_match_max_changed;
+ /* this will reallocate object with an appropriate sized buffer */
+ expAdjust(esPtr);
+
+diff -uNr expect-5.38.orig/exp_command.h expect-5.38/exp_command.h
+--- expect-5.38.orig/exp_command.h 2002-04-08 08:57:20.000000000 +1000
++++ expect-5.38/exp_command.h 2003-03-01 10:36:18.000000000 +1100
+@@ -25,6 +25,7 @@
+ EXTERN char * exp_get_var _ANSI_ARGS_((Tcl_Interp *,char *));
+
+ EXTERN int exp_default_match_max;
++EXTERN int exp_default_match_max_changed;
+ EXTERN int exp_default_parity;
+ EXTERN int exp_default_rm_nulls;
+
+@@ -97,6 +98,7 @@
+ int msize; /* # of bytes that buffer can hold (max) */
+ int umsize; /* # of bytes (min) that is guaranteed to
match */
+ /* this comes from match_max command */
++ int umsize_changed; /* is umsize changed by user? */
+ int printed; /* # of bytes written to stdout (if logging on) */
+ /* but not actually returned via a match yet */
+ int echoed; /* additional # of bytes (beyond "printed"
above) */
+diff -uNr expect-5.38.orig/expect.c expect-5.38/expect.c
+--- expect-5.38.orig/expect.c 2002-04-08 09:00:33.000000000 +1000
++++ expect-5.38/expect.c 2003-03-01 10:36:18.000000000 +1100
+@@ -41,8 +41,17 @@
+ #include "tcldbg.h"
+ #endif
+
++/* The initial length is 2000. We increment it by 2000. The maximum
++ is 8MB (0x800000). */
++#define EXP_MATCH_MAX 2000
++#define EXP_MATCH_INC 2000
++#define EXP_MATCH_STEP_LIMIT 0x700000
++#define EXP_MATCH_LIMIT 0x800000
++#define EXP_MATCH_LIMIT_QUOTE "0x800000"
++
+ /* initial length of strings that we can guarantee patterns can match */
+-int exp_default_match_max = 2000;
++int exp_default_match_max = EXP_MATCH_MAX;
++int exp_default_match_max_changed = 0;
+ #define INIT_EXPECT_TIMEOUT_LIT "10" /* seconds */
+ #define INIT_EXPECT_TIMEOUT 10 /* seconds */
+ int exp_default_parity = TRUE;
+@@ -1618,6 +1627,76 @@
+ return newsize;
+ }
+
++/* returns # of bytes until we see a newline at the end or EOF. */
++/*ARGSUSED*/
++static int
++expReadNewLine(interp,esPtr,save_flags) /* INTL */
++Tcl_Interp *interp;
++ExpState *esPtr;
++int save_flags;
++{
++ int size;
++ int exp_size;
++ int full_size;
++ int count;
++ char *str;
++
++ count = 0;
++ for (;;) {
++ exp_size = expSizeGet(esPtr);
++
++ /* When we reach the limit, we will only read one char at a
++ time. */
++ if (esPtr->umsize >= EXP_MATCH_STEP_LIMIT)
++ size = TCL_UTF_MAX;
++ else
++ size = exp_size;
++
++ if (exp_size + TCL_UTF_MAX >= esPtr->msize) {
++ if (esPtr->umsize >= EXP_MATCH_LIMIT) {
++ expDiagLogU("WARNING: interact buffer is full. probably your
program\r\n");
++ expDiagLogU("is not interactive or has a very long output
line. The\r\n");
++ expDiagLogU("current limit is " EXP_MATCH_LIMIT_QUOTE
".\r\n");
++ expDiagLogU("Dumping first half of buffer in order to
continue\r\n");
++ expDiagLogU("Recommend you enlarge the buffer.\r\n");
++
exp_buffer_shuffle(interp,esPtr,save_flags,EXPECT_OUT,"expect");
++ return count;
++ }
++ else {
++ esPtr->umsize += EXP_MATCH_INC;
++ expAdjust(esPtr);
++ }
++ }
++
++ full_size = esPtr->msize - (size / TCL_UTF_MAX);
++ size = Tcl_ReadChars(esPtr->channel,
++ esPtr->buffer,
++ full_size,
++ 1 /* append */);
++ if (size > 0) {
++ count += size;
++ /* We try again if there are more to read and we haven't
++ seen a newline at the end. */
++ if (size == full_size) {
++ str = Tcl_GetStringFromObj(esPtr->buffer, &size);
++ if (str[size - 1] != '\n')
++ continue;
++ }
++ }
++ else {
++ /* It is even trickier. We got an error from read. We have
++ to recover from it. Let's make sure the size of
++ buffer is correct. It can be corrupted. */
++ str = Tcl_GetString(esPtr->buffer);
++ Tcl_SetObjLength(esPtr->buffer, strlen(str));
++ }
++
++ break;
++ }
++
++ return count;
++}
++
+ /* returns # of bytes read or (non-positive) error of form EXP_XXX */
+ /* returns 0 for end of file */
+ /* If timeout is non-zero, set an alarm before doing the read, else assume
*/
+@@ -1632,6 +1711,8 @@
+ {
+ int cc = EXP_TIMEOUT;
+ int size = expSizeGet(esPtr);
++ int full_size;
++ int count;
+
+ if (size + TCL_UTF_MAX >= esPtr->msize)
+ exp_buffer_shuffle(interp,esPtr,save_flags,EXPECT_OUT,"expect");
+@@ -1648,11 +1729,43 @@
+ }
+ #endif
+
+-
++ /* FIXME: If we ask less than what is available in the tcl buffer
++ when tcl has seen EOF, we will throw away the remaining data
++ since the next read will get EOF. Since expect is line-oriented,
++ we exand our buffer to get EOF or the next newline at the end of
++ the input buffer. I don't know if it is the right fix. H.J. */
++ count = 0;
++ full_size = esPtr->msize - (size / TCL_UTF_MAX);
+ cc = Tcl_ReadChars(esPtr->channel,
+- esPtr->buffer,
+- esPtr->msize - (size / TCL_UTF_MAX),
+- 1 /* append */);
++ esPtr->buffer,
++ full_size,
++ 1 /* append */);
++ if (cc > 0) {
++ count += cc;
++ /* It gets very tricky. There are more to read. We will expand
++ our buffer and get EOF or a newline at the end unless the
++ buffer length has been changed. */
++ if (cc == full_size) {
++ char *str;
++ str = Tcl_GetStringFromObj(esPtr->buffer, &size);
++ if (str[size - 1] != '\n') {
++ if (esPtr->umsize_changed) {
++ char buf[20]; /* big enough for 64bit int in hex.
*/
++ snprintf(buf,sizeof(buf),"0x%x", esPtr->umsize);
++ expDiagLogU("WARNING: interact buffer is not large enough
to hold\r\n");
++ expDiagLogU("all output. probably your program is not
interactive or\r\n");
++ expDiagLogU("has a very long output line. The current
limit is ");
++ expDiagLogU(buf);
++ expDiagLogU(".\r\n");
++ }
++ else {
++ cc = expReadNewLine(interp,esPtr,save_flags);
++ if (cc > 0)
++ count += cc;
++ }
++ }
++ }
++ }
+ i_read_errno = errno;
+
+ #ifdef SIMPLE_EVENT
+@@ -1673,7 +1786,7 @@
+ }
+ }
+ #endif
+- return cc;
++ return count > 0 ? count : cc;
+ }
+
+ /*
+@@ -2746,8 +2859,14 @@
+ return(TCL_ERROR);
+ }
+
+- if (Default) exp_default_match_max = size;
+- else esPtr->umsize = size;
++ if (Default) {
++ exp_default_match_max = size;
++ exp_default_match_max_changed = 1;
++ }
++ else {
++ esPtr->umsize = size;
++ esPtr->umsize_changed = 1;
++ }
+
+ return(TCL_OK);
+ }
diff --git a/devel/expect/expect-5.43.0-tcl_8.5.5_fix-1.patch
b/devel/expect/expect-5.43.0-tcl_8.5.5_fix-1.patch
new file mode 100644
index 0000000..5b9596a
--- /dev/null
+++ b/devel/expect/expect-5.43.0-tcl_8.5.5_fix-1.patch
@@ -0,0 +1,125 @@
+Submitted By: DJ Lucas <dj_AT_linuxfromscratch_DOT_org>
+Date: 2008-09-28
+Initial Package Version: 5.43
+Upstream status: Not Submitted
+Origin: LFS ticket 2126 (http://wiki.linuxfromscratch.org/lfs/ticket/2126)
+ Bryan Kadzban <bryan AT kadzban.is-a-geek.net>
+Description: Removes references to functions that Tcl 8.5 no longer exposes
+ and correct other minor build problems WRT TCL-8.5.x.
+
+diff -Naur expect-5.43-orig/Dbg.c expect-5.43/Dbg.c
+--- expect-5.43-orig/Dbg.c 2002-03-22 22:11:54.000000000 -0600
++++ expect-5.43/Dbg.c 2008-08-24 01:30:15.000000000 -0500
+@@ -9,7 +9,7 @@
+ */
+
+ #include <stdio.h>
+-
++#include "expect_cf.h"
+ #include "tcldbgcf.h"
+ #if 0
+ /* tclInt.h drags in stdlib. By claiming no-stdlib, force it to drag in */
+diff -Naur expect-5.43-orig/exp_inter.c expect-5.43/exp_inter.c
+--- expect-5.43-orig/exp_inter.c 2004-08-17 21:03:00.000000000 -0500
++++ expect-5.43/exp_inter.c 2008-08-24 01:28:59.000000000 -0500
+@@ -36,6 +36,7 @@
+ #include <ctype.h>
+
+ #include "tcl.h"
++#include "tclInt.h"
+ #include "string.h"
+
+ #include "exp_tty_in.h"
+diff -Naur expect-5.43/exp_command.c expect-5.43-patched/exp_command.c
+--- expect-5.43/exp_command.c 2004-08-20 13:18:01.000000000 -0400
++++ expect-5.43-patched/exp_command.c 2008-01-12 11:42:45.000000000 -0500
+@@ -2265,6 +2265,8 @@
+ /*NOTREACHED*/
+ }
+
++static struct exp_cmd_data cmd_data[];
++
+ /*ARGSUSED*/
+ static int
+ Exp_CloseObjCmd(clientData, interp, objc, objv)
+@@ -2311,12 +2313,23 @@
+ /* Historical note: we used "close" long before there was a */
+ /* Tcl builtin by the same name. */
+
++ /* The code that registered this function as the handler for */
++ /* the "close" command stored away the old handler in the */
++ /* exp_cmd_data for the "close" command. */
++
++ struct exp_cmd_data *cmd_ptr;
+ Tcl_CmdInfo info;
++
++ for(cmd_ptr = &cmd_data[0]; cmd_ptr->name; cmd_ptr++) {
++ if(strncmp(cmd_ptr->name, "close", 5) == 0)
++ break;
++ }
++
+ Tcl_ResetResult(interp);
+ if (0 == Tcl_GetCommandInfo(interp,"close",&info)) {
+ info.clientData = 0;
+ }
+- return(Tcl_CloseObjCmd(info.clientData,interp,objc_orig,objv_orig));
++
return(cmd_ptr->old_objProc(info.clientData,interp,objc_orig,objv_orig));
+ }
+
+ if (chanName) {
+@@ -2961,7 +2974,10 @@
+ /* if successful (i.e., TCL_RETURN is returned) */
+ /* modify the result, so that we will handle it specially */
+
+- int result = Tcl_ReturnObjCmd(clientData,interp,objc,objv);
++ Tcl_CmdInfo info;
++ Tcl_GetCommandInfo(interp, "return", &info);
++
++ int result = info.objProc(clientData,interp,objc,objv);
+ if (result == TCL_RETURN)
+ result = EXP_TCL_RETURN;
+ return result;
+@@ -3062,8 +3078,7 @@
+
+ for (;c->name;c++) {
+ /* if already defined, don't redefine */
+- if ((c->flags & EXP_REDEFINE) ||
+- !(Tcl_FindHashEntry(&globalNsPtr->cmdTable,c->name) ||
++ if (!(Tcl_FindHashEntry(&globalNsPtr->cmdTable,c->name) ||
+ Tcl_FindHashEntry(&currNsPtr->cmdTable,c->name))) {
+ if (c->objproc)
+ Tcl_CreateObjCommand(interp,c->name,
+@@ -3072,6 +3087,21 @@
+ Tcl_CreateCommand(interp,c->name,c->proc,
+ c->data,exp_deleteProc);
+ }
++ else if (c->flags & EXP_REDEFINE) { /* unless the REDEFINE
flag is present */
++ Tcl_CmdInfo info;
++
++ if (Tcl_GetCommandInfo(interp, c->name, &info)) {
++ c->old_proc = info.proc;
++ c->old_objProc = info.objProc;
++ }
++
++ if (c->objproc)
++ Tcl_CreateObjCommand(interp,c->name,
++
c->objproc,c->data,exp_deleteObjProc);
++ else
++ Tcl_CreateCommand(interp,c->name,c->proc,
++ c->data,exp_deleteProc);
++ }
+ if (!(c->name[0] == 'e' &&
+ c->name[1] == 'x' &&
+ c->name[2] == 'p')
+diff -Naur expect-5.43/exp_command.h expect-5.43-patched/exp_command.h
+--- expect-5.43/exp_command.h 2008-01-12 11:44:11.000000000 -0500
++++ expect-5.43-patched/exp_command.h 2008-01-12 11:26:05.000000000 -0500
+@@ -297,6 +297,8 @@
+ Tcl_CmdProc *proc;
+ ClientData data;
+ int flags;
++ Tcl_CmdProc *old_proc; /* these store the procedure for the
old command, */
++ Tcl_ObjCmdProc *old_objProc; /* if any */
+ };
+
+ EXTERN void exp_create_commands _ANSI_ARGS_((Tcl_Interp *,
diff --git a/devel/tcl/HISTORY b/devel/tcl/HISTORY
index 9a8a7a6..71485b1 100644
--- a/devel/tcl/HISTORY
+++ b/devel/tcl/HISTORY
@@ -1,3 +1,6 @@
+2009-09-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * INSTALL: install private headers
+
2009-04-19 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated stable to version 8.5.7

diff --git a/devel/tcl/INSTALL b/devel/tcl/INSTALL
index 056d7ea..80b4dbc 100755
--- a/devel/tcl/INSTALL
+++ b/devel/tcl/INSTALL
@@ -1,3 +1,10 @@
default_install &&

-ln -sf tclsh${VERSION:0:3} ${INSTALL_ROOT}/usr/bin/tclsh
+ln -sf tclsh${VERSION:0:3} ${INSTALL_ROOT}/usr/bin/tclsh &&
+mkdir -p ${INSTALL_ROOT}/usr/lib/tcl${VERSION:0:3}/include/unix &&
+mkdir -p ${INSTALL_ROOT}/usr/lib/tcl${VERSION:0:3}/include/generic &&
+cp ${SOURCE_DIRECTORY}/unix/*.h \
+ ${INSTALL_ROOT}/usr/lib/tcl${VERSION:0:3}/include/unix &&
+cp ${SOURCE_DIRECTORY}/generic/*.h \
+ ${INSTALL_ROOT}/usr/lib/tcl${VERSION:0:3}/include/generic &&
+rm
${INSTALL_ROOT}/usr/lib/tcl${VERSION:0:3}/include/generic/{tcl.h,tclDecls.h,tclPlatDecls.h}
diff --git a/devel/tk/BUILD b/devel/tk/BUILD
index 7f4e01f..02c0117 100755
--- a/devel/tk/BUILD
+++ b/devel/tk/BUILD
@@ -1,7 +1,12 @@
-cd $SOURCE2_DIRECTORY/unix &&
+local TCLVERSION="$(echo 'puts [set tcl_version]' | tclsh)" &&
+local TCLHDIR="${INSTALL_ROOT}/usr/lib/tcl${TCLVERSION}/include" &&
+
+CFLAGS="${CFLAGS} -I${TCLHDIR}/generic -I${TCLHDIR}/unix" &&
+
+cd $SOURCE_DIRECTORY/unix &&
OPTS="$OPTS --enable-threads" &&
if [ "$DEVEL" = "y" ]; then
OPTS="$OPTS --enable-xft"
fi &&

- default_build
+default_build
diff --git a/devel/tk/DEPENDS b/devel/tk/DEPENDS
index 67dbb08..21d1279 100755
--- a/devel/tk/DEPENDS
+++ b/devel/tk/DEPENDS
@@ -1,4 +1,3 @@
depends xorg-libs &&
-depends tcl &&
-depends fontconfig
-
+depends tcl "--with-tcl=${INSTALL_ROOT}/usr/lib" &&
+depends fontconfig
diff --git a/devel/tk/DETAILS b/devel/tk/DETAILS
index 7749d24..520b1ca 100755
--- a/devel/tk/DETAILS
+++ b/devel/tk/DETAILS
@@ -1,25 +1,18 @@
SPELL=tk
if [ "$DEVEL" = "y" ]; then
VERSION=8.6a3
- SOURCE=tcl$VERSION-src.tar.gz
- SOURCE2=tk$VERSION-src.tar.gz
+ SOURCE=tk$VERSION-src.tar.gz
SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
- SOURCE2_GPG="gurus.gpg:${SOURCE2}.sig:WORKS_FOR_ME"
else
VERSION=8.5.7
- SOURCE=tcl$VERSION-src.tar.gz
- SOURCE2=tk$VERSION-src.tar.gz
-
SOURCE_HASH=sha512:374c457324dff568b849e558d7360949c23f01e824f8e47b7af648b469c3b6738daecd44bd8d5d65f356e57c263b4008e138606919013e11d5be81a6bc7d8973
-
SOURCE2_HASH=sha512:e783ef8e8d54d74677eec105558b30b7aeebbec27b7c603ff2b43a749f9d61973fafb994ea1ef81ef7279e50cbca664462b85d0cd1a773e0b89a3a7383ec6f74
+ SOURCE=tk$VERSION-src.tar.gz
+
SOURCE_HASH=sha512:e783ef8e8d54d74677eec105558b30b7aeebbec27b7c603ff2b43a749f9d61973fafb994ea1ef81ef7279e50cbca664462b85d0cd1a773e0b89a3a7383ec6f74
fi
- SOURCE_DIRECTORY=$BUILD_DIRECTORY/tcl$VERSION
-SOURCE2_DIRECTORY=$BUILD_DIRECTORY/tk$VERSION
+ SOURCE_DIRECTORY=$BUILD_DIRECTORY/tk$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/tcl/$SOURCE
- SOURCE2_URL[0]=$SOURCEFORGE_URL/tcl/$SOURCE2
WEB_SITE=http://www.scriptics.com/
ENTERED=20020507
LICENSE[0]=UNKNOWN
- LICENSE[1]=UNKNOWN
DOCS="ChangeLog README"
KEYWORDS="devel"
SHORT="Tcl provides a multi-platform scripting environment."
diff --git a/devel/tk/FINAL b/devel/tk/FINAL
deleted file mode 100755
index 56126fa..0000000
--- a/devel/tk/FINAL
+++ /dev/null
@@ -1,2 +0,0 @@
- cd / &&
- rm_source_dir $SOURCE2_DIRECTORY
diff --git a/devel/tk/HISTORY b/devel/tk/HISTORY
index 55e4dc4..c96f2e7 100644
--- a/devel/tk/HISTORY
+++ b/devel/tk/HISTORY
@@ -1,3 +1,12 @@
+2009-09-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD, DEPENDS, DETAILS, INSTALL, PRE_BUILD:
+ use only tk source, use installed tcl for building
+ * FINAL: deleted
+
+2009-09-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * INSTALL: install private headers
+ * INSTALL: corrected SOURCE_DIRECTORY
+
2009-04-19 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated stable to version 8.5.7

diff --git a/devel/tk/INSTALL b/devel/tk/INSTALL
index 758ccb8..f48959d 100755
--- a/devel/tk/INSTALL
+++ b/devel/tk/INSTALL
@@ -1,3 +1,10 @@
default_install &&

ln -sf wish${VERSION:0:3} ${INSTALL_ROOT}/usr/bin/wish
+
+mkdir -p ${INSTALL_DIRECTORY}/usr/lib/tk${VERSION:0:3}/include/unix &&
+mkdir -p ${INSTALL_DIRECTORY}/usr/lib/tk${VERSION:0:3}/include/generic &&
+cp ${SOURCE_DIRECTORY}/unix/*.h \
+ ${INSTALL_DIRECTORY}/usr/lib/tk${VERSION:0:3}/include/unix &&
+cp ${SOURCE_DIRECTORY}/generic/*.h \
+ ${INSTALL_DIRECTORY}/usr/lib/tk${VERSION:0:3}/include/generic
diff --git a/devel/tk/PRE_BUILD b/devel/tk/PRE_BUILD
index b0bf14d..5a93cc0 100755
--- a/devel/tk/PRE_BUILD
+++ b/devel/tk/PRE_BUILD
@@ -1,8 +1,5 @@
-mk_source_dir $SOURCE_DIRECTORY &&
-mk_source_dir $SOURCE2_DIRECTORY &&
-unpack_file &&
-unpack_file 2 &&
-cd $SOURCE2_DIRECTORY &&
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&

if [[ "$DEVEL" == "y" ]]; then
patch -p0 < $SCRIPT_DIRECTORY/tk-fix.patch
diff --git a/devel/tk/tcl8.6a3-src.tar.gz.sig
b/devel/tk/tcl8.6a3-src.tar.gz.sig
deleted file mode 100644
index e04aa17..0000000
Binary files a/devel/tk/tcl8.6a3-src.tar.gz.sig and /dev/null differ
diff --git a/x11/nx/BUILD b/x11/nx/BUILD
index 6e89c73..330a1f0 100755
--- a/x11/nx/BUILD
+++ b/x11/nx/BUILD
@@ -1,27 +1,21 @@
# build Compression Library and Proxy
-for i in nxcomp nxproxy; do
- pushd $i; default_build; popd
+for i in nxcomp nxcompshad nxproxy; do
+ message "${MESSAGE_COLOR}building $i.${DEFAULT_COLOR}" &&
+ pushd ${SOURCE_DIRECTORY}/$i &&
+ default_build &&
+ popd
done &&

# build X11 Support Libraries and Agents
-pushd nx-X11
- make World
+message "${MESSAGE_COLOR}building nx-X11.${DEFAULT_COLOR}" &&
+pushd ${SOURCE_DIRECTORY}/nx-X11 &&
+ make_single &&
+ FAST=1 make World WORLDOPTS="" MAKE="make" &&
+ make_normal &&
popd &&

# build Extended Compression Library
-pushd nxcompext
- default_build
-popd &&
-
-# build RFB Agent
-pushd nxviewer
- xmkmf -a
- cp -a /usr/X11R6/lib/libXp.so* ../nx-X11/exports/lib/
- make
-popd &&
-
-# build RDP Agent
-pushd nxdesktop
- ./configure &&
- make
+message "${MESSAGE_COLOR}building nxcompext.${DEFAULT_COLOR}" &&
+pushd ${SOURCE_DIRECTORY}/nxcompext &&
+ default_build &&
popd
diff --git a/x11/nx/DEPENDS b/x11/nx/DEPENDS
index 86326c1..61b86b5 100755
--- a/x11/nx/DEPENDS
+++ b/x11/nx/DEPENDS
@@ -1,9 +1,19 @@
-depends g++ &&
-depends libpng &&
-depends jpeg &&
-depends gzip &&
-depends xorg-libs &&
-depends openssh &&
-depends nc &&
-depends perl &&
-depends expect
+depends autoconf &&
+depends g++ &&
+depends gccmakedep &&
+depends gzip &&
+depends imake &&
+depends inputproto &&
+depends jpeg &&
+depends libpng &&
+depends libxau &&
+depends libxcomposite &&
+depends libxdamage &&
+depends libxdmcp &&
+depends libxpm &&
+depends libxrandr &&
+depends libxtst &&
+depends nc &&
+depends openssh &&
+depends perl &&
+depends zlib
diff --git a/x11/nx/DETAILS b/x11/nx/DETAILS
index d67e964..ace7065 100755
--- a/x11/nx/DETAILS
+++ b/x11/nx/DETAILS
@@ -1,13 +1,12 @@
SPELL=nx
- VERSION=1.5.0
- SOURCE=nxcomp-${VERSION}-80.tar.gz
- SOURCE2=nxproxy-${VERSION}-9.tar.gz
- SOURCE3=nxcompext-${VERSION}-20.tar.gz
- SOURCE4=nxviewer-${VERSION}-15.tar.gz
- SOURCE5=nxdesktop-${VERSION}-78.tar.gz
- SOURCE6=nx-X11-${VERSION}-21.tar.gz
- SOURCE7=nxagent-${VERSION}-112.tar.gz
- SOURCE8=nxauth-${VERSION}-1.tar.gz
+ VERSION=3.3.0
+ SOURCE=nx-X11-${VERSION}-7.tar.gz
+ SOURCE2=nxagent-${VERSION}-18.tar.gz
+ SOURCE3=nxauth-${VERSION}-1.tar.gz
+ SOURCE4=nxcomp-${VERSION}-4.tar.gz
+ SOURCE5=nxcompext-${VERSION}-4.tar.gz
+ SOURCE6=nxcompshad-${VERSION}-3.tar.gz
+ SOURCE7=nxproxy-${VERSION}-2.tar.gz
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}
SOURCE_URL[0]=http://64.34.161.181/download/${VERSION}/sources/${SOURCE}
SOURCE2_URL[0]=http://64.34.161.181/download/${VERSION}/sources/${SOURCE2}
@@ -16,7 +15,6 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}
SOURCE5_URL[0]=http://64.34.161.181/download/${VERSION}/sources/${SOURCE5}
SOURCE6_URL[0]=http://64.34.161.181/download/${VERSION}/sources/${SOURCE6}
SOURCE7_URL[0]=http://64.34.161.181/download/${VERSION}/sources/${SOURCE7}
- SOURCE8_URL[0]=http://64.34.161.181/download/${VERSION}/sources/${SOURCE8}
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
SOURCE2_GPG="gurus.gpg:${SOURCE2}.sig"
SOURCE3_GPG="gurus.gpg:${SOURCE3}.sig"
@@ -24,15 +22,14 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}
SOURCE5_GPG="gurus.gpg:${SOURCE5}.sig"
SOURCE6_GPG="gurus.gpg:${SOURCE6}.sig"
SOURCE7_GPG="gurus.gpg:${SOURCE7}.sig"
- SOURCE8_GPG="gurus.gpg:${SOURCE8}.sig"
WEB_SITE=http://www.nomachine.com/
ENTERED=20050102
LICENSE[0]=GPL
LICENSE[1]=GPL
LICENSE[2]=GPL
LICENSE[3]=GPL
- LICENSE[4]=GPL
- LICENSE[5]=MIT
+ LICENSE[4]=GPL
+ LICENSE[5]=GPL
LICENSE[6]=GPL
LICENSE[7]=GPL
KEYWORDS="terminal x11"
diff --git a/x11/nx/HISTORY b/x11/nx/HISTORY
index f3261b0..7f051c4 100644
--- a/x11/nx/HISTORY
+++ b/x11/nx/HISTORY
@@ -1,3 +1,16 @@
+2009-09-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD, DEPENDS, DETAILS, INSTALL, PRE_BUILD,
+ patches/nx-2.1.0-deprecated-headers.patch,
+ patches/nx-2.1.0-invalid-options.patch,
+ patches/nx-3.1.0-gcc-4.3.patch,
+ patches/nx-3.2.0-nxproxy_read_from_stdin.patch,
+ patches/nx-3.3.0-cflags.patch,
+ patches/nx-3.3.0-nxcomp-glibc2.10.patch,
+ patches/nx-x11-1.5.0-tmp-exec.patch,
+ patches/nxcomp-1.5.0-pic.patch:
+ updated to 3.3.0, added patches from gentoo to make the
+ spell compile
+
2008-03-18 Eric Sandall <sandalle AT sourcemage.org>
* DEPENDS: Switch X11-LIBS to the one and only xorg-libs

@@ -36,4 +49,3 @@

2005-01-02 Richard Johns <johnsr AT lincoln.ac.nz>
* PREPARE, DETAILS, DEPENDS, PRE_BUILD, BUILD, INSTALL: Created spell
-
diff --git a/x11/nx/INSTALL b/x11/nx/INSTALL
index 840e919..0ac1df5 100755
--- a/x11/nx/INSTALL
+++ b/x11/nx/INSTALL
@@ -5,31 +5,31 @@ NX_BIN=${NX_PREFIX}
mkdir -p ${NX_PREFIX}/lib &&
cp -a ${SPELL_DIRECTORY}/nxagent ${INSTALLROOT}/usr/bin &&
ln -snf nxagent ${INSTALLROOT}/usr/bin/nxproxy &&
-ln -snf nxagent ${INSTALLROOT}/usr/bin/nxviewer &&
-ln -snf nxagent ${INSTALLROOT}/usr/bin/nxdesktop

-cp -a nxcomp/libXcomp.so.${VERSION} ${NX_LIB} &&
+cp -a ${SOURCE_DIRECTORY}/nxcomp/libXcomp.so.${VERSION} ${NX_LIB} &&
ln -sf libXcomp.so.${VERSION} ${NX_LIB}/libXcomp.so &&
-ln -sf libXcomp.so.${VERSION} ${NX_LIB}/libXcomp.so.1 &&
+ln -sf libXcomp.so.${VERSION} ${NX_LIB}/libXcomp.so.3 &&

-cp -a nxcompext/libXcompext.so.${VERSION} ${NX_LIB} &&
+cp -a ${SOURCE_DIRECTORY}/nxcompext/libXcompext.so.${VERSION} ${NX_LIB}
&&
ln -sf libXcompext.so.${VERSION} ${NX_LIB}/libXcompext.so &&
-ln -sf libXcompext.so.${VERSION} ${NX_LIB}/libXcompext.so.1 &&
+ln -sf libXcompext.so.${VERSION} ${NX_LIB}/libXcompext.so.3 &&

-cp -a nx-X11/lib/X11/libX11.so.6.2 ${NX_LIB} &&
+cp -a ${SOURCE_DIRECTORY}/nxcompshad/libXcompshad.so.${VERSION} ${NX_LIB}
&&
+ln -sf libXcompshad.so.${VERSION} ${NX_LIB}/libXcompshad.so &&
+ln -sf libXcompshad.so.${VERSION} ${NX_LIB}/libXcompshad.so.3 &&
+
+cp -a ${SOURCE_DIRECTORY}/nx-X11/lib/X11/libX11.so.6.2 ${NX_LIB} &&
ln -sf libX11.so.6.2 ${NX_LIB}/libX11.so &&
ln -sf libX11.so.6.2 ${NX_LIB}/libX11.so.6 &&

-cp -a nx-X11/lib/Xext/libXext.so.6.4 ${NX_LIB} &&
+cp -a ${SOURCE_DIRECTORY}/nx-X11/lib/Xext/libXext.so.6.4 ${NX_LIB} &&
ln -sf libXext.so.6.4 ${NX_LIB}/libXext.so &&
ln -sf libXext.so.6.4 ${NX_LIB}/libXext.so.6 &&

-cp -a nx-X11/lib/Xrender/libXrender.so.1.2 ${NX_LIB} &&
-ln -sf libXrender.so.1.2 ${NX_LIB}/libXrender.so &&
-ln -sf libXrender.so.1.2 ${NX_LIB}/libXrender.so.1 &&
+cp -a ${SOURCE_DIRECTORY}/nx-X11/lib/Xrender/libXrender.so.1.2.2
${NX_LIB} &&
+ln -sf libXrender.so.1.2.2 ${NX_LIB}/libXrender.so &&
+ln -sf libXrender.so.1.2.2 ${NX_LIB}/libXrender.so.1 &&

install -m 755 nx-X11/programs/Xserver/nxagent ${NX_BIN} &&
-install -m 755 nxproxy/nxproxy ${NX_BIN} &&
-install -m 755 nxdesktop/nxdesktop ${NX_BIN} &&
-install -m 755 nxviewer/nxviewer/nxviewer ${NX_BIN} &&
-install -m 755 nxviewer/nxpasswd/nxpasswd ${INSTALLROOT}/usr/bin/
+install -m 755 nxproxy/nxproxy ${NX_BIN}
+#install -m 755 nxviewer/nxpasswd/nxpasswd ${INSTALLROOT}/usr/bin/
diff --git a/x11/nx/PRE_BUILD b/x11/nx/PRE_BUILD
index bea8d0b..1903c6d 100755
--- a/x11/nx/PRE_BUILD
+++ b/x11/nx/PRE_BUILD
@@ -1,5 +1,5 @@
mkdir -p ${SOURCE_DIRECTORY} &&
-cd ${SOURCE_DIRECTORY}
+cd ${SOURCE_DIRECTORY} &&

unpack_file '' &&
unpack_file 2 &&
@@ -7,5 +7,26 @@ unpack_file 3 &&
unpack_file 4 &&
unpack_file 5 &&
unpack_file 6 &&
-unpack_file 7 &&
-unpack_file 8
+unpack_file 7
+
+cd ${SOURCE_DIRECTORY}/nxproxy &&
+patch -p0 <
${SCRIPT_DIRECTORY}/patches/nx-3.2.0-nxproxy_read_from_stdin.patch &&
+cd ${SOURCE_DIRECTORY}/nxcomp &&
+patch -p0 < ${SCRIPT_DIRECTORY}/patches/nx-2.1.0-invalid-options.patch &&
+patch -p0 < ${SCRIPT_DIRECTORY}/patches/nx-3.3.0-nxcomp-glibc2.10.patch &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p0 < ${SCRIPT_DIRECTORY}/patches/nxcomp-1.5.0-pic.patch &&
+patch -p0 < ${SCRIPT_DIRECTORY}/patches/nx-x11-1.5.0-tmp-exec.patch &&
+patch -p0 < ${SCRIPT_DIRECTORY}/patches/nx-3.3.0-cflags.patch &&
+
+for i in nxcomp nxcompext nxcompshad nxproxy; do
+ message "${MESSAGE_COLOR}autoreconf in
${SOURCE_DIRECTORY}/$i${DEFAULT_COLOR}"
+ cd ${SOURCE_DIRECTORY}/${i} &&
+ autoreconf
+done &&
+
+
+HOSTCONF="${SOURCE_DIRECTORY}/nx-X11/config/cf/host.def"
+echo "#define CcCmd gcc" >> "${HOSTCONF}"
+echo "#define OptimizedCDebugFlags ${CFLAGS} GccAliasingArgs" >>
"${HOSTCONF}"
+echo "#define OptimizedCplusplusDebugFlags ${CXXFLAGS} GccAliasingArgs" >>
"${HOSTCONF}"
diff --git a/x11/nx/nx-X11-1.5.0-21.tar.gz.sig
b/x11/nx/nx-X11-1.5.0-21.tar.gz.sig
deleted file mode 100644
index cb099c7..0000000
Binary files a/x11/nx/nx-X11-1.5.0-21.tar.gz.sig and /dev/null differ
diff --git a/x11/nx/nx-X11-3.3.0-7.tar.gz.sig
b/x11/nx/nx-X11-3.3.0-7.tar.gz.sig
new file mode 100644
index 0000000..ed82dc1
Binary files /dev/null and b/x11/nx/nx-X11-3.3.0-7.tar.gz.sig differ
diff --git a/x11/nx/nxagent-1.5.0-112.tar.gz.sig
b/x11/nx/nxagent-1.5.0-112.tar.gz.sig
deleted file mode 100644
index 99682d8..0000000
Binary files a/x11/nx/nxagent-1.5.0-112.tar.gz.sig and /dev/null differ
diff --git a/x11/nx/nxagent-3.3.0-18.tar.gz.sig
b/x11/nx/nxagent-3.3.0-18.tar.gz.sig
new file mode 100644
index 0000000..697fa2d
Binary files /dev/null and b/x11/nx/nxagent-3.3.0-18.tar.gz.sig differ
diff --git a/x11/nx/nxauth-1.5.0-1.tar.gz.sig
b/x11/nx/nxauth-1.5.0-1.tar.gz.sig
deleted file mode 100644
index f4ea855..0000000
Binary files a/x11/nx/nxauth-1.5.0-1.tar.gz.sig and /dev/null differ
diff --git a/x11/nx/nxauth-3.3.0-1.tar.gz.sig
b/x11/nx/nxauth-3.3.0-1.tar.gz.sig
new file mode 100644
index 0000000..d653123
Binary files /dev/null and b/x11/nx/nxauth-3.3.0-1.tar.gz.sig differ
diff --git a/x11/nx/nxcomp-1.5.0-80.tar.gz.sig
b/x11/nx/nxcomp-1.5.0-80.tar.gz.sig
deleted file mode 100644
index 15e3ff9..0000000
Binary files a/x11/nx/nxcomp-1.5.0-80.tar.gz.sig and /dev/null differ
diff --git a/x11/nx/nxcomp-3.3.0-4.tar.gz.sig
b/x11/nx/nxcomp-3.3.0-4.tar.gz.sig
new file mode 100644
index 0000000..7370304
Binary files /dev/null and b/x11/nx/nxcomp-3.3.0-4.tar.gz.sig differ
diff --git a/x11/nx/nxcompext-1.5.0-20.tar.gz.sig
b/x11/nx/nxcompext-1.5.0-20.tar.gz.sig
deleted file mode 100644
index 9f46239..0000000
Binary files a/x11/nx/nxcompext-1.5.0-20.tar.gz.sig and /dev/null differ
diff --git a/x11/nx/nxcompext-3.3.0-4.tar.gz.sig
b/x11/nx/nxcompext-3.3.0-4.tar.gz.sig
new file mode 100644
index 0000000..1159dd2
Binary files /dev/null and b/x11/nx/nxcompext-3.3.0-4.tar.gz.sig differ
diff --git a/x11/nx/nxcompshad-3.3.0-3.tar.gz.sig
b/x11/nx/nxcompshad-3.3.0-3.tar.gz.sig
new file mode 100644
index 0000000..a8193c4
Binary files /dev/null and b/x11/nx/nxcompshad-3.3.0-3.tar.gz.sig differ
diff --git a/x11/nx/nxdesktop-1.5.0-78.tar.gz.sig
b/x11/nx/nxdesktop-1.5.0-78.tar.gz.sig
deleted file mode 100644
index 0fe2d22..0000000
Binary files a/x11/nx/nxdesktop-1.5.0-78.tar.gz.sig and /dev/null differ
diff --git a/x11/nx/nxproxy-1.5.0-9.tar.gz.sig
b/x11/nx/nxproxy-1.5.0-9.tar.gz.sig
deleted file mode 100644
index c49ced4..0000000
Binary files a/x11/nx/nxproxy-1.5.0-9.tar.gz.sig and /dev/null differ
diff --git a/x11/nx/nxproxy-3.3.0-2.tar.gz.sig
b/x11/nx/nxproxy-3.3.0-2.tar.gz.sig
new file mode 100644
index 0000000..3feb841
Binary files /dev/null and b/x11/nx/nxproxy-3.3.0-2.tar.gz.sig differ
diff --git a/x11/nx/nxviewer-1.5.0-15.tar.gz.sig
b/x11/nx/nxviewer-1.5.0-15.tar.gz.sig
deleted file mode 100644
index c19bab0..0000000
Binary files a/x11/nx/nxviewer-1.5.0-15.tar.gz.sig and /dev/null differ
diff --git a/x11/nx/patches/nx-2.1.0-deprecated-headers.patch
b/x11/nx/patches/nx-2.1.0-deprecated-headers.patch
new file mode 100644
index 0000000..c9741d5
--- /dev/null
+++ b/x11/nx/patches/nx-2.1.0-deprecated-headers.patch
@@ -0,0 +1,111 @@
+diff -urN BlockCacheSet.cpp BlockCacheSet.cpp
+--- BlockCacheSet.cpp 2006-11-05 13:22:45.963189321 +0000
++++ BlockCacheSet.cpp 2006-11-05 13:23:25.000000000 +0000
+@@ -15,7 +15,9 @@
+ /* */
+ /**************************************************************************/
+
+-#include <iostream.h>
++using namespace std;
++
++#include <iostream>
+ #include "BlockCacheSet.h"
+
+
+diff -urN Loop.cpp Loop.cpp
+--- Loop.cpp 2006-11-05 13:22:45.854205948 +0000
++++ Loop.cpp 2006-11-05 13:23:25.000000000 +0000
+@@ -15,6 +15,8 @@
+ /* */
+ /**************************************************************************/
+
++using namespace std;
++
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
+@@ -29,7 +31,7 @@
+ #include <dirent.h>
+ #include <pwd.h>
+
+-#include <fstream.h>
++#include <fstream>
+ #include <fcntl.h>
+
+ #include <sys/types.h>
+diff -urN Message.cpp Message.cpp
+--- Message.cpp 2006-11-05 13:22:45.963189321 +0000
++++ Message.cpp 2006-11-05 13:23:25.000000000 +0000
+@@ -15,8 +15,10 @@
+ /* */
+ /**************************************************************************/
+
++using namespace std;
++
+ #include <stdio.h>
+-#include <fstream.h>
++#include <fstream>
+ #include <unistd.h>
+ #include <string.h>
+
+diff -urN Misc.cpp Misc.cpp
+--- Misc.cpp 2006-11-05 13:22:45.701229285 +0000
++++ Misc.cpp 2006-11-05 13:23:25.000000000 +0000
+@@ -15,7 +15,9 @@
+ /* */
+ /**************************************************************************/
+
+-#include <iostream.h>
++using namespace std;
++
++#include <iostream>
+ #include <stdio.h>
+ #include <ctype.h>
+ #include <stdlib.h>
+diff -urN Misc.h Misc.h
+--- Misc.h 2006-11-05 13:22:45.643238132 +0000
++++ Misc.h 2006-11-05 13:23:25.000000000 +0000
+@@ -18,8 +18,10 @@
+ #ifndef Misc_H
+ #define Misc_H
+
+-#include <iostream.h>
+-#include <fstream.h>
++using namespace std;
++
++#include <iostream>
++#include <fstream>
+
+ #include <errno.h>
+ #include <string.h>
+diff -urN Proxy.cpp Proxy.cpp
+--- Proxy.cpp 2006-11-05 13:22:45.856205642 +0000
++++ Proxy.cpp 2006-11-05 13:23:25.000000000 +0000
+@@ -15,10 +15,12 @@
+ /* */
+ /**************************************************************************/
+
++using namespace std;
++
+ #include <stdio.h>
+ #include <unistd.h>
+ #include <stdlib.h>
+-#include <fstream.h>
++#include <fstream>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+
+diff -urN Split.cpp Split.cpp
+--- Split.cpp 2006-11-05 13:22:45.797214643 +0000
++++ Split.cpp 2006-11-05 13:23:25.000000000 +0000
+@@ -15,7 +15,9 @@
+ /* */
+ /**************************************************************************/
+
+-#include <fstream.h>
++using namespace std;
++
++#include <fstream>
+ #include <unistd.h>
+ #include <string.h>
+ #include <sys/stat.h>
diff --git a/x11/nx/patches/nx-2.1.0-invalid-options.patch
b/x11/nx/patches/nx-2.1.0-invalid-options.patch
new file mode 100644
index 0000000..17e4f43
--- /dev/null
+++ b/x11/nx/patches/nx-2.1.0-invalid-options.patch
@@ -0,0 +1,38 @@
+--- configure.in 2006-11-04 19:37:56.000000000 +0000
++++ configure.in 2006-11-04 19:38:23.000000000 +0000
+@@ -52,35 +52,6 @@
+ AC_PROG_CC
+ AC_LANG_CPLUSPLUS
+
+-dnl Check whether option -Wno-deprecated
+-dnl is needed by GCC compiler.
+-
+-AC_MSG_CHECKING([whether compiler needs -Wno-deprecated])
+-gcc_version=`${CC} --version | grep 'gcc (GCC) [[3-4]].' | head -n 1`
+-case "${gcc_version}" in
+- gcc*)
+- AC_MSG_RESULT([yes])
+- CXXFLAGS="$CXXFLAGS -Wno-deprecated"
+- ;;
+-
+- *)
+- AC_MSG_RESULT([no])
+- ;;
+-esac
+-
+-AC_MSG_CHECKING([whether compiler accepts -Wmissing-declarations and
-Wnested-externs])
+-gcc_version=`${CC} --version | grep 'gcc (GCC) [[3-4]].' | head -n 1`
+-case "${gcc_version}" in
+- gcc*)
+- AC_MSG_RESULT([no])
+- ;;
+-
+- *)
+- AC_MSG_RESULT([yes])
+- CXXFLAGS="$CXXFLAGS -Wmissing-declarations -Wnested-externs"
+- ;;
+-esac
+-
+ dnl Check for BSD compatible install.
+
+ AC_PROG_INSTALL
diff --git a/x11/nx/patches/nx-3.1.0-gcc-4.3.patch
b/x11/nx/patches/nx-3.1.0-gcc-4.3.patch
new file mode 100644
index 0000000..112c697
--- /dev/null
+++ b/x11/nx/patches/nx-3.1.0-gcc-4.3.patch
@@ -0,0 +1,24 @@
+--- nxcompshad/Misc.h
++++ nxcompshad/Misc.h
+@@ -18,10 +18,10 @@
+ #ifndef Misc_H
+ #define Misc_H
+
+-#include <iostream.h>
++#include <iostream>
+
+-#include <errno.h>
+-#include <string.h>
++#include <cerrno>
++#include <cstring>
+
+ //
+ // Error handling macros.
+@@ -35,6 +35,6 @@
+ // Log file.
+ //
+
+-extern ostream *logofs;
++extern std::ostream *logofs;
+
+ #endif /* Misc_H */
diff --git a/x11/nx/patches/nx-3.2.0-nxproxy_read_from_stdin.patch
b/x11/nx/patches/nx-3.2.0-nxproxy_read_from_stdin.patch
new file mode 100644
index 0000000..bce692d
--- /dev/null
+++ b/x11/nx/patches/nx-3.2.0-nxproxy_read_from_stdin.patch
@@ -0,0 +1,68 @@
+--- Main.c.old 2007-07-18 17:39:13.000000000 +0200
++++ Main.c 2008-03-12 04:40:30.000000000 +0100
+@@ -36,28 +36,48 @@
+ int result = -1;
+
+ char *options = NULL;
+-
++
++ char *nx_commfd_str = NULL;
++
+ options = getenv("NX_DISPLAY");
+-
+- if (NXTransParseCommandLine(argc, argv) < 0)
++
++ if ((nx_commfd_str = getenv("NX_COMMFD")) != NULL)
+ {
+- NXTransCleanup();
+- }
++ int nx_commfd = atoi(nx_commfd_str);
+
+- if (NXTransParseEnvironment(options, 0) < 0)
+- {
+- NXTransCleanup();
++ if (result)
++ result = NXTransCreate(nx_commfd, NX_MODE_SERVER, options);
++
++ // go into endless loop
++
++ if (result)
++ {
++ while (NXTransRunning(NX_FD_ANY))
++ result = NXTransContinue(NULL);
++ }
+ }
++ else
++ {
++ if (NXTransParseCommandLine(argc, argv) < 0)
++ {
++ NXTransCleanup();
++ }
++
++ if (NXTransParseEnvironment(options, 0) < 0)
++ {
++ NXTransCleanup();
++ }
++
++ /*
++ * This should not return...
++ */
++
++ #ifdef TEST
++ fprintf(stderr, "Main: Yielding control to NX entry point.\n");
++ #endif
+
+- /*
+- * This should not return...
+- */
+-
+- #ifdef TEST
+- fprintf(stderr, "Main: Yielding control to NX entry point.\n");
+- #endif
+-
+- result = NXTransProxy(NX_FD_ANY, NX_MODE_ANY, NX_DISPLAY_ANY);
++ result = NXTransProxy(NX_FD_ANY, NX_MODE_ANY, NX_DISPLAY_ANY);
++ }
+
+ /*
+ * ...So these should not be called.
diff --git a/x11/nx/patches/nx-3.3.0-cflags.patch
b/x11/nx/patches/nx-3.3.0-cflags.patch
new file mode 100644
index 0000000..3556293
--- /dev/null
+++ b/x11/nx/patches/nx-3.3.0-cflags.patch
@@ -0,0 +1,54 @@
+--- nxcomp/configure.in.orig 2008-12-18 15:48:09.000000000 +0100
++++ nxcomp/configure.in 2008-12-18 15:54:14.000000000 +0100
+@@ -7,8 +7,7 @@
+
+ dnl Set our default compilation flags.
+
+-CXXFLAGS="-O3 -fno-rtti -fno-exceptions"
+-CFLAGS="-O3"
++CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions"
+
+ dnl Reset default linking directives.
+
+--- nxcompext/configure.in.orig 2008-12-18 15:55:29.000000000 +0100
++++ nxcompext/configure.in 2008-12-18 15:55:51.000000000 +0100
+@@ -5,11 +5,6 @@
+ AC_INIT(NXlib.h)
+ AC_PREREQ(2.13)
+
+-dnl Reset default compilation flags.
+-
+-CXXFLAGS="-O3"
+-CFLAGS="-O3"
+-
+ dnl Reset default linking directives.
+
+ LIBSTATIC=""
+--- nxcompshad/configure.in.orig 2008-12-18 15:56:13.000000000 +0100
++++ nxcompshad/configure.in 2008-12-18 15:56:22.000000000 +0100
+@@ -5,11 +5,6 @@
+ AC_INIT(Shadow.h)
+ AC_PREREQ(2.13)
+
+-dnl Reset default compilation flags.
+-
+-CXXFLAGS="-O3"
+-CPPFLAGS="-O3"
+-
+ dnl Reset default linking directives.
+
+ LIBSTATIC=""
+--- nxproxy/configure.in.orig 2008-12-18 15:57:48.000000000 +0100
++++ nxproxy/configure.in 2008-12-18 15:57:55.000000000 +0100
+@@ -5,11 +5,6 @@
+ AC_INIT(Main.c)
+ AC_PREREQ(2.13)
+
+-dnl Reset default compilation flags.
+-
+-CXXFLAGS="-O3"
+-CPPFLAGS="-O3"
+-
+ dnl Prefer headers and libraries from nx-X11 if present.
+
+ if test -d "../nx-X11/exports/include" ; then
diff --git a/x11/nx/patches/nx-3.3.0-nxcomp-glibc2.10.patch
b/x11/nx/patches/nx-3.3.0-nxcomp-glibc2.10.patch
new file mode 100644
index 0000000..12267c7
--- /dev/null
+++ b/x11/nx/patches/nx-3.3.0-nxcomp-glibc2.10.patch
@@ -0,0 +1,11 @@
+--- Loop.cpp.orig 2009-07-06 12:38:10.000000000 +0200
++++ Loop.cpp 2009-07-06 12:38:14.000000000 +0200
+@@ -10979,7 +10979,7 @@
+ packMethod == PACK_LOSSLESS ||
+ packMethod == PACK_ADAPTIVE)
+ {
+- char *dash = rindex(opt, '-');
++ const char *dash = rindex(opt, '-');
+
+ if (dash != NULL && strlen(dash) == 2 &&
+ *(dash + 1) >= '0' && *(dash + 1) <= '9')
diff --git a/x11/nx/patches/nx-x11-1.5.0-tmp-exec.patch
b/x11/nx/patches/nx-x11-1.5.0-tmp-exec.patch
new file mode 100644
index 0000000..ece2214
--- /dev/null
+++ b/x11/nx/patches/nx-x11-1.5.0-tmp-exec.patch
@@ -0,0 +1,11 @@
+--- nx-X11/config/imake/imake.c.orig 2006-11-05 00:10:49.000000000 +0000
++++ nx-X11/config/imake/imake.c 2006-11-05 00:11:49.000000000 +0000
+@@ -974,7 +974,7 @@
+ static void
+ get_libc_version(FILE *inFile)
+ {
+- char aout[] = "/tmp/imakeXXXXXX";
++ char aout[] = "./imakeXXXXXX";
+ FILE *fp;
+ const char *format = "%s -o %s -x c -";
+ char *cc;
diff --git a/x11/nx/patches/nxcomp-1.5.0-pic.patch
b/x11/nx/patches/nxcomp-1.5.0-pic.patch
new file mode 100644
index 0000000..2ccaf97
--- /dev/null
+++ b/x11/nx/patches/nxcomp-1.5.0-pic.patch
@@ -0,0 +1,20 @@
+--- nxcomp/Makefile.in.agriffis 2005-11-12 12:48:42.000000000 -0500
++++ nxcomp/Makefile.in 2005-12-15 12:24:46.000000000 -0500
+@@ -32,7 +32,7 @@
+
+ CXX = @CXX@
+ CXXFLAGS = @CXXFLAGS@ @X_CFLAGS@ @DEFS@ \
+- -Wall -Wpointer-arith
++ -Wall -Wpointer-arith -fPIC
+ CXXINCLUDES =
+ CXXDEFINES =
+
+@@ -42,7 +42,7 @@
+
+ CC = @CC@
+ CCFLAGS = @CFLAGS@ @X_CFLAGS@ @DEFS@ \
+- -Wall -Wpointer-arith
++ -Wall -Wpointer-arith -fPIC
+ CCINCLUDES =
+ CCDEFINES =
+



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (59986b6134f15143d8571fe7a0a58925fe1d78aa), Florian Franzmann, 09/06/2009

Archive powered by MHonArc 2.6.24.

Top of Page