From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Dec 30 21:10:10 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.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 2375EF7C for ; Mon, 30 Dec 2013 21:10:10 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (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 01FFF1060 for ; Mon, 30 Dec 2013 21:10:10 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id rBULA9lG098875 for ; Mon, 30 Dec 2013 21:10:09 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id rBULA9Ow098874; Mon, 30 Dec 2013 21:10:09 GMT (envelope-from gnats) Resent-Date: Mon, 30 Dec 2013 21:10:09 GMT Resent-Message-Id: <201312302110.rBULA9Ow098874@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, KATO Tsuguru 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 8AAD0A2D for ; Mon, 30 Dec 2013 21:01:06 +0000 (UTC) Received: from omta03.auone-net.jp (mail-or1-f17.auone-net.jp [106.187.231.17]) by mx1.freebsd.org (Postfix) with ESMTP id 5BBA41F22 for ; Mon, 30 Dec 2013 21:01:06 +0000 (UTC) Received: from coppermine.my.domain (ZT028061.ppp.dion.ne.jp [59.128.28.61]) by omta03.auone-net.jp (au one net mail) with ESMTP id 4BCB01880011 for ; Tue, 31 Dec 2013 06:01:04 +0900 (JST) Message-Id: <20131231054644.b409f578a8464e317c3fe95c@yahoo.com> Date: Tue, 31 Dec 2013 05:46:44 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/185340: audio/xmms-wma: Fix build with clang X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Dec 2013 21:10:10 -0000 >Number: 185340 >Category: ports >Synopsis: audio/xmms-wma: Fix build with clang >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Dec 30 21:10:09 UTC 2013 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 8.4-RELEASE-p4 i386 >Organization: >Environment: >Description: - Fix build with clang >How-To-Repeat: >Fix: diff -urN /usr/ports/audio/xmms-wma/Makefile audio/xmms-wma/Makefile --- /usr/ports/audio/xmms-wma/Makefile 2013-12-12 02:42:17.000000000 +0900 +++ audio/xmms-wma/Makefile 2013-12-31 00:00:00.000000000 +0900 @@ -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 @@ 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 + +.if ${PORT_OPTIONS:MICONV} +USES+= iconv CFLAGS+= -DUSE_ICONV -USES= iconv .endif .include -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 >Release-Note: >Audit-Trail: >Unformatted: