From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Aug 30 13:10:08 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8CCA3106566B for ; Tue, 30 Aug 2011 13:10:08 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 755368FC0A for ; Tue, 30 Aug 2011 13:10:08 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p7UDA8wL079380 for ; Tue, 30 Aug 2011 13:10:08 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p7UDA87h079379; Tue, 30 Aug 2011 13:10:08 GMT (envelope-from gnats) Date: Tue, 30 Aug 2011 13:10:08 GMT Message-Id: <201108301310.p7UDA87h079379@freefall.freebsd.org> To: freebsd-ports-bugs@FreeBSD.org From: KATO Tsuguru Cc: Subject: Re: ports/160110: Update port: games/xfrisk to 1.3.r1 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: KATO Tsuguru List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Aug 2011 13:10:08 -0000 The following reply was made to PR ports/160110; it has been noted by GNATS. From: KATO Tsuguru To: bug-followup@FreeBSD.org Cc: Subject: Re: ports/160110: Update port: games/xfrisk to 1.3.r1 Date: Tue, 30 Aug 2011 22:00:06 +0900 This is a multi-part message in MIME format. --Multipart=_Tue__30_Aug_2011_22_00_06_+0900_3Vmo_MF=zDIWbD1c Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Remake of the patch against current tree. --Multipart=_Tue__30_Aug_2011_22_00_06_+0900_3Vmo_MF=zDIWbD1c Content-Type: text/x-diff; name="games_xfrisk.diff" Content-Disposition: attachment; filename="games_xfrisk.diff" Content-Transfer-Encoding: 7bit diff -urN /usr/ports/games/xfrisk/Makefile games/xfrisk/Makefile --- /usr/ports/games/xfrisk/Makefile 2011-08-30 17:52:16.000000000 +0900 +++ games/xfrisk/Makefile 2011-08-30 18:13:33.000000000 +0900 @@ -6,12 +6,10 @@ # PORTNAME= xfrisk -PORTVERSION= 1.2 -PORTREVISION= 5 +PORTVERSION= 1.3.r1 CATEGORIES= games -MASTER_SITES= http://old.tuxick.net/xfrisk/files/ \ - http://devel.ringlet.net/games/xfrisk/ -DISTNAME= XFrisk-${PORTVERSION} +MASTER_SITES= http://old.tuxick.net/xfrisk/files/ +DISTNAME= ${PORTNAME}-${PORTVERSION:S/.r/-rc/} MAINTAINER= ports@FreeBSD.org COMMENT= A multi-player networked Risk game for X11 @@ -20,12 +18,27 @@ NO_CDROM= Possible trademark infringement -NO_INSTALL_MANPAGES= yes -WRKSRC= ${WRKDIR}/XFrisk +USE_XORG= ice sm x11 xext xmu xt xpm USE_GMAKE= yes - -USE_XORG= x11 xt xaw xmu sm ice -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" +GNU_CONFIGURE= yes +CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" +MAKE_JOBS_SAFE= yes + +CPPFLAGS= -I${LOCALBASE}/include +LDFLAGS= -L${LOCALBASE}/lib + +PORTDOCS= AUTHORS BUGS ChangeLog FAQ NEWS README TODO +PLIST_FILES= bin/aiColson bin/aiConway bin/aiDummy bin/risk bin/xfrisk \ + bin/xfriskserver %%DATADIR%%/Countries.risk \ + %%DATADIR%%/Help.risk %%DATADIR%%/World.risk +PLIST_DIRS= %%DATADIR%% + +post-install: +.if !defined(NOPORTDOCS) + @${MKDIR} ${DOCSDIR} +.for file in ${PORTDOCS} + ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} +.endfor +.endif .include diff -urN /usr/ports/games/xfrisk/distinfo games/xfrisk/distinfo --- /usr/ports/games/xfrisk/distinfo 2011-07-04 02:04:18.000000000 +0900 +++ games/xfrisk/distinfo 2011-08-24 03:20:02.000000000 +0900 @@ -1,2 +1,2 @@ -SHA256 (XFrisk-1.2.tar.gz) = 40f4c0786e5a60974f3b0bbfa043964361378e5cb9e7b7d466ad1160a5b40800 -SIZE (XFrisk-1.2.tar.gz) = 228943 +SHA256 (xfrisk-1.3-rc1.tar.gz) = 7c1c69b258651b88d372e0e04e4c38e2d2bc584946667c115b763380fb99833e +SIZE (xfrisk-1.3-rc1.tar.gz) = 286809 diff -urN /usr/ports/games/xfrisk/files/patch-ab games/xfrisk/files/patch-ab --- /usr/ports/games/xfrisk/files/patch-ab 2008-04-23 15:15:11.000000000 +0900 +++ games/xfrisk/files/patch-ab 1970-01-01 09:00:00.000000000 +0900 @@ -1,30 +0,0 @@ ---- Makefile Sun Jan 23 14:01:55 2000 -+++ Makefile.new Mon May 29 23:12:10 2000 -@@ -55,9 +55,9 @@ - #################### - # C compiler options - # GNU gcc is recommended. --CC=gcc -+CC?=gcc - # Use these with gcc --CFLAGS=-g -Wall -W -fno-common -pedantic -+CFLAGS+= -Wall -W -fno-common -pedantic - - # If you don't have gcc, don't use -Wall -W -fno-common - #CFLAGS=-g -@@ -81,13 +81,13 @@ - - ## Installation prefix - # Adjust to taste. Stuff gets installed here. --PREFIX=/usr/local -+PREFIX?=/usr/local - #PREFIX=/usr/local/X11 - - ## X11 location and options - # for X11R6 - # Point this at your X tree. --XDIR=/usr/X11R6 -+XDIR?=/usr/local - #XDIR=/usr/local/X11 - #XDIR=/usr/openwin - diff -urN /usr/ports/games/xfrisk/pkg-descr games/xfrisk/pkg-descr --- /usr/ports/games/xfrisk/pkg-descr 1997-06-04 11:31:59.000000000 +0900 +++ games/xfrisk/pkg-descr 2011-07-30 03:20:00.000000000 +0900 @@ -1,3 +1,5 @@ XFrisk is a multi-player Risk game that supports network play. It includes a server, "friskserver", and a client, "xfrisk". Note that the client supports only 8bpp and 24bpp visuals. + +WWW: http://old.tuxick.net/xfrisk/ diff -urN /usr/ports/games/xfrisk/pkg-plist games/xfrisk/pkg-plist --- /usr/ports/games/xfrisk/pkg-plist 2000-05-30 12:28:00.000000000 +0900 +++ games/xfrisk/pkg-plist 1970-01-01 09:00:00.000000000 +0900 @@ -1,10 +0,0 @@ -bin/friskserver -bin/risk -bin/xfrisk -bin/aiDummy -bin/aiConway -bin/aiColson -lib/xfrisk/World.risk -lib/xfrisk/Countries.risk -lib/xfrisk/Help.risk -@dirrm lib/xfrisk --Multipart=_Tue__30_Aug_2011_22_00_06_+0900_3Vmo_MF=zDIWbD1c--