From owner-svn-ports-all@FreeBSD.ORG  Sat Jan 25 10:41:58 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 61A02501;
 Sat, 25 Jan 2014 10:41:58 +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 34145158B;
 Sat, 25 Jan 2014 10:41:58 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0PAfwfh053851;
 Sat, 25 Jan 2014 10:41:58 GMT (envelope-from miwi@svn.freebsd.org)
Received: (from miwi@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0PAfw2J053850;
 Sat, 25 Jan 2014 10:41:58 GMT (envelope-from miwi@svn.freebsd.org)
Message-Id: <201401251041.s0PAfw2J053850@svn.freebsd.org>
From: Martin Wilke <miwi@FreeBSD.org>
Date: Sat, 25 Jan 2014 10:41:58 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-branches@freebsd.org
Subject: svn commit: r341006 - branches/2014Q1/audio/xmms-wma
X-SVN-Group: ports-branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 25 Jan 2014 10:41:58 -0000

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>