From root@helo.liwing.de  Tue Aug 12 12:27:29 2003
Return-Path: <root@helo.liwing.de>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 77A7137B401
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 12 Aug 2003 12:27:29 -0700 (PDT)
Received: from helo.liwing.de (helo.liwing.de [213.70.188.163])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 8740843FBF
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 12 Aug 2003 12:27:28 -0700 (PDT)
	(envelope-from root@helo.liwing.de)
Received: from helo.liwing.de (localhost.liwing.de [127.0.0.1])
	by helo.liwing.de (8.12.7/8.12.7) with ESMTP id h7CJRO6l084896;
	Tue, 12 Aug 2003 19:27:24 GMT
	(envelope-from root@helo.liwing.de)
Received: (from root@localhost)
	by helo.liwing.de (8.12.7/8.12.7/Submit) id h7CJRMD3084895;
	Tue, 12 Aug 2003 19:27:22 GMT
Message-Id: <200308121927.h7CJRMD3084895@helo.liwing.de>
Date: Tue, 12 Aug 2003 19:27:22 GMT
From: Jens Rehsack <rehsack@liwing.de>
Reply-To: Jens Rehsack <rehsack@liwing.de>
To: FreeBSD-gnats-submit@freebsd.org
Cc: Jens Rehsack <rehsack@liwing.de>, adam-ports@blacktabby.org
Subject: [PATCH] update of games/freeciv to 1.14
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         55508
>Category:       ports
>Synopsis:       [PATCH] update of games/freeciv to 1.14
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Aug 12 12:30:20 PDT 2003
>Closed-Date:    Tue Aug 26 01:20:02 PDT 2003
>Last-Modified:  Tue Aug 26 03:30:12 PDT 2003
>Originator:     Jens Rehsack
>Release:        FreeBSD 5.1-CURRENT i386
>Organization:
LiWing IT-Services
>Environment:
System: FreeBSD statler 5.1-CURRENT FreeBSD 5.1-CURRENT #0: Mon Aug 11 08:11:10 GMT 2003 trevor@statler:/usr/obj/usr/src/sys/STATLER i386


>Description:
	JJust an update :-)
>How-To-Repeat:
	Install FreeCiv an wonder about the version :-)
>Fix:

	

--- patch-update-1.14 begins here ---
Index: games/freeciv/Makefile
===================================================================
diff -u games/freeciv/Makefile.orig games/freeciv/Makefile
--- games/freeciv/Makefile.orig	Mon Aug 11 20:19:49 2003
+++ games/freeciv/Makefile	Tue Aug 12 19:18:14 2003
@@ -6,7 +6,7 @@
 #
 
 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/ \
@@ -20,6 +20,7 @@
 USE_XPM=	yes
 USE_BZIP2=	yes
 WANT_GNOME=	yes
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
@@ -32,5 +33,8 @@
 .else
 LIB_DEPENDS+=	Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
 .endif
+
+post-patch:
+	cd ${WRKSRC}; ${FIND} . -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e 's/@program_transform_name@//'
 
 .include <bsd.port.post.mk>
Index: games/freeciv/distinfo
===================================================================
diff -u games/freeciv/distinfo.orig games/freeciv/distinfo
--- games/freeciv/distinfo.orig	Wed Aug  7 21:37:39 2002
+++ games/freeciv/distinfo	Mon Aug 11 20:35:00 2003
@@ -1 +1 @@
-MD5 (freeciv-1.13.0.tar.bz2) = a3544f113dbab77f3c6f00130c1bf181
+MD5 (freeciv-1.14.0.tar.bz2) = c506ec29b94ea516aaa02a107129cf10
Index: games/freeciv/pkg-plist
===================================================================
diff -u games/freeciv/pkg-plist.orig games/freeciv/pkg-plist
--- games/freeciv/pkg-plist.orig	Wed Aug  7 21:37:39 2002
+++ games/freeciv/pkg-plist	Tue Aug 12 18:29:18 2003
@@ -27,6 +27,13 @@
 share/freeciv/freeciv.rc
 share/freeciv/freeciv.rc-2.0
 share/freeciv/helpdata.txt
+share/freeciv/history
+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 +101,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
@@ -146,6 +151,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
@@ -163,6 +169,7 @@
 @dirrm share/freeciv/scenario
 @dirrm share/freeciv/nation
 @dirrm share/freeciv/misc
+@dirrm share/freeciv/history
 @dirrm share/freeciv/isotrident
 @dirrm share/freeciv/default
 @dirrm share/freeciv/civ2
--- patch-update-1.14 ends here ---


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: demon 
State-Changed-When: Tue Aug 26 01:19:40 PDT 2003 
State-Changed-Why:  
Port updated, thanks for submission! 

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

From: "Guy Coleman" <gtchask@mm.st>
To: freebsd-gnats-submit@freebsd.org
Cc: rehsack@liwing.de
Subject: Re: ports/55508: [PATCH] update of games/freeciv to 1.14
Date: Tue, 26 Aug 2003 11:24:55 +0100

 ports/54502 includes this update and adds SDL_mixer and ESound support.
 Also, adding the CONFIGURE_TARGET means that the REINPLACE_CMD in
 post-patch isn't needed.
 
 I've fixed up the patch so it works, and included it below. Sorry for any
 tab/spacing mess, I had to paste this into a webmail interface.
 
 ----------
 
 Index: Makefile
 ===================================================================
 RCS file: /home/ncvs/ports/games/freeciv/Makefile,v
 retrieving revision 1.53
 diff -u -r1.53 Makefile
 --- Makefile    26 Aug 2003 08:19:34 -0000      1.53
 +++ Makefile    26 Aug 2003 10:13:43 -0000
 @@ -20,7 +20,7 @@
  USE_XPM=       yes
  USE_BZIP2=     yes
  WANT_GNOME=    yes
 -USE_REINPLACE= yes
 +CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
  GNU_CONFIGURE= yes
  CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
                 LIBS="-L${LOCALBASE}/lib"
 @@ -34,7 +34,31 @@
  LIB_DEPENDS+=  Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
  .endif
  
 -post-patch:
 -       cd ${WRKSRC}; ${FIND} . -name Makefile.in | ${XARGS}
 ${REINPLACE_CMD} -e 's/@program_transform_name@//'
 +.if ${HAVE_GNOME:Mesound}!=""
 +WITH_ESOUND=   yes
 +.endif
 +
 +.if exists(${LOCALBASE}/lib/libSDL_mixer.so)
 +WITH_SDL_MIXER=        yes
 +.endif
 +
 +.if defined(WITH_ESOUND)
 +USE_GNOME+=    esound
 +CONFIGURE_ARGS+=--enable-esound --disable-sdl-mixer
 +.if defined(PKGNAMESUFFIX)
 +PKGNAMESUFFIX:=        ${PKGNAMESUFFIX}-esound
 +.else
 +PKGNAMESUFFIX= -esound
 +.endif
 +.elif defined(WITH_SDL_MIXER)
 +LIB_DEPENDS+=  SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer
 +SDL_CONFIG?=   ${LOCALBASE}/bin/sdl11-config
 +CONFIGURE_ARGS+=--enable-sdl-mixer --disable-esound
 +.if defined(PKGNAMESUFFIX)
 +PKGNAMESUFFIX:=        ${PKGNAMESUFFIX}-sdl-mixer
 +.else
 +PKGNAMESUFFIX= -sdl-mixer
 +.endif
 +.endif
  
  .include <bsd.port.post.mk>
>Unformatted:
