From owner-svn-ports-branches@FreeBSD.ORG Sat Jan 25 13:07:32 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 1174B60A; Sat, 25 Jan 2014 13:07:32 +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 E61801FEF; Sat, 25 Jan 2014 13:07:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0PD7Qjd011045; Sat, 25 Jan 2014 13:07:31 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0PD7QPN011043; Sat, 25 Jan 2014 13:07:26 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201401251307.s0PD7QPN011043@svn.freebsd.org> From: Martin Wilke Date: Sat, 25 Jan 2014 13:07:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r341027 - in branches/2014Q1/audio/bmp-mac: . files 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:07:32 -0000 Author: miwi Date: Sat Jan 25 13:07:26 2014 New Revision: 341027 URL: http://svnweb.freebsd.org/changeset/ports/341027 QAT: https://qat.redports.org/buildarchive/r341027/ Log: MFH: r340293 - Fix build with clang PR: 185515 Submitted by: ports fury Modified: branches/2014Q1/audio/bmp-mac/Makefile (contents, props changed) branches/2014Q1/audio/bmp-mac/files/patch-configure.in (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/audio/bmp-mac/Makefile ============================================================================== --- branches/2014Q1/audio/bmp-mac/Makefile Sat Jan 25 13:06:05 2014 (r341026) +++ branches/2014Q1/audio/bmp-mac/Makefile Sat Jan 25 13:07:26 2014 (r341027) @@ -12,23 +12,27 @@ DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${ MAINTAINER= ports@FreeBSD.org COMMENT= Monkey's Audio Codec non-win32 port -LIB_DEPENDS= libbeep.so:${PORTSDIR}/multimedia/beep-media-player \ - libmac.so:${PORTSDIR}/audio/mac +LIB_DEPENDS= libmac.so:${PORTSDIR}/audio/mac \ + libbeep.so:${PORTSDIR}/multimedia/beep-media-player USES= gmake pkgconfig -GNU_CONFIGURE= yes -USE_AUTOTOOLS= autoconf libtool -CPPFLAGS+= "-I${LOCALBASE}/include" -PLUGDIR= lib/bmp/Input -PLUGFILE= lib${PKGNAMEPREFIX}${PORTNAME}.so -PLIST_FILES= ${PLUGDIR}/${PLUGFILE} +USE_AUTOTOOLS= libtoolize aclocal automake autoconf +LIBTOOLIZE_ARGS=--force --copy +AUTOMAKE_ARGS= --add-missing --copy + +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib + +PLIST_FILES= lib/bmp/Input/libbmp-mac.so post-patch: - @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \ - 's|-D.*_DISABLE_DEPRECATED||g' + @${REINPLACE_CMD} -e \ + 's|-D.*_DISABLE_DEPRECATED|| ; \ + s|@BMP_LIBS@|@GTK_LIBS@|' ${WRKSRC}/src/Makefile.am do-install: - @${MKDIR} ${STAGEDIR}${PREFIX}/${PLUGDIR} - ${INSTALL_LIB} ${WRKSRC}/src/.libs/${PLUGFILE} ${STAGEDIR}${PREFIX}/${PLUGDIR}/ + @${MKDIR} ${STAGEDIR}${PREFIX}/lib/bmp/Input + (cd ${WRKSRC}/src/.libs && ${INSTALL_LIB} libbmp-mac.so \ + ${STAGEDIR}${PREFIX}/lib/bmp/Input) .include Modified: branches/2014Q1/audio/bmp-mac/files/patch-configure.in ============================================================================== --- branches/2014Q1/audio/bmp-mac/files/patch-configure.in Sat Jan 25 13:06:05 2014 (r341026) +++ branches/2014Q1/audio/bmp-mac/files/patch-configure.in Sat Jan 25 13:07:26 2014 (r341027) @@ -1,11 +1,14 @@ --- configure.in.orig Tue Jan 17 23:49:11 2006 +++ configure.in Tue Jan 17 23:49:55 2006 -@@ -62,7 +62,7 @@ +@@ -62,9 +62,9 @@ AC_CHECK_LIB(mac, DecompressFile, []) -#MAC_LIBS="-lmac" -+MAC_LIBS="-lmac -lpthread" ++MAC_LIBS="-lmac -pthread" #MAC_INCLUDES="-I/usr/include/mac" - MAC_CXXFLAGS="-s -O3 -Wall -pedantic -DBUILD_CROSS_PLATFORM" +-MAC_CXXFLAGS="-s -O3 -Wall -pedantic -DBUILD_CROSS_PLATFORM" ++MAC_CXXFLAGS="-DBUILD_CROSS_PLATFORM" + AC_SUBST(MAC_LIBS) + AC_SUBST(MAC_CXXFLAGS)