Update squeak to version 2.2.

5 files changed, 66 insertions, 48 deletions

diff --git a/lang/squeak2/Makefile b/lang/squeak2/Makefile
index dd2c9b95bd7a..87db337be812 100644
--- a/lang/squeak2/Makefile
+++ b/lang/squeak2/Makefile
@@ -1,27 +1,49 @@
-# New ports collection makefile for:   squeak
-# Version required:    1.18
-# Date created:        25 April 1997
-# Whom:                jesse
+# New ports collection makefile for:   	squeak
+# Version required:    			2.2
+# Date created:        			12/01/1998
+# Whom:                			nectar@FreeBSD.ORG
 #
 # $Id: Makefile,v 1.3 1998/11/28 02:18:44 asami Exp $
 #
 
-DISTNAME=      Squeak-1.18
-PKGNAME=       squeak-1.18
-CATEGORIES=    lang
-MASTER_SITES=  ftp://ftp.create.ucsb.edu/pub/Smalltalk/Squeak/unix/
+DISTNAME=	2.2
+PKGNAME=	squeak-2.2
+CATEGORIES=	lang
+MASTER_SITES=	http://www.nectar.com/distfiles/squeak/ \
+		ftp://alix.inria.fr/pub/squeak/unix/ \
+		ftp://st.cs.uiuc.edu/pub/Smalltalk/Squeak/unix/ \
+		http://st-www.cs.uiuc.edu/ftp/Smalltalk/Squeak/ \
+		ftp://uiarchive.cso.uiuc.edu/pub/lang/smalltalk/smalltalk/Squeak/ \
+		http://wuarchive.wustl.edu/languages/smalltalk/smalltalk/Squeak/ \
+		ftp://ftp.cs.uni-magdeburg.de/pub/Smalltalk/Smalltalk/Squeak/
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} image/${SQUEAK_SRC}
 
-MAINTAINER=    jesse@cs.uni-magdeburg.de
+MAINTAINER=	nectar@FreeBSD.ORG
 
-BROKEN=		upgrade
-USE_XLIB=	yes
-WRKSRC=         $(WRKDIR)/Squeak-1.18/src
+ALLFILES=	${DISTNAME}${EXTRACT_SUFX} ${SQUEAK_SRC}
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+
+DIST_SUBDIR=	squeak
+SQUEAK_SRC=	SqueakV2.sources
+USE_GMAKE=	yes
+MAKEFILE=	GNUmakefile
+VMBUILD=	freebsd
+MAKE_ARGS=	VMBUILD=${VMBUILD}
+PORTMAKE=	${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
+		${MAKEFILE} ${MAKE_ARGS}
+
+do-build:
+	@(cd ${WRKSRC} && ${PORTMAKE} mkdir)
+	@(cd ${WRKSRC}/${VMBUILD} && ${PORTMAKE} interp)
 
 do-install:
-	${INSTALL_PROGRAM} $(WRKSRC)/SqueakVM $(PREFIX)/bin
-	${MKDIR} $(PREFIX)/share/squeak 
-	${INSTALL_DATA} $(WRKSRC)/../image/SqueakV1.sources $(PREFIX)/share/squeak
-	${INSTALL_DATA} $(WRKSRC)/../image/Squeak1.18.image $(PREFIX)/share/squeak
-	${INSTALL_DATA} $(WRKSRC)/../image/Squeak1.18.changes $(PREFIX)/share/squeak
+	@(cd ${WRKSRC}/${VMBUILD} && \
+	${INSTALL_PROGRAM} SqueakVM-2.2-${VMBUILD} ${PREFIX}/bin/SqueakVM)
+	${MKDIR} ${PREFIX}/share/squeak
+.for f in Squeak2.2.changes Squeak2.2.image
+	(cd ${WRKSRC}/image && ${INSTALL_DATA} $f ${PREFIX}/share/squeak/$f)
+.endfor
+	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${SQUEAK_SRC} \
+		${PREFIX}/share/squeak/${SQUEAK_SRC}
 
 .include <bsd.port.mk>
diff --git a/lang/squeak2/distinfo b/lang/squeak2/distinfo
index 3d88a2adf8ee..19157e49a02f 100644
--- a/lang/squeak2/distinfo
+++ b/lang/squeak2/distinfo
@@ -1 +1,2 @@
-MD5 (Squeak-1.18.tar.gz) = 87e8db2d63b7b582b7874aa30dc37efe
+MD5 (squeak/2.2.tar.gz) = 7587f421f9858c00c8c66f8ff2997528
+MD5 (squeak/SqueakV2.sources) = af0663f5112faa78635462dbb6fd3367
diff --git a/lang/squeak2/files/patch-aa b/lang/squeak2/files/patch-aa
deleted file mode 100644
index 3eb64bcdf6ec..000000000000
--- a/lang/squeak2/files/patch-aa
+++ /dev/null
@@ -1,24 +0,0 @@
-*** /usr/ports/lang/squeak/work/Squeak-1.18/src/Makefile	Sun Jan 19 00:29:00 1997
---- Makefile	Fri Apr 25 18:12:29 1997
-***************
-*** 23,32 ****
-  
-  CC=		gcc
-  LD=		gcc
-! CCFLAGS=	-O3 -funroll-loops -g
-  LDFLAGS=
-! LIBS=		-lX11 -lm
-! INCLUDE=
-  
-  # top-level targets -- default is to build just the VM
-  
---- 23,32 ----
-  
-  CC=		gcc
-  LD=		gcc
-! CCFLAGS=	-O2 -funroll-loops
-  LDFLAGS=
-! LIBS=		-L${X11BASE}/lib -lX11 -lm
-! INCLUDE=	-I${X11BASE}/include
-  
-  # top-level targets -- default is to build just the VM
diff --git a/lang/squeak2/pkg-descr b/lang/squeak2/pkg-descr
index e2eb8e0d13a9..8275511cef46 100644
--- a/lang/squeak2/pkg-descr
+++ b/lang/squeak2/pkg-descr
@@ -1,4 +1,22 @@
-This is the port of squeak, a free smalltalk system with a graphical
-user interface. 
+Squeak is a new implementation of the Smalltalk programming
+environment; it includes:
 
--- Roland Jesse <jesse@cs.uni-magdeburg.de>
+    * 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:
+
+    * 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>
diff --git a/lang/squeak2/pkg-plist b/lang/squeak2/pkg-plist
index 43d0ca125fa9..37367cbe9460 100644
--- a/lang/squeak2/pkg-plist
+++ b/lang/squeak2/pkg-plist
@@ -1,4 +1,5 @@
 bin/SqueakVM
-share/squeak/SqueakV1.sources
-share/squeak/Squeak1.18.image
-share/squeak/Squeak1.18.changes
+share/squeak/Squeak2.2.changes
+share/squeak/Squeak2.2.image
+share/squeak/SqueakV2.sources
+@dirrm share/squeak