ports/81212: Maintainer update: additional sound drivers for audio/boodler

[Dan Pelleg]

>Number:         81212
>Category:       ports
>Synopsis:       Maintainer update: additional sound drivers for audio/boodler
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed May 18 18:30:02 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Dan Pelleg
>Release:        FreeBSD 5.4-STABLE i386
>Organization:
>Environment:

	
>Description:

ESD and file sound driver support, in addition to the (original, now default)
OSS. Catch contributed by Sergey Zaharchenko.
Build is controlled by the DRIVER variable, which is also appended to the
package name.

>How-To-Repeat:
	
>Fix:

	


diff -ruN boodler-1.5.3_1/Makefile boodler-1.5.3_2/Makefile
--- boodler-1.5.3_1/Makefile	Sun May 15 22:20:20 2005
+++ boodler-1.5.3_2/Makefile	Sun May 15 22:39:26 2005
@@ -7,7 +7,7 @@
 
 PORTNAME=	boodler
 PORTVERSION=	1.5.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://www.eblong.com/zarf/boodler/ \
 		http://s89813419.onlinehome.us/
@@ -21,19 +21,40 @@
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 USE_PYTHON=	yes
-DRIVER=		oss
+DRIVER?=	oss
 WRKSRC=		${WRKDIR}/${PORTNAME}
 BHOME=		${PREFIX}/share/boodler
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS=	%%PREFIX%%/share/boodler/boodle
 
-.if defined(DRIVER_FILE)
-DRIVER=		FILE
+pre-everything::
+	@${ECHO} ""
+	@${ECHO} "The following build options are available for Boodler:"
+	@${ECHO} ""
+	@${ECHO} "      DRIVER=OSS	Configure to use /dev/dsp."
+	@${ECHO} "      DRIVER=ESD	Configure to use EsounD."
+	@${ECHO} "      DRIVER=FILE	Configure to write raw PCM data to a file."
+	@${ECHO} ""
+	@${ECHO} "Boodler can only be configured to use one of these"
+	@${ECHO} "interfaces. The default is to use OSS."
+	@${ECHO} ""
+
+.if ${DRIVER:L} == "oss"
+# Probably nothing here...
+.endif
+
+.if ${DRIVER:L} == "esd"
+LIB_DEPENDS=esd.2:${PORTSDIR}/audio/esound
+PKGNAMESUFFIX=-esd
+.endif
+
+.if ${DRIVER:L} == "file"
+PKGNAMESUFFIX=-file
 .endif
 
 .include <bsd.port.pre.mk>
 
-.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "ia64"
+.if ${ARCH} == "amd64" || ${ARCH} == "ia64"
 PIC=	--PIC
 .endif
 
@@ -42,7 +63,7 @@
 	@${RMDIR} ${WRKDIR}/boodler-snd/string
 
 do-build:
-	(cd ${WRKSRC} && ${PYTHON_CMD} configure.py --driver ${DRIVER} ${PIC} && make)
+	(cd ${WRKSRC} && ${PYTHON_CMD} configure.py --driver ${DRIVER:L} ${PIC} --include ${PREFIX}/include --lib ${PREFIX}/lib && make)
 	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}/effects ${WRKSRC}/boodle/
 
 do-install:
>Release-Note:
>Audit-Trail:
>Unformatted: