From e3d5ef48b7f80fa01f4bf6fc374ca35c728ff3e6 Mon Sep 17 00:00:00 2001 From: antoine Date: Thu, 30 May 2013 11:45:14 +0000 Subject: - Unbreak with clang - Use PORTDOCS, PORT_OPTIONS, DATADIR - Trim Makefile header Approved by: miwi (mentor) --- games/seabattle/Makefile | 22 +++++++++++----------- games/seabattle/files/patch-batt.c | 11 +++++++++++ games/seabattle/pkg-plist | 16 +++++++--------- 3 files changed, 29 insertions(+), 20 deletions(-) create mode 100644 games/seabattle/files/patch-batt.c (limited to 'games') diff --git a/games/seabattle/Makefile b/games/seabattle/Makefile index 3373f9d000cd..83d8d077c1eb 100644 --- a/games/seabattle/Makefile +++ b/games/seabattle/Makefile @@ -1,28 +1,28 @@ -# New ports collection makefile for: seabattle -# Date created: 6 June 1997 -# Whom: Andrey Zakhvatov -# +# Created by: Andrey Zakhvatov # $FreeBSD$ -# PORTNAME= seabattle PORTVERSION= 1.0 PORTREVISION= 1 CATEGORIES= games -MASTER_SITES= ${MASTER_SITE_SUNSITE} \ +MASTER_SITES= SUNSITE \ http://www.deater.net/weave/vmwprod/ MASTER_SITE_SUBDIR= games/strategy MAINTAINER= ports@FreeBSD.org -COMMENT= A curses based battleship type game +COMMENT= Curses based battleship type game + +PORTDOCS= readme.txt + +.include do-install: ${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 + ${INSTALL_DATA} ${WRKSRC}/*.au ${DATADIR} +.if ${PORT_OPTIONS:MDOCS} + @${MKDIR} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/readme.txt ${DOCSDIR} .endif .include diff --git a/games/seabattle/files/patch-batt.c b/games/seabattle/files/patch-batt.c new file mode 100644 index 000000000000..2a489dd45311 --- /dev/null +++ b/games/seabattle/files/patch-batt.c @@ -0,0 +1,11 @@ +--- ./batt.c.orig 1997-05-13 15:45:51.000000000 +0000 ++++ ./batt.c 2013-05-28 08:46:50.000000000 +0000 +@@ -13,7 +13,7 @@ + int salvo_play=0; /* paramaters uncluttered*/ + int first_time=0; + +-int main(int argc, char *argv) ++int main(int argc, char **argv) + { + MAIN_THINGY *main_thing; + diff --git a/games/seabattle/pkg-plist b/games/seabattle/pkg-plist index 04bee92aae45..cd158d374fd3 100644 --- a/games/seabattle/pkg-plist +++ b/games/seabattle/pkg-plist @@ -1,10 +1,8 @@ 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 -@dirrm share/seabattle -%%PORTDOCS%%@dirrm share/doc/seabattle +%%DATADIR%%/hit1.au +%%DATADIR%%/hit2.au +%%DATADIR%%/miss1.au +%%DATADIR%%/miss2.au +%%DATADIR%%/opening.au +%%DATADIR%%/sunkit.au +@dirrm %%DATADIR%% -- cgit