From j@wh4-422.st.uni-magdeburg.de  Mon Dec 21 15:11:47 1998
Received: from wh4-422.st.uni-magdeburg.de (wh4-422.st.Uni-Magdeburg.DE [141.44.164.142])
          by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id PAA08405
          for <FreeBSD-gnats-submit@freebsd.org>; Mon, 21 Dec 1998 15:11:37 -0800 (PST)
          (envelope-from j@wh4-422.st.uni-magdeburg.de)
Received: (from j@localhost)
	by wh4-422.st.uni-magdeburg.de (8.9.1/8.9.1) id AAA24486;
	Tue, 22 Dec 1998 00:10:46 +0100 (CET)
	(envelope-from j)
Message-Id: <199812212310.AAA24486@wh4-422.st.uni-magdeburg.de>
Date: Tue, 22 Dec 1998 00:10:46 +0100 (CET)
From: jesse@cs.uni-magdeburg.de
Reply-To: jesse@cs.uni-magdeburg.de
To: FreeBSD-gnats-submit@freebsd.org
Subject: Update of port lang/squeak1
X-Send-Pr-Version: 3.2

>Number:         9159
>Category:       ports
>Synopsis:       Update of port lang/squeak1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Dec 21 15:20:01 PST 1998
>Closed-Date:    Tue Dec 22 20:41:49 PST 1998
>Last-Modified:  Tue Dec 22 20:42:13 PST 1998
>Originator:     Roland Jesse
>Release:        FreeBSD 3.0-RELEASE i386
>Organization:
Otto-von-Guericke University of Magdeburg
>Environment:
FreeBSD wh4-422.st.uni-magdeburg.de 3.0-RELEASE FreeBSD 3.0-RELEASE #4: Sun Nov 22 13:08:34 MET 1998     j@wh4-422.st.uni-magdeburg.de:/usr/src/sys/compile/RDJ  i386
>Description:
The port lang/squeak was outdated. This is the update to the last
version in the 1.x branch.
>How-To-Repeat:
The output of the recursive diff ('diff -ruN') of the old and the new
port:

diff -ruN squeak/Makefile squeak1/Makefile
--- squeak/Makefile	Sat Dec  5 10:59:33 1998
+++ squeak1/Makefile	Mon Dec 21 00:56:34 1998
@@ -1,26 +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
 
-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=	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 -ruN squeak/files/Makefile squeak1/files/Makefile
--- squeak/files/Makefile	Tue Jun 10 11:31:49 1997
+++ squeak1/files/Makefile	Thu Jan  1 01:00:00 1970
@@ -1,152 +0,0 @@
-# Makefile for Unix Squeak; author: Ian Piumarta (ian.piumarta@inria.fr)
-
-# the name of the resulting virtual machine
-
-VM=		SqueakVM
-
-# libraries, compiler, flags
-#
-# CC and LD should point to the programs used for compiling and linking,
-# respectively (both of these will normally be 'cc' or 'gcc').
-#
-# CCFLAGS and LDFLAGS should contain any extra flags needed by your
-# compiler or linker, respectively.  For example, on the newer Sparcs
-# (such as the UltraSparc) you can improve interpreter performance 
-# by including "-mv8" in CCFLAGS when using gcc.
-#
-# LIBS should contain any '-L' and '-l' flags required for your
-# architecture (e.g. some Sparc machines will have to specify
-# -L/usr/openwin/lib).  At the very least this will contain '-lX11'.
-#
-# INCLUDE should contain any '-I' flags required (e.g. some Sparc machines
-# will have to specify "-I/usr/openwin/include" here ).
-
-CC=		gcc
-LD=		gcc
-CCFLAGS=	-O2 -funroll-loops -g 
-LDFLAGS=
-LIBS=		-lX11 -lm
-INCLUDE=	-I/usr/X11R6/include
-
-# top-level targets -- default is to build just the VM
-
-all:		$(VM)
-utilities:	lf2cr
-
-# the files comprising the VM
-
-SRC=		InterpTestInline.c \
-		sqFilePrims.c sqSoundPrims.c \
-		sqUnixDirectory.c sqUnixJoystick.c sqUnixSound.c \
-		sqXWindow.c
-HDR=		sq.h sqUnixConfig.h
-
-OBJ=		$(SRC:.c=.o)
-
-# extra stuff that goes in the tar file when moving things around
-
-TAR=		InterpTest.c Makefile cr2lf.c cgsix.c \
-		Squeak*.image Squeak*.changes Squeak*.sources \
-		*.cs README
-
-# rules and regulations...
-
-$(VM):		$(OBJ)
-		$(LD) $(LDFLAGS) -o $@ $(OBJ) $(LIBS)
-
-.c.o:
-		$(CC) $(CCFLAGS) $(INCLUDE) -c $<
-
-# utilities
-
-lf2cr:		cr2lf
-		ln -s cr2lf lf2cr
-
-cr2lf:		cr2lf.c
-		$(CC) -o cr2lf cr2lf.c
-
-# miscellaneous sundries...
-
-tidy:
-		/bin/rm -f *~ core
-
-clean:		tidy
-		/bin/rm -f *.o
-
-spotless:	clean
-		/bin/rm -f $(VM) cr2lf lf2cr
-		makedepend
-		makedepend
-		/bin/rm -f *.bak
-
-depend:
-		makedepend $(INCLUDE) $(SRC) $(HDR)
-
-tar:
-		tar cvf sq.tar $(SRC) $(HDR) $(TAR)
-
-# DO NOT DELETE THIS LINE -- make depend depends on it.
-
-InterpTestInline.o: sq.h sqUnixConfig.h /usr/include/math.h
-InterpTestInline.o: /usr/include/sys/cdefs.h /usr/include/stdio.h
-InterpTestInline.o: /usr/include/sys/types.h /usr/include/machine/ansi.h
-InterpTestInline.o: /usr/include/machine/types.h
-InterpTestInline.o: /usr/include/machine/endian.h /usr/include/stdlib.h
-InterpTestInline.o: /usr/include/string.h /usr/include/time.h
-InterpTestInline.o: /usr/include/unistd.h /usr/include/sys/unistd.h
-sqFilePrims.o: sq.h sqUnixConfig.h /usr/include/math.h
-sqFilePrims.o: /usr/include/sys/cdefs.h /usr/include/stdio.h
-sqFilePrims.o: /usr/include/sys/types.h /usr/include/machine/ansi.h
-sqFilePrims.o: /usr/include/machine/types.h /usr/include/machine/endian.h
-sqFilePrims.o: /usr/include/stdlib.h /usr/include/string.h
-sqFilePrims.o: /usr/include/time.h /usr/include/unistd.h
-sqFilePrims.o: /usr/include/sys/unistd.h
-sqSoundPrims.o: sq.h sqUnixConfig.h /usr/include/math.h
-sqSoundPrims.o: /usr/include/sys/cdefs.h /usr/include/stdio.h
-sqSoundPrims.o: /usr/include/sys/types.h /usr/include/machine/ansi.h
-sqSoundPrims.o: /usr/include/machine/types.h /usr/include/machine/endian.h
-sqSoundPrims.o: /usr/include/stdlib.h /usr/include/string.h
-sqSoundPrims.o: /usr/include/time.h /usr/include/unistd.h
-sqSoundPrims.o: /usr/include/sys/unistd.h
-sqUnixDirectory.o: sq.h sqUnixConfig.h /usr/include/math.h
-sqUnixDirectory.o: /usr/include/sys/cdefs.h /usr/include/stdio.h
-sqUnixDirectory.o: /usr/include/sys/types.h /usr/include/machine/ansi.h
-sqUnixDirectory.o: /usr/include/machine/types.h /usr/include/machine/endian.h
-sqUnixDirectory.o: /usr/include/stdlib.h /usr/include/string.h
-sqUnixDirectory.o: /usr/include/time.h /usr/include/unistd.h
-sqUnixDirectory.o: /usr/include/sys/unistd.h /usr/include/dirent.h
-sqUnixDirectory.o: /usr/include/sys/dirent.h /usr/include/sys/param.h
-sqUnixDirectory.o: /usr/include/sys/syslimits.h /usr/include/sys/signal.h
-sqUnixDirectory.o: /usr/include/machine/signal.h /usr/include/machine/trap.h
-sqUnixDirectory.o: /usr/include/machine/param.h /usr/include/machine/limits.h
-sqUnixDirectory.o: /usr/include/sys/stat.h /usr/include/sys/time.h
-sqUnixJoystick.o: sq.h sqUnixConfig.h /usr/include/math.h
-sqUnixJoystick.o: /usr/include/sys/cdefs.h /usr/include/stdio.h
-sqUnixJoystick.o: /usr/include/sys/types.h /usr/include/machine/ansi.h
-sqUnixJoystick.o: /usr/include/machine/types.h /usr/include/machine/endian.h
-sqUnixJoystick.o: /usr/include/stdlib.h /usr/include/string.h
-sqUnixJoystick.o: /usr/include/time.h /usr/include/unistd.h
-sqUnixJoystick.o: /usr/include/sys/unistd.h
-sqUnixSound.o: sq.h sqUnixConfig.h /usr/include/math.h
-sqUnixSound.o: /usr/include/sys/cdefs.h /usr/include/stdio.h
-sqUnixSound.o: /usr/include/sys/types.h /usr/include/machine/ansi.h
-sqUnixSound.o: /usr/include/machine/types.h /usr/include/machine/endian.h
-sqUnixSound.o: /usr/include/stdlib.h /usr/include/string.h
-sqUnixSound.o: /usr/include/time.h /usr/include/unistd.h
-sqUnixSound.o: /usr/include/sys/unistd.h
-sqXWindow.o: sq.h sqUnixConfig.h /usr/include/math.h /usr/include/sys/cdefs.h
-sqXWindow.o: /usr/include/stdio.h /usr/include/sys/types.h
-sqXWindow.o: /usr/include/machine/ansi.h /usr/include/machine/types.h
-sqXWindow.o: /usr/include/machine/endian.h /usr/include/stdlib.h
-sqXWindow.o: /usr/include/string.h /usr/include/time.h /usr/include/unistd.h
-sqXWindow.o: /usr/include/sys/unistd.h /usr/include/sys/time.h
-sqXWindow.o: /usr/include/sys/param.h /usr/include/sys/syslimits.h
-sqXWindow.o: /usr/include/sys/signal.h /usr/include/machine/signal.h
-sqXWindow.o: /usr/include/machine/trap.h /usr/include/machine/param.h
-sqXWindow.o: /usr/include/machine/limits.h /usr/include/errno.h
-sq.o: sqUnixConfig.h /usr/include/math.h /usr/include/sys/cdefs.h
-sq.o: /usr/include/stdio.h /usr/include/sys/types.h
-sq.o: /usr/include/machine/ansi.h /usr/include/machine/types.h
-sq.o: /usr/include/machine/endian.h /usr/include/stdlib.h
-sq.o: /usr/include/string.h /usr/include/time.h /usr/include/unistd.h
-sq.o: /usr/include/sys/unistd.h
diff -ruN squeak/files/md5 squeak1/files/md5
--- squeak/files/md5	Tue Jun 10 11:31:49 1997
+++ squeak1/files/md5	Mon Dec 21 00:56:34 1998
@@ -1 +1,2 @@
-MD5 (Squeak-1.18.tar.gz) = 87e8db2d63b7b582b7874aa30dc37efe
+MD5 (squeak/1.31.tar.gz) = b4ae8440a89573db57b034dd546ab122
+MD5 (squeak/SqueakV1.sources) = 72bb18e9b23f6a841efd332277c154d4
diff -ruN squeak/patches/patch-aa squeak1/patches/patch-aa
--- squeak/patches/patch-aa	Tue Jun 10 11:31:49 1997
+++ squeak1/patches/patch-aa	Mon Dec 21 01:05:45 1998
@@ -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
+--- 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=
-  
-  # 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
+  # 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])
+  
+--- 27,34 ----
+  
+  # platform identification
+  
+! #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 -ruN squeak/patches/patch-ab squeak1/patches/patch-ab
--- squeak/patches/patch-ab	Sun Jun 29 13:07:11 1997
+++ squeak1/patches/patch-ab	Thu Jan  1 01:00:00 1970
@@ -1,21 +0,0 @@
-*** /usr/ports/lang/squeak/work/Squeak-1.18/src/sqUnixConfig.h	Thu Jan 23 16:56:00 1997
---- ./sqUnixConfig.h	Fri Apr 25 18:30:06 1997
-***************
-*** 51,56 ****
---- 51,66 ----
-        and PgUp, PgDn, Home, End keys on the right keypad).
-  */
-  
-+ #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)	        /* FreeBSD */
-+ # undef  HAS_D_NAMLEN
-+ # define HAS_TIMEZONE
-+ # undef  HAS_ON_EXIT
-+ # define HAS_LSB_FIRST
-+ # undef  HAS_SUN_AUDIO
-+ # undef  DOUBLE_WORD_ALIGNMENT
-+ # define DOUBLE_WORD_ORDER
-+ #endif
-+ 
-  #if defined(sun) && (defined(sparc) || defined(__sparc))
-  # include <errno.h>
-  # ifdef ECHRNG					/* Sparc/Solaris */
diff -ruN squeak/pkg/DESCR squeak1/pkg/DESCR
--- squeak/pkg/DESCR	Tue Jun 10 11:31:49 1997
+++ squeak1/pkg/DESCR	Mon Dec 21 00:56:34 1998
@@ -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 -ruN squeak/pkg/PLIST squeak1/pkg/PLIST
--- squeak/pkg/PLIST	Tue Jun 10 11:31:49 1997
+++ squeak1/pkg/PLIST	Mon Dec 21 00:56:34 1998
@@ -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

>Fix:
Please remove the port lang/squeak after committing the new one as
lang/squeak1. Thanks a lot.
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: steve 
State-Changed-When: Tue Dec 22 20:41:49 PST 1998 
State-Changed-Why:  
Committed, thanks! 
>Unformatted:
