Update to version 1.31.

PR:		9159
Submitted by:	maintainer

5 files changed, 83 insertions, 39 deletions

diff --git a/lang/squeak1/Makefile b/lang/squeak1/Makefile
index 86b4fe9da64..43126959638 100644
--- a/lang/squeak1/Makefile
+++ b/lang/squeak1/Makefile
@@ -1,28 +1,50 @@
-# New ports collection makefile for:   squeak
-# Version required:    1.18
-# Date created:        25 April 1997
-# Whom:                jesse
+# New ports collection makefile for:   	squeak1
+# Version required:    			1.31
+# Date created:        			20 December 1998
+# Whom:                			jesse@cs.uni-magdeburg.de
 #
-# $Id: Makefile,v 1.3 1998/11/28 02:18:44 asami Exp $
+# $Id$
 #
 
-DISTNAME=      Squeak-1.18
-PKGNAME=       squeak-1.18
-CATEGORIES=    lang
-MASTER_SITES=  ftp://ftp.create.ucsb.edu/pub/Smalltalk/Squeak/unix/
+DISTNAME=	1.31
+PKGNAME=	squeak-1.31
+CATEGORIES=	lang
+MASTER_SITES=	http://www.apfel.de/~jesse/squeak/ \
+		ftp://alix.inria.fr/pub/squeak/unix/ \
+		ftp://st.cs.uiuc.edu/pub/Smalltalk/Squeak/unix/ \
+		ftp://ftp.cs.uni-magdeburg.de/pub/Smalltalk/Smalltalk/Squeak/ \
+		ftp://ftp.cs.uni-magdeburg.de/pub/Smalltalk/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/
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} image/${SQUEAK_SRC}
 
-MAINTAINER=    jesse@cs.uni-magdeburg.de
+MAINTAINER=	jesse@cs.uni-magdeburg.de
 
-BROKEN=		upgrade
+ALLFILES=	${DISTNAME}${EXTRACT_SUFX} ${SQUEAK_SRC}
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
-USE_XLIB=	yes
-WRKSRC=         $(WRKDIR)/Squeak-1.18/src
+DIST_SUBDIR=	squeak
+SQUEAK_SRC=	SqueakV1.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-1.31-${VMBUILD} ${PREFIX}/bin/SqueakVM)
+	${MKDIR} ${PREFIX}/share/squeak
+.for f in Squeak1.31.changes Squeak1.31.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/squeak1/distinfo b/lang/squeak1/distinfo
index 3d88a2adf8e..0cb001d4aa2 100644
--- a/lang/squeak1/distinfo
+++ b/lang/squeak1/distinfo
@@ -1 +1,2 @@
-MD5 (Squeak-1.18.tar.gz) = 87e8db2d63b7b582b7874aa30dc37efe
+MD5 (squeak/1.31.tar.gz) = b4ae8440a89573db57b034dd546ab122
+MD5 (squeak/SqueakV1.sources) = 72bb18e9b23f6a841efd332277c154d4
diff --git a/lang/squeak1/files/patch-aa b/lang/squeak1/files/patch-aa
index 3eb64bcdf6e..c5a10c35319 100644
--- a/lang/squeak1/files/patch-aa
+++ b/lang/squeak1/files/patch-aa
@@ -1,24 +1,42 @@
-*** /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
+*** /usr/ports/lang/squeak1/work/1.31/src/GNUmakefile.conf	Thu Mar  5 15:42:07 1998
+--- src/GNUmakefile.conf	Mon Dec 21 01:01:59 1998
 ***************
-*** 23,32 ****
+*** 27,33 ****
   
-  CC=		gcc
-  LD=		gcc
-! CCFLAGS=	-O3 -funroll-loops -g
-  LDFLAGS=
-! LIBS=		-lX11 -lm
-! INCLUDE=
+  # platform identification
   
-  # top-level targets -- default is to build just the VM
+! UTSMAC:=	$(shell arch     | tr [A-Z] [a-z])
+  UTSSYS:=	$(shell uname -s | tr [A-Z] [a-z] | sed 's/-//g')
+  UTSREL:=	$(shell uname -r | tr [A-Z] [a-z])
   
---- 23,32 ----
+--- 27,34 ----
   
-  CC=		gcc
-  LD=		gcc
-! CCFLAGS=	-O2 -funroll-loops
-  LDFLAGS=
-! LIBS=		-L${X11BASE}/lib -lX11 -lm
-! INCLUDE=	-I${X11BASE}/include
+  # platform identification
   
-  # top-level targets -- default is to build just the VM
+! #UTSMAC:=	$(shell arch     | tr [A-Z] [a-z])
+! UTSMAC:=	$(shell uname -m | tr [A-Z] [a-z])
+  UTSSYS:=	$(shell uname -s | tr [A-Z] [a-z] | sed 's/-//g')
+  UTSREL:=	$(shell uname -r | tr [A-Z] [a-z])
+  
+***************
+*** 52,57 ****
+--- 53,71 ----
+  #									   #
+  #			START OF CONFIGURATION SECTION			   #
+  #									   #
++ ifeq ($(SYSTEM),                                        freebsd)
++   CC=		gcc
++   CCFLAGS:=	-O3 -fomit-frame-pointer $(PROFILE)
++   INCDIRS:=	-I/usr/X11R6/include
++   LDO=		ld -r
++   LD=		gcc
++   LDFLAGS:=	$(PROFILE)
++   LIBDIRS=	-L/usr/X11R6/lib
++   LIBS=		-lX11 -lXext -lm
++   GNU=		gnu-
++   GAWK=		awk
++ endif
++ 
+  ifeq ($(SYSTEM),					linux)
+    CC=		gcc
+    CCFLAGS:=	-O2 -g $(PROFILE)
diff --git a/lang/squeak1/pkg-descr b/lang/squeak1/pkg-descr
index e2eb8e0d13a..7f9b61210cf 100644
--- a/lang/squeak1/pkg-descr
+++ b/lang/squeak1/pkg-descr
@@ -1,4 +1,6 @@
 This is the port of squeak, a free smalltalk system with a graphical
 user interface. 
 
+http://squeak.cs.uiuc.edu/
+
 -- Roland Jesse <jesse@cs.uni-magdeburg.de>
diff --git a/lang/squeak1/pkg-plist b/lang/squeak1/pkg-plist
index 43d0ca125fa..4cbdd797461 100644
--- a/lang/squeak1/pkg-plist
+++ b/lang/squeak1/pkg-plist
@@ -1,4 +1,5 @@
 bin/SqueakVM
+share/squeak/Squeak1.31.changes
+share/squeak/Squeak1.31.image
 share/squeak/SqueakV1.sources
-share/squeak/Squeak1.18.image
-share/squeak/Squeak1.18.changes
+@dirrm share/squeak