ports/53474: Fix sound support for squeak3, and some modified.

[NINOMIYA Hideyuki]

>Number:         53474
>Category:       ports
>Synopsis:       <synopsis of the problem (one line)>
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jun 18 18:00:23 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     NINOMIYA Hideyuki
>Release:        FreeBSD 5.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD WhiteBase.private 5.0-CURRENT FreeBSD 5.0-CURRENT #0: Tue Mar 11 11:15:28 JST 2003 nin at WhiteBase.private:/ext/obj/ext/current/src/sys/WhiteBase i386

>Description:
Sound support comes to do squeak3(squeak-3.5) porting, but does not
become effective because, actually, it cannot detect the library which
I am going to utilize with stage of configure.

>How-To-Repeat:
cd /usr/ports/lang/squeak3
make configure

But !, the next message is out, "audio support disabled".

Of course a sound does not sound even if I start squeak which built it
after having started nasd.

>Fix:

* fix for sound support.
* WITHOUT_AUDIO make option added.
* WITH_MMX make option added (effect is unconfirmed).
* inisqueak smoothly run patch added.

--- squeak3.diff begins here ---
diff -urN squeak3.orig/Makefile squeak3/Makefile
--- squeak3.orig/Makefile	Thu Jun 12 11:13:22 2003
+++ squeak3/Makefile	Mon Jun 16 22:07:38 2003
@@ -21,7 +21,6 @@
 
 # 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.4-1
 SQUEAK_IMAGE_VERSION=	3.5
@@ -42,12 +41,23 @@
 CONFIGURE_WRKSRC=	${WRKSRC}/build
 INSTALL_WRKSRC=	${CONFIGURE_WRKSRC}
 CONFIGURE_SCRIPT=	../platforms/unix/config/configure
-CONFIGURE_ARGS+=	--libdir=${PREFIX}/share --with-audio
+CONFIGURE_ARGS+=	--libdir=${PREFIX}/share --with-audio=nas
 # 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
 DIST_SUBDIR=	squeak
 
+.ifdef (WITHOUT_AUDIO)
+CONFIGURE_ARGS+=	--without-audio
+.else
+LIB_DEPENDS+=	audio.2:${PORTSDIR}/audio/nas
+CONFIGURE_ARGS+=	--with-audio=nas
+.endif
+
+.ifdef (WITH_MMX)
+CONFIGURE_ARGS+=	--enable-mpg-mmx
+.endif
+
 MAKEFILE=	Makefile
 .ifdef (CC)
 MAKE_ARGS+=	CC=${CC}
@@ -75,7 +85,7 @@
 	(cd ${PREFIX}/share/squeak && ${GZIP_CMD} ${file})
 .endfor
 # install inisqueak and change the build in version number on the fly
-	${SED} -e 's|VERSION=3.4-5170|VERSION=3.5-5180|' ${WRKSRC}/build/inisqueak > ${PREFIX}/bin/inisqueak
+	${SED} -e 's|3.4-5170|3.5-5180|' ${WRKSRC}/build/inisqueak > ${PREFIX}/bin/inisqueak
 	${CHMOD} 755 ${PREFIX}/bin/inisqueak
 	${STRIP_CMD} ${PREFIX}/share/squeak/${SQUEAK_VERSION}/squeak
 	${CAT} ${PKGMESSAGE}
diff -urN squeak3.orig/files/patch-platform-unix-config-inisqueak.in squeak3/files/patch-platform-unix-config-inisqueak.in
--- squeak3.orig/files/patch-platform-unix-config-inisqueak.in	Thu Jan  1 09:00:00 1970
+++ squeak3/files/patch-platform-unix-config-inisqueak.in	Mon Jun 16 22:07:38 2003
@@ -0,0 +1,13 @@
+--- platforms/unix/config/inisqueak.in.orig	Mon Jun 16 11:14:41 2003
++++ platforms/unix/config/inisqueak.in	Mon Jun 16 11:19:18 2003
+@@ -83,8 +83,8 @@
+ 
+ SQUEAK=${bindir}/squeak
+ SOURCES=SqueakV${MAJOR}.sources
+-IMAGE=squeak.image.gz
+-CHANGES=squeak.changes.gz
++IMAGE=Squeak${VERSION}.image.gz
++CHANGES=Squeak${VERSION}.changes.gz
+ 
+ # local install function
+ 
--- squeak3.diff ends here ---



>Release-Note:
>Audit-Trail:
>Unformatted: