- Allow build with non-base gcc [1]

- Respect CFLAGS/CXXFLAGS
- Bump PORTREVISION since port was building with -g previously

PR:		155662
Submitted by:	Jason E. Hale <bsdkaffee@gmail.com> (maintainer)
		[1] avg@

5 files changed, 49 insertions, 3 deletions

diff --git a/audio/libofa/Makefile b/audio/libofa/Makefile
index f0f9a9bbe171..43462f4dc6c1 100644
--- a/audio/libofa/Makefile
+++ b/audio/libofa/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libofa
 PORTVERSION=	0.9.3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	audio
 MASTER_SITES=	GOOGLE_CODE
 
@@ -23,8 +23,7 @@ USE_DOS2UNIX=	yes
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnomehack pkgconfig
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
 MAKE_JOBS_SAFE=	yes
 USE_LDCONFIG=	yes
 
diff --git a/audio/libofa/files/patch-configure b/audio/libofa/files/patch-configure
new file mode 100644
index 000000000000..7f59fd800ddf
--- /dev/null
+++ b/audio/libofa/files/patch-configure
@@ -0,0 +1,16 @@
+--- ./configure.orig	2011-03-18 11:01:22.000000000 -0400
++++ ./configure	2011-03-18 11:01:22.000000000 -0400
+@@ -20315,13 +20315,6 @@
+ 
+ 
+ 
+-if test "$GCC" = yes; then
+-  dnlCFLAGS="$CFLAGS -Wall -O2"
+-  CFLAGS="$CFLAGS -Wall -g"
+-fi
+-if test "$GXX" = yes; then
+-  CXXFLAGS="$CXXFLAGS -Wall -g"
+-fi
+ 
+ 
+ echo "$as_me:$LINENO: checking for XML_ExpatVersion in -lexpat" >&5
diff --git a/audio/libofa/files/patch-examples__example.cpp b/audio/libofa/files/patch-examples__example.cpp
new file mode 100644
index 000000000000..4a0eb68b177c
--- /dev/null
+++ b/audio/libofa/files/patch-examples__example.cpp
@@ -0,0 +1,11 @@
+--- ./examples/example.cpp.orig	2011-03-18 11:01:22.000000000 -0400
++++ ./examples/example.cpp	2011-03-18 11:01:22.000000000 -0400
+@@ -7,6 +7,8 @@
+ 
+ -------------------------------------------------------------------*/
+ 
++#include <stdio.h>
++#include <string.h>
+ #include "protocol.h"
+ 
+ AudioData* loadWaveFile(char *file);
diff --git a/audio/libofa/files/patch-examples__protocol.cpp b/audio/libofa/files/patch-examples__protocol.cpp
new file mode 100644
index 000000000000..cf239a1e164d
--- /dev/null
+++ b/audio/libofa/files/patch-examples__protocol.cpp
@@ -0,0 +1,10 @@
+--- ./examples/protocol.cpp.orig	2011-03-18 11:01:22.000000000 -0400
++++ ./examples/protocol.cpp	2011-03-18 11:01:22.000000000 -0400
+@@ -8,6 +8,7 @@
+ -------------------------------------------------------------------*/
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include <string>
+ #include <map>
+ #include <expat.h>
diff --git a/audio/libofa/files/patch-lib__signal_op.cpp b/audio/libofa/files/patch-lib__signal_op.cpp
new file mode 100644
index 000000000000..54690666c4e6
--- /dev/null
+++ b/audio/libofa/files/patch-lib__signal_op.cpp
@@ -0,0 +1,10 @@
+--- ./lib/signal_op.cpp.orig	2011-03-18 11:01:22.000000000 -0400
++++ ./lib/signal_op.cpp	2011-03-18 11:01:39.000000000 -0400
+@@ -13,6 +13,7 @@
+ 
+ 
+ #include <math.h>
++#include <stdlib.h>
+ #include "signal_op.h"
+ #include "AFLIB/aflibConverter.h"
+ #include "error_op.h"