From gtc@mm.st  Sat Jul 19 03:58:11 2003
Return-Path: <gtc@mm.st>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 6DBF337B401
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 19 Jul 2003 03:58:11 -0700 (PDT)
Received: from mta03-svc.ntlworld.com (mta03-svc.ntlworld.com [62.253.162.43])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 2C3EA43F3F
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 19 Jul 2003 03:58:10 -0700 (PDT)
	(envelope-from gtc@mm.st)
Received: from [81.107.150.176] by mta03-svc.ntlworld.com
          (InterMail vM.4.01.03.37 201-229-121-137-20020806) with ESMTP
          id <20030719105807.GPIE2652.mta03-svc.ntlworld.com@[81.107.150.176]>;
          Sat, 19 Jul 2003 11:58:07 +0100
Message-Id: <1058612269.6576.24.camel@fire.alarm>
Date: 19 Jul 2003 11:57:49 +0100
From: Guy Coleman <gtc@mm.st>
To: freebsd-gnats-submit@FreeBSD.org
Cc: janni@hacker7.net
Subject: Re: [Update] games/freeciv: 1.13.0 -> 1.14.0

>Number:         54630
>Category:       ports
>Synopsis:       Re: [Update] games/freeciv: 1.13.0 -> 1.14.0
>Confidential:   yes
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jul 19 04:00:35 PDT 2003
>Closed-Date:    Sat Aug 02 06:44:53 PDT 2003
>Last-Modified:  Sat Aug 02 06:44:53 PDT 2003
>Originator:     
>Release:        
>Organization:
>Environment:
>Description:
 Diff included below. It includes a fixed pkg-plist and removal of two
 dead mirrors. I've also got a reply from the maintainer when I sent him
 an update:
 
 Feel free to send it in, with my approval.
 I've gotten several sets of patches from other people as well, and just
 haven't had the time to clean them up and submit them.
 
 thanks
  -Adam
 
 So I guess that's official approval.
 
 Index: Makefile
 ===================================================================
 RCS file: /home/ncvs/ports/games/freeciv/Makefile,v
 retrieving revision 1.51
 diff -u -r1.51 Makefile
 --- Makefile	26 Apr 2003 18:27:02 -0000	1.51
 +++ Makefile	19 Jul 2003 10:34:07 -0000
 @@ -6,24 +6,42 @@
  #
  
  PORTNAME=	freeciv
 -PORTVERSION=	1.13.0
 +PORTVERSION=	1.14.0
  CATEGORIES=	games
  MASTER_SITES=	ftp://ftp.freeciv.org/pub/freeciv/stable/ \
 -		ftp://ftp.netc.pt/pub/freeciv/stable/ \
 -		ftp://ftp.pvv.ntnu.no/pub/freeciv/stable/
 +		ftp://ftp.siena.linux.it/pub/mirror/ftp.freeciv.org/stable/
  
  MAINTAINER?=	adam-ports@blacktabby.org
 -COMMENT?=	A civilisation clone for X11; multiplayer
 +COMMENT=	A civilisation clone for X11; multiplayer
  
  LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext
  
 -USE_XPM=	yes
 -USE_BZIP2=	yes
 -WANT_GNOME=	yes
 +.if defined(SOUND)
 +.if ${SOUND} == SDL
 +LIB_DEPENDS+=	SDL_mixer.5:${PORTSDIR}/audio/sdl_mixer
 +SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
 +CONFIGURE_ARGS+=--enable-sdl-mixer --disable-esound
 +.elif ${SOUND} == ESOUND
 +LIB_DEPENDS+=	esd.2:${PORTSDIR}/audio/esound
 +CONFIGURE_ARGS+=--enable-esound --disable-sdl-mixer
 +.endif
 +.else
 +CONFIGURE_ARGS+=--disable-esound --disable-sdl-mixer
 +.endif
 +
 +CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
  GNU_CONFIGURE=	yes
  CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
  		LIBS="-L${LOCALBASE}/lib"
  
 +pre-configure:
 +.ifndef SOUND
 +	@${ECHO_MSG} "===> Set SOUND=SDL or SOUND=ESOUND for SDL/EsoundD sound
 support respectively."
 +.endif
 +
 +USE_XPM=	yes
 +USE_BZIP2=	yes
 +WANT_GNOME=	yes
  .include <bsd.port.pre.mk>
  
  .if ${HAVE_GNOME:Mgtk12}!=""
 Index: distinfo
 ===================================================================
 RCS file: /home/ncvs/ports/games/freeciv/distinfo,v
 retrieving revision 1.19
 diff -u -r1.19 distinfo
 --- distinfo	7 Aug 2002 21:37:39 -0000	1.19
 +++ distinfo	19 Jul 2003 10:04:25 -0000
 @@ -1 +1 @@
 -MD5 (freeciv-1.13.0.tar.bz2) = a3544f113dbab77f3c6f00130c1bf181
 +MD5 (freeciv-1.14.0.tar.bz2) = c506ec29b94ea516aaa02a107129cf10
 Index: pkg-plist
 ===================================================================
 RCS file: /home/ncvs/ports/games/freeciv/pkg-plist,v
 retrieving revision 1.16
 diff -u -r1.16 pkg-plist
 --- pkg-plist	7 Aug 2002 21:37:39 -0000	1.16
 +++ pkg-plist	19 Jul 2003 10:43:23 -0000
 @@ -27,6 +27,12 @@
  share/freeciv/freeciv.rc
  share/freeciv/freeciv.rc-2.0
  share/freeciv/helpdata.txt
 +share/freeciv/history/buildings.ruleset
 +share/freeciv/history/game.ruleset
 +share/freeciv/history/governments.ruleset
 +share/freeciv/history/techs.ruleset
 +share/freeciv/history/terrain.ruleset
 +share/freeciv/history/units.ruleset
  share/freeciv/isotrident.tilespec
  share/freeciv/isotrident/cities.spec
  share/freeciv/isotrident/cities.xpm
 @@ -94,13 +100,11 @@
  share/freeciv/nation/japanese.ruleset
  share/freeciv/nation/kenyan.ruleset
  share/freeciv/nation/korean.ruleset
 -share/freeciv/nation/krevi.ruleset
  share/freeciv/nation/latvian.ruleset
  share/freeciv/nation/lithuanian.ruleset
  share/freeciv/nation/misc_cities.ruleset
  share/freeciv/nation/mongol.ruleset
  share/freeciv/nation/mordor.ruleset
 -share/freeciv/nation/olympic.ruleset
  share/freeciv/nation/persian.ruleset
  share/freeciv/nation/polish.ruleset
  share/freeciv/nation/portuguese.ruleset
 @@ -122,8 +126,8 @@
  share/freeciv/nation/welsh.ruleset
  share/freeciv/nation/zulu.ruleset
  share/freeciv/scenario/british-isles-85x80-v2.80.sav
 -share/freeciv/scenario/earth-80x50-v2.sav
  share/freeciv/scenario/earth-160x90-v2.sav
 +share/freeciv/scenario/earth-80x50-v2.sav
  share/freeciv/scenario/europe-200x100-v2.sav
  share/freeciv/scenario/hagworld-120x60-v1.2.sav
  share/freeciv/scenario/iberian-peninsula-136x100-v1.0.sav
 @@ -146,6 +150,7 @@
  share/locale/de/LC_MESSAGES/freeciv.mo
  share/locale/en_GB/LC_MESSAGES/freeciv.mo
  share/locale/es/LC_MESSAGES/freeciv.mo
 +share/locale/et/LC_MESSAGES/freeciv.mo
  share/locale/fi/LC_MESSAGES/freeciv.mo
  share/locale/fr/LC_MESSAGES/freeciv.mo
  share/locale/hu/LC_MESSAGES/freeciv.mo
 @@ -159,11 +164,49 @@
  share/locale/ro/LC_MESSAGES/freeciv.mo
  share/locale/ru/LC_MESSAGES/freeciv.mo
  share/locale/sv/LC_MESSAGES/freeciv.mo
 +@dirrm share/locale/sv/LC_MESSAGES
 +@dirrm share/locale/sv
 +@dirrm share/locale/ru/LC_MESSAGES
 +@dirrm share/locale/ru
 +@dirrm share/locale/ro/LC_MESSAGES
 +@dirrm share/locale/ro
 +@dirrm share/locale/pt_BR/LC_MESSAGES
 +@dirrm share/locale/pt_BR
 +@dirrm share/locale/pt/LC_MESSAGES
 +@dirrm share/locale/pt
 +@dirrm share/locale/pl/LC_MESSAGES
 +@dirrm share/locale/pl
 +@dirrm share/locale/no/LC_MESSAGES
 +@dirrm share/locale/no
 +@dirrm share/locale/nl/LC_MESSAGES
 +@dirrm share/locale/nl
 +@dirrm share/locale/ja/LC_MESSAGES
 +@dirrm share/locale/ja
 +@dirrm share/locale/it/LC_MESSAGES
 +@dirrm share/locale/it
 +@dirrm share/locale/hu/LC_MESSAGES
 +@dirrm share/locale/hu
 +@dirrm share/locale/fr/LC_MESSAGES
 +@dirrm share/locale/fr
 +@dirrm share/locale/fi/LC_MESSAGES
 +@dirrm share/locale/fi
 +@dirrm share/locale/et/LC_MESSAGES
 +@dirrm share/locale/et
 +@dirrm share/locale/es/LC_MESSAGES
 +@dirrm share/locale/es
 +@dirrm share/locale/en_GB/LC_MESSAGES
 +@dirrm share/locale/en_GB
 +@dirrm share/locale/de/LC_MESSAGES
 +@dirrm share/locale/de
 +@dirrm share/locale/da/LC_MESSAGES
 +@dirrm share/locale/da
 +@dirrm share/locale
  @dirrm share/freeciv/trident
  @dirrm share/freeciv/scenario
  @dirrm share/freeciv/nation
  @dirrm share/freeciv/misc
  @dirrm share/freeciv/isotrident
 +@dirrm share/freeciv/history
  @dirrm share/freeciv/default
  @dirrm share/freeciv/civ2
  @dirrm share/freeciv/civ1
 
 
>How-To-Repeat:
>Fix:
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: oliver 
State-Changed-When: Sat Aug 2 06:43:50 PDT 2003 
State-Changed-Why:  
Misfiled PR, Followup to ports/54502 


Responsible-Changed-From-To: gnats-admin->freebsd-ports-bugs 
Responsible-Changed-By: oliver 
Responsible-Changed-When: Sat Aug 2 06:43:50 PDT 2003 
Responsible-Changed-Why:  
Misfiled PR, Followup to ports/54502 

http://www.freebsd.org/cgi/query-pr.cgi?pr=54630 
>Unformatted:
