Date: Tue, 17 Dec 2013 02:46:30 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/184823: audio/sidplay: Fix build with clang Message-ID: <20131217024630.14c9609dd1d449201af06674@yahoo.com> Resent-Message-ID: <201312161810.rBGIA55O015914@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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 <bsd.port.mk> 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 <iostream.h> +-#include <iomanip.h> +-#include <fstream.h> ++#include <iostream> ++#include <iomanip> ++#include <fstream> + #include <string.h> + + #include <stdlib.h> +@@ -39,6 +39,16 @@ + #include <sidplay/fformat.h> + #include <sidplay/myendian.h> + ++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 <stdio.h> + #include <stdlib.h> + #include <string.h> +-#include <iostream.h> +-#include <iomanip.h> ++#include <iostream> ++#include <iomanip> + + #include <sidplay/sidtune.h> + #include <sidplay/fformat.h> + ++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 <ctype.h> +-#include <iomanip.h> +-#include <fstream.h> ++#include <iomanip> ++#include <iostream> + #include <signal.h> + #include <stdlib.h> + #include <string.h> +@@ -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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20131217024630.14c9609dd1d449201af06674>