From owner-freebsd-ports Sun Dec 29 21:20: 7 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0A1B837B405 for ; Sun, 29 Dec 2002 21:20:02 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0F54E43EC5 for ; Sun, 29 Dec 2002 21:20:01 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id gBU5K0NS035324 for ; Sun, 29 Dec 2002 21:20:00 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id gBU5K0aF035323; Sun, 29 Dec 2002 21:20:00 -0800 (PST) Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CD31137B401 for ; Sun, 29 Dec 2002 21:12:45 -0800 (PST) Received: from blueyonder.co.uk (80-192-24-35.cable.ubr01.hf.blueyonder.co.uk [80.192.24.35]) by mx1.FreeBSD.org (Postfix) with SMTP id 4110D43EA9 for ; Sun, 29 Dec 2002 21:12:44 -0800 (PST) (envelope-from keith@bristol.homeunix.org) Received: (qmail 49338 invoked from network); 30 Dec 2002 05:12:45 -0000 Received: from athlon.home (10.90.0.2) by gateway.home with SMTP; 30 Dec 2002 05:12:45 -0000 Received: (qmail 669 invoked by uid 1000); 30 Dec 2002 05:12:35 -0000 Message-Id: <20021230051235.668.qmail@athlon.home> Date: 30 Dec 2002 05:12:35 -0000 From: Keith Jones Reply-To: Keith Jones To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/46627: [PATCH] upgrade stella to 1.2 (1.1 is broken in -CURRENT) Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 46627 >Category: ports >Synopsis: [PATCH] upgrade stella to 1.2 (1.1 is broken in -CURRENT) >Confidential: no >Severity: critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sun Dec 29 21:20:00 PST 2002 >Closed-Date: >Last-Modified: >Originator: Keith Jones >Release: FreeBSD 5.0-RC2 i386 >Organization: none >Environment: System: FreeBSD athlon.home 5.0-RC2 FreeBSD 5.0-RC2 #0: Wed Dec 18 13:43:24 GMT 2002 root@hollin.btc.adaptec.com:/usr/obj/usr/src/sys/GENERIC i386 >Description: Version 1.1 of the Stella port breaks numerous C++ standards, which GCC 2.95 didn't have a problem with but GCC 3.2.1 doesn't like any more. As a result, this port can't be built in 5.0-RC. >How-To-Repeat: # cd /usr/ports/emulators/stella # make >Fix: Patches below (I can send you a tarball if it's easier). === NEW FILE: files/patch-ae === --- ../ui/sound/OSS.c.orig Tue Jan 8 17:11:32 2002 +++ ../ui/sound/OSS.c Mon Dec 30 04:08:03 2002 @@ -32,12 +32,7 @@ #include #include #include - -#ifdef __FreeBSD__ - #include -#else - #include -#endif +#include #include "TIASound.h" === END NEW FILE files/patch-ae === --- files/patch-ac.orig Thu Mar 4 23:24:28 1999 +++ files/patch-ac Mon Dec 30 03:47:48 2002 @@ -1,15 +1,15 @@ ---- makefile.orig Thu Mar 4 16:52:03 1999 -+++ makefile Thu Mar 4 16:53:33 1999 -@@ -129,6 +129,15 @@ - LDLIBS=`gtk-config --libs` \ - OBJS="gtk.o editor.o SndUnix.o" +--- makefile.orig Mon Apr 22 01:53:19 2002 ++++ makefile Mon Dec 30 03:44:36 2002 +@@ -218,6 +218,15 @@ + LDLIBS+="$(LIBS.X11)" \ + OBJS="mainX11.o SndUnix.o" +freebsd-x: -+ make xstella \ ++ gmake stella.x11 \ + INCLUDES="$(INCLUDES) -I$(UI)/x11 -I$(UI)/sound" \ -+ SYS_INCLUDES="-I${X11BASE}/include" \ ++ SYS_INCLUDES="-I$(X11BASE)/include" \ + OPTIONS="-DBSPF_UNIX -DSHOW_TIMING" \ -+ LDFLAGS="-L${X11BASE}/lib" \ ++ LDFLAGS="-L$(X11BASE)/lib" \ + LDLIBS="-lX11 -lXext" \ + OBJS="mainX11.o SndUnix.o" + --- distinfo.orig Thu Mar 4 23:24:28 1999 +++ distinfo Mon Dec 30 04:11:26 2002 @@ -1 +1 @@ -MD5 (stella-1.1-src.tar.gz) = 6e2e5336f2789654ddd822d82a4c7b8e +MD5 (stella-1.2-src.tar.gz) = 2c24c0fa2655a597b9e04742485e5ed8 --- pkg-descr.orig Thu Mar 4 23:24:29 1999 +++ pkg-descr Mon Dec 30 04:22:17 2002 @@ -4,9 +4,9 @@ to enjoy all of your favorite 2600 games once again by emulating the 2600's hardware with software. Stella is written in C++, which allows it to be ported to other operating systems and architectures. Since - its original release Stella has been ported to AcronOS, AmigaOS, DOS, + its original release Stella has been ported to AcornOS, AmigaOS, DOS, FreeBSD, IRIX, Linux, MacOS, OpenStep, OS/2, Unix, and Windows. -See also: http://www4.ncsu.edu/~bwmott/www/2600/ +See also: http://stella.sourceforge.net/ -Jacques Vidrine +Keith Jones --- pkg-plist.orig Thu Mar 4 23:24:29 1999 +++ pkg-plist Mon Dec 30 04:29:04 2002 @@ -1,16 +1,14 @@ -bin/xstella +bin/stella.x11 bin/stella-sound -share/stella/roms/ELK.BIN -share/stella/roms/OKIEDOKE.BIN -share/stella/roms/OYSTR29.BIN -share/stella/roms/TEST.BIN -share/stella/roms/TPS.BIN -@dirrm share/stella/roms share/stella/stella.pro @dirrm share/stella -share/doc/stella/Stella.pdf -share/doc/stella/elk.doc -share/doc/stella/okiedoke.doc -share/doc/stella/oystron.doc -share/doc/stella/tps.doc +share/doc/stella/graphics/chucky_cheese.png +share/doc/stella/graphics/circuit.png +share/doc/stella/graphics/console.png +share/doc/stella/graphics/jr_pacman.png +share/doc/stella/graphics/pacman.png +share/doc/stella/graphics/secret_quest.png +share/doc/stella/graphics/space_invaders.png +@dirrm share/doc/stella/graphics +share/doc/stella/stella.html @dirrm share/doc/stella --- Makefile.orig Sun Nov 10 16:45:56 2002 +++ Makefile Mon Dec 30 04:40:52 2002 @@ -1,14 +1,21 @@ -# New ports collection makefile for: stella-1.1 -# Date created: March 4, 1999 -# Whom: Jacques Vidrine +# New ports collection makefile for: stella-1.2 +# Date created: December 30, 2002 +# Whom: Keith Jones # -# $FreeBSD: ports/emulators/stella/Makefile,v 1.14 2002/11/10 16:45:56 lioux Exp $ +# $FreeBSD$ # PORTNAME= stella -PORTVERSION= 1.1 +PORTVERSION= 1.2 CATEGORIES= emulators -MASTER_SITES= ftp://ftp.eos.ncsu.edu/pub/bsvc/stella/1.1/ +MASTER_SITES= http://unc.dl.sourceforge.net/sourceforge/stella/ \ + http://umn.dl.sourceforge.net/sourceforge/stella/ \ + http://telia.dl.sourceforge.net/sourceforge/stella/ \ + http://easynews.dl.sourceforge.net/sourceforge/stella/ \ + http://twtelecom.dl.sourceforge.net/sourceforge/stella/ \ + http://belnet.dl.sourceforge.net/sourceforge/stella/ \ + http://switch.dl.sourceforge.net/sourceforge/stella/ \ + http://cesnet.dl.sourceforge.net/sourceforge/stella/ DISTNAME= ${PORTNAME}-${PORTVERSION}-src MAINTAINER= ports@FreeBSD.org PORTTOP= ${WRKDIR}/${PKGNAME} WRKSRC= ${PORTTOP}/src/build +USE_GMAKE= yes MAKEFILE= makefile ALL_TARGET= freebsd-x USE_XLIB= yes -ROMSDIR= ${PREFIX}/share/stella/roms -ROMS= ELK.BIN OKIEDOKE.BIN OYSTR29.BIN TEST.BIN TPS.BIN DOCSDIR= ${PREFIX}/share/doc/stella -DOCS= docs/Stella.pdf games/docs/elk.doc games/docs/okiedoke.doc \ - games/docs/oystron.doc games/docs/tps.doc +DOCS= docs/stella.html +GFX= docs/graphics/chucky_cheese.png \ + docs/graphics/circuit.png \ + docs/graphics/console.png \ + docs/graphics/jr_pacman.png \ + docs/graphics/pacman.png \ + docs/graphics/secret_quest.png \ + docs/graphics/space_invaders.png post-build: @(cd ${PORTTOP}/src/ui/sound && \ @@ -34,19 +46,19 @@ ${MAKE_ARGS} oss) do-install: -.for exe in src/build/xstella src/ui/sound/stella-sound +.for exe in src/build/stella.x11 src/ui/sound/stella-sound ${INSTALL_PROGRAM} ${PORTTOP}/${exe} ${PREFIX}/bin/ .endfor - ${MKDIR} ${ROMSDIR} -.for rom in ${ROMS} - ${INSTALL_DATA} ${PORTTOP}/games/ROMS/${rom} ${ROMSDIR}/ -.endfor ${INSTALL_DATA} ${PORTTOP}/src/emucore/stella.pro \ ${PREFIX}/share/stella/ .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} .for doc in ${DOCS} ${INSTALL_DATA} ${PORTTOP}/${doc} ${DOCSDIR}/ +.endfor + ${MKDIR} ${DOCSDIR}/graphics +.for gfx in ${GFX} + ${INSTALL_DATA} ${PORTTOP}/${gfx} ${DOCSDIR}/graphics/ .endfor .endif >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message