[kde-freebsd] [PATCH] audio/arts: Add more OPTIONS and proper CONFIGURE_ARGS for existing OPTIONS

[Naram Qashat]

>Submitter-Id:	current-users
>Originator:	Naram Qashat
>Organization:	
>Confidential:	no 
>Synopsis:	[PATCH] audio/arts: Add more OPTIONS and proper CONFIGURE_ARGS for existing OPTIONS
>Severity:	non-critical
>Priority:	low
>Category:	ports 
>Class:		change-request
>Release:	FreeBSD 7.2-STABLE i386
>Environment:
System: FreeBSD kirby.cyberbotx.com 7.2-STABLE FreeBSD 7.2-STABLE #0: Wed Jun  3 04:24:13 EDT
>Description:
This adds OPTIONS for audiofile, libmad, and jack. This also updates the checks
for jack, esd, and nas to use configure arguments to enable or disable them,
removing the need for the REINPLACE_CMDs within pre-configure.

Port maintainer (kde at FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- arts-1.5.10_2,1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/audio/arts/Makefile /kirby/shared/ports/audio/arts/Makefile
--- /usr/ports/audio/arts/Makefile	2009-08-03 12:23:47.000000000 -0400
+++ /kirby/shared/ports/audio/arts/Makefile	2009-08-08 21:43:04.000000000 -0400
@@ -18,9 +18,7 @@
 MAINTAINER=	kde at FreeBSD.org
 COMMENT=	Audio system for the KDE integrated X11 desktop
 
-LIB_DEPENDS+=	audiofile:${PORTSDIR}/audio/libaudiofile \
-		mad:${PORTSDIR}/audio/libmad \
-		ogg:${PORTSDIR}/audio/libogg \
+LIB_DEPENDS+=	ogg:${PORTSDIR}/audio/libogg \
 		glib-2.0:${PORTSDIR}/devel/glib20 \
 		vorbis:${PORTSDIR}/audio/libvorbis
 
@@ -37,42 +35,56 @@
 
 CFLAGS+=	-DHAVE_VASPRINTF
 CONFIGURE_ENV+=	DO_NOT_COMPILE="${DO_NOT_COMPILE}"
+CONFIGURE_ARGS+=	--without-libaudioio --without-sgilibaudio \
+			--without-mas --without-alsa
 
-OPTIONS=	ESD "Enable esound support" off \
+OPTIONS=	AUDIOFILE "Enable audiofile support" on \
+		MAD "Enable MAD mp3 decoder support" on \
+		JACK "Enable Jack support" on \
+		ESD "Enable esound support" off \
 		NAS "Enable NAS support" off
 
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "i386" || ${ARCH} == "amd64"
+.if !defined(WITHOUT_AUDIOFILE)
+LIB_DEPENDS+=	audiofile:${PORTSDIR}/audio/libaudiofile
+CONFIGURE_ARGS+=	--with-audiofile
+.else
+CONFIGURE_ARGS+=	--without-audiofile
+.endif
+
+.if !defined(WITHOUT_MAD)
+LIB_DEPENDS+=	mad:${PORTSDIR}/audio/libmad
+CONFIGURE_ARGS+=	--enable-libmad
+.else
+CONFIGURE_ARGS+=	--disable-libmad
+.endif
+
+.if (${ARCH} == "i386" || ${ARCH} == "amd64") && !defined(WITHOUT_JACK)
 LIB_DEPENDS+=	jack:${PORTSDIR}/audio/jack
+CONFIGURE_ARGS+=	--with-jack
+.else
+CONFIGURE_ARGS+=	--without-jack
 .endif
 
 .if defined(WITH_ESD)
 USE_GNOME+=	esound
+CONFIGURE_ARGS+=	--with-esd
+.else
+CONFIGURE_ARGS+=	--without-esd
 .endif
 
 .if defined(WITH_NAS)
 LIB_DEPENDS+=	audio:${PORTSDIR}/audio/nas
+CONFIGURE_ARGS+=	--with-nas
+.else
+CONFIGURE_ARGS+=	--without-nas
 .endif
 
 pre-configure:
 	@${REINPLACE_CMD} -e 's|-O2||g' -e 's|-lpthread|${PTHREAD_LIBS}|g' \
 		${WRKSRC}/${CONFIGURE_SCRIPT}
-.if defined(WITHOUT_ESD)
-	${REINPLACE_CMD} -e 's|arts_libesd_include=yes|arts_libesd_include=no|g' \
-		${WRKSRC}/configure
-.endif
-
-.if defined(WITH_NAS)
-	${REINPLACE_CMD} \
-		-e 's|LIBS="-laudio  $$LIBS"|LIBS="-laudio -lm -lXt -lXau $$LIBS"|g' \
-			${WRKSRC}/configure
-.elif defined(WITHOUT_NAS)
-	${REINPLACE_CMD} \
-		-e 's|ac_cv_lib_audio_AuOpenServer=yes|ac_cv_lib_audio_AuOpenServer=no|g' \
-			${WRKSRC}/configure
-.endif
 
 post-configure:
 	${TOUCH} ${WRKSRC}/mcop/arts_export.h.in
--- arts-1.5.10_2,1.patch ends here ---