Fix broken build caused by invalid shell syntax in a configure script.

While here, patch a couple 64-bit issues and add destdir support. The
latter involved making some absolute symlinks relative, which changes
the binary package, and someone might have built this revision with a
version of bash accepting the invalid script syntax, so PKGREVISION++.

5 files changed, 73 insertions, 7 deletions

diff --git a/lang/STk/patches/patch-aa b/lang/STk/patches/patch-aa
index ee350858768..a146e90f4c0 100644
--- a/lang/STk/patches/patch-aa
+++ b/lang/STk/patches/patch-aa
@@ -1,11 +1,20 @@
-$NetBSD: patch-aa,v 1.1 1998/09/07 21:22:07 agc Exp $
+$NetBSD: patch-aa,v 1.2 2008/09/07 00:23:58 dholland Exp $
 
 Don't delete any previous directory, just in case.
 And *definitely* make it non-interactive.
 
---- Makefile.in	1998/09/07 20:49:10	1.1
-+++ Makefile.in	1998/09/07 20:49:40
-@@ -178,7 +178,7 @@
+--- Makefile.in.orig	1999-09-03 16:21:32.000000000 -0400
++++ Makefile.in	2008-09-06 19:39:24.000000000 -0400
+@@ -18,6 +18,8 @@
+ # Last file update:  3-Sep-1999 20:03 (eg)
+ #
+ 
++root=$(DESTDIR)
++
+ SHELL		= /bin/sh
+ CP		= /bin/cp
+ STRIP		= strip
+@@ -175,7 +177,7 @@ clean-before:
  	  echo "*** This STk version ($(VERSION)) has already been installed "; \
  	  echo "*** on this machine. Should I clean this directory before "; \
  	  echo "*** starting installation of STk-$(VERSION)? [no] " ; \
diff --git a/lang/STk/patches/patch-ao b/lang/STk/patches/patch-ao
index 68b6169ef47..581923a6a1f 100644
--- a/lang/STk/patches/patch-ao
+++ b/lang/STk/patches/patch-ao
@@ -1,7 +1,7 @@
-$NetBSD: patch-ao,v 1.1 2007/02/15 21:19:00 joerg Exp $
+$NetBSD: patch-ao,v 1.2 2008/09/07 00:23:58 dholland Exp $
 
---- Src/Makefile.in.orig	2007-02-15 20:52:32.000000000 +0000
-+++ Src/Makefile.in
+--- Src/Makefile.in.orig	1999-09-03 16:21:32.000000000 -0400
++++ Src/Makefile.in	2008-09-06 20:03:00.000000000 -0400
 @@ -47,7 +47,7 @@ TCLLIB		= ../Tcl/libtcl.a
  EVTCLLIB	= ../Tcl/libevtcl.a
  MPLIB		= ../Mp/$(MP).a
@@ -11,3 +11,21 @@ $NetBSD: patch-ao,v 1.1 2007/02/15 21:19:00 joerg Exp $
  
  ALLIBS	 = $(MPLIB) $(STACKLIB) $(TKLIB) $(TCLLIB) $(EVTCLLIB)
  SALLLIBS = $(MPLIB) $(STACKLIB) $(TCLLIB) 
+@@ -111,7 +111,7 @@ install.stk: stk
+ 	-if [ ! -d $(root)$(bindir) ] ; then mkdir -p $(root)$(bindir); fi
+ 	/bin/rm -f $(root)$(bindir)/stk $(root)$(bindir)/stk-$(VERSION) 
+ 	ln -s $(execdir)/stk $(root)$(bindir)/stk-$(VERSION) 
+-	ln -s $(execdir)/stk $(root)$(bindir)/stk 
++	ln -s stk-$(VERSION) $(root)$(bindir)/stk 
+ 	-if [ ! -d $(root)$(execdir) ] ; then mkdir -p $(root)$(execdir); fi
+ 	$(CP) stk $(root)$(execdir)
+ 	chmod 0755 $(root)$(execdir)/stk
+@@ -127,7 +127,7 @@ install.snow: snow
+ 	-if [ ! -d $(root)$(bindir) ] ; then mkdir -p $(root)$(bindir); fi
+ 	/bin/rm -f $(root)$(bindir)/snow-$(VERSION) $(root)$(bindir)/snow
+ 	ln -s $(execdir)/snow $(root)$(bindir)/snow-$(VERSION) 
+-	ln -s $(execdir)/snow $(root)$(bindir)/snow 
++	ln -s snow-$(VERSION) $(root)$(bindir)/snow 
+ 	-if [ ! -d $(root)$(execdir) ] ; then mkdir -p $(root)$(execdir); fi
+ 	$(CP) snow $(root)$(execdir)
+ 	chmod 0755 $(root)$(execdir)/snow
diff --git a/lang/STk/patches/patch-ap b/lang/STk/patches/patch-ap
new file mode 100644
index 00000000000..33e0ca301ca
--- /dev/null
+++ b/lang/STk/patches/patch-ap
@@ -0,0 +1,13 @@
+$NetBSD: patch-ap,v 1.1 2008/09/07 00:23:58 dholland Exp $
+
+--- Tcl/configure~	2008-09-06 18:51:25.000000000 -0400
++++ Tcl/configure	2008-09-06 19:11:07.000000000 -0400
+@@ -3219,7 +3219,7 @@ else
+ 	# results, and the version is kept in special file).
+     
+ 	if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
+-	    system=MP-RAS-`awk '{print $3}' /etc/.relid'`
++	    system=MP-RAS-`awk '{print $3}' /etc/.relid`
+ 	fi
+ 	if test "`uname -s`" = "AIX" ; then
+ 	    system=AIX-`uname -v`.`uname -r`
diff --git a/lang/STk/patches/patch-aq b/lang/STk/patches/patch-aq
new file mode 100644
index 00000000000..3a6dc549099
--- /dev/null
+++ b/lang/STk/patches/patch-aq
@@ -0,0 +1,13 @@
+$NetBSD: patch-aq,v 1.1 2008/09/07 00:23:58 dholland Exp $
+
+--- Tk/generic/tkArgv.c~	1998-01-03 07:46:25.000000000 -0500
++++ Tk/generic/tkArgv.c	2008-09-06 19:25:03.000000000 -0400
+@@ -178,7 +178,7 @@ Tk_ParseArgv(interp, tkwin, argcPtr, arg
+ 	infoPtr = matchPtr;
+ 	switch (infoPtr->type) {
+ 	    case TK_ARGV_CONSTANT:
+-		*((int *) infoPtr->dst) = (int) infoPtr->src;
++		*((intptr_t *) infoPtr->dst) = (intptr_t) infoPtr->src;
+ 		break;
+ 	    case TK_ARGV_INT:
+ 		if (argc == 0) {
diff --git a/lang/STk/patches/patch-ar b/lang/STk/patches/patch-ar
new file mode 100644
index 00000000000..948a7278471
--- /dev/null
+++ b/lang/STk/patches/patch-ar
@@ -0,0 +1,13 @@
+$NetBSD: patch-ar,v 1.1 2008/09/07 00:23:58 dholland Exp $
+
+--- Tk/generic/tkCursor.c~	1998-01-03 07:46:25.000000000 -0500
++++ Tk/generic/tkCursor.c	2008-09-06 19:26:43.000000000 -0400
+@@ -288,7 +288,7 @@ Tk_NameOfCursor(display, cursor)
+ 
+     if (!initialized) {
+ 	printid:
+-	sprintf(string, "cursor id 0x%x", (unsigned int) cursor);
++	sprintf(string, "cursor id 0x%lx", (unsigned long) cursor);
+ 	return string;
+     }
+     idKey.display = display;