Date: Fri, 2 Feb 2001 18:56:09 -0800 (PST) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org Subject: ports/24819: Update port: games/seabattle Message-ID: <200102030256.f132u9v71819@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 24819
>Category: ports
>Synopsis: Update port: games/seabattle
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Feb 02 19:00:02 PST 2001
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: 4.2-RELEASE i386
>Organization:
>Environment:
>Description:
- Add secondary site to MASTER_SITES
- Support CC properly
- Support NOPORTDOCS
- Add WWW: line
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/games/seabattle/Makefile games/seabattle/Makefile
--- /usr/ports/games/seabattle/Makefile Sat Apr 15 00:24:01 2000
+++ games/seabattle/Makefile Fri Feb 2 04:32:32 2001
@@ -5,21 +5,23 @@
# $FreeBSD: ports/games/seabattle/Makefile,v 1.4 2000/04/14 12:26:30 asami Exp $
#
-PORTNAME= seabattle
-PORTVERSION= 1.0
-CATEGORIES= games
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
+PORTNAME= seabattle
+PORTVERSION= 1.0
+PORTREVISION= 1
+CATEGORIES= games
+MASTER_SITES= ${MASTER_SITE_SUNSITE} \
+ http://www.deater.net/weave/vmwprod/
MASTER_SITE_SUBDIR= games/strategy
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
do-install:
- @ ${INSTALL_PROGRAM} ${WRKSRC}/seabattle ${PREFIX}/bin/seabattle
- @ ${MKDIR} ${PREFIX}/share/seabattle
-.for file in hit1 hit2 miss1 miss2 opening sunkit
- @ ${INSTALL_DATA} ${WRKSRC}/${file}.au ${PREFIX}/share/seabattle/${file}.au
-.endfor
- @ ${MKDIR} ${PREFIX}/share/doc/seabattle
- @ ${INSTALL_DATA} ${WRKSRC}/readme.txt ${PREFIX}/share/doc/seabattle/readme.txt
+ ${INSTALL_PROGRAM} ${WRKSRC}/seabattle ${PREFIX}/bin
+ @${MKDIR} ${PREFIX}/share/seabattle
+ ${INSTALL_DATA} ${WRKSRC}/*.au ${PREFIX}/share/seabattle
+.if !defined(NOPORTDOCS)
+ @${MKDIR} ${PREFIX}/share/doc/seabattle
+ ${INSTALL_DATA} ${WRKSRC}/readme.txt ${PREFIX}/share/doc/seabattle
+.endif
.include <bsd.port.mk>
diff -urN /usr/ports/games/seabattle/files/patch-aa games/seabattle/files/patch-aa
--- /usr/ports/games/seabattle/files/patch-aa Fri Mar 27 21:07:59 1998
+++ games/seabattle/files/patch-aa Fri Feb 2 04:20:49 2001
@@ -1,28 +1,28 @@
-*** Makefile Tue May 13 17:53:34 1997
---- /home/andy/tmp/wrk/Makefile Mon Jun 30 14:43:45 1997
-***************
-*** 17,28 ****
- #C_OPTS =
- #L_OPTS = -lcurses
-
-! #On Linux, uncomment the following
- #
-! PLATFORM = Linux
-! C_OPTS = -O2 -Wall
- L_OPTS = -lncurses
--
-
- #For Dos/Windows DJGPP (you need the curses lib)
- #PLATFORM = DOS_DJGPP
---- 17,27 ----
- #C_OPTS =
- #L_OPTS = -lcurses
-
-! #On FreeBSD/Linux, uncomment the following
- #
-! PLATFORM = FreeBSD/Linux
-! C_OPTS = ${CFLAGS} -DPREFIX=\"${PREFIX}\"
- L_OPTS = -lncurses
-
- #For Dos/Windows DJGPP (you need the curses lib)
- #PLATFORM = DOS_DJGPP
+--- Makefile.orig Wed May 14 02:53:34 1997
++++ Makefile Fri Feb 2 04:20:41 2001
+@@ -8,7 +8,7 @@
+ ##############################################################
+
+ #Your compiler. If gcc doesn't work, try CC
+-CC = gcc
++#CC = gcc
+ #CC = cc
+
+ #On Suns, SGIs, and other Unix systems uncomment the following
+@@ -17,12 +17,12 @@
+ #C_OPTS =
+ #L_OPTS = -lcurses
+
+-#On Linux, uncomment the following
++#On FreeBSD/Linux, uncomment the following
+ #
+-PLATFORM = Linux
+-C_OPTS = -O2 -Wall
++PLATFORM = FreeBSD/Linux
++DATADIR = ${PREFIX}/share/seabattle
++C_OPTS = ${CFLAGS} -DDATADIR=\"${DATADIR}\"
+ L_OPTS = -lncurses
+-
+
+ #For Dos/Windows DJGPP (you need the curses lib)
+ #PLATFORM = DOS_DJGPP
diff -urN /usr/ports/games/seabattle/files/patch-ab games/seabattle/files/patch-ab
--- /usr/ports/games/seabattle/files/patch-ab Fri Mar 27 21:07:59 1998
+++ games/seabattle/files/patch-ab Fri Feb 2 04:21:19 2001
@@ -1,19 +1,11 @@
-*** batt.h Tue May 13 19:58:17 1997
---- /home/andy/tmp/wrk/batt.h Mon Jun 30 14:41:02 1997
-***************
-*** 2,8 ****
- * batt.h Part of the SEABATTLE game by Vince Weaver *
- ************************************************************************/
-
-! #include <curses.h> /* Slang support is good for rxvt in linux */
- #include <stdio.h>
- #include <ctype.h>
- #include <stdlib.h>
---- 2,8 ----
- * batt.h Part of the SEABATTLE game by Vince Weaver *
- ************************************************************************/
-
-! #include <ncurses.h> /* Slang support is good for rxvt in linux */
- #include <stdio.h>
- #include <ctype.h>
- #include <stdlib.h>
+--- batt.h.orig Wed May 14 04:58:17 1997
++++ batt.h Fri Feb 2 04:18:06 2001
+@@ -2,7 +2,7 @@
+ * batt.h Part of the SEABATTLE game by Vince Weaver *
+ ************************************************************************/
+
+-#include <curses.h> /* Slang support is good for rxvt in linux */
++#include <ncurses.h> /* Slang support is good for rxvt in linux */
+ #include <stdio.h>
+ #include <ctype.h>
+ #include <stdlib.h>
diff -urN /usr/ports/games/seabattle/files/patch-ac games/seabattle/files/patch-ac
--- /usr/ports/games/seabattle/files/patch-ac Fri Mar 27 21:07:59 1998
+++ games/seabattle/files/patch-ac Fri Feb 2 04:22:08 2001
@@ -1,55 +1,31 @@
-*** bdb.c Tue May 13 19:49:59 1997
---- /home/andy/tmp/wrk/bdb.c Mon Jun 30 14:41:23 1997
-***************
-*** 325,332 ****
- char names[10][100],text[100];
- int ch,scores[10],i;
- /* If not there, create one */
-! if( (fff=fopen("hiscore.sea","r+"))==NULL ){
-! if ( (fff=fopen("hiscore.sea","a+"))!=NULL) {
- fprintf(fff,"Vince\n50\nMarie\n55\nJohn\n56\n");
- fprintf(fff,"Gus\n57\nLizann\n58\nKevin\n59\n");
- fprintf(fff,"Hal\n60\nHairold\n61\nChipper\n62\nBob\n63\n");
---- 325,332 ----
- char names[10][100],text[100];
- int ch,scores[10],i;
- /* If not there, create one */
-! if( (fff=fopen(PREFIX "/share/seabattle/hiscore.sea","r+"))==NULL ){
-! if ( (fff=fopen(PREFIX "/share/seabattle/hiscore.sea","a+"))!=NULL) {
- fprintf(fff,"Vince\n50\nMarie\n55\nJohn\n56\n");
- fprintf(fff,"Gus\n57\nLizann\n58\nKevin\n59\n");
- fprintf(fff,"Hal\n60\nHairold\n61\nChipper\n62\nBob\n63\n");
-***************
-*** 335,341 ****
- }
- else fclose(fff);
-
-! if ( (fff=fopen("hiscore.sea","r"))!=NULL) {
- for(i=0;i<10;i++)
- fscanf(fff,"%s%i",names[i],&scores[i]);
- fclose(fff);
---- 335,341 ----
- }
- else fclose(fff);
-
-! if ( (fff=fopen(PREFIX "/share/seabattle/hiscore.sea","r"))!=NULL) {
- for(i=0;i<10;i++)
- fscanf(fff,"%s%i",names[i],&scores[i]);
- fclose(fff);
-***************
-*** 355,361 ****
- set_color(C_WHITE,C_BOLD);
- sprintf(text,"%s got a new High Score, #%i",name,i+1);
- printxy(20,1,text);
-! if ( (fff=fopen("hiscore.sea","w+"))!=NULL) {
- for(i=0;i<10;i++) fprintf(fff,"%s\n%i",names[i],scores[i]);
- fclose(fff);
- }
---- 355,361 ----
- set_color(C_WHITE,C_BOLD);
- sprintf(text,"%s got a new High Score, #%i",name,i+1);
- printxy(20,1,text);
-! if ( (fff=fopen(PREFIX "/share/seabattle/hiscore.sea","w+"))!=NULL) {
- for(i=0;i<10;i++) fprintf(fff,"%s\n%i",names[i],scores[i]);
- fclose(fff);
- }
+--- bdb.c.orig Wed May 14 04:49:59 1997
++++ bdb.c Fri Feb 2 04:22:00 2001
+@@ -325,8 +325,8 @@
+ char names[10][100],text[100];
+ int ch,scores[10],i;
+ /* If not there, create one */
+- if( (fff=fopen("hiscore.sea","r+"))==NULL ){
+- if ( (fff=fopen("hiscore.sea","a+"))!=NULL) {
++ if( (fff=fopen(DATADIR "/hiscore.sea","r+"))==NULL ){
++ if ( (fff=fopen(DATADIR "/hiscore.sea","a+"))!=NULL) {
+ fprintf(fff,"Vince\n50\nMarie\n55\nJohn\n56\n");
+ fprintf(fff,"Gus\n57\nLizann\n58\nKevin\n59\n");
+ fprintf(fff,"Hal\n60\nHairold\n61\nChipper\n62\nBob\n63\n");
+@@ -335,7 +335,7 @@
+ }
+ else fclose(fff);
+
+- if ( (fff=fopen("hiscore.sea","r"))!=NULL) {
++ if ( (fff=fopen(DATADIR "/hiscore.sea","r"))!=NULL) {
+ for(i=0;i<10;i++)
+ fscanf(fff,"%s%i",names[i],&scores[i]);
+ fclose(fff);
+@@ -355,7 +355,7 @@
+ set_color(C_WHITE,C_BOLD);
+ sprintf(text,"%s got a new High Score, #%i",name,i+1);
+ printxy(20,1,text);
+- if ( (fff=fopen("hiscore.sea","w+"))!=NULL) {
++ if ( (fff=fopen(DATADIR "/hiscore.sea","w+"))!=NULL) {
+ for(i=0;i<10;i++) fprintf(fff,"%s\n%i",names[i],scores[i]);
+ fclose(fff);
+ }
diff -urN /usr/ports/games/seabattle/files/patch-ad games/seabattle/files/patch-ad
--- /usr/ports/games/seabattle/files/patch-ad Fri Mar 27 21:08:00 1998
+++ games/seabattle/files/patch-ad Fri Feb 2 04:23:06 2001
@@ -1,35 +1,23 @@
-*** binp.c Tue May 13 17:51:00 1997
---- /home/andy/tmp/wrk/binp.c Mon Jun 30 14:41:38 1997
-***************
-*** 129,143 ****
- /* Incomplete as of yet */
- if (which_one==1)
- if (sound_device)
-! if(rand()%2) system("cat hit1.au > /dev/audio ");
-! else system("cat hit2.au > /dev/audio ");
- else beep();
- if (which_one==2)
- if (sound_device)
-! if(rand()%2) system("cat miss1.au > /dev/audio ");
-! else system("cat miss2.au > /dev/audio ");
- if (which_one==3)
-! if (sound_device) system("cat sunkit.au > /dev/audio ");
- else beep();
- }
-
---- 129,143 ----
- /* Incomplete as of yet */
- if (which_one==1)
- if (sound_device)
-! if(rand()%2) system("cat " PREFIX "/share/seabattle/hit1.au > /dev/audio ");
-! else system("cat " PREFIX "/share/seabattle/hit2.au > /dev/audio ");
- else beep();
- if (which_one==2)
- if (sound_device)
-! if(rand()%2) system("cat " PREFIX "/share/seabattle/miss1.au > /dev/audio ");
-! else system("cat " PREFIX "/share/seabattle/miss2.au > /dev/audio ");
- if (which_one==3)
-! if (sound_device) system("cat " PREFIX "/share/seabattle/sunkit.au > /dev/audio ");
- else beep();
- }
-
+--- binp.c.orig Wed May 14 02:51:00 1997
++++ binp.c Fri Feb 2 04:22:56 2001
+@@ -129,15 +129,15 @@
+ /* Incomplete as of yet */
+ if (which_one==1)
+ if (sound_device)
+- if(rand()%2) system("cat hit1.au > /dev/audio ");
+- else system("cat hit2.au > /dev/audio ");
++ if(rand()%2) system("cat " DATADIR "/hit1.au > /dev/audio ");
++ else system("cat " DATADIR "/hit2.au > /dev/audio ");
+ else beep();
+ if (which_one==2)
+ if (sound_device)
+- if(rand()%2) system("cat miss1.au > /dev/audio ");
+- else system("cat miss2.au > /dev/audio ");
++ if(rand()%2) system("cat " DATADIR "/miss1.au > /dev/audio ");
++ else system("cat " DATADIR "/miss2.au > /dev/audio ");
+ if (which_one==3)
+- if (sound_device) system("cat sunkit.au > /dev/audio ");
++ if (sound_device) system("cat " DATADIR "/sunkit.au > /dev/audio ");
+ else beep();
+ }
+
diff -urN /usr/ports/games/seabattle/pkg-descr games/seabattle/pkg-descr
--- /usr/ports/games/seabattle/pkg-descr Fri Mar 27 21:08:00 1998
+++ games/seabattle/pkg-descr Fri Feb 2 04:37:54 2001
@@ -1,20 +1,4 @@
+A curses based battleship type game. Sink the computer's fleet.
+Full color and 8bit sound.
- .|'''| '||'''|, || || '||`
- || || || || || ||
- `|'''|, .|''|, '''|. ||;;;; '''|. ''||'' ''||'' || .|''|,
- . || ||..|| .|''|| || || .|''|| || || || ||..||
- |...|' `|... `|..||. .||...|' `|..||. `|..' `|..' .||. `|...
-
- version 1.0 -- 14 May 1997
-
- A Game By Vince Weaver -- Who cannot draw ASCII ships
- weave@eng.umd.edu http://www.glue.umd.edu/~weave
- Another Amazing Project for ENEE114
-
- Send any bug reports, comments, or anything else to
- Vince Weaver, weave@eng.umd.edu
-
- Check out other VMW Software productions at
- http://www.glue.umd.edu/~weave/vmwprod
-
- Sea Battle -- A VMW Software Production ----------------------------
+WWW: http://www.deater.net/weave/vmwprod/seabattle.html
diff -urN /usr/ports/games/seabattle/pkg-plist games/seabattle/pkg-plist
--- /usr/ports/games/seabattle/pkg-plist Fri Mar 27 21:08:01 1998
+++ games/seabattle/pkg-plist Fri Feb 2 04:15:20 2001
@@ -1,10 +1,10 @@
bin/seabattle
+%%PORTDOCS%%share/doc/seabattle/readme.txt
share/seabattle/hit1.au
share/seabattle/hit2.au
share/seabattle/miss1.au
share/seabattle/miss2.au
share/seabattle/opening.au
share/seabattle/sunkit.au
-share/doc/seabattle/readme.txt
@dirrm share/seabattle
-@dirrm share/doc/seabattle
+%%PORTDOCS%%@dirrm share/doc/seabattle
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200102030256.f132u9v71819>