Attachment #138740 for bug #184823

View | Details | Raw Unified | Return to bug 184823
Collapse All | Expand All





PORTNAME=	sidplay
PORTVERSION=	1.0.9
DISTVERSIONPREFIX=	base-
CATEGORIES=	audio emulators
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

PLIST_FILES=	bin/sid2wav bin/sidcon bin/sidplay
GNU_CONFIGURE=	yes
NO_STAGE=	yes

post-install:
	${STRIP_CMD} ${PREFIX}/bin/sidplay ${PREFIX}/bin/sid2wav \
		${PREFIX}/bin/sidcon

.include <bsd.port.mk>




--- 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




--- 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,




--- 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
 {

Lines 1-3 Link Here

(-)audio/sidplay/pkg-plist (-3 lines)
1	bin/sidplay
2	bin/sid2wav
3	bin/sidcon

Return to bug 184823

Lines 3-27 Link Here

(-)audio/sidplay/Makefile (-9 / +7 lines)
3		3
4	PORTNAME= sidplay	4	PORTNAME= sidplay
5	PORTVERSION= 1.0.9	5	PORTVERSION= 1.0.9
		6	DISTVERSIONPREFIX= base-
6	CATEGORIES= audio emulators	7	CATEGORIES= audio emulators
7	MASTER_SITES= http://bsd-geek.de/FreeBSD/distfiles/	8	MASTER_SITES= http://bsd-geek.de/FreeBSD/distfiles/ \
8	DISTNAME= ${PORTNAME}-base-${PORTVERSION}	9	http://www.sourcefiles.org/Multimedia/Module_Players/
9	EXTRACT_SUFX= .tgz	10	EXTRACT_SUFX= .tgz
10		11
11	MAINTAINER= ports@FreeBSD.org	12	MAINTAINER= ports@FreeBSD.org
12	COMMENT= Commodore SID-chip emulator that plays SID music files	13	COMMENT= Commodore SID-chip emulator that plays SID music files
13		14
		15	LICENSE= GPLv2 # (or later)
		16
14	LIB_DEPENDS= libsidplay.so:${PORTSDIR}/audio/libsidplay	17	LIB_DEPENDS= libsidplay.so:${PORTSDIR}/audio/libsidplay
15		18
		19	GNU_CONFIGURE= yes
16	CONFIGURE_ARGS= --with-sidplay-includes=${LOCALBASE}/include \	20	CONFIGURE_ARGS= --with-sidplay-includes=${LOCALBASE}/include \
17	--with-sidplay-library=${LOCALBASE}/lib	21	--with-sidplay-library=${LOCALBASE}/lib
18		22
19	WRKSRC= ${WRKDIR}/${PORTNAME}-base-${PORTVERSION}	23	PLIST_FILES= bin/sid2wav bin/sidcon bin/sidplay
20	GNU_CONFIGURE= yes
21	NO_STAGE= yes
22
23	post-install:
24	${STRIP_CMD} ${PREFIX}/bin/sidplay ${PREFIX}/bin/sid2wav \
25	${PREFIX}/bin/sidcon
26		24
27	.include <bsd.port.mk>	25	.include <bsd.port.mk>

Line 0 Link Here

(-)audio/sidplay/files/patch-sid2wav.cpp (+32 lines)
	1	--- sid2wav.cpp.orig
	2	+++ sid2wav.cpp
	3	@@ -18,9 +18,9 @@
	4	// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
	5	//
	6
	7	-#include <iostream.h>
	8	-#include <iomanip.h>
	9	-#include <fstream.h>
	10	+#include <iostream>
	11	+#include <iomanip>
	12	+#include <fstream>
	13	#include <string.h>
	14
	15	#include <stdlib.h>
	16	@@ -39,6 +39,16 @@
	17	#include <sidplay/fformat.h>
	18	#include <sidplay/myendian.h>
	19
	20	+using std::cerr;
	21	+using std::cout;
	22	+using std::endl;
	23	+using std::dec;
	24	+using std::flush;
	25	+using std::hex;
	26	+using std::ios;
	27	+using std::setfill;
	28	+using std::setw;
	29	+
	30	const char s2w_version[] = "1.8";
	31
	32	struct wav_hdr // little endian

Line 0 Link Here

(-)audio/sidplay/files/patch-sidcon.cpp (+23 lines)
	1	--- sidcon.cpp.orig
	2	+++ sidcon.cpp
	3	@@ -25,12 +25,18 @@
	4	#include <stdio.h>
	5	#include <stdlib.h>
	6	#include <string.h>
	7	-#include <iostream.h>
	8	-#include <iomanip.h>
	9	+#include <iostream>
	10	+#include <iomanip>
	11
	12	#include <sidplay/sidtune.h>
	13	#include <sidplay/fformat.h>
	14
	15	+using std::cerr;
	16	+using std::cin;
	17	+using std::cout;
	18	+using std::endl;
	19	+using std::flush;
	20	+
	21	static bool toPSID = true,
	22	toSIDPLAY = false,
	23	checkOnly = false,

Line 0 Link Here

(-)audio/sidplay/files/patch-sidplay.cpp (+28 lines)
	1	--- sidplay.cpp.orig
	2	+++ sidplay.cpp
	3	@@ -18,8 +18,8 @@
	4	//
	5
	6	#include <ctype.h>
	7	-#include <iomanip.h>
	8	-#include <fstream.h>
	9	+#include <iomanip>
	10	+#include <iostream>
	11	#include <signal.h>
	12	#include <stdlib.h>
	13	#include <string.h>
	14	@@ -41,6 +41,14 @@
	15	#define DISALLOW_STEREO_SOUND
	16	#endif
	17
	18	+using std::cerr;
	19	+using std::cout;
	20	+using std::dec;
	21	+using std::endl;
	22	+using std::hex;
	23	+using std::setfill;
	24	+using std::setw;
	25	+
	26	// Error and status message numbers.
	27	enum
	28	{