- 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
Responsible Changed From-To: freebsd-ports-bugs->pawel I'll take it.
Author: pawel Date: Thu Dec 19 17:49:36 2013 New Revision: 336941 URL: http://svnweb.freebsd.org/changeset/ports/336941 Log: - Fix build with clang - Update MASTER_SITES - Add LICENSE - Switch to PLIST_FILES PR: ports/184823 Submitted by: KATO Tsuguru <tkato432@yahoo.com> Added: head/audio/sidplay/files/patch-sid2wav.cpp (contents, props changed) head/audio/sidplay/files/patch-sidcon.cpp (contents, props changed) head/audio/sidplay/files/patch-sidplay.cpp (contents, props changed) Deleted: head/audio/sidplay/pkg-plist Modified: head/audio/sidplay/Makefile (contents, props changed) Modified: head/audio/sidplay/Makefile ============================================================================== --- head/audio/sidplay/Makefile Thu Dec 19 17:46:59 2013 (r336940) +++ head/audio/sidplay/Makefile Thu Dec 19 17:49:36 2013 (r336941) @@ -3,25 +3,27 @@ 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 +PLIST_FILES= bin/sid2wav bin/sidcon bin/sidplay post-install: - ${STRIP_CMD} ${PREFIX}/bin/sidplay ${PREFIX}/bin/sid2wav \ - ${PREFIX}/bin/sidcon + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/sidplay \ + ${STAGEDIR}${PREFIX}/bin/sid2wav \ + ${STAGEDIR}${PREFIX}/bin/sidcon .include <bsd.port.mk> Added: head/audio/sidplay/files/patch-sid2wav.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/sidplay/files/patch-sid2wav.cpp Thu Dec 19 17:49:36 2013 (r336941) @@ -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 Added: head/audio/sidplay/files/patch-sidcon.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/sidplay/files/patch-sidcon.cpp Thu Dec 19 17:49:36 2013 (r336941) @@ -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, Added: head/audio/sidplay/files/patch-sidplay.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/sidplay/files/patch-sidplay.cpp Thu Dec 19 17:49:36 2013 (r336941) @@ -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 + { _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed Committed, with minor changes. Thanks!
Author: bapt Date: Fri Dec 20 07:58:21 2013 New Revision: 336977 URL: http://svnweb.freebsd.org/changeset/ports/336977 Log: MFH: r336941 - Fix build with clang - Update MASTER_SITES - Add LICENSE - Switch to PLIST_FILES PR: ports/184823 Submitted by: KATO Tsuguru <tkato432@yahoo.com> Added: branches/2014Q1/audio/sidplay/files/patch-sid2wav.cpp - copied unchanged from r336941, head/audio/sidplay/files/patch-sid2wav.cpp branches/2014Q1/audio/sidplay/files/patch-sidcon.cpp - copied unchanged from r336941, head/audio/sidplay/files/patch-sidcon.cpp branches/2014Q1/audio/sidplay/files/patch-sidplay.cpp - copied unchanged from r336941, head/audio/sidplay/files/patch-sidplay.cpp Deleted: branches/2014Q1/audio/sidplay/pkg-plist Modified: branches/2014Q1/audio/sidplay/Makefile (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/audio/sidplay/Makefile ============================================================================== --- branches/2014Q1/audio/sidplay/Makefile Fri Dec 20 07:57:14 2013 (r336976) +++ branches/2014Q1/audio/sidplay/Makefile Fri Dec 20 07:58:21 2013 (r336977) @@ -3,25 +3,27 @@ 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 +PLIST_FILES= bin/sid2wav bin/sidcon bin/sidplay post-install: - ${STRIP_CMD} ${PREFIX}/bin/sidplay ${PREFIX}/bin/sid2wav \ - ${PREFIX}/bin/sidcon + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/sidplay \ + ${STAGEDIR}${PREFIX}/bin/sid2wav \ + ${STAGEDIR}${PREFIX}/bin/sidcon .include <bsd.port.mk> Copied: branches/2014Q1/audio/sidplay/files/patch-sid2wav.cpp (from r336941, head/audio/sidplay/files/patch-sid2wav.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/audio/sidplay/files/patch-sid2wav.cpp Fri Dec 20 07:58:21 2013 (r336977, copy of r336941, head/audio/sidplay/files/patch-sid2wav.cpp) @@ -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 Copied: branches/2014Q1/audio/sidplay/files/patch-sidcon.cpp (from r336941, head/audio/sidplay/files/patch-sidcon.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/audio/sidplay/files/patch-sidcon.cpp Fri Dec 20 07:58:21 2013 (r336977, copy of r336941, head/audio/sidplay/files/patch-sidcon.cpp) @@ -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, Copied: branches/2014Q1/audio/sidplay/files/patch-sidplay.cpp (from r336941, head/audio/sidplay/files/patch-sidplay.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/audio/sidplay/files/patch-sidplay.cpp Fri Dec 20 07:58:21 2013 (r336977, copy of r336941, head/audio/sidplay/files/patch-sidplay.cpp) @@ -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 + { _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"