4 files changed, 98 insertions, 14 deletions
diff --git a/lang/squeak/Makefile b/lang/squeak/Makefile
index b8315b6e005..0d00ebf4577 100644
--- a/lang/squeak/Makefile
+++ b/lang/squeak/Makefile
@@ -1,13 +1,14 @@
-# $NetBSD: Makefile,v 1.15 2001/06/11 06:34:40 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2001/08/23 21:18:30 fredb Exp $
 #
 
-DISTNAME=	Squeak-3.0pre2
-PKGNAME=	squeak-3.0pre2
+DISTNAME=	Squeak-3.0
+PKGNAME=	squeak-3.0
 CATEGORIES=	lang
 MASTER_SITES=	ftp://st.cs.uiuc.edu/Smalltalk/Squeak/3.0/platform-independent/
+MASTER_SITES+=	ftp://st.cs.uiuc.edu/Smalltalk/Squeak/3.0/unix-linux/src/
 MASTER_SITES+=	ftp://ftp.inria.fr/INRIA/Projects/SOR/users/piumarta/squeak/
-DISTFILES=	ReadMe.txt.gz Squeak3.0-3545.zip SqueakV3.sources.gz
-DISTFILES+=	${DISTNAME}${EXTRACT_SUFX}
+DISTFILES=	ReadMe.txt.gz Squeak3.0-3552.zip SqueakV3.sources.gz
+DISTFILES+=	${DISTNAME}-src${EXTRACT_SUFX}
 
 MAINTAINER=	fredb@netbsd.org
 HOMEPAGE=	http://www.squeak.org/
@@ -23,7 +24,7 @@ USE_X11=	yes
 
 CPPFLAGS+=	-DNETBSD_OSS_HACK
 DIST_SUBDIR=	squeak
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+EXTRACT_ONLY=	${DISTNAME}-src${EXTRACT_SUFX}
 WRKSRC=		${WRKDIR}/Squeak-3.0/build
 
 CONFIGURE_SCRIPT= ${WRKSRC}/../src/unix/configure
@@ -34,7 +35,7 @@ post-extract:
 	${GZCAT} ${DISTDIR}/${DIST_SUBDIR}/${f} > ${WRKDIR}/${f:C/.gz//}
 .endfor
 	cd ${WRKDIR} && \
-	    ${LOCALBASE}/bin/unzip ${DISTDIR}/${DIST_SUBDIR}/Squeak3.0-3545.zip
+	    ${LOCALBASE}/bin/unzip ${DISTDIR}/${DIST_SUBDIR}/Squeak3.0-3552.zip
 	${MKDIR} ${WRKSRC}
 
 pre-configure:
@@ -46,9 +47,9 @@ post-install:
 .for f in ReadMe.txt SqueakV3.sources
 	${INSTALL_DATA} ${WRKDIR}/${f} ${PREFIX}/share/squeak/
 .endfor
-.for f in Squeak3.0final.changes Squeak3.0final.image
+.for f in Squeak3.0.changes Squeak3.0.image
 	${INSTALL_DATA} ${WRKDIR}/${f} \
-		${PREFIX}/share/squeak/3.0/${f:C/final//}
+		${PREFIX}/share/squeak/3.0/${f}
 .endfor
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/squeak/distinfo b/lang/squeak/distinfo
index d767ae4988f..18ef2bde854 100644
--- a/lang/squeak/distinfo
+++ b/lang/squeak/distinfo
@@ -1,14 +1,16 @@
-$NetBSD: distinfo,v 1.4 2001/05/16 02:27:52 fredb Exp $
+$NetBSD: distinfo,v 1.5 2001/08/23 21:18:30 fredb Exp $
 
 SHA1 (squeak/ReadMe.txt.gz) = e632f908e576d8ccbf8386a1b94689e261a2aec7
 Size (squeak/ReadMe.txt.gz) = 6513 bytes
-SHA1 (squeak/Squeak3.0-3545.zip) = 1cff9279be038078aebaf52ae2c81157fe893980
-Size (squeak/Squeak3.0-3545.zip) = 4780566 bytes
+SHA1 (squeak/Squeak3.0-3552.zip) = ffa356344ef7a9b14de4b4e449a4e8d97b04580d
+Size (squeak/Squeak3.0-3552.zip) = 4868994 bytes
 SHA1 (squeak/SqueakV3.sources.gz) = 7e992d801856ef57565fca34f8af324495dcd871
 Size (squeak/SqueakV3.sources.gz) = 3476504 bytes
-SHA1 (squeak/Squeak-3.0pre2.tar.gz) = b18686de1b642f77368ca5b7346f807c7e372fdc
-Size (squeak/Squeak-3.0pre2.tar.gz) = 724829 bytes
+SHA1 (squeak/Squeak-3.0-src.tar.gz) = 231cc39c8dceafea270da1652ced83ec769a0bb5
+Size (squeak/Squeak-3.0-src.tar.gz) = 745258 bytes
 SHA1 (patch-aa) = 5b88ea010030c20a8712e1cc71e12adc1ae267c0
 SHA1 (patch-ab) = c58b921df217fca2221893a6b017cbc7aba28bbe
 SHA1 (patch-ac) = 035cb8f3d00619de7b2c638168834ac6da2aaad8
 SHA1 (patch-ad) = b9b9b99da74429a4a42e7ff5ecc632c0dfe61648
+SHA1 (patch-ae) = c1714d9dbeeb7a86cfda350c567d29431616e281
+SHA1 (patch-af) = 8fc7494c1182ff9a55ae26aaa389e94e52c9f6c7
diff --git a/lang/squeak/patches/patch-ae b/lang/squeak/patches/patch-ae
new file mode 100644
index 00000000000..23c36dacc07
--- /dev/null
+++ b/lang/squeak/patches/patch-ae
@@ -0,0 +1,21 @@
+$NetBSD: patch-ae,v 1.1 2001/08/23 21:18:31 fredb Exp $
+
+*** ../src/unix/util/relpath	21 May 2001 03:43:46 -0000	1.1.1.1
+--- ../src/unix/util/relpath	21 May 2001 03:45:25 -0000
+***************
+*** 44,50 ****
+  path=$2
+  
+  for dir in `echo $cwd | tr '/' ' '`; do
+!   if expr match $path "/$dir" >/dev/null; then
+      path=`echo $path | sed "s,^/$dir,,"`
+      cwd=`echo $cwd | sed "s,^/$dir,,"`
+    fi
+--- 44,50 ----
+  path=$2
+  
+  for dir in `echo $cwd | tr '/' ' '`; do
+!   if expr X$path : X"/$dir" >/dev/null; then
+      path=`echo $path | sed "s,^/$dir,,"`
+      cwd=`echo $cwd | sed "s,^/$dir,,"`
+    fi
diff --git a/lang/squeak/patches/patch-af b/lang/squeak/patches/patch-af
new file mode 100644
index 00000000000..3dec2edd7c9
--- /dev/null
+++ b/lang/squeak/patches/patch-af
@@ -0,0 +1,60 @@
+$NetBSD: patch-af,v 1.1 2001/08/23 21:18:31 fredb Exp $
+
+*** ../src/unix/inisqueak.in	21 May 2001 03:43:46 -0000	1.1.1.1
+--- ../src/unix/inisqueak.in	21 May 2001 04:05:03 -0000
+***************
+*** 56,64 ****
+  CHANGES=Squeak${VERSION}.changes
+  SOURCES=SqueakV${MAJOR}.sources
+  
+- # Sun's /bin/sh does not understand "test -e", but [/usr]/bin/test does
+- test="`which test`"
+- 
+  startup="yes"
+  
+  if test ! -w .; then
+--- 56,61 ----
+***************
+*** 81,90 ****
+  {
+    file="${1}"
+    dir="${2}"
+!   if ${test} ! -e ${1}; then
+!     if ${test} -e ${2}/${1}; then
+        echo "+ ${3} ${2}/${1} ."
+                ${3} ${2}/${1} .
+      else
+        missing "${2}/${1}"
+      fi
+--- 78,89 ----
+  {
+    file="${1}"
+    dir="${2}"
+!   if test ! -f ${1} ; then
+!     if test -f ${2}/${1} ; then
+        echo "+ ${3} ${2}/${1} ."
+                ${3} ${2}/${1} .
++       echo "+ chmod u+w ${1}"
++               chmod u+w ${1}
+      else
+        missing "${2}/${1}"
+      fi
+***************
+*** 95,103 ****
+  }
+  
+  install "${SOURCES}" "${SQDATADIR}"  "ln -s"
+! install "${IMAGE}"   "${VSQDATADIR}" "cp -p"
+! install "${CHANGES}" "${VSQDATADIR}" "cp -p"
+! 
+! echo "Running ${SQUEAK}"
+  
+! exec ${SQUEAK}
+--- 94,100 ----
+  }
+  
+  install "${SOURCES}" "${SQDATADIR}"  "ln -s"
+! install "${IMAGE}"   "${VSQDATADIR}" "cp"
+! install "${CHANGES}" "${VSQDATADIR}" "cp"
+  
+! echo "Done.  Now start 'squeak'!"