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

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

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

 Author: miwi
 Date: Sat Jan 25 10:41:57 2014
 New Revision: 341006
 URL: http://svnweb.freebsd.org/changeset/ports/341006
 QAT: https://qat.redports.org/buildarchive/r341006/
 
 Log:
   MFH: r340234
   
   - Fix build with clang
   
   PR:		185340
   Submitted by:	ports fury
 
 Modified:
   branches/2014Q1/audio/xmms-wma/Makefile
 Directory Properties:
   branches/2014Q1/   (props changed)
 
 Modified: branches/2014Q1/audio/xmms-wma/Makefile
 ==============================================================================
 --- branches/2014Q1/audio/xmms-wma/Makefile	Sat Jan 25 10:39:36 2014	(r341005)
 +++ branches/2014Q1/audio/xmms-wma/Makefile	Sat Jan 25 10:41:57 2014	(r341006)
 @@ -3,7 +3,7 @@
  
  PORTNAME=	xmms-wma
  PORTVERSION=	1.0.5
 -PORTREVISION=	2
 +PORTREVISION=	3
  CATEGORIES=	audio
  MASTER_SITES=	http://mcmcc.bat.ru/xmms-wma/
  
 @@ -12,38 +12,54 @@ COMMENT=	WMA plugin for xmms
  
  LIB_DEPENDS=	libxmms.so:${PORTSDIR}/multimedia/xmms
  
 -USES=		gmake
 -NO_STAGE=	yes
 -USE_BZIP2=	yes
 -CFLAGS+=	-fPIC -DPIC
 +OPTIONS_DEFINE=	ICONV
 +OPTIONS_DEFAULT=ICONV
 +
  ONLY_FOR_ARCHS=	i386 amd64 sparc64
 +
 +USE_BZIP2=	yes
 +USES=		compiler gmake
  USE_XORG=	xi xext x11
 +USE_CSTD=	gnu89
 +USE_LDCONFIG=	yes
 +
 +CFLAGS+=	-fPIC -DPIC
  
  PLIST_FILES=	lib/xmms/Input/libwma.so
 -USE_LDCONFIG=	yes
  
 -.if defined(WITH_ICONV)
 +.include <bsd.port.options.mk>
 +
 +.if ${PORT_OPTIONS:MICONV}
 +USES+=		iconv
  CFLAGS+=	-DUSE_ICONV
 -USES=		iconv
  .endif
  
  .include <bsd.port.pre.mk>
  
 -pre-everything::
 -.if !defined(WITH_ICONV)
 -	@${ECHO_MSG} "You may specify the following on the command line:"
 -	@${ECHO_MSG} " "
 -	@${ECHO_MSG} "WITH_ICONV=yes	Enable tag recoding support using iconv"
 -	@${ECHO_MSG} " "
 +.if ${CHOSEN_COMPILER_TYPE} == "clang"
 +CFLAGS+=	-D__inline__=
  .endif
  
  post-extract:
 -	@${REINPLACE_CMD} -e 's|gcc|${CC}|g' ${WRKSRC}/Makefile.inc
 -	@${REINPLACE_CMD} -e 's|gcc|${CC}|g' ${WRKSRC}/ffmpeg-strip-wma/config.mak
 -	@${REINPLACE_CMD} -e 's|CFLAGS :=|CFLAGS := ${CFLAGS}|g' ${WRKSRC}/Makefile.inc
 -.if ${ARCH}=="sparc64"
 -	@${REINPLACE_CMD} -e 's|X86|SPARC64|' ${WRKSRC}/ffmpeg-strip-wma/config.mak
 -	@${REINPLACE_CMD} -e 's|#define ARCH_X86 1|#define ARCH_SPARC64 1|' ${WRKSRC}/ffmpeg-strip-wma/config.h
 +	@${REINPLACE_CMD} -e \
 +		's|^CC :=|CC ?=| ; \
 +		 s|^CFLAGS :=|CFLAGS += | ; \
 +		 s|-O[0-9]||' ${WRKSRC}/Makefile.inc
 +	@${REINPLACE_CMD} -e \
 +		's|^MAKE=|MAKE?=| ; \
 +		 s|^CC=|CC?=| ; \
 +		 s|-O[0-9]||' ${WRKSRC}/ffmpeg-strip-wma/config.mak
 +.if ${ARCH} == "sparc64"
 +	@${REINPLACE_CMD} -e \
 +		 s|X86|SPARC64|' ${WRKSRC}/ffmpeg-strip-wma/config.mak
 +	@${REINPLACE_CMD} -e \
 +		's|#define ARCH_X86 1|#define ARCH_SPARC64 1|' \
 +		${WRKSRC}/ffmpeg-strip-wma/config.h
  .endif
  
 +do-install:
 +	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/xmms/Input
 +	(cd ${WRKSRC} && ${INSTALL_LIB} libwma.so \
 +		${STAGEDIR}${PREFIX}/lib/xmms/Input)
 +
  .include <bsd.port.post.mk>
 _______________________________________________
 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?201401251050.s0PAo1Lb080729>