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++.

7 files changed, 93 insertions, 13 deletions

diff --git a/lang/STk/Makefile b/lang/STk/Makefile
index 817a88ecb50..81e11fab64e 100644
--- a/lang/STk/Makefile
+++ b/lang/STk/Makefile
@@ -1,13 +1,15 @@
-# $NetBSD: Makefile,v 1.18 2007/02/22 19:26:37 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2008/09/07 00:23:57 dholland Exp $
 
 DISTNAME=	STk-4.0.1
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		lang
 MASTER_SITES=		ftp://kaolin.unice.fr/pub/STk/
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://kaolin.unice.fr/STk/
-COMMENT=		Scheme interpreter with full access to the Tk graphical package
+COMMENT=	Scheme interpreter with full access to the Tk graphical package
+
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 OSVERSION_SPECIFIC=	yes
 GNU_CONFIGURE=		yes
@@ -16,6 +18,15 @@ BUILDLINK_DEPMETHOD.libXt?=	build
 
 MAKE_ENV+=		X11_LDFLAGS=${X11_LDFLAGS:Q}
 
+# Respin these symlinks so they aren't absolute.
+STKVER=${DISTNAME:S/STk-//}
+STKDIR=lib/stk/${STKVER}/${OPSYS}-${OS_VERSION}-${MACHINE_ARCH}
+post-install:
+	${RM} -f ${DESTDIR}${PREFIX}/bin/snow-${STKVER}
+	${RM} -f ${DESTDIR}${PREFIX}/bin/stk-${STKVER}
+	${LN} -s ../${STKDIR}/snow ${DESTDIR}${PREFIX}/bin/snow-${STKVER}
+	${LN} -s ../${STKDIR}/stk ${DESTDIR}${PREFIX}/bin/stk-${STKVER}
+
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
diff --git a/lang/STk/distinfo b/lang/STk/distinfo
index 184ef8d6479..bf15fc59271 100644
--- a/lang/STk/distinfo
+++ b/lang/STk/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.8 2007/02/15 21:19:00 joerg Exp $
+$NetBSD: distinfo,v 1.9 2008/09/07 00:23:57 dholland Exp $
 
 SHA1 (STk-4.0.1.tar.gz) = 50dc98c2b64db1c9cca54411cb406feb4cb57600
 RMD160 (STk-4.0.1.tar.gz) = 58ad3c66f77a6ab33db5d4ca9f2510d50b6b6f0d
 Size (STk-4.0.1.tar.gz) = 3673684 bytes
-SHA1 (patch-aa) = 15c6df46138d136fc88028ff1602e5e4dbc2891c
+SHA1 (patch-aa) = ede831f8e235ebbecc38918f1d1cf3e535aef164
 SHA1 (patch-ab) = 9bb574febca26ab89d9e9a4074667e91ffffaf26
 SHA1 (patch-ac) = f1fd66d383504a486d93316f5ad85c59036e8d8c
 SHA1 (patch-ad) = c27349d17bb5085ffe81a4c74862662360a08ff1
@@ -17,4 +17,7 @@ SHA1 (patch-ak) = 7548a9912788c1a951ef9d14f0b21bebf0899b66
 SHA1 (patch-al) = c5a8f2f3d2a70ef5c4ca23c1574b5b25f2c0dacb
 SHA1 (patch-am) = cb59da47c5e7fd1f07c456fa1a1258217c798ed5
 SHA1 (patch-an) = 0ee1b8edf2fe7a8910c42d46375ba0ad90bf1bd6
-SHA1 (patch-ao) = 5c210dc3b21240393dea35407c209ee4b44709f7
+SHA1 (patch-ao) = 4875d35255251fa738cca7af48d30afe5d13a90d
+SHA1 (patch-ap) = 622a54639eb73f5b7d3b77af3ad35c336f8f8cfc
+SHA1 (patch-aq) = 5d615eaddcda6c99ad69b8c5a5f4b0dfe12fd5c0
+SHA1 (patch-ar) = 9f27696cc40048ad56697314d9f3909a951caa46
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;