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++.diff -r1.18 -r1.19 pkgsrc/lang/STk/Makefile
(dholland)
| @@ -1,22 +1,33 @@ | @@ -1,22 +1,33 @@ | |||
| 1 | # $NetBSD: Makefile,v 1.18 2007/02/22 19:26:37 wiz Exp $ | 1 | # $NetBSD: Makefile,v 1.19 2008/09/07 00:23:57 dholland Exp $ | |
| 2 | 2 | |||
| 3 | DISTNAME= STk-4.0.1 | 3 | DISTNAME= STk-4.0.1 | |
| 4 | PKGREVISION= 1 | 4 | PKGREVISION= 2 | |
| 5 | CATEGORIES= lang | 5 | CATEGORIES= lang | |
| 6 | MASTER_SITES= ftp://kaolin.unice.fr/pub/STk/ | 6 | MASTER_SITES= ftp://kaolin.unice.fr/pub/STk/ | |
| 7 | 7 | |||
| 8 | MAINTAINER= pkgsrc-users@NetBSD.org | 8 | MAINTAINER= pkgsrc-users@NetBSD.org | |
| 9 | HOMEPAGE= http://kaolin.unice.fr/STk/ | 9 | HOMEPAGE= http://kaolin.unice.fr/STk/ | |
| 10 | COMMENT= Scheme interpreter with full access to the Tk graphical package | 10 | COMMENT= Scheme interpreter with full access to the Tk graphical package | |
| 11 | ||||
| 12 | PKG_DESTDIR_SUPPORT= user-destdir | |||
| 11 | 13 | |||
| 12 | OSVERSION_SPECIFIC= yes | 14 | OSVERSION_SPECIFIC= yes | |
| 13 | GNU_CONFIGURE= yes | 15 | GNU_CONFIGURE= yes | |
| 14 | 16 | |||
| 15 | BUILDLINK_DEPMETHOD.libXt?= build | 17 | BUILDLINK_DEPMETHOD.libXt?= build | |
| 16 | 18 | |||
| 17 | MAKE_ENV+= X11_LDFLAGS=${X11_LDFLAGS:Q} | 19 | MAKE_ENV+= X11_LDFLAGS=${X11_LDFLAGS:Q} | |
| 18 | 20 | |||
| 21 | # Respin these symlinks so they aren't absolute. | |||
| 22 | STKVER=${DISTNAME:S/STk-//} | |||
| 23 | STKDIR=lib/stk/${STKVER}/${OPSYS}-${OS_VERSION}-${MACHINE_ARCH} | |||
| 24 | post-install: | |||
| 25 | ${RM} -f ${DESTDIR}${PREFIX}/bin/snow-${STKVER} | |||
| 26 | ${RM} -f ${DESTDIR}${PREFIX}/bin/stk-${STKVER} | |||
| 27 | ${LN} -s ../${STKDIR}/snow ${DESTDIR}${PREFIX}/bin/snow-${STKVER} | |||
| 28 | ${LN} -s ../${STKDIR}/stk ${DESTDIR}${PREFIX}/bin/stk-${STKVER} | |||
| 29 | ||||
| 19 | .include "../../x11/libSM/buildlink3.mk" | 30 | .include "../../x11/libSM/buildlink3.mk" | |
| 20 | .include "../../x11/libX11/buildlink3.mk" | 31 | .include "../../x11/libX11/buildlink3.mk" | |
| 21 | .include "../../x11/libXt/buildlink3.mk" | 32 | .include "../../x11/libXt/buildlink3.mk" | |
| 22 | .include "../../mk/bsd.pkg.mk" | 33 | .include "../../mk/bsd.pkg.mk" |
| @@ -1,20 +1,23 @@ | @@ -1,20 +1,23 @@ | |||
| 1 | $NetBSD: distinfo,v 1.8 2007/02/15 21:19:00 joerg Exp $ | 1 | $NetBSD: distinfo,v 1.9 2008/09/07 00:23:57 dholland Exp $ | |
| 2 | 2 | |||
| 3 | SHA1 (STk-4.0.1.tar.gz) = 50dc98c2b64db1c9cca54411cb406feb4cb57600 | 3 | SHA1 (STk-4.0.1.tar.gz) = 50dc98c2b64db1c9cca54411cb406feb4cb57600 | |
| 4 | RMD160 (STk-4.0.1.tar.gz) = 58ad3c66f77a6ab33db5d4ca9f2510d50b6b6f0d | 4 | RMD160 (STk-4.0.1.tar.gz) = 58ad3c66f77a6ab33db5d4ca9f2510d50b6b6f0d | |
| 5 | Size (STk-4.0.1.tar.gz) = 3673684 bytes | 5 | Size (STk-4.0.1.tar.gz) = 3673684 bytes | |
| 6 | SHA1 (patch-aa) = 15c6df46138d136fc88028ff1602e5e4dbc2891c | 6 | SHA1 (patch-aa) = ede831f8e235ebbecc38918f1d1cf3e535aef164 | |
| 7 | SHA1 (patch-ab) = 9bb574febca26ab89d9e9a4074667e91ffffaf26 | 7 | SHA1 (patch-ab) = 9bb574febca26ab89d9e9a4074667e91ffffaf26 | |
| 8 | SHA1 (patch-ac) = f1fd66d383504a486d93316f5ad85c59036e8d8c | 8 | SHA1 (patch-ac) = f1fd66d383504a486d93316f5ad85c59036e8d8c | |
| 9 | SHA1 (patch-ad) = c27349d17bb5085ffe81a4c74862662360a08ff1 | 9 | SHA1 (patch-ad) = c27349d17bb5085ffe81a4c74862662360a08ff1 | |
| 10 | SHA1 (patch-ae) = 0f07c54b19c1484a3c0c03e92ddbcbe371ba1f99 | 10 | SHA1 (patch-ae) = 0f07c54b19c1484a3c0c03e92ddbcbe371ba1f99 | |
| 11 | SHA1 (patch-af) = 2625837a9d784071b2bfed71e2798891c6c47b71 | 11 | SHA1 (patch-af) = 2625837a9d784071b2bfed71e2798891c6c47b71 | |
| 12 | SHA1 (patch-ag) = dde1a30f1b0f0d781d8d2389af6bc2393dd40729 | 12 | SHA1 (patch-ag) = dde1a30f1b0f0d781d8d2389af6bc2393dd40729 | |
| 13 | SHA1 (patch-ah) = 353ac24f2a097e360067a292828ef2f469e137c8 | 13 | SHA1 (patch-ah) = 353ac24f2a097e360067a292828ef2f469e137c8 | |
| 14 | SHA1 (patch-ai) = f83af050a51c95f2de6d0cd109388e822727a724 | 14 | SHA1 (patch-ai) = f83af050a51c95f2de6d0cd109388e822727a724 | |
| 15 | SHA1 (patch-aj) = 17158d45f3a57a822a5eb13ad7f8c2e631329e41 | 15 | SHA1 (patch-aj) = 17158d45f3a57a822a5eb13ad7f8c2e631329e41 | |
| 16 | SHA1 (patch-ak) = 7548a9912788c1a951ef9d14f0b21bebf0899b66 | 16 | SHA1 (patch-ak) = 7548a9912788c1a951ef9d14f0b21bebf0899b66 | |
| 17 | SHA1 (patch-al) = c5a8f2f3d2a70ef5c4ca23c1574b5b25f2c0dacb | 17 | SHA1 (patch-al) = c5a8f2f3d2a70ef5c4ca23c1574b5b25f2c0dacb | |
| 18 | SHA1 (patch-am) = cb59da47c5e7fd1f07c456fa1a1258217c798ed5 | 18 | SHA1 (patch-am) = cb59da47c5e7fd1f07c456fa1a1258217c798ed5 | |
| 19 | SHA1 (patch-an) = 0ee1b8edf2fe7a8910c42d46375ba0ad90bf1bd6 | 19 | SHA1 (patch-an) = 0ee1b8edf2fe7a8910c42d46375ba0ad90bf1bd6 | |
| 20 | SHA1 (patch-ao) = 5c210dc3b21240393dea35407c209ee4b44709f7 | 20 | SHA1 (patch-ao) = 4875d35255251fa738cca7af48d30afe5d13a90d | |
| 21 | SHA1 (patch-ap) = 622a54639eb73f5b7d3b77af3ad35c336f8f8cfc | |||
| 22 | SHA1 (patch-aq) = 5d615eaddcda6c99ad69b8c5a5f4b0dfe12fd5c0 | |||
| 23 | SHA1 (patch-ar) = 9f27696cc40048ad56697314d9f3909a951caa46 |
| @@ -1,16 +1,25 @@ | @@ -1,16 +1,25 @@ | |||
| 1 | $NetBSD: patch-aa,v 1.1 1998/09/07 21:22:07 agc Exp $ | 1 | $NetBSD: patch-aa,v 1.2 2008/09/07 00:23:58 dholland Exp $ | |
| 2 | 2 | |||
| 3 | Don't delete any previous directory, just in case. | 3 | Don't delete any previous directory, just in case. | |
| 4 | And *definitely* make it non-interactive. | 4 | And *definitely* make it non-interactive. | |
| 5 | 5 | |||
| 6 | --- Makefile.in 1998/09/07 20:49:10 1.1 | 6 | --- Makefile.in.orig 1999-09-03 16:21:32.000000000 -0400 | |
| 7 | +++ Makefile.in 1998/09/07 20:49:40 | 7 | +++ Makefile.in 2008-09-06 19:39:24.000000000 -0400 | |
| 8 | @@ -178,7 +178,7 @@ | 8 | @@ -18,6 +18,8 @@ | |
| 9 | # Last file update: 3-Sep-1999 20:03 (eg) | |||
| 10 | # | |||
| 11 | ||||
| 12 | +root=$(DESTDIR) | |||
| 13 | + | |||
| 14 | SHELL = /bin/sh | |||
| 15 | CP = /bin/cp | |||
| 16 | STRIP = strip | |||
| 17 | @@ -175,7 +177,7 @@ clean-before: | |||
| 9 | echo "*** This STk version ($(VERSION)) has already been installed "; \ | 18 | echo "*** This STk version ($(VERSION)) has already been installed "; \ | |
| 10 | echo "*** on this machine. Should I clean this directory before "; \ | 19 | echo "*** on this machine. Should I clean this directory before "; \ | |
| 11 | echo "*** starting installation of STk-$(VERSION)? [no] " ; \ | 20 | echo "*** starting installation of STk-$(VERSION)? [no] " ; \ | |
| 12 | - read a; \ | 21 | - read a; \ | |
| 13 | + a=n; \ | 22 | + a=n; \ | |
| 14 | case $$a in \ | 23 | case $$a in \ | |
| 15 | y*|Y*) echo "Deleting previous installation"; \ | 24 | y*|Y*) echo "Deleting previous installation"; \ | |
| 16 | /bin/rm -rf $(stkdir)/$(VERSION);; \ | 25 | /bin/rm -rf $(stkdir)/$(VERSION);; \ |
| @@ -1,13 +1,31 @@ | @@ -1,13 +1,31 @@ | |||
| 1 | $NetBSD: patch-ao,v 1.1 2007/02/15 21:19:00 joerg Exp $ | 1 | $NetBSD: patch-ao,v 1.2 2008/09/07 00:23:58 dholland Exp $ | |
| 2 | 2 | |||
| 3 | --- Src/Makefile.in.orig 2007-02-15 20:52:32.000000000 +0000 | 3 | --- Src/Makefile.in.orig 1999-09-03 16:21:32.000000000 -0400 | |
| 4 | +++ Src/Makefile.in | 4 | +++ Src/Makefile.in 2008-09-06 20:03:00.000000000 -0400 | |
| 5 | @@ -47,7 +47,7 @@ TCLLIB = ../Tcl/libtcl.a | 5 | @@ -47,7 +47,7 @@ TCLLIB = ../Tcl/libtcl.a | |
| 6 | EVTCLLIB = ../Tcl/libevtcl.a | 6 | EVTCLLIB = ../Tcl/libevtcl.a | |
| 7 | MPLIB = ../Mp/$(MP).a | 7 | MPLIB = ../Mp/$(MP).a | |
| 8 | STACKLIB = ../Stack/libstack.a | 8 | STACKLIB = ../Stack/libstack.a | |
| 9 | -LIBS = @LIBS@ $(LIB_DLD) $(LIB_MALLOC) | 9 | -LIBS = @LIBS@ $(LIB_DLD) $(LIB_MALLOC) | |
| 10 | +LIBS = ${X11_LDFLAGS} @LIBS@ $(LIB_DLD) $(LIB_MALLOC) | 10 | +LIBS = ${X11_LDFLAGS} @LIBS@ $(LIB_DLD) $(LIB_MALLOC) | |
| 11 | 11 | |||
| 12 | ALLIBS = $(MPLIB) $(STACKLIB) $(TKLIB) $(TCLLIB) $(EVTCLLIB) | 12 | ALLIBS = $(MPLIB) $(STACKLIB) $(TKLIB) $(TCLLIB) $(EVTCLLIB) | |
| 13 | SALLLIBS = $(MPLIB) $(STACKLIB) $(TCLLIB) | 13 | SALLLIBS = $(MPLIB) $(STACKLIB) $(TCLLIB) | |
| 14 | @@ -111,7 +111,7 @@ install.stk: stk | |||
| 15 | -if [ ! -d $(root)$(bindir) ] ; then mkdir -p $(root)$(bindir); fi | |||
| 16 | /bin/rm -f $(root)$(bindir)/stk $(root)$(bindir)/stk-$(VERSION) | |||
| 17 | ln -s $(execdir)/stk $(root)$(bindir)/stk-$(VERSION) | |||
| 18 | - ln -s $(execdir)/stk $(root)$(bindir)/stk | |||
| 19 | + ln -s stk-$(VERSION) $(root)$(bindir)/stk | |||
| 20 | -if [ ! -d $(root)$(execdir) ] ; then mkdir -p $(root)$(execdir); fi | |||
| 21 | $(CP) stk $(root)$(execdir) | |||
| 22 | chmod 0755 $(root)$(execdir)/stk | |||
| 23 | @@ -127,7 +127,7 @@ install.snow: snow | |||
| 24 | -if [ ! -d $(root)$(bindir) ] ; then mkdir -p $(root)$(bindir); fi | |||
| 25 | /bin/rm -f $(root)$(bindir)/snow-$(VERSION) $(root)$(bindir)/snow | |||
| 26 | ln -s $(execdir)/snow $(root)$(bindir)/snow-$(VERSION) | |||
| 27 | - ln -s $(execdir)/snow $(root)$(bindir)/snow | |||
| 28 | + ln -s snow-$(VERSION) $(root)$(bindir)/snow | |||
| 29 | -if [ ! -d $(root)$(execdir) ] ; then mkdir -p $(root)$(execdir); fi | |||
| 30 | $(CP) snow $(root)$(execdir) | |||
| 31 | chmod 0755 $(root)$(execdir)/snow |
$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`
$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) {
$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;