- Fix build with clang

PR:		185512
Submitted by:	ports fury

1 files changed, 19 insertions, 13 deletions

diff --git a/audio/bmp-flac/Makefile b/audio/bmp-flac/Makefile
index bfedc2248740..ed7351be87f1 100644
--- a/audio/bmp-flac/Makefile
+++ b/audio/bmp-flac/Makefile
@@ -12,22 +12,33 @@ DISTNAME=	${PORTNAME}-CVS-${PORTVERSION}-with-bmp-plugin
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	FLAC input plugin for beep-media-player
 
-LIB_DEPENDS=	libbeep.so:${PORTSDIR}/multimedia/beep-media-player \
-		libFLAC.so:${PORTSDIR}/audio/flac
+LICENSE=	GPLv2
 
-PLIST_FILES=	lib/bmp/Input/libbmp-flac.so
+LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac \
+		libbeep.so:${PORTSDIR}/multimedia/beep-media-player
 
-USES=		iconv pkgconfig
 USE_BZIP2=	yes
+USES=		iconv pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	${ICONV_CONFIGURE_ARG} \
 		--with-ogg="${LOCALBASE}" \
 		--with-xmms-prefix="${LOCALBASE}"
-
 MAKEFILE=	${FILESDIR}/Makefile
 
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+
+PLIST_FILES=	lib/bmp/Input/libbmp-flac.so
+
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == "sparc64"
+BROKEN=		Does not compile with GCC 4.2
+.endif
+
 post-patch:
-	@${REINPLACE_CMD} -e 's|echo aout|echo elf|' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e \
+		'/xtra_stdcpp/s|-lstdc++||' ${WRKSRC}/configure
 
 # "obj" is magic to our make(1)
 # make sure we get the new includes from ${LOCALBASE}/include/FLAC
@@ -38,12 +49,7 @@ post-configure:
 # This is to avoid libtool running ldconfig -m ${LOCALBASE}/lib/bmp/Input
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/bmp/Input
-	${INSTALL_LIB} ${WRKSRC}/src/plugin_bmp/.libs/libbmp-flac.so ${STAGEDIR}${PREFIX}/lib/bmp/Input
-
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "sparc64"
-BROKEN=		Does not compile with GCC 4.2
-.endif
+	(cd ${WRKSRC}/src/plugin_bmp/.libs && ${INSTALL_LIB} libbmp-flac.so \
+		${STAGEDIR}${PREFIX}/lib/bmp/Input)
 
 .include <bsd.port.post.mk>