Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 25 Jan 2014 13:10:05 GMT
From:      dfilter@FreeBSD.ORG (dfilter service)
To:        freebsd-ports-bugs@FreeBSD.org
Subject:   Re: ports/185515: commit references a PR
Message-ID:  <201401251310.s0PDA5cj014442@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/185515; it has been noted by GNATS.

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/185515: commit references a PR
Date: Sat, 25 Jan 2014 13:07:39 +0000 (UTC)

 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 <bsd.port.mk>
 
 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)
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401251310.s0PDA5cj014442>