From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Jul 19 15:30:19 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org 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 9878816A421 for ; Tue, 19 Jul 2005 15:30:19 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 661A343D49 for ; Tue, 19 Jul 2005 15:30:15 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j6JFUFKe031563 for ; Tue, 19 Jul 2005 15:30:15 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j6JFUF3F031562; Tue, 19 Jul 2005 15:30:15 GMT (envelope-from gnats) Resent-Date: Tue, 19 Jul 2005 15:30:15 GMT Resent-Message-Id: <200507191530.j6JFUF3F031562@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, "Alejandro Pulver" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 05B6616A41F for ; Tue, 19 Jul 2005 15:24:59 +0000 (GMT) (envelope-from alejandro@varnet.biz) Received: from relay03.pair.com (relay03.pair.com [209.68.5.17]) by mx1.FreeBSD.org (Postfix) with SMTP id 73E7E43D46 for ; Tue, 19 Jul 2005 15:24:58 +0000 (GMT) (envelope-from alejandro@varnet.biz) Received: (qmail 99011 invoked from network); 19 Jul 2005 15:24:56 -0000 Received: from unknown (HELO phobos.mars.bsd) (unknown) by unknown with SMTP; 19 Jul 2005 15:24:56 -0000 Message-Id: <1121786697.0@phobos.mars.bsd> Date: Tue, 19 Jul 2005 12:24:57 -0300 From: "Alejandro Pulver" To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.4.4 Cc: Subject: ports/83727: [UPDATE] games/pmars - A portable corewar system with ICWS'94 extensions X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Jul 2005 15:30:20 -0000 >Number: 83727 >Category: ports >Synopsis: [UPDATE] games/pmars - A portable corewar system with ICWS'94 extensions >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Tue Jul 19 15:30:15 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Alejandro Pulver >Release: FreeBSD 5.4-RELEASE i386 >Organization: >Environment: >Description: >How-To-Repeat: >Fix: --- pmars.diff begins here --- diff -urN pmars.old/Makefile pmars/Makefile --- pmars.old/Makefile Tue Jul 19 12:23:10 2005 +++ pmars/Makefile Tue Jul 19 12:11:08 2005 @@ -6,37 +6,82 @@ # PORTNAME= pmars -PORTVERSION= 0.8 +PORTVERSION= 0.9.2 CATEGORIES= games -MASTER_SITES= http://www.koth.org/pmars/ \ - http://www.giovannelli.it/~gmarco/files/ -DISTFILES= pmars08s.tar.Z +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITE_SUBDIR= corewar -MAINTAINER= gmarco@giovannelli.it +MAINTAINER= alejandro@varnet.biz COMMENT= A portable corewar system with ICWS'94 extensions -USE_XLIB= yes -NO_WRKSUBDIR= yes -MAKEFILE= makefile -ALL_TARGET= pmars -MAN6= pmars.6 +WRKSRC= ${WRKDIR}/${DISTNAME}/src + +OPTIONS= ICWS94 "Enable ICWS'94 support" on \ + OPTIMIZED_CFLAGS "Enable compilation optimizations" on \ + PERMUTATE "Enable the -P switch" on \ + SMALLMEM "Use 16-bit addresses (smaller)" off + +MAKE_ARGS+= CFLAGS+="${CFLAGS}" \ + CFLAGS+="-fno-builtin" + +PLIST_FILES= bin/${PORTNAME}${PKGNAMESUFFIX} do-install: - @${MKDIR} ${PREFIX}/share/games - @${MKDIR} ${PREFIX}/share/games/corewars - @${INSTALL_PROGRAM} ${WRKSRC}/pmars ${PREFIX}/bin - @${INSTALL_DATA} ${WRKSRC}/pmars.6 ${PREFIX}/man/man6 - @${INSTALL_DATA} ${WRKSRC}/*.red ${PREFIX}/share/games/corewars - @${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/games/corewars - @${ECHO_MSG} "" - @${ECHO_MSG} "You can try something like :" - @${ECHO_MSG} "pmars -v 603 ${PREFIX}/share/games/corewars/rave.red ${PREFIX}/share/games/corewars/aeka.red" - @${ECHO_MSG} "to see how the simulator works (rave.red and aeka.red are two sample warriors)" - @${ECHO_MSG} "" - @${ECHO_MSG} "Some other warriors are installed in : ${PREFIX}/share/games/corewars" - @${ECHO_MSG} "" - @${ECHO_MSG} "Plase read also ${PREFIX}/share/games/corewars/README file for more infos" - @${ECHO_MSG} "on corewars and on the current version of pmars" - @${ECHO_MSG} "" + @${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} \ + ${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX} + +.include + +.if defined(WITH_ICWS94) +MAKE_ARGS+= CFLAGS+="-DEXT94" +.endif + +.if defined(WITH_OPTIMIZED_CFLAGS) +MAKE_ARGS+= CFLAGS+="-O3 -fomit-frame-pointer" +.endif + +.if defined(WITH_PERMUTATE) +MAKE_ARGS+= CFLAGS+="-DPERMUTATE" +.endif + +.if defined(WITH_SMALLMEM) +MAKE_ARGS+= CFLAGS+="-DSMALLMEM" +.endif + +.if defined(WITH_SDL) +EXTRA_PATCHES= ${FILESDIR}/sdl-patch-Makefile +.else +EXTRA_PATCHES= ${FILESDIR}/common-patch-Makefile +.endif + +.if defined(WITH_SERVER) +PKGNAMESUFFIX= -server +MAKE_ARGS+= CFLAGS+="-DSERVER" + +.elif defined(WITH_CURSES) +PKGNAMESUFFIX= -curses +MAKE_ARGS+= CFLAGS+="-DGRAPHX" \ + LIB+="-lcurses" + +.elif defined(WITH_X11) +PKGNAMESUFFIX= -x11 +USE_XLIB= yes +MAKE_ARGS+= CFLAGS+="-DXWINGRAPHX" \ + CFLAGS+="-I${X11BASE}/include" \ + LIB+="-L${X11BASE}/lib -lX11" + +.elif defined(WITH_SDL) +MASTER_SITES= http://www.cs.helsinki.fi/u/jpihlaja/cw/pmars-sdl/ +PKGNAMESUFFIX= -sdl +DISTNAME= ${PORTNAME}-${PORTVERSION}-5 +USE_SDL= sdl +MAKE_ARGS+= CFLAGS+="`${SDL_CONFIG} --cflags`" \ + LIB+="`${SDL_CONFIG} --libs`" \ + CFLAGS+="-DSDLGRAPHX" + +.else +IGNORE= Please choose an interface: SERVER, CURSES, X11 or SDL + +.endif -.include +.include diff -urN pmars.old/distinfo pmars/distinfo --- pmars.old/distinfo Tue Jul 19 12:23:10 2005 +++ pmars/distinfo Wed Jul 6 19:11:53 2005 @@ -1,2 +1,4 @@ -MD5 (pmars08s.tar.Z) = ad1869ea0a388f5c5070c4cd33b09d25 -SIZE (pmars08s.tar.Z) = 226225 +MD5 (pmars-0.9.2.tar.gz) = a73943a34e9de8f0d3028fc4566cd558 +SIZE (pmars-0.9.2.tar.gz) = 158415 +MD5 (pmars-0.9.2-5.tar.gz) = 4733185c5eb6a4554a54d91331e6501d +SIZE (pmars-0.9.2-5.tar.gz) = 200966 diff -urN pmars.old/files/common-patch-Makefile pmars/files/common-patch-Makefile --- pmars.old/files/common-patch-Makefile Wed Dec 31 21:00:00 1969 +++ pmars/files/common-patch-Makefile Wed Jul 6 20:37:52 2005 @@ -0,0 +1,20 @@ +--- Makefile.orig Sun Dec 24 09:53:39 2000 ++++ Makefile Wed Jul 6 20:33:52 2005 +@@ -1,5 +1,4 @@ + # generic UNIX makefile +-CC = gcc # req. for linux + #CC = cc # if you don't have gcc + # Configuration options: + # +@@ -16,11 +15,8 @@ + # (6) -DXWINGRAPHX 1 X-Windows graphics (UNIX) + # (7) -DPERMUTATE enables -P switch + +-CFLAGS = -O -DEXT94 -DXWINGRAPHX -DPERMUTATE +-LFLAGS = -x + # LIB = -lcurses -ltermlib # enable this one for curses display + # LIB = -lvgagl -lvga # enable this one for Linux/SVGA +-LIB = -L/usr/X11R6/lib -lX11 # enable this one for X11 + + .SUFFIXES: .o .c .c~ .man .doc .6 + MAINFILE = pmars diff -urN pmars.old/files/patch-aa pmars/files/patch-aa --- pmars.old/files/patch-aa Tue Jul 19 12:23:10 2005 +++ pmars/files/patch-aa Wed Dec 31 21:00:00 1969 @@ -1,25 +0,0 @@ ---- makefile.orig Fri Oct 27 06:37:29 1995 -+++ makefile Sun Apr 11 20:36:53 1999 -@@ -1,6 +1,6 @@ - # generic UNIX makefile - #CC = gcc # req. for linux --CC = cc # if you don't have gcc -+CC ?= cc # if you don't have gcc - # Configuration options: - # - # No. Name Incompatible with Description -@@ -15,11 +15,12 @@ - # (5) -DSMALLMEM 16-bit addresses, less memory - # (6) -DXWINGRAPHX 1 X-Windows graphics (UNIX) - --CFLAGS = -O -DEXT94 -+CFLAGS ?= -O -+CFLAGS += -I/usr/X11R6/include -DEXT94 -DGRAPHX -DXWINGRAPHX - LFLAGS = -x - LIB = -lcurses -ltermlib # enable this one for curses display - # LIB = -lvgagl -lvga # enable this one for Linux/SVGA --# LIB = -lX11 # enable this one for X11 -+LIB = -L/usr/X11R6/lib -lX11 # enable this one for X11 - - .SUFFIXES: .o .c .c~ .man .doc .6 - MAINFILE = pmars diff -urN pmars.old/files/sdl-patch-Makefile pmars/files/sdl-patch-Makefile --- pmars.old/files/sdl-patch-Makefile Wed Dec 31 21:00:00 1969 +++ pmars/files/sdl-patch-Makefile Mon Jul 18 10:34:03 2005 @@ -0,0 +1,17 @@ +--- Makefile.orig Thu May 1 10:09:46 2003 ++++ Makefile Mon Jul 18 09:49:02 2005 +@@ -1,5 +1,4 @@ + # generic UNIX makefile +-CC = gcc # req. for linux + #CC = cc # if you don't have gcc + # Configuration options: + # +@@ -18,8 +17,6 @@ + # (8) -DSDLGRAPHX 1 SDL graphics (generic) + + #DBG = -g -W -Wall -pg +-CFLAGS = -O4 -fomit-frame-pointer $(DBG) -DSERVER -DEXT94 -DPERMUTATE $(INC) +-LFLAGS = -x + # LIB = -lcurses -ltermlib # enable this one for curses display + # LIB = -lvgagl -lvga # enable this one for Linux/SVGA + # LIB = -L/usr/X11R6/lib -lX11 # enable this one for X11 diff -urN pmars.old/pkg-descr pmars/pkg-descr --- pmars.old/pkg-descr Tue Jul 19 12:23:10 2005 +++ pmars/pkg-descr Wed Jul 6 22:22:49 2005 @@ -1,9 +1,12 @@ -pMARS (portable Memory Array Redcode Simulator) is a corewar -interpreter with multi-platform support. -pMARS implements the ICWS'94 draft standard, but can also be -used in ICWS'88 mode. -The base system includes a graphical core display for UNIX (curses, -X11 and Linux svgalib), PC/DOS, and the Mac. +pMARS (portable Memory Array Redcode Simulator) is a corewar interpreter with +multi-platform support. + +pMARS implements the ICWS'94 draft standard, but can also be used in ICWS'88 +mode. + +The base system includes a graphical core display for UNIX (curses, X11 and +Linux svgalib), PC/DOS, and the Mac. + A line-oriented debugger is included to help in writing warriors. Contributors: @@ -12,9 +15,7 @@ * Stefan Strack (stst@vuse.vanderbilt.edu) * Mintardjo Wangsawidjaja (wangsawm@kira.csos.orst.edu) -distfile: pmars08s.tar.Z (about 220kb) - WWW: http://www.koth.org/pmars/ --Gianmarco -gmarco@giovannelli.it +- Alejandro Pulver +alejandro@varnet.biz diff -urN pmars.old/pkg-plist pmars/pkg-plist --- pmars.old/pkg-plist Tue Jul 19 12:23:10 2005 +++ pmars/pkg-plist Wed Dec 31 21:00:00 1969 @@ -1,9 +0,0 @@ -bin/pmars -share/games/corewars/aeka.red -share/games/corewars/pspace.red -share/games/corewars/validate.red -share/games/corewars/rave.red -share/games/corewars/flashpaper.red -share/games/corewars/README -@dirrm share/games/corewars -@unexec /bin/rmdir %D/share/games >/dev/null 2>&1 || true --- pmars.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: