Update 2.4 -> 2.7.

Submitted by:	jesse@cs.uni-magdeburg.de
PR:		ports/17220

6 files changed, 62 insertions, 119 deletions

diff --git a/lang/squeak2/Makefile b/lang/squeak2/Makefile
index c800079fb64a..f30413f76a89 100644
--- a/lang/squeak2/Makefile
+++ b/lang/squeak2/Makefile
@@ -6,46 +6,58 @@
 # $FreeBSD$
 #
 
-DISTNAME=	2.4
-PKGNAME=	squeak-2.4
+DISTNAME=	Squeak2.7-src
+PKGNAME=	squeak-2.7
 CATEGORIES=	lang
-MASTER_SITES=	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/
+MASTER_SITES=	ftp://ftp.inria.fr/INRIA/Projects/SOR/users/piumarta/squeak/ \
+		ftp://ftp.cs.uni-magdeburg.de/pub/Smalltalk/free/squeak/unix/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${SQUEAK_SRC}
 
 MAINTAINER=	jesse@cs.uni-magdeburg.de
 
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
-
+NO_WRKSUBDIR=	yes
 USE_XLIB=	yes
 USE_GMAKE=	yes
 DIST_SUBDIR=	squeak
-SQUEAK_SRC=	SqueakV2.sources
-MAKEFILE=	GNUmakefile
-VMBUILD=	freebsd
-MAKE_ARGS=	VMBUILD=${VMBUILD}
+SQUEAK_SRC=	SqueakV2.sources.gz Squeak2.7.image.gz Squeak2.7.changes.gz
+SQUEAK_LIB=	Profiler.so SoundCodecPrims.so Squeak3D.so System.so
+
+MAKEFILE=	Makefile
 .ifdef (CC)
 MAKE_ARGS+=	CC=${CC}
 .endif
 .ifdef (CFLAGS)
 MAKE_ARGS+=	CCFLAGS="${CFLAGS}"
 .endif
-PORTMAKE=	${SETENV} ${MAKE_ENV} ${GMAKE} -e ${MAKE_FLAGS} \
-		${MAKEFILE} ${MAKE_ARGS}
-
-do-build:
-	@(cd ${WRKSRC} && ${PORTMAKE} mkdir)
-	@(cd ${WRKSRC}/${VMBUILD} && ${PORTMAKE} interp)
 
 do-install:
-	@(cd ${WRKSRC}/${VMBUILD} && \
-	${INSTALL_PROGRAM} SqueakVM-2.4-${VMBUILD} ${PREFIX}/bin/SqueakVM)
+	@(cd ${WRKSRC}/freebsd && \
+	${INSTALL_PROGRAM} squeak ${PREFIX}/bin/squeak)
 	${MKDIR} ${PREFIX}/share/squeak
-.for f in Squeak2.4.changes Squeak2.4.image
-	(cd ${WRKSRC}/image && ${INSTALL_DATA} $f ${PREFIX}/share/squeak/$f)
+.for l in ${SQUEAK_LIB}
+	(cd ${WRKSRC}/freebsd && ${INSTALL_DATA} $l ${PREFIX}/lib/$l)
 .endfor
-	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${SQUEAK_SRC} \
-		${PREFIX}/share/squeak/${SQUEAK_SRC}
+.for f in ${SQUEAK_SRC}
+	(cd ${DISTDIR}/${DIST_SUBDIR} && ${INSTALL_DATA} $f ${PREFIX}/share/squeak/$f)
+	(cd ${PREFIX}/share/squeak && ${EXTRACT_CMD} -d $f)
+.endfor
+	(cd ${PREFIX}/share/squeak && ${CHMOD} 644 Squeak2.7.changes)
+
+post-install:
+	@${ECHO} "Make sure you have ${PREFIX}/bin in your PATH"
+	@${ECHO} "and ${PREFIX}/lib in your LD_LIBRARY_PATH."
+	@${ECHO} ""
+	@${ECHO} "In order to be able to make use of squeak you need"
+	@${ECHO} "to have an image and a changes file in your working"
+	@${ECHO} "directory as well as access to a source file."
+	@${ECHO} "Execute the following:"
+	@${ECHO} "cd <your_private_working_directory>"
+	@${ECHO} "cp ${PREFIX}/share/squeak/Squeak2.7.image ."
+	@${ECHO} "cp ${PREFIX}/share/squeak/Squeak2.7.changes ."
+	@${ECHO} "ln -s ${PREFIX}/share/squeak/SqueakV2.sources ."
+	@${ECHO} ""
+	@${ECHO} "To finally start up the system type:"
+	@${ECHO} "squeak Squeak2.7.image"
 
 .include <bsd.port.mk>
diff --git a/lang/squeak2/distinfo b/lang/squeak2/distinfo
index 4405a83b0cae..cd7667c1b984 100644
--- a/lang/squeak2/distinfo
+++ b/lang/squeak2/distinfo
@@ -1,2 +1,4 @@
-MD5 (squeak/2.4.tar.gz) = db8a90c127ba98496f159e9ea0e4320d
-MD5 (squeak/SqueakV2.sources) = af0663f5112faa78635462dbb6fd3367
+MD5 (squeak/Squeak2.7-src.tar.gz) = b52ff01a25eac4d5ec0088b432f2d8a1
+MD5 (squeak/SqueakV2.sources.gz) = 80487895bb1d1cbfddc8736273cccc92
+MD5 (squeak/Squeak2.7.image.gz) = c74bdb08de5e88eab5dd5e042dc0f98e
+MD5 (squeak/Squeak2.7.changes.gz) = 303220f35e986ea27003ddda2087c12a
diff --git a/lang/squeak2/files/patch-aa b/lang/squeak2/files/patch-aa
index a9cc01b0cf04..c4dba9fb21bd 100644
--- a/lang/squeak2/files/patch-aa
+++ b/lang/squeak2/files/patch-aa
@@ -1,90 +1,15 @@
---- src/GNUmakefile.conf.orig	Thu Apr 22 08:01:59 1999
-+++ src/GNUmakefile.conf	Thu Dec  9 13:27:03 1999
-@@ -93,13 +93,13 @@
- #			START OF CONFIGURATION SECTION			   #
- #									   #
- ifeq ($(SYSTEM),					linux)
--  CC=		gcc
-+  CC:=		gcc
-   CCFLAGS:=	-O2 -g $(PROFILE) # -fomit-frame-pointer
- ifeq ($(UTSMAC),i386)
-   CCFLAGS+=	-malign-functions=2 -malign-jumps=3 -malign-loops=2
- endif
-   LDO=		ld -r
--  LD=		gcc -rdynamic
-+  LD=		$(CC) -rdynamic
-   LDFLAGS:=	 $(PROFILE)
-   SHCFLAGS:=	-O2 -g -fPIC
-   SHLDFLAGS:=	-rdynamic -shared
-@@ -110,11 +110,11 @@
- endif
- 
- ifeq ($(SYSTEM),					freebsd)
--  CC=		gcc
-+  CC:=		gcc
-   CCFLAGS:=	-O3 -fexpensive-optimizations -fomit-frame-pointer $(PROFILE)
-   INCDIRS:=	-I/usr/X11R6/include
-   LDO=		ld -r
--  LD=		gcc
-+  LD=		$(CC)
-   LDFLAGS:=	$(PROFILE)
-   SHCFLAGS:=	-O2 -g -fPIC
-   SHLDFLAGS:=	-rdynamic -shared
-@@ -125,7 +125,7 @@
- endif
- 
- ifeq ($(MACHINE)-$(SYSTEM),				alpha-osf1)
--  CC=		$(UTIL)decgcc
-+  CC:=		$(UTIL)decgcc
-   CCFLAGS:=	-O2 -g $(PROFILE)
-   LDO=		ld -taso -r
-   LD=		cc
-@@ -138,11 +138,11 @@
- endif
- 
- ifeq ($(MACHINE)-$(SYSTEM),				sparc-solaris)
--  CC=		gcc
-+  CC:=		gcc
-   CCFLAGS:=	-O2 -g $(PROFILE)
-   INCDIRS=	-I/usr/openwin/include
-   LDO=		ld -r
--  LD=		gcc
-+  LD=		$(CC)
-   LDFLAGS:=	$(PROFILE)
-   SHCFLAGS:=	-O2 -g -fPIC
-   SHLDFLAGS:=	-G
-@@ -153,10 +153,10 @@
- endif
- 
- ifeq ($(MACHINE)-$(SYSTEM),				sparc-sunos)
--  CC=		gcc
-+  CC:=		gcc
-   CCFLAGS:=	-O2 -g $(PROFILE)
-   LDO=		ld -r
--  LD=		gcc
-+  LD=		$(CC)
-   LDFLAGS:=	$(PROFILE)
-   SHCFLAGS:=	-O2 -g -fPIC
-   SHLDFLAGS:=	-rdynamic -shared
-@@ -166,10 +166,10 @@
- endif
- 
- ifeq ($(MACHINE)-$(SYSTEM),				hppa-hpux)
--  CC=		gcc
-+  CC:=		gcc
-   CCFLAGS:=	-O6 -g $(PROFILE)
-   LDO=		ld -r
--  LD=		gcc
-+  LD=		$(CC)
-   LDFLAGS:=	$(PROFILE)
-   SHCFLAGS:=	-O2 -g -fPIC
-   SHLDFLAGS:=	-rdynamic -shared
-@@ -179,7 +179,7 @@
- endif
- 
- ifeq ($(SYSTEM),					irix) 
--  CC=		cc -32 -mips2
-+  CC:=		cc -32 -mips2
-   CCFLAGS:=	-O3 $(PROFILE) 
-   LDO=		ld -32 -mips2 -r
-   LD=		cc
+--- conf/config.guess.orig	Mon Mar  6 11:52:02 2000
++++ conf/config.guess	Mon Mar  6 11:52:24 2000
+@@ -477,11 +477,7 @@
+ 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+ 	exit 0 ;;
+     *:FreeBSD:*:*)
+-	if test -x /usr/bin/objformat -a "elf" = "`/usr/bin/objformat`"; then
+-		echo ${UNAME_MACHINE}-unknown-freebsdelf`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+-	else
+-		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+-	fi
++	echo freebsd
+ 	exit 0 ;;
+     *:NetBSD:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
diff --git a/lang/squeak2/pkg-comment b/lang/squeak2/pkg-comment
index 00168b23618f..573f72aeb787 100644
--- a/lang/squeak2/pkg-comment
+++ b/lang/squeak2/pkg-comment
@@ -1 +1 @@
-Full Smalltalk 80 with portability to UN*X, Mac, and Windows
+Full Smalltalk 80 with portability to UNIX, Mac, and Windows
diff --git a/lang/squeak2/pkg-descr b/lang/squeak2/pkg-descr
index d71ca892bec5..14b1b4cd7b93 100644
--- a/lang/squeak2/pkg-descr
+++ b/lang/squeak2/pkg-descr
@@ -17,6 +17,6 @@ features:
       applications!); and
     * Sophistication (full Smalltalk-80 language, libraries, and tools).
 
-WWW: http://squeak.cs.uiuc.edu/
+WWW: http://www.squeak.org/
 
 Roland Jesse <jesse@cs.uni-magdeburg.de>
diff --git a/lang/squeak2/pkg-plist b/lang/squeak2/pkg-plist
index 525d6b1e6f50..11dcc05f3b3b 100644
--- a/lang/squeak2/pkg-plist
+++ b/lang/squeak2/pkg-plist
@@ -1,5 +1,9 @@
-bin/SqueakVM
-share/squeak/Squeak2.4.changes
-share/squeak/Squeak2.4.image
+bin/squeak
+lib/Profiler.so
+lib/SoundCodecPrims.so
+lib/Squeak3D.so
+lib/System.so
+share/squeak/Squeak2.7.changes
+share/squeak/Squeak2.7.image
 share/squeak/SqueakV2.sources
 @dirrm share/squeak