>Number:         13775
>Category:       pkg
>Synopsis:       update for lang/squeak to 3.0 final (update#3552)
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Thu Aug 23 12:32:00 PDT 2001
>Closed-Date:
>Last-Modified:
>Originator:     Greg A. Woods
>Release:        2001/08/20
>Organization:
Planix, Inc.; Toronto, Ontario; Canada
>Environment:

>Description:

	squid-3.0 final is available, as is update#3552

	this patch also fixes several problems with the installation
	procedure and the `inisqueak' script

>How-To-Repeat:

>Fix:

	apply the following patch to lang/squeak

Index: Makefile
===================================================================
RCS file: /cvs/master/m-NetBSD/main/pkgsrc/lang/squeak/Makefile,v
retrieving revision 1.15
diff -c -r1.15 Makefile
*** Makefile	11 Jun 2001 06:34:40 -0000	1.15
--- Makefile	23 Aug 2001 19:05:55 -0000
***************
*** 1,13 ****
  # $NetBSD: Makefile,v 1.15 2001/06/11 06:34:40 jlam Exp $
  #
  
! DISTNAME=	Squeak-3.0pre2
! PKGNAME=	squeak-3.0pre2
  CATEGORIES=	lang
  MASTER_SITES=	ftp://st.cs.uiuc.edu/Smalltalk/Squeak/3.0/platform-independent/
  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}
  
  MAINTAINER=	fredb@netbsd.org
  HOMEPAGE=	http://www.squeak.org/
--- 1,14 ----
  # $NetBSD: Makefile,v 1.15 2001/06/11 06:34:40 jlam Exp $
  #
  
! 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-3552.zip SqueakV3.sources.gz
! DISTFILES+=	${DISTNAME}-src${EXTRACT_SUFX}
  
  MAINTAINER=	fredb@netbsd.org
  HOMEPAGE=	http://www.squeak.org/
***************
*** 23,29 ****
  
  CPPFLAGS+=	-DNETBSD_OSS_HACK
  DIST_SUBDIR=	squeak
! EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
  WRKSRC=		${WRKDIR}/Squeak-3.0/build
  
  CONFIGURE_SCRIPT= ${WRKSRC}/../src/unix/configure
--- 24,30 ----
  
  CPPFLAGS+=	-DNETBSD_OSS_HACK
  DIST_SUBDIR=	squeak
! EXTRACT_ONLY=	${DISTNAME}-src${EXTRACT_SUFX}
  WRKSRC=		${WRKDIR}/Squeak-3.0/build
  
  CONFIGURE_SCRIPT= ${WRKSRC}/../src/unix/configure
***************
*** 34,40 ****
  	${GZCAT} ${DISTDIR}/${DIST_SUBDIR}/${f} > ${WRKDIR}/${f:C/.gz//}
  .endfor
  	cd ${WRKDIR} && \
! 	    ${LOCALBASE}/bin/unzip ${DISTDIR}/${DIST_SUBDIR}/Squeak3.0-3545.zip
  	${MKDIR} ${WRKSRC}
  
  pre-configure:
--- 35,41 ----
  	${GZCAT} ${DISTDIR}/${DIST_SUBDIR}/${f} > ${WRKDIR}/${f:C/.gz//}
  .endfor
  	cd ${WRKDIR} && \
! 	    ${LOCALBASE}/bin/unzip ${DISTDIR}/${DIST_SUBDIR}/Squeak3.0-3552.zip
  	${MKDIR} ${WRKSRC}
  
  pre-configure:
***************
*** 46,52 ****
  .for f in ReadMe.txt SqueakV3.sources
  	${INSTALL_DATA} ${WRKDIR}/${f} ${PREFIX}/share/squeak/
  .endfor
! .for f in Squeak3.0final.changes Squeak3.0final.image
  	${INSTALL_DATA} ${WRKDIR}/${f} \
  		${PREFIX}/share/squeak/3.0/${f:C/final//}
  .endfor
--- 47,53 ----
  .for f in ReadMe.txt SqueakV3.sources
  	${INSTALL_DATA} ${WRKDIR}/${f} ${PREFIX}/share/squeak/
  .endfor
! .for f in Squeak3.0.changes Squeak3.0.image
  	${INSTALL_DATA} ${WRKDIR}/${f} \
  		${PREFIX}/share/squeak/3.0/${f:C/final//}
  .endfor
Index: distinfo
===================================================================
RCS file: /cvs/master/m-NetBSD/main/pkgsrc/lang/squeak/distinfo,v
retrieving revision 1.4
diff -c -r1.4 distinfo
*** distinfo	16 May 2001 02:27:52 -0000	1.4
--- distinfo	23 Aug 2001 19:34:24 -0000
***************
*** 2,14 ****
  
  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/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 (patch-aa) = 5b88ea010030c20a8712e1cc71e12adc1ae267c0
  SHA1 (patch-ab) = c58b921df217fca2221893a6b017cbc7aba28bbe
  SHA1 (patch-ac) = 035cb8f3d00619de7b2c638168834ac6da2aaad8
  SHA1 (patch-ad) = b9b9b99da74429a4a42e7ff5ecc632c0dfe61648
--- 2,16 ----
  
  SHA1 (squeak/ReadMe.txt.gz) = e632f908e576d8ccbf8386a1b94689e261a2aec7
  Size (squeak/ReadMe.txt.gz) = 6513 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.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
Index: patches/patch-ae
===================================================================
RCS file: patches/patch-ae
diff -N patches/patch-ae
*** /dev/null	1 Jan 1970 00:00:00 -0000
--- patches/patch-ae	23 Aug 2001 18:37:14 -0000
***************
*** 0 ****
--- 1,21 ----
+ $NetBSD$
+ 
+ *** ../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
Index: patches/patch-af
===================================================================
RCS file: patches/patch-af
diff -N patches/patch-af
*** /dev/null	1 Jan 1970 00:00:00 -0000
--- patches/patch-af	23 Aug 2001 19:33:47 -0000
***************
*** 0 ****
--- 1,60 ----
+ $NetBSD$
+ 
+ *** ../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'!"
>Release-Note:
>Audit-Trail:
>Unformatted: