From owner-svn-ports-branches@FreeBSD.ORG Sat Jan 25 13:08:42 2014 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E7F166E8; Sat, 25 Jan 2014 13:08:42 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BA6B21FF6; Sat, 25 Jan 2014 13:08:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0PD8gsU011331; Sat, 25 Jan 2014 13:08:42 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0PD8gsc011330; Sat, 25 Jan 2014 13:08:42 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201401251308.s0PD8gsc011330@svn.freebsd.org> From: Martin Wilke Date: Sat, 25 Jan 2014 13:08:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r341028 - branches/2014Q1/audio/bmp-flac X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Jan 2014 13:08:43 -0000 Author: miwi Date: Sat Jan 25 13:08:42 2014 New Revision: 341028 URL: http://svnweb.freebsd.org/changeset/ports/341028 QAT: https://qat.redports.org/buildarchive/r341028/ Log: MFH: r340295 - Fix build with clang PR: 185512 Submitted by: ports fury Modified: branches/2014Q1/audio/bmp-flac/Makefile Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/audio/bmp-flac/Makefile ============================================================================== --- branches/2014Q1/audio/bmp-flac/Makefile Sat Jan 25 13:07:26 2014 (r341027) +++ branches/2014Q1/audio/bmp-flac/Makefile Sat Jan 25 13:08:42 2014 (r341028) @@ -12,22 +12,33 @@ DISTNAME= ${PORTNAME}-CVS-${PORTVERSION} 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 + +.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 - -.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