Upgrade 2.2 -> 2.3.

Submitted by:	Roland Jesse <jesse@cs.uni-magdeburg.de>

12 files changed, 96 insertions, 50 deletions

diff --git a/lang/squeak2/Makefile b/lang/squeak2/Makefile
index 19770ea21f98..7d2c7bbbbc51 100644
--- a/lang/squeak2/Makefile
+++ b/lang/squeak2/Makefile
@@ -1,27 +1,30 @@
 # New ports collection makefile for:   	squeak
-# Version required:    			2.2
-# Date created:        			12/01/1998
-# Whom:                			nectar@FreeBSD.ORG
+# Version required:    			2.3
+# Date created:        			4 March 1999
+# Whom:                			jesse@cs.uni-magdeburg.de
 #
-# $Id: Makefile,v 1.6 1998/12/28 12:49:18 asami Exp $
+# $Id$
 #
 
-DISTNAME=	2.2
-PKGNAME=	squeak-2.2
+DISTNAME=	2.3
+PKGNAME=	squeak-2.3
 CATEGORIES=	lang
-MASTER_SITES=	http://www.nectar.com/distfiles/squeak/ \
-		ftp://alix.inria.fr/pub/squeak/unix/
+MASTER_SITES=	ftp://alix.inria.fr/pub/squeak/unix/ \
+		ftp://alix.inria.fr/pub/squeak/unix/2.3/ \
+		ftp://ftp.cs.uni-magdeburg.de/pub/Smalltalk/Smalltalk/Squeak/ \
+		ftp://ftp.cs.uni-magdeburg.de/pub/Smalltalk/Smalltalk/Squeak/2.3/ \
+		http://www.nectar.com/distfiles/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} image/${SQUEAK_SRC}
 
-MAINTAINER=	nectar@FreeBSD.ORG
+MAINTAINER=	jesse@cs.uni-magdeburg.de
 
 ALLFILES=	${DISTNAME}${EXTRACT_SUFX} ${SQUEAK_SRC}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 USE_XLIB=	yes
+USE_GMAKE=	yes
 DIST_SUBDIR=	squeak
 SQUEAK_SRC=	SqueakV2.sources
-USE_GMAKE=	yes
 MAKEFILE=	GNUmakefile
 VMBUILD=	freebsd
 MAKE_ARGS=	VMBUILD=${VMBUILD}
@@ -34,9 +37,9 @@ do-build:
 
 do-install:
 	@(cd ${WRKSRC}/${VMBUILD} && \
-	${INSTALL_PROGRAM} SqueakVM-2.2-${VMBUILD} ${PREFIX}/bin/SqueakVM)
+	${INSTALL_PROGRAM} SqueakVM-2.3-${VMBUILD} ${PREFIX}/bin/SqueakVM)
 	${MKDIR} ${PREFIX}/share/squeak
-.for f in Squeak2.2.changes Squeak2.2.image
+.for f in Squeak2.3.changes Squeak2.3.image
 	(cd ${WRKSRC}/image && ${INSTALL_DATA} $f ${PREFIX}/share/squeak/$f)
 .endfor
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${SQUEAK_SRC} \
diff --git a/lang/squeak2/distinfo b/lang/squeak2/distinfo
index 19157e49a02f..26736860cd78 100644
--- a/lang/squeak2/distinfo
+++ b/lang/squeak2/distinfo
@@ -1,2 +1,2 @@
-MD5 (squeak/2.2.tar.gz) = 7587f421f9858c00c8c66f8ff2997528
+MD5 (squeak/2.3.tar.gz) = 95602a7d8686d916a52006fbf0643ecc
 MD5 (squeak/SqueakV2.sources) = af0663f5112faa78635462dbb6fd3367
diff --git a/lang/squeak2/files/patch-aa b/lang/squeak2/files/patch-aa
new file mode 100644
index 000000000000..874e2c8881a8
--- /dev/null
+++ b/lang/squeak2/files/patch-aa
@@ -0,0 +1,20 @@
+--- /usr/ports/lang/squeak2/work/2.3/src/sqXWindow.c	Tue Feb  9 15:25:30 1999
++++ src/sqXWindow.c	Thu Mar  4 09:42:26 1999
+@@ -88,7 +88,7 @@
+ char shortImageName[MAXPATHLEN+1];	/* just the base name */
+ char vmPath[MAXPATHLEN+1];		/* full path to interpreter's directory */
+ 
+-int initialHeapSize;			/* 5 megabytes by default */
++int initialHeapSize;			/* 20 megabytes by default */
+ 
+ int    initialArgc;
+ char **initialArgv;
+@@ -2494,7 +2494,7 @@
+   if ((ev= getenv("SQUEAK_MEMORY")))
+     initialHeapSize= strtobkm(ev);
+   else
+-    initialHeapSize= 5*1024*1024;	/* 5 megabytes by default */
++    initialHeapSize= 20*1024*1024;	/* 20 megabytes by default */
+ 
+   if (getenv("SQUEAK_LAZY"))
+     sleepWhenUnmapped= 1;
diff --git a/lang/squeak2/pkg-comment b/lang/squeak2/pkg-comment
index 095395b1b271..89b9c651e6e0 100644
--- a/lang/squeak2/pkg-comment
+++ b/lang/squeak2/pkg-comment
@@ -1 +1 @@
-A Smalltalk system with graphical user interface.
+Full Smalltalk 80 with portability to UN*X, Mac, and Windows.
diff --git a/lang/squeak2/pkg-descr b/lang/squeak2/pkg-descr
index 8275511cef46..757e57888915 100644
--- a/lang/squeak2/pkg-descr
+++ b/lang/squeak2/pkg-descr
@@ -1,22 +1,22 @@
 Squeak is a new implementation of the Smalltalk programming
-environment; it includes:
-
+environment; it includes among other things:
     * a rapid-turn-around Smalltalk-80 compiler,
     * a caching-JIT run-time virtual machine (with full source in
       Smalltalk),
     * large class libraries with portable data and GUI models, and
     * an integrated development environment with coding tools, GUI
-      construction,
-    * and much more. 
-
-Squeak was developed at Apple Labs, and has been ported to a variety
-of computers (including most flavors of UNIX and Windows). Compared to
-other Smalltalk systems, Squeak has 4 important features:
+      construction.
 
+Squeak was developed at Apple Labs and Walt Disney and has been ported
+to a variety of computers (including most flavors of UNIX and
+Windows). Compared to other Smalltalk systems, Squeak has 4 important
+features:
     * Portability (to Mac, Windows, WinCE, and many flavors of UNIX);
     * Speed (it uses native C for compute-intensive code);
     * Price (free, including all source code and the right to distribute
       applications!); and
     * Sophistication (full Smalltalk-80 language, libraries, and tools).
 
-Jacques Vidrine <nectar@FreeBSD.ORG>
+See http://squeak.cs.uiuc.edu/ for more information.
+
+Roland Jesse <jesse@cs.uni-magdeburg.de>
diff --git a/lang/squeak2/pkg-plist b/lang/squeak2/pkg-plist
index 37367cbe9460..fc3a3f9d726b 100644
--- a/lang/squeak2/pkg-plist
+++ b/lang/squeak2/pkg-plist
@@ -1,5 +1,5 @@
 bin/SqueakVM
-share/squeak/Squeak2.2.changes
-share/squeak/Squeak2.2.image
+share/squeak/Squeak2.3.changes
+share/squeak/Squeak2.3.image
 share/squeak/SqueakV2.sources
 @dirrm share/squeak
diff --git a/lang/squeak3/Makefile b/lang/squeak3/Makefile
index 19770ea21f98..7d2c7bbbbc51 100644
--- a/lang/squeak3/Makefile
+++ b/lang/squeak3/Makefile
@@ -1,27 +1,30 @@
 # New ports collection makefile for:   	squeak
-# Version required:    			2.2
-# Date created:        			12/01/1998
-# Whom:                			nectar@FreeBSD.ORG
+# Version required:    			2.3
+# Date created:        			4 March 1999
+# Whom:                			jesse@cs.uni-magdeburg.de
 #
-# $Id: Makefile,v 1.6 1998/12/28 12:49:18 asami Exp $
+# $Id$
 #
 
-DISTNAME=	2.2
-PKGNAME=	squeak-2.2
+DISTNAME=	2.3
+PKGNAME=	squeak-2.3
 CATEGORIES=	lang
-MASTER_SITES=	http://www.nectar.com/distfiles/squeak/ \
-		ftp://alix.inria.fr/pub/squeak/unix/
+MASTER_SITES=	ftp://alix.inria.fr/pub/squeak/unix/ \
+		ftp://alix.inria.fr/pub/squeak/unix/2.3/ \
+		ftp://ftp.cs.uni-magdeburg.de/pub/Smalltalk/Smalltalk/Squeak/ \
+		ftp://ftp.cs.uni-magdeburg.de/pub/Smalltalk/Smalltalk/Squeak/2.3/ \
+		http://www.nectar.com/distfiles/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} image/${SQUEAK_SRC}
 
-MAINTAINER=	nectar@FreeBSD.ORG
+MAINTAINER=	jesse@cs.uni-magdeburg.de
 
 ALLFILES=	${DISTNAME}${EXTRACT_SUFX} ${SQUEAK_SRC}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 USE_XLIB=	yes
+USE_GMAKE=	yes
 DIST_SUBDIR=	squeak
 SQUEAK_SRC=	SqueakV2.sources
-USE_GMAKE=	yes
 MAKEFILE=	GNUmakefile
 VMBUILD=	freebsd
 MAKE_ARGS=	VMBUILD=${VMBUILD}
@@ -34,9 +37,9 @@ do-build:
 
 do-install:
 	@(cd ${WRKSRC}/${VMBUILD} && \
-	${INSTALL_PROGRAM} SqueakVM-2.2-${VMBUILD} ${PREFIX}/bin/SqueakVM)
+	${INSTALL_PROGRAM} SqueakVM-2.3-${VMBUILD} ${PREFIX}/bin/SqueakVM)
 	${MKDIR} ${PREFIX}/share/squeak
-.for f in Squeak2.2.changes Squeak2.2.image
+.for f in Squeak2.3.changes Squeak2.3.image
 	(cd ${WRKSRC}/image && ${INSTALL_DATA} $f ${PREFIX}/share/squeak/$f)
 .endfor
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${SQUEAK_SRC} \
diff --git a/lang/squeak3/distinfo b/lang/squeak3/distinfo
index 19157e49a02f..26736860cd78 100644
--- a/lang/squeak3/distinfo
+++ b/lang/squeak3/distinfo
@@ -1,2 +1,2 @@
-MD5 (squeak/2.2.tar.gz) = 7587f421f9858c00c8c66f8ff2997528
+MD5 (squeak/2.3.tar.gz) = 95602a7d8686d916a52006fbf0643ecc
 MD5 (squeak/SqueakV2.sources) = af0663f5112faa78635462dbb6fd3367
diff --git a/lang/squeak3/files/patch-aa b/lang/squeak3/files/patch-aa
new file mode 100644
index 000000000000..874e2c8881a8
--- /dev/null
+++ b/lang/squeak3/files/patch-aa
@@ -0,0 +1,20 @@
+--- /usr/ports/lang/squeak2/work/2.3/src/sqXWindow.c	Tue Feb  9 15:25:30 1999
++++ src/sqXWindow.c	Thu Mar  4 09:42:26 1999
+@@ -88,7 +88,7 @@
+ char shortImageName[MAXPATHLEN+1];	/* just the base name */
+ char vmPath[MAXPATHLEN+1];		/* full path to interpreter's directory */
+ 
+-int initialHeapSize;			/* 5 megabytes by default */
++int initialHeapSize;			/* 20 megabytes by default */
+ 
+ int    initialArgc;
+ char **initialArgv;
+@@ -2494,7 +2494,7 @@
+   if ((ev= getenv("SQUEAK_MEMORY")))
+     initialHeapSize= strtobkm(ev);
+   else
+-    initialHeapSize= 5*1024*1024;	/* 5 megabytes by default */
++    initialHeapSize= 20*1024*1024;	/* 20 megabytes by default */
+ 
+   if (getenv("SQUEAK_LAZY"))
+     sleepWhenUnmapped= 1;
diff --git a/lang/squeak3/pkg-comment b/lang/squeak3/pkg-comment
index 095395b1b271..89b9c651e6e0 100644
--- a/lang/squeak3/pkg-comment
+++ b/lang/squeak3/pkg-comment
@@ -1 +1 @@
-A Smalltalk system with graphical user interface.
+Full Smalltalk 80 with portability to UN*X, Mac, and Windows.
diff --git a/lang/squeak3/pkg-descr b/lang/squeak3/pkg-descr
index 8275511cef46..757e57888915 100644
--- a/lang/squeak3/pkg-descr
+++ b/lang/squeak3/pkg-descr
@@ -1,22 +1,22 @@
 Squeak is a new implementation of the Smalltalk programming
-environment; it includes:
-
+environment; it includes among other things:
     * a rapid-turn-around Smalltalk-80 compiler,
     * a caching-JIT run-time virtual machine (with full source in
       Smalltalk),
     * large class libraries with portable data and GUI models, and
     * an integrated development environment with coding tools, GUI
-      construction,
-    * and much more. 
-
-Squeak was developed at Apple Labs, and has been ported to a variety
-of computers (including most flavors of UNIX and Windows). Compared to
-other Smalltalk systems, Squeak has 4 important features:
+      construction.
 
+Squeak was developed at Apple Labs and Walt Disney and has been ported
+to a variety of computers (including most flavors of UNIX and
+Windows). Compared to other Smalltalk systems, Squeak has 4 important
+features:
     * Portability (to Mac, Windows, WinCE, and many flavors of UNIX);
     * Speed (it uses native C for compute-intensive code);
     * Price (free, including all source code and the right to distribute
       applications!); and
     * Sophistication (full Smalltalk-80 language, libraries, and tools).
 
-Jacques Vidrine <nectar@FreeBSD.ORG>
+See http://squeak.cs.uiuc.edu/ for more information.
+
+Roland Jesse <jesse@cs.uni-magdeburg.de>
diff --git a/lang/squeak3/pkg-plist b/lang/squeak3/pkg-plist
index 37367cbe9460..fc3a3f9d726b 100644
--- a/lang/squeak3/pkg-plist
+++ b/lang/squeak3/pkg-plist
@@ -1,5 +1,5 @@
 bin/SqueakVM
-share/squeak/Squeak2.2.changes
-share/squeak/Squeak2.2.image
+share/squeak/Squeak2.3.changes
+share/squeak/Squeak2.3.image
 share/squeak/SqueakV2.sources
 @dirrm share/squeak