From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Dec 16 18:10:05 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.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 B0E46694 for ; Mon, 16 Dec 2013 18:10:05 +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 9000B191B for ; Mon, 16 Dec 2013 18:10:05 +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 rBGIA5rU015915 for ; Mon, 16 Dec 2013 18:10:05 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id rBGIA55O015914; Mon, 16 Dec 2013 18:10:05 GMT (envelope-from gnats) Resent-Date: Mon, 16 Dec 2013 18:10:05 GMT Resent-Message-Id: <201312161810.rBGIA55O015914@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 8819D27E for ; Mon, 16 Dec 2013 18:00:49 +0000 (UTC) Received: from omta01.auone-net.jp (mail-or0-f67.auone-net.jp [106.187.230.67]) by mx1.freebsd.org (Postfix) with ESMTP id 2EBEE17E7 for ; Mon, 16 Dec 2013 18:00:49 +0000 (UTC) Received: from coppermine.my.domain (ZT030106.ppp.dion.ne.jp [59.128.30.106]) by omta01.auone-net.jp (au one net mail) with ESMTP id A891998006D for ; Tue, 17 Dec 2013 03:00:46 +0900 (JST) Message-Id: <20131217024630.14c9609dd1d449201af06674@yahoo.com> Date: Tue, 17 Dec 2013 02:46:30 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/184823: audio/sidplay: 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, 16 Dec 2013 18:10:05 -0000 >Number: 184823 >Category: ports >Synopsis: audio/sidplay: 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 16 18:10:05 UTC 2013 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 8.4-RELEASE-p4 i386 >Organization: >Environment: >Description: - Fix build with clang - Update MASTER_SITES - Add LICENSE - Support PLIST_FILES New file: files/patch-sid2wav.cpp files/patch-sidcon.cpp files/patch-sidplay.cpp Remove file: pkg-plist >How-To-Repeat: >Fix: diff -urN /usr/ports/audio/sidplay/Makefile audio/sidplay/Makefile --- /usr/ports/audio/sidplay/Makefile 2013-12-12 02:42:01.000000000 +0900 +++ audio/sidplay/Makefile 2013-12-17 00:00:00.000000000 +0900 @@ -3,25 +3,23 @@ PORTNAME= sidplay PORTVERSION= 1.0.9 +DISTVERSIONPREFIX= base- CATEGORIES= audio emulators -MASTER_SITES= http://bsd-geek.de/FreeBSD/distfiles/ -DISTNAME= ${PORTNAME}-base-${PORTVERSION} +MASTER_SITES= http://bsd-geek.de/FreeBSD/distfiles/ \ + http://www.sourcefiles.org/Multimedia/Module_Players/ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= Commodore SID-chip emulator that plays SID music files +LICENSE= GPLv2 # (or later) + LIB_DEPENDS= libsidplay.so:${PORTSDIR}/audio/libsidplay +GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-sidplay-includes=${LOCALBASE}/include \ --with-sidplay-library=${LOCALBASE}/lib -WRKSRC= ${WRKDIR}/${PORTNAME}-base-${PORTVERSION} -GNU_CONFIGURE= yes -NO_STAGE= yes - -post-install: - ${STRIP_CMD} ${PREFIX}/bin/sidplay ${PREFIX}/bin/sid2wav \ - ${PREFIX}/bin/sidcon +PLIST_FILES= bin/sid2wav bin/sidcon bin/sidplay .include diff -urN /usr/ports/audio/sidplay/files/patch-sid2wav.cpp audio/sidplay/files/patch-sid2wav.cpp --- /usr/ports/audio/sidplay/files/patch-sid2wav.cpp 1970-01-01 09:00:00.000000000 +0900 +++ audio/sidplay/files/patch-sid2wav.cpp 2013-12-17 00:00:00.000000000 +0900 @@ -0,0 +1,32 @@ +--- sid2wav.cpp.orig ++++ sid2wav.cpp +@@ -18,9 +18,9 @@ + // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + // + +-#include +-#include +-#include ++#include ++#include ++#include + #include + + #include +@@ -39,6 +39,16 @@ + #include + #include + ++using std::cerr; ++using std::cout; ++using std::endl; ++using std::dec; ++using std::flush; ++using std::hex; ++using std::ios; ++using std::setfill; ++using std::setw; ++ + const char s2w_version[] = "1.8"; + + struct wav_hdr // little endian diff -urN /usr/ports/audio/sidplay/files/patch-sidcon.cpp audio/sidplay/files/patch-sidcon.cpp --- /usr/ports/audio/sidplay/files/patch-sidcon.cpp 1970-01-01 09:00:00.000000000 +0900 +++ audio/sidplay/files/patch-sidcon.cpp 2013-12-17 00:00:00.000000000 +0900 @@ -0,0 +1,23 @@ +--- sidcon.cpp.orig ++++ sidcon.cpp +@@ -25,12 +25,18 @@ + #include + #include + #include +-#include +-#include ++#include ++#include + + #include + #include + ++using std::cerr; ++using std::cin; ++using std::cout; ++using std::endl; ++using std::flush; ++ + static bool toPSID = true, + toSIDPLAY = false, + checkOnly = false, diff -urN /usr/ports/audio/sidplay/files/patch-sidplay.cpp audio/sidplay/files/patch-sidplay.cpp --- /usr/ports/audio/sidplay/files/patch-sidplay.cpp 1970-01-01 09:00:00.000000000 +0900 +++ audio/sidplay/files/patch-sidplay.cpp 2013-12-17 00:00:00.000000000 +0900 @@ -0,0 +1,28 @@ +--- sidplay.cpp.orig ++++ sidplay.cpp +@@ -18,8 +18,8 @@ + // + + #include +-#include +-#include ++#include ++#include + #include + #include + #include +@@ -41,6 +41,14 @@ + #define DISALLOW_STEREO_SOUND + #endif + ++using std::cerr; ++using std::cout; ++using std::dec; ++using std::endl; ++using std::hex; ++using std::setfill; ++using std::setw; ++ + // Error and status message numbers. + enum + { diff -urN /usr/ports/audio/sidplay/pkg-plist audio/sidplay/pkg-plist --- /usr/ports/audio/sidplay/pkg-plist 2013-11-06 21:51:59.000000000 +0900 +++ audio/sidplay/pkg-plist 1970-01-01 09:00:00.000000000 +0900 @@ -1,3 +0,0 @@ -bin/sidplay -bin/sid2wav -bin/sidcon >Release-Note: >Audit-Trail: >Unformatted: