From tkato432@yahoo.com  Sat Jan  5 18:02:07 2013
Return-Path: <tkato432@yahoo.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	by hub.freebsd.org (Postfix) with ESMTP id C4024B03
	for <FreeBSD-gnats-submit@FreeBSD.org>; Sat,  5 Jan 2013 18:02:01 +0000 (UTC)
	(envelope-from tkato432@yahoo.com)
Received: from msa105lp.auone-net.jp (msa105lp.auone-net.jp [222.3.140.168])
	by mx1.freebsd.org (Postfix) with ESMTP id 6F3019B3
	for <FreeBSD-gnats-submit@FreeBSD.org>; Sat,  5 Jan 2013 18:02:01 +0000 (UTC)
Received: from localhost.localdomain (ZT034245.ppp.dion.ne.jp [59.128.34.245])
	by msa105lp.auone-net.jp (au one net msa) with ESMTP id 2321150036
	for <FreeBSD-gnats-submit@FreeBSD.org>; Sun,  6 Jan 2013 03:01:58 +0900 (JST)
Message-Id: <20130106023408.8c5f3e977acd2fd41f7dd76e@yahoo.com>
Date: Sun, 6 Jan 2013 02:34:08 +0900
From: KATO Tsuguru <tkato432@yahoo.com>
To: FreeBSD-gnats-submit@FreeBSD.org
Subject: games/starlanes: Fix build with clang

>Number:         175041
>Category:       ports
>Synopsis:       games/starlanes: Fix build with clang
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    miwi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jan 05 18:10:11 UTC 2013
>Closed-Date:    Thu Feb 07 14:45:51 UTC 2013
>Last-Modified:  Thu Feb  7 14:50:01 UTC 2013
>Originator:     KATO Tsuguru
>Release:        FreeBSD 7.4-RELEASE-p10 i386
>Organization:
>Environment:
>Description:
- Fix build with clang

Remove file:
files/patch-aa
files/patch-ab

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/games/starlanes/Makefile games/starlanes/Makefile
--- /usr/ports/games/starlanes/Makefile	2012-11-08 07:33:53.000000000 +0900
+++ games/starlanes/Makefile	2013-01-05 22:54:47.000000000 +0900
@@ -1,24 +1,28 @@
-# New ports collection makefile for:	starlanes
-# Date created:				7 May 1997
-# Whom:					Andrey Zakhvatov
-#
+# Created by: Andrey Zakhvatov
 # $FreeBSD: head/games/starlanes/Makefile 300896 2012-07-14 13:54:48Z beat $
-#
 
 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 -urN /usr/ports/games/starlanes/files/patch-aa games/starlanes/files/patch-aa
--- /usr/ports/games/starlanes/files/patch-aa	2012-11-08 07:33:53.000000000 +0900
+++ games/starlanes/files/patch-aa	1970-01-01 09:00:00.000000000 +0900
@@ -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 -urN /usr/ports/games/starlanes/files/patch-ab games/starlanes/files/patch-ab
--- /usr/ports/games/starlanes/files/patch-ab	2012-11-08 07:33:53.000000000 +0900
+++ games/starlanes/files/patch-ab	1970-01-01 09:00:00.000000000 +0900
@@ -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:
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->araujo 
Responsible-Changed-By: araujo 
Responsible-Changed-When: Fri Jan 18 06:17:17 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=175041 
State-Changed-From-To: open->closed 
State-Changed-By: miwi 
State-Changed-When: Thu Feb 7 14:45:22 UTC 2013 
State-Changed-Why:  
take 


Responsible-Changed-From-To: araujo->miwi 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Thu Feb 7 14:45:22 UTC 2013 
Responsible-Changed-Why:  
committed txh. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=175041 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/175041: commit references a PR
Date: Thu,  7 Feb 2013 14:45:36 +0000 (UTC)

 Author: miwi
 Date: Thu Feb  7 14:45:23 2013
 New Revision: 311856
 URL: http://svnweb.freebsd.org/changeset/ports/311856
 
 Log:
   - Fix build with clang
   
   PR:		175041
   Submitted by:	ports fury
 
 Deleted:
   head/games/starlanes/files/patch-aa
   head/games/starlanes/files/patch-ab
 Modified:
   head/games/starlanes/Makefile   (contents, props changed)
 
 Modified: head/games/starlanes/Makefile
 ==============================================================================
 --- head/games/starlanes/Makefile	Thu Feb  7 14:43:48 2013	(r311855)
 +++ head/games/starlanes/Makefile	Thu Feb  7 14:45:23 2013	(r311856)
 @@ -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>
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
