Update to 2.7. A short change log is not available.

6 files changed, 51 insertions, 48 deletions

diff --git a/lang/squeak/Makefile b/lang/squeak/Makefile
index ee48bc12401..d71d6b23e04 100644
--- a/lang/squeak/Makefile
+++ b/lang/squeak/Makefile
@@ -1,20 +1,19 @@
-# $NetBSD: Makefile,v 1.6 2000/02/16 22:02:31 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.7 2000/08/14 16:51:35 mjl Exp $
 #
 
-DISTNAME=	Squeak2.6-src
-PKGNAME=	squeak-2.6
+DISTNAME=	Squeak2.7-src
+PKGNAME=	squeak-2.7
 CATEGORIES=	lang
-MASTER_SITES=	http://www-sor.inria.fr/~piumarta/squeak/unix/release/ \
-		ftp://ftp.cs.uni-magdeburg.de/pub/Smalltalk/Smalltalk/Squeak/unix/ \
-		ftp://ftp.cs.uni-magdeburg.de/pub/Smalltalk/Smalltalk/Squeak/unix/image/ \
-		http://www.nectar.com/distfiles/squeak/
-DISTFILES=	Squeak2.6-src.tar.gz Squeak2.6.image.gz Squeak2.6.changes.gz SqueakV2.sources.gz
+MASTER_SITES=	ftp://ftp.inria.fr/INRIA/Projects/SOR/users/piumarta/squeak/
+DISTFILES=	Squeak2.7-src.tar.gz Squeak2.7.image.gz Squeak2.7.changes.gz SqueakV2.sources.gz
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.squeak.org/
 
+BUILD_DEPENDS+=	${LOCALBASE}/bin/autoconf:../../devel/autoconf
+
 DIST_SUBDIR=	squeak
-EXTRACT_ONLY=	Squeak2.6-src.tar.gz
+EXTRACT_ONLY=	Squeak2.7-src.tar.gz
 USE_X11=	yes
 USE_GMAKE=	yes
 NO_WRKSUBDIR=	yes
@@ -22,10 +21,13 @@ NO_WRKSUBDIR=	yes
 ALL_TARGET=	squeak
 MAKE_ENV+=	LIBS="-Wl,-R${X11BASE}/lib -L${X11BASE}/lib"
 
+pre-configure:
+	cd ${WRKSRC}/conf; ${LOCALBASE}/bin/autoconf
+
 do-install:
 	${MKDIR} ${PREFIX}/share/squeak
 	${INSTALL_PROGRAM} ${WRKSRC}/`${WRKSRC}/conf/config.guess`/squeak ${PREFIX}/bin
-	for f in Squeak2.6.changes Squeak2.6.image SqueakV2.sources ; do		\
+	for f in Squeak2.7.changes Squeak2.7.image SqueakV2.sources ; do		\
 		${GZCAT} ${DISTDIR}/${DIST_SUBDIR}/$$f.gz > ${PREFIX}/share/squeak/$$f; \
 	done
 
diff --git a/lang/squeak/files/md5 b/lang/squeak/files/md5
index e3999bd792a..14c27117a64 100644
--- a/lang/squeak/files/md5
+++ b/lang/squeak/files/md5
@@ -1,6 +1,6 @@
-$NetBSD: md5,v 1.3 2000/02/16 22:02:33 dmcmahill Exp $
+$NetBSD: md5,v 1.4 2000/08/14 16:51:36 mjl Exp $
 
-MD5 (squeak/Squeak2.6-src.tar.gz) = 7e0728d338d6464b9689ef69eade1c3f
-MD5 (squeak/Squeak2.6.image.gz) = db0e9d876d67733736afb2969140aff9
-MD5 (squeak/Squeak2.6.changes.gz) = 9230a1e6d93f61c0ac818b3f715103a5
+MD5 (squeak/Squeak2.7-src.tar.gz) = b52ff01a25eac4d5ec0088b432f2d8a1
+MD5 (squeak/Squeak2.7.image.gz) = c74bdb08de5e88eab5dd5e042dc0f98e
+MD5 (squeak/Squeak2.7.changes.gz) = 303220f35e986ea27003ddda2087c12a
 MD5 (squeak/SqueakV2.sources.gz) = 80487895bb1d1cbfddc8736273cccc92
diff --git a/lang/squeak/files/patch-sum b/lang/squeak/files/patch-sum
index baf3509e966..aef6886c627 100644
--- a/lang/squeak/files/patch-sum
+++ b/lang/squeak/files/patch-sum
@@ -1,5 +1,4 @@
-$NetBSD: patch-sum,v 1.1 2000/02/16 22:02:33 dmcmahill Exp $
+$NetBSD: patch-sum,v 1.2 2000/08/14 16:51:36 mjl Exp $
 
-MD5 (patch-aa) = 68fdddb9d006a2abd6f4ad0908834ff0
-MD5 (patch-ab) = b7f926b7d9914f1be10b4f17347b3feb
-MD5 (patch-ac) = 29d447f2c369c9e3b808fb6c2e72a8c3
+MD5 (patch-aa) = 0768180ca2b8f9adc2030a74923818f0
+MD5 (patch-ac) = 3a9557ab954cef05f2ee3e167a8f50c9
diff --git a/lang/squeak/patches/patch-aa b/lang/squeak/patches/patch-aa
index 55e6f470887..a36c9512cf5 100644
--- a/lang/squeak/patches/patch-aa
+++ b/lang/squeak/patches/patch-aa
@@ -1,24 +1,23 @@
-$NetBSD: patch-aa,v 1.1 2000/02/16 22:02:33 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.2 2000/08/14 16:51:36 mjl Exp $
 
--Get the right flag for exporting symbols from program
--Use the CFLAGS set by the package system
--Don't override everything on alpha
-
---- ./conf/configure.in.orig	Mon Oct 18 12:25:06 1999
-+++ ./conf/configure.in	Wed Feb 16 11:08:18 2000
-@@ -104,8 +104,8 @@
+--- conf/configure.in.orig	Mon Aug 14 18:07:46 2000
++++ conf/configure.in	Mon Aug 14 18:10:40 2000
+@@ -105,10 +105,10 @@
+     AC_TRY_RUN([int main(){return !((__GNUC__ >= 2) && (__GNUC_MINOR__ > 90));}],
        ac_cv_prog_egcs="yes", ac_cv_prog_egcs="no"))
  
 -  CFLAGS="-g -O2"
 -  WFLAGS="-Wall"
-+  #CFLAGS="-g -O2"
-+  #WFLAGS="-Wall"
++#  CFLAGS="-g -O2"
++#  WFLAGS="-Wall"
    LD="$CC"
 -  LDFLAGS="-rdynamic"
 +  LDFLAGS="-Wl,--export-dynamic"
  
    SHCC="$CC"
-@@ -120,10 +120,11 @@
+   if test "$ac_cv_prog_egcs" = "yes"; then
+@@ -121,12 +121,13 @@
+ 
    case "$host" in
      i?86*)		CFLAGS="$CFLAGS -fomit-frame-pointer" ;;
 -    alpha*)		CC="$srcdir/../util/decgcc"
@@ -27,19 +26,22 @@ $NetBSD: patch-aa,v 1.1 2000/02/16 22:02:33 dmcmahill Exp $
 -			SHCC="../$CC"
 -			SHLD="cc"
 -			SHLDFLAGS="-taso -shared -expect_unresolved \"*\"" ;;
-+    alpha*)		#CC="$srcdir/../util/decgcc"
-+			#LD="cc"
-+			#LDFLAGS="-taso -call_shared"
-+			#SHCC="../$CC"
-+			#SHLD="cc"
-+			#SHLDFLAGS="-taso -shared -expect_unresolved \"*\"" 
++    alpha*)		# CC="$srcdir/../util/decgcc"
++			# LD="cc"
++			# LDFLAGS="-taso -call_shared"
++			# SHCC="../$CC"
++			# SHLD="cc"
++			# SHLDFLAGS="-taso -shared -expect_unresolved \"*\""
 +			;;
    esac
  
-@@ -188,5 +189,5 @@
+   AC_PROG_AWK
+@@ -198,7 +199,7 @@
+   AC_PATH_X
    test ! -f /usr/include/X11/Intrinsic.h -a "$x_includes" != NONE && \
      INCS="-I${x_includes}"
 -  test "$x_libraries" != NONE -a ! -z "$x_libraries" && LIBS="$LIBS -L${x_libraries}"
 +  test "$x_libraries" != NONE -a ! -z "$x_libraries" && LIBS="$LIBS -L${x_libraries} -Wl,-R${x_libraries}"
    AC_CHECK_LIB(Xext, XShmAttach)
    if test -z "ac_cv_lib_Xext_XShmAttach"; then
+     AC_MSG_WARN([XShm not found: DISABLING SHARED MEMORY])
diff --git a/lang/squeak/patches/patch-ac b/lang/squeak/patches/patch-ac
index b00aac79bc5..e5cc45cbed4 100644
--- a/lang/squeak/patches/patch-ac
+++ b/lang/squeak/patches/patch-ac
@@ -1,22 +1,22 @@
-$NetBSD: patch-ac,v 1.1 2000/02/16 22:02:34 dmcmahill Exp $
+$NetBSD: patch-ac,v 1.2 2000/08/14 16:51:36 mjl Exp $
 
-don't use __alpha__ as an operating system check....
-This may take some more work if there is an issue with unaligned access
-on NetBSD, but at least this should compile (the unpatched one won't)
-
---- ./src/sqXWindow.c.orig	Mon Oct 18 13:32:08 1999
-+++ ./src/sqXWindow.c	Wed Feb 16 11:25:57 2000
-@@ -2830,5 +2830,5 @@
+--- src/sqXWindow.c.orig	Mon Aug 14 18:14:23 2000
++++ src/sqXWindow.c	Mon Aug 14 18:15:35 2000
+@@ -2960,7 +2960,7 @@
+   error("Segmentation fault");
  }
  
 -#ifdef __alpha__
 +#if defined(__alpha__) && !defined(__NetBSD__)
  /* headers for setsysinfo (see below) */
  # include <sys/sysinfo.h>
-@@ -2842,5 +2842,5 @@
+ # include <sys/proc.h>
+@@ -2972,7 +2972,7 @@
+ 
    /* initialisation */
  
 -#ifdef __alpha__
 +#if defined(__alpha__) && !defined(__NetBSD__)
    /* disable printing of unaligned access exceptions */
    {
+     int buf[2]= { SSIN_UACPROC, UAC_NOPRINT };
diff --git a/lang/squeak/pkg/PLIST b/lang/squeak/pkg/PLIST
index bb561eb6648..376617ae2e3 100644
--- a/lang/squeak/pkg/PLIST
+++ b/lang/squeak/pkg/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2000/02/16 22:02:34 dmcmahill Exp $
+@comment $NetBSD: PLIST,v 1.3 2000/08/14 16:51:36 mjl Exp $
 bin/squeak
-share/squeak/Squeak2.6.changes
-share/squeak/Squeak2.6.image
+share/squeak/Squeak2.7.changes
+share/squeak/Squeak2.7.image
 share/squeak/SqueakV2.sources
 @dirrm share/squeak