- Fix build with clang

PR:		175041
Submitted by:	ports fury

3 files changed, 15 insertions, 59 deletions

diff --git a/games/starlanes/Makefile b/games/starlanes/Makefile
index d7fc83e88d86..4aed217c61d3 100644
--- a/games/starlanes/Makefile
+++ b/games/starlanes/Makefile
@@ -1,24 +1,28 @@
-# New ports collection makefile for:	starlanes
-# Date created:				7 May 1997
-# Whom:					Andrey Zakhvatov
-#
+# Created by: Andrey Zakhvatov
 # $FreeBSD$
-#
 
 PORTNAME=	starlanes
 PORTVERSION=	1.2.2
 CATEGORIES=	games
-MASTER_SITES=	${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR=	games/strategy
+MASTER_SITES=	SUNSITE/games/strategy
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	The classic space-age stock trading game
+COMMENT=	Classic space-age stock trading game
 
-ALL_TARGET=	# empty
 MAN6=		starlanes.6
 PLIST_FILES=	bin/starlanes
 
-post-extract:
-	@${RM} ${WRKSRC}/starlanes
+post-patch:
+	@${REINPLACE_CMD} -e \
+		's| restrict| m_restrict| ; \
+		 s|(restrict|(m_restrict|' ${WRKSRC}/starlanes.c
+
+do-build:
+	(cd ${WRKSRC} \
+		&& ${CC} ${CFLAGS} -o starlanes starlanes.c -lcurses)
+
+do-install:
+	(cd ${WRKSRC} && ${INSTALL_PROGRAM} starlanes ${PREFIX}/bin)
+	(cd ${WRKSRC} && ${INSTALL_MAN} starlanes.6 ${MAN6PREFIX}/man/man6)
 
 .include <bsd.port.mk>
diff --git a/games/starlanes/files/patch-aa b/games/starlanes/files/patch-aa
deleted file mode 100644
index 9ab476297f38..000000000000
--- a/games/starlanes/files/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
-*** starlanes.c	Sun Mar 30 01:42:18 1997
---- /home/andy/tmp/wrk/starlanes.c	Sat May 10 15:33:29 1997
-***************
-*** 26,32 ****
-  #include <ctype.h>
-  #include <time.h>
-  #include <unistd.h>
-! #include <curses.h>
-  #include <termios.h>
-  
-  /* color stuff: */
---- 26,32 ----
-  #include <ctype.h>
-  #include <time.h>
-  #include <unistd.h>
-! #include <ncurses.h>
-  #include <termios.h>
-  
-  /* color stuff: */
diff --git a/games/starlanes/files/patch-ab b/games/starlanes/files/patch-ab
deleted file mode 100644
index c9412b003c60..000000000000
--- a/games/starlanes/files/patch-ab
+++ /dev/null
@@ -1,29 +0,0 @@
---- Makefile.orig	Sun Mar 30 09:36:44 1997
-+++ Makefile	Thu Mar 30 01:54:39 2000
-@@ -2,21 +2,17 @@
- # Makefile for Starlanes
- #
- 
--CC=gcc
--CCOPTS=-Wall
-+CC?=gcc
-+CCOPTS=${CFLAGS}
- CURSESLIB=ncurses
--INSTALLDIR=/usr/local
-+INSTALLDIR=${PREFIX}
- 
- starlanes: starlanes.c
- 	$(CC) $(CCOPTS) -o starlanes starlanes.c -l$(CURSESLIB)
- 
- install:
--	cp starlanes $(INSTALLDIR)/games
--	cp starlanes.6 $(INSTALLDIR)/man/man6
--	chown bin:bin $(INSTALLDIR)/games/starlanes
--	chown root:root $(INSTALLDIR)/man/man6/starlanes.6
--	chmod 755 $(INSTALLDIR)/games/starlanes
--	chmod 444 $(INSTALLDIR)/man/man6/starlanes.6
-+	${BSD_INSTALL_PROGRAM} starlanes $(INSTALLDIR)/bin
-+	${BSD_INSTALL_MAN} starlanes.6 $(INSTALLDIR)/man/man6
- 
- # fakeinstall just echos the install commands:
- fakeinstall: