ports/148802: [PATCH] audio/audacity-devel: Fix build error and other cleanups

[Greg Larkin]

>Number:         148802
>Category:       ports
>Synopsis:       [PATCH] audio/audacity-devel: Fix build error and other cleanups
>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:   Tue Jul 20 20:40:04 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Greg Larkin
>Release:        FreeBSD 7.0-RELEASE i386
>Organization:
The FreeBSD Project
>Environment:
System: FreeBSD fbsd70.entropy.prv 7.0-RELEASE FreeBSD 7.0-RELEASE #0: Sun Feb 24 19:59:52 UTC 2008
>Description:
rnejdl at ringofsaturn.com reported in PR ports/145221 that audacity fails to
compile. This problem was caused by a conflict with the installed version
of devel/allegro.

audio/audacity-devel/Makefile has been updated to locate allegro.h within
its bundled portsmf directory, instead of searching the system include files
first. devel/allegro's allegro.h include file is very different than the one
provided by portsmf.

I also fixed various portlint warnings and errors related to GNU autotools.

Port maintainer (xxjack12xx at gmail.com) is cc'd.

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

--- audacity-devel-1.3.12_3.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/audio/audacity-devel/Makefile,v
retrieving revision 1.46
diff -u -u -r1.46 Makefile
--- Makefile	6 Jun 2010 20:43:30 -0000	1.46
+++ Makefile	20 Jul 2010 20:33:54 -0000
@@ -6,7 +6,7 @@
 
 PORTNAME=	audacity
 PORTVERSION=	1.3.12
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE} \
 		SF/${PORTNAME}/${PORTNAME}-unstable/${PORTVERSION}
@@ -16,14 +16,13 @@
 MAINTAINER=	xxjack12xx at gmail.com
 COMMENT=	Audacity is a GUI editor for digital audio waveforms
 
-BUILD_DEPENDS+=	automake-1.10:${PORTSDIR}/devel/automake110
-BUILD_DEPENDS+=	autoconf-2.62:${PORTSDIR}/devel/autoconf262
 LIB_DEPENDS=	sndfile.1:${PORTSDIR}/audio/libsndfile
 
 CONFLICTS=	audacity-[0-9]*
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-src-${PORTVERSION}-beta
 
+USE_AUTOTOOLS=	aclocal:110 autoconf:262
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GCC=	4.2+
@@ -60,11 +59,18 @@
 SSE_CFLAGS=	-mno-sse -mno-sse2
 .endif
 
-CONFIGURE_ARG+=	--destdir=/
-CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
-		CPPFLAGS="${CPPFLAGS} -I${WRKSRC}/lib-src/portaudio-v19/include -I${LOCALBASE}/include ${SSE_CFLAGS} ${PTHREAD_CFLAGS}" \
-		CFLAGS="${CFLAGS} -I${WRKSRC}/lib-src/portaudio-v19/include -I${LOCALBASE}/include ${SSE_CFLAGS} ${PTHREAD_CFLAGS}" \
-		WX_CONFIG=${WX_CONFIG}
+ACLOCAL_ARGS+=	-I ${WRKSRC}/m4
+AUTOCONF_ARGS+=	-I ${WRKSRC}/m4
+
+CONFIGURE_ARG+	=--destdir=/
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${WRKSRC}/lib-src/portsmf -I${WRKSRC}/lib-src/portaudio-v19/include -I${LOCALBASE}/include ${SSE_CFLAGS} ${PTHREAD_CFLAGS}
+CXXFLAGS+=	-I${WRKSRC}/lib-src/portsmf -I${WRKSRC}/lib-src/portaudio-v19/include -I${LOCALBASE}/include ${SSE_CFLAGS} ${PTHREAD_CFLAGS}
+CFLAGS+=	-I${WRKSRC}/lib-src/portsmf -I${WRKSRC}/lib-src/portaudio-v19/include -I${LOCALBASE}/include ${SSE_CFLAGS} ${PTHREAD_CFLAGS}
+
+CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}" \
+		CPPFLAGS="${CPPFLAGS}" \
+		WX_CONFIG="${WX_CONFIG}"
 
 .if !defined(NOPORTDOCS)
 MAKE_ENV=	DOC=yes
--- audacity-devel-1.3.12_3.patch ends here ---

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