o Update to 3.5

o Add PKGMESSAGE with post installation notes
o Add sound support due to user requests

PR:		53144
Submitted by:	maintainer

5 files changed, 55 insertions, 37 deletions

diff --git a/lang/squeak3/Makefile b/lang/squeak3/Makefile
index ad44ad3a7136..ac371f22750b 100644
--- a/lang/squeak3/Makefile
+++ b/lang/squeak3/Makefile
@@ -6,11 +6,12 @@
 #
 
 PORTNAME=	squeak
-PORTVERSION=	3.2
+PORTVERSION=	3.5
 CATEGORIES=	lang
-MASTER_SITES=	ftp://ftp.cs.uni-magdeburg.de/pub/Smalltalk/Smalltalk/Squeak/3.2/unix-linux/ \
-		ftp://ftp.cs.uni-magdeburg.de/pub/Smalltalk/Smalltalk/Squeak/3.2/ \
-		ftp://st.cs.uiuc.edu/Smalltalk/Squeak/3.2/unix-linux/
+MASTER_SITES=	ftp://st.cs.uiuc.edu/Smalltalk/Squeak/3.5/ \
+		http://www-sor.inria.fr/~piumarta/squeak/unix/release/ \
+		ftp://ftp.cs.uni-magdeburg.de/pub/Smalltalk/Smalltalk/Squeak/3.4/unix-linux/ \
+		ftp://st.cs.uiuc.edu/Smalltalk/Squeak/3.4/unix-linux/
 DISTNAME=	Squeak-${SQUEAK_VERSION}.src
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${SQUEAK_SRC} ${SQUEAK_IMAGE_SRC}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
@@ -20,13 +21,15 @@ COMMENT=	Full Smalltalk 80 with portability to UNIX, Mac, and Windows
 
 # Don't set USE_ZIP as this breaks EXTRACT_CMD, EXTRACT_SUFX, and what not.
 BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
+LIB_DEPENDS+=	audio.2:${PORTSDIR}/audio/nas
 
-SQUEAK_VERSION=	3.2-5
-SQUEAK_PATCHNR=	4956
+SQUEAK_VERSION=	3.4-1
+SQUEAK_IMAGE_VERSION=	3.5
+SQUEAK_PATCHNR=	5180
 SQUEAK_SRC=	SqueakV3.sources.gz
-SQUEAK_IMAGE_SRC=	Squeak3.2-4956.zip
-SQUEAK_IMAGE=	Squeak3.2-${SQUEAK_PATCHNR}.image \
-		Squeak3.2-${SQUEAK_PATCHNR}.changes
+SQUEAK_IMAGE_SRC=	Squeak${SQUEAK_IMAGE_VERSION}-${SQUEAK_PATCHNR}.zip
+SQUEAK_IMAGE=	Squeak${SQUEAK_IMAGE_VERSION}-${SQUEAK_PATCHNR}.image \
+		Squeak${SQUEAK_IMAGE_VERSION}-${SQUEAK_PATCHNR}.changes
 
 WRKSRC=		${WRKDIR}/Squeak-${SQUEAK_VERSION}
 MAN1=		inisqueak.1 squeak.1
@@ -39,7 +42,7 @@ LDCONFIG_DIRS=	${PREFIX}/share/squeak/${SQUEAK_VERSION}
 CONFIGURE_WRKSRC=	${WRKSRC}/build
 INSTALL_WRKSRC=	${CONFIGURE_WRKSRC}
 CONFIGURE_SCRIPT=	../platforms/unix/config/configure
-CONFIGURE_ARGS+=	--libdir=${PREFIX}/share
+CONFIGURE_ARGS+=	--libdir=${PREFIX}/share --with-audio
 # don't pass "-s" to install to avoid trying to strip a shell script
 CONFIGURE_ENV=	INSTALL_PROGRAM="${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE}"
 BUILD_WRKSRC=	${WRKSRC}/build
@@ -57,6 +60,13 @@ pre-configure:
 	@${MKDIR} ${BUILD_WRKSRC}
 	@cd ${WRKSRC}/platforms/unix/npsqueak && ${REINPLACE_CMD} -e 's|include|include -I${X11BASE}/include|g' Makefile
 
+post-configure:
+# PREFIX safeness
+	@${REINPLACE_CMD} -E \
+		-e s'|^(prefix).*$$|\1=${PREFIX}|' \
+		-e s'|^(docdir).*$$|\1=${DOCSDIR}|' \
+		${CONFIGURE_WRKSRC}/${MAKEFILE}
+
 post-install:
 	(cd ${DISTDIR}/${DIST_SUBDIR} && ${INSTALL_DATA} ${SQUEAK_SRC} ${PREFIX}/share/squeak/)
 	(cd ${PREFIX}/share/squeak && ${EXTRACT_CMD} -d ${SQUEAK_SRC})
@@ -64,18 +74,10 @@ post-install:
 .for file in ${SQUEAK_IMAGE}
 	(cd ${PREFIX}/share/squeak && ${GZIP_CMD} ${file})
 .endfor
-	strip ${PREFIX}/share/squeak/${SQUEAK_VERSION}/squeak
 # install inisqueak and change the build in version number on the fly
-	${SED} -e 's|VERSION=3.2gamma-4881|VERSION=3.2-4956|' ${WRKSRC}/build/inisqueak > ${PREFIX}/bin/inisqueak
-	(cd ${PREFIX}/bin && ${CHMOD} 755 inisqueak)
-	@${ECHO} "--------------- Please note: ---------------"
-	@${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} "Please see the inisqueak(1) manpage for details."
-	@${ECHO} "--------------- Thanks for listening. ---------------"
+	${SED} -e 's|VERSION=3.4-5170|VERSION=3.5-5180|' ${WRKSRC}/build/inisqueak > ${PREFIX}/bin/inisqueak
+	${CHMOD} 755 ${PREFIX}/bin/inisqueak
+	${STRIP_CMD} ${PREFIX}/share/squeak/${SQUEAK_VERSION}/squeak
+	${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/lang/squeak3/distinfo b/lang/squeak3/distinfo
index 70c03abdba2a..a7d878321a4d 100644
--- a/lang/squeak3/distinfo
+++ b/lang/squeak3/distinfo
@@ -1,3 +1,3 @@
-MD5 (squeak/Squeak-3.2-5.src.tar.gz) = 4fb17638e6e674a538f1404c8e60abff
+MD5 (squeak/Squeak-3.4-1.src.tar.gz) = 780af1cf1cdc8d44c1ce30a527bdd508
 MD5 (squeak/SqueakV3.sources.gz) = 7dc6b3840e6bc1e5f81e3717fb46d2c3
-MD5 (squeak/Squeak3.2-4956.zip) = bb87597c508b92aab832bd067c49e9c6
+MD5 (squeak/Squeak3.5-5180.zip) = d9ca0657278fe5d5dba18aa799b0db30
diff --git a/lang/squeak3/pkg-descr b/lang/squeak3/pkg-descr
index 4334f49f56f2..3cbd7d51ec71 100644
--- a/lang/squeak3/pkg-descr
+++ b/lang/squeak3/pkg-descr
@@ -17,4 +17,5 @@ features:
       applications!); and
     * Sophistication (full Smalltalk-80 language, libraries, and tools).
 
-WWW: http://www.squeak.org/
+WWW: http://www.squeak.org/ (Squeak project)
+     http://www-sor.inria.fr/~piumarta/squeak/ (Unix Squeak)
diff --git a/lang/squeak3/pkg-message b/lang/squeak3/pkg-message
new file mode 100644
index 000000000000..3a4835522211
--- /dev/null
+++ b/lang/squeak3/pkg-message
@@ -0,0 +1,10 @@
+--------------- Please note: ---------------
+Make sure you have ${PREFIX}/bin in your PATH and
+${PREFIX}/lib as well as ${PREFIX}/share/squeak/3.4-1
+in your LD_LIBRARY_PATH.
+
+In order to be able to make use of squeak you need
+to have an image and a changes file in your working
+directory as well as access to a source file.
+Please see the inisqueak(1) manpage for details.
+--------------- Thanks for listening. ---------------
diff --git a/lang/squeak3/pkg-plist b/lang/squeak3/pkg-plist
index 0c33977a04cc..23faa23b7496 100644
--- a/lang/squeak3/pkg-plist
+++ b/lang/squeak3/pkg-plist
@@ -1,18 +1,23 @@
 bin/inisqueak
 bin/squeak
-share/squeak/3.2-5/B3DAcceleratorPlugin.la
-share/squeak/3.2-5/B3DAcceleratorPlugin.so
-share/squeak/3.2-5/PseudoTTYPlugin.la
-share/squeak/3.2-5/PseudoTTYPlugin.so
-share/squeak/3.2-5/UnixOSProcessPlugin.la
-share/squeak/3.2-5/UnixOSProcessPlugin.so
-share/squeak/3.2-5/npsqueak.so
-share/squeak/3.2-5/npsqueakrun
-share/squeak/3.2-5/squeak
+share/doc/squeak/COPYING
+share/doc/squeak/COPYRIGHT
+share/doc/squeak/LICENSE
+share/doc/squeak/README.Contributing
+share/doc/squeak/README.Keyboard
+share/doc/squeak/README.Sound
+share/squeak/3.4-1/B3DAcceleratorPlugin.la
+share/squeak/3.4-1/B3DAcceleratorPlugin.so
+share/squeak/3.4-1/PseudoTTYPlugin.la
+share/squeak/3.4-1/PseudoTTYPlugin.so
+share/squeak/3.4-1/npsqueak.so
+share/squeak/3.4-1/npsqueakrun
+share/squeak/3.4-1/squeak
 share/squeak/ReadMe.txt
-share/squeak/Squeak3.2-4956.changes.gz
-share/squeak/Squeak3.2-4956.image.gz
+share/squeak/Squeak3.5-5180.changes.gz
+share/squeak/Squeak3.5-5180.image.gz
 share/squeak/SqueakV3.sources
 share/squeak/npsqueakregister
-@dirrm share/squeak/3.2-5
+@dirrm share/squeak/3.4-1
 @dirrm share/squeak
+@dirrm share/doc/squeak