From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Jul 19 14:10:20 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9911516A4D4 for ; Mon, 19 Jul 2004 14:10:20 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7F9C443D46 for ; Mon, 19 Jul 2004 14:10:20 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i6JEAKDl064175 for ; Mon, 19 Jul 2004 14:10:20 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i6JEAK80064174; Mon, 19 Jul 2004 14:10:20 GMT (envelope-from gnats) Resent-Date: Mon, 19 Jul 2004 14:10:20 GMT Resent-Message-Id: <200407191410.i6JEAK80064174@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 [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 66F3F16A4CE for ; Mon, 19 Jul 2004 14:01:30 +0000 (GMT) Received: from hfep02.dion.ne.jp (hfep02.dion.ne.jp [203.181.105.68]) by mx1.FreeBSD.org (Postfix) with ESMTP id 842ED43D53 for ; Mon, 19 Jul 2004 14:01:28 +0000 (GMT) (envelope-from tkato432@yahoo.com) Received: from localhost ([219.108.124.36]) by hfep02.dion.ne.jp with SMTP id <20040719140117180.UQZA@hfep02.dion.ne.jp> for ; Mon, 19 Jul 2004 23:01:17 +0900 Message-Id: <20040719230016.70c8661d.tkato432@yahoo.com> Date: Mon, 19 Jul 2004 23:00:16 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/69293: Update port: emulators/stella to 1.4 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Jul 2004 14:10:21 -0000 >Number: 69293 >Category: ports >Synopsis: Update port: emulators/stella to 1.4 >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 Jul 19 14:10:20 GMT 2004 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 4.10-RELEASE-p2 i386 >Organization: >Environment: >Description: - Update to version 1.4 Remove file: files/patch-ac files/patch-src::emucore::Props.cxx files/patch-src::emucore::Props.hxx files/patch-src::emucore::PropsSet.cxx files/patch-src::emucore::PropsSet.hxx files/patch-src::emucore::m6502::src::M6502.cxx files/patch-src::emucore::m6502::src::M6502.hxx files/patch-src::ui::common::Settiongs.cxx files/patch-src::ui::common::Settiongs.hxx files/patch-src::ui::sound::SoundOSS.cxx >How-To-Repeat: >Fix: diff -urN /usr/ports/emulators/stella/Makefile emulators/stella/Makefile --- /usr/ports/emulators/stella/Makefile Tue Mar 16 19:06:51 2004 +++ emulators/stella/Makefile Mon Jul 19 09:07:02 2004 @@ -6,8 +6,7 @@ # PORTNAME= stella -PORTVERSION= 1.3 -PORTREVISION= 2 +PORTVERSION= 1.4 CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -21,22 +20,21 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} BUILD_WRKSRC= ${WRKSRC}/src/build -USE_XLIB= yes +USE_GCC= 3.3 +USE_SDL= sdl USE_GMAKE= yes MAKEFILE= makefile -PLIST_SUB= STELLA_BIN="${STELLA_BIN}" - -.if defined(WITHOUT_SDL) -ALL_TARGET= freebsd-x -STELLA_BIN= stella.x11 -.else -USE_SDL= sdl -ALL_TARGET= freebsd-sdl -STELLA_BIN= stella.sdl -.endif +MAKE_ARGS= CXX="${CXX}" LD="${CXX}" OPTIMIZATIONS="${CXXFLAGS}" \ + LDFLAGS="${CPPFLAGS}" LDLIBS="${LDFLAGS}" +ALL_TARGET= linux-gl + +CPPFLAGS= `${SDL_CONFIG} --cflags` \ + -I${LOCALBASE}/include/libpng -I${X11BASE}/include +LDFLAGS= `${SDL_CONFIG} --libs` \ + -L${LOCALBASE}/lib -L${X11BASE}/lib -lpng -lz do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/build/${STELLA_BIN} ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/src/build/stella ${PREFIX}/bin @${MKDIR} ${DATADIR} ${INSTALL_DATA} ${WRKSRC}/src/emucore/stella.pro ${DATADIR} .if !defined(NOPORTDOCS) diff -urN /usr/ports/emulators/stella/distinfo emulators/stella/distinfo --- /usr/ports/emulators/stella/distinfo Thu Jan 29 20:24:52 2004 +++ emulators/stella/distinfo Sun Jul 18 18:06:44 2004 @@ -1,2 +1,2 @@ -MD5 (stella-1.3-src.tar.gz) = b9318f82a180ff0a404fca78511b2772 -SIZE (stella-1.3-src.tar.gz) = 433201 +MD5 (stella-1.4-src.tar.gz) = dc2496a46eb823aa9994c77a7f62cf62 +SIZE (stella-1.4-src.tar.gz) = 670366 diff -urN /usr/ports/emulators/stella/files/patch-ac emulators/stella/files/patch-ac --- /usr/ports/emulators/stella/files/patch-ac Thu Sep 25 03:37:41 2003 +++ emulators/stella/files/patch-ac Thu Jan 1 09:00:00 1970 @@ -1,84 +0,0 @@ ---- src/build/makefile.orig Tue Feb 18 10:19:44 2003 -+++ src/build/makefile Tue Sep 16 21:48:28 2003 -@@ -23,7 +23,7 @@ - ## Comment a line out to disable that option, remove comment to enable it. - ##============================================================================ - --OPTIMIZATIONS = -O2 -Wall -Wno-unused -+# OPTIMIZATIONS = -O2 -Wall -Wno-unused - ### to get full optimization under gcc/x Intel based OS's.. - # OPTIMIZATIONS = -O3 -mcpu=pentiumpro -march=pentiumpro -Wall -Wno-unused \ - # -funroll-loops -fstrength-reduce -fomit-frame-pointer -ffast-math \ -@@ -61,7 +61,7 @@ - ### to include support for saving snapshots in png format - ### (requires PNG library) - ### Only X11 and SDL ports supported for now --# SNAPSHOT_SUPPORT = 1 -+SNAPSHOT_SUPPORT = 1 - - ### comment this out if your system doesn't - ### have the gettimeofday function -@@ -79,8 +79,8 @@ - ## No configurable options below this line ... - ##============================================================================ - --CXX = g++ --LD = g++ -+CXX ?= g++ -+LD = $(CXX) - - LDFLAGS = - LDLIBS = -@@ -92,8 +92,8 @@ - - OBJS.SDL = - OPTS.SDL = --LIBS.SDL = `sdl-config --libs` --CFLAGS.SDL = `sdl-config --cflags` -+LIBS.SDL = `${SDL_CONFIG} --libs` -+CFLAGS.SDL = `${SDL_CONFIG} --cflags` - - OPTS.DOS = - -@@ -103,7 +103,7 @@ - - INCLUDES = -I. -I$(CORE) -I$(CORE)/m6502/src -I$(CORE)/m6502/src/bspf/src -I$(UI)/common - --CXXFLAGS = $(OPTIMIZATIONS) $(INCLUDES) $(SYS_INCLUDES) -+CXXFLAGS += $(OPTIMIZATIONS) $(INCLUDES) $(SYS_INCLUDES) - - ## set the user-defined options - ifdef BSPF_BOOL -@@ -265,6 +265,32 @@ - LDLIBS+="$(LIBS.X11)" \ - OBJS="mainX11.o" - OBJS+="$(OBJS.X11)" -+ -+freebsd-x: -+ $(MAKE) stella.x11 \ -+ INCLUDES="$(INCLUDES) -I$(UI)/x11 -I$(UI)/sound" \ -+ SYS_INCLUDES="-I$(X11BASE)/include -I$(LOCALBASE)/include/libpng" \ -+ OPTIONS="-DBSPF_UNIX=1" \ -+ OPTIONS+="$(OPTS.X11)" \ -+ LDFLAGS="-L$(X11BASE)/lib -L$(LOCALBASE)/lib" \ -+ LDFLAGS+="$(CFLAGS.X11)" \ -+ LDLIBS="-lX11 -lXext" \ -+ LDLIBS+="$(LIBS.X11)" \ -+ OBJS="mainX11.o" \ -+ OBJS+="$(OBJS.X11)" -+ -+freebsd-sdl: -+ $(MAKE) stella.sdl \ -+ INCLUDES="$(INCLUDES) -I$(UI)/sdl -I$(UI)/sound" \ -+ SYS_INCLUDES="-I$(X11BASE)/include -I$(LOCALBASE)/include/libpng" \ -+ OPTIONS="-DBSPF_UNIX=1" \ -+ OPTIONS+="$(OPTS.SDL)" \ -+ LDFLAGS="-L$(X11BASE)/lib -L$(LOCALBASE)/lib" \ -+ LDFLAGS+="$(CFLAGS.SDL)" \ -+ LDLIBS="-lX11 -lXext" \ -+ LDLIBS+="$(LIBS.SDL)" \ -+ OBJS="mainSDL.o RectList.o" \ -+ OBJS+="$(OBJS.SDL)" - - ############################################################################### - ## List of "core" object files diff -urN /usr/ports/emulators/stella/files/patch-src::emucore::Props.cxx emulators/stella/files/patch-src::emucore::Props.cxx --- /usr/ports/emulators/stella/files/patch-src::emucore::Props.cxx Wed Sep 24 22:55:05 2003 +++ emulators/stella/files/patch-src::emucore::Props.cxx Thu Jan 1 09:00:00 1970 @@ -1,38 +0,0 @@ ---- src/emucore/Props.cxx.orig Tue Feb 18 10:19:44 2003 -+++ src/emucore/Props.cxx Wed Sep 17 00:42:05 2003 -@@ -103,7 +103,7 @@ - } - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --void Properties::load(istream& in) -+void Properties::load(std::istream& in) - { - // Empty my property array - mySize = 0; -@@ -146,7 +146,7 @@ - } - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --void Properties::save(ostream& out) -+void Properties::save(std::ostream& out) - { - // Write out each of the key and value pairs - for(uInt32 i = 0; i < mySize; ++i) -@@ -164,7 +164,7 @@ - } - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --string Properties::readQuotedString(istream& in) -+string Properties::readQuotedString(std::istream& in) - { - char c; - -@@ -205,7 +205,7 @@ - } - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --void Properties::writeQuotedString(ostream& out, const string& s) -+void Properties::writeQuotedString(std::ostream& out, const string& s) - { - out.put('"'); - for(uInt32 i = 0; i < s.length(); ++i) diff -urN /usr/ports/emulators/stella/files/patch-src::emucore::Props.hxx emulators/stella/files/patch-src::emucore::Props.hxx --- /usr/ports/emulators/stella/files/patch-src::emucore::Props.hxx Wed Sep 24 22:55:05 2003 +++ emulators/stella/files/patch-src::emucore::Props.hxx Thu Jan 1 09:00:00 1970 @@ -1,37 +0,0 @@ ---- src/emucore/Props.hxx.orig Tue Feb 18 10:19:44 2003 -+++ src/emucore/Props.hxx Wed Sep 17 00:42:29 2003 -@@ -79,14 +79,14 @@ - - @param in The input stream to use - */ -- void load(istream& in); -+ void load(std::istream& in); - - /** - Save properties to the specified output stream - - @param out The output stream to use - */ -- void save(ostream& out); -+ void save(std::ostream& out); - - /** - Merge the given properties into this properties object -@@ -103,7 +103,7 @@ - @param in The input stream to use - @return The string inside the quotes - */ -- static string readQuotedString(istream& in); -+ static string readQuotedString(std::istream& in); - - /** - Write the specified string to the given output stream as a -@@ -112,7 +112,7 @@ - @param out The output stream to use - @param s The string to output - */ -- static void writeQuotedString(ostream& out, const string& s); -+ static void writeQuotedString(std::ostream& out, const string& s); - - public: - /** diff -urN /usr/ports/emulators/stella/files/patch-src::emucore::PropsSet.cxx emulators/stella/files/patch-src::emucore::PropsSet.cxx --- /usr/ports/emulators/stella/files/patch-src::emucore::PropsSet.cxx Wed Sep 24 22:55:05 2003 +++ emulators/stella/files/patch-src::emucore::PropsSet.cxx Thu Jan 1 09:00:00 1970 @@ -1,19 +0,0 @@ ---- src/emucore/PropsSet.cxx.orig Tue Feb 18 10:19:44 2003 -+++ src/emucore/PropsSet.cxx Wed Sep 17 00:47:25 2003 -@@ -203,14 +203,14 @@ - } - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --void PropertiesSet::save(ostream& out) -+void PropertiesSet::save(std::ostream& out) - { - saveNode(out, myRoot); - } - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --void PropertiesSet::saveNode(ostream& out, TreeNode *node) -+void PropertiesSet::saveNode(std::ostream& out, TreeNode *node) - { - if(node) - { diff -urN /usr/ports/emulators/stella/files/patch-src::emucore::PropsSet.hxx emulators/stella/files/patch-src::emucore::PropsSet.hxx --- /usr/ports/emulators/stella/files/patch-src::emucore::PropsSet.hxx Wed Sep 24 22:55:05 2003 +++ emulators/stella/files/patch-src::emucore::PropsSet.hxx Thu Jan 1 09:00:00 1970 @@ -1,20 +0,0 @@ ---- src/emucore/PropsSet.hxx.orig Tue Feb 18 10:19:44 2003 -+++ src/emucore/PropsSet.hxx Wed Sep 17 00:47:27 2003 -@@ -75,7 +75,7 @@ - - @param out The output stream to use - */ -- void save(ostream& out); -+ void save(std::ostream& out); - - /** - Get the number of properties in the collection. -@@ -134,7 +134,7 @@ - @param out The output stream to use - @param node The current subroot of the tree - */ -- void saveNode(ostream& out, TreeNode *node); -+ void saveNode(std::ostream& out, TreeNode *node); - - // The root of the BST - TreeNode* myRoot; diff -urN /usr/ports/emulators/stella/files/patch-src::emucore::TIASound.c emulators/stella/files/patch-src::emucore::TIASound.c --- /usr/ports/emulators/stella/files/patch-src::emucore::TIASound.c Wed Sep 24 22:55:05 2003 +++ emulators/stella/files/patch-src::emucore::TIASound.c Sun Jul 18 18:44:22 2004 @@ -1,18 +1,16 @@ ---- src/emucore/TIASound.c.orig Tue Feb 18 02:19:44 2003 -+++ src/emucore/TIASound.c Wed Sep 24 15:51:58 2003 -@@ -171,11 +171,13 @@ - { - uint8 chan; - int16 n; -- -+ +--- src/emucore/TIASound.c.orig Mon Jun 14 04:22:45 2004 ++++ src/emucore/TIASound.c Sun Jul 18 18:43:44 2004 +@@ -173,10 +173,12 @@ + uint8 chan; + int16 n; + + srandom(time(NULL)); + - /* fill the 9bit polynomial with random bits */ - for (n=0; n - #include - --#ifdef __FreeBSD__ -- #include --#else -- #include --#endif -+#include - - #define DSP_DEVICE "/dev/dsp" - #define MIXER_DEVICE "/dev/mixer" diff -urN /usr/ports/emulators/stella/pkg-plist emulators/stella/pkg-plist --- /usr/ports/emulators/stella/pkg-plist Thu Sep 25 03:39:51 2003 +++ emulators/stella/pkg-plist Sun Jul 18 18:56:39 2004 @@ -1,4 +1,4 @@ -bin/%%STELLA_BIN%% +bin/stella %%PORTDOCS%%%%DOCSDIR%%/graphics/chucky_cheese.png %%PORTDOCS%%%%DOCSDIR%%/graphics/circuit.png %%PORTDOCS%%%%DOCSDIR%%/graphics/console.png >Release-Note: >Audit-Trail: >Unformatted: