From swell.k@gmail.com  Mon Mar 23 07:45:53 2009
Return-Path: <swell.k@gmail.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4519B106566B
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 23 Mar 2009 07:45:53 +0000 (UTC)
	(envelope-from swell.k@gmail.com)
Received: from mail-bw0-f164.google.com (mail-bw0-f164.google.com [209.85.218.164])
	by mx1.freebsd.org (Postfix) with ESMTP id 8C7858FC18
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 23 Mar 2009 07:45:52 +0000 (UTC)
	(envelope-from swell.k@gmail.com)
Received: by bwz8 with SMTP id 8so1521732bwz.43
        for <FreeBSD-gnats-submit@freebsd.org>; Mon, 23 Mar 2009 00:45:51 -0700 (PDT)
Received: by 10.103.91.2 with SMTP id t2mr2926496mul.47.1237794351469;
        Mon, 23 Mar 2009 00:45:51 -0700 (PDT)
Received: from localhost (95-24-174-59.broadband.corbina.ru [95.24.174.59])
        by mx.google.com with ESMTPS id 23sm9654975mun.0.2009.03.23.00.45.49
        (version=TLSv1/SSLv3 cipher=RC4-MD5);
        Mon, 23 Mar 2009 00:45:50 -0700 (PDT)
Message-Id: <86prg865tg.fsf@gmail.com>
Date: Mon, 23 Mar 2009 10:45:15 +0300
From: Anonymous <swell.k@gmail.com>
To: FreeBSD-gnats-submit@freebsd.org
Subject: [patch] games/wesnoth-devel: update to 1.6
X-Send-Pr-Version: 3.113

>Number:         132957
>Category:       ports
>Synopsis:       [patch] games/wesnoth-devel: update to 1.6
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    philip
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Mar 23 07:50:02 UTC 2009
>Closed-Date:    Tue Mar 24 20:11:46 UTC 2009
>Last-Modified:  Tue Mar 24 20:11:46 UTC 2009
>Originator:     Anonymous
>Release:        FreeBSD 8.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD luffy 8.0-CURRENT FreeBSD 8.0-CURRENT #0 r190296M: Sun Mar 22 22:26:10 UTC 2009 root@luffy:/usr/obj/usr/src/sys/PHOENIX amd64

>Description:
- update
- add fribidi to OPTIONS and sort WITHOUT_FRIBIDI
>How-To-Repeat:
>Fix:

--- wesnoth-devel.diff begins here ---
Index: games/wesnoth-devel/Makefile
===================================================================
RCS file: /home/csup/ports/games/wesnoth-devel/Makefile,v
retrieving revision 1.66
diff -u -p -r1.66 Makefile
--- games/wesnoth-devel/Makefile	22 Mar 2009 19:03:41 -0000	1.66
+++ games/wesnoth-devel/Makefile	23 Mar 2009 07:36:46 -0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	wesnoth
-PORTVERSION=	1.5.14
+PORTVERSION=	1.6
 CATEGORIES=	games
 PKGNAMESUFFIX=	-devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
@@ -52,6 +52,7 @@ MAN6_ZH_CN=	wesnoth.6
 
 OPTIONS=	CAMPAIGN "Enable campaign server" On \
 		EDITOR	"Enable map editor"  On \
+		FRIBIDI	"Enable bidirectional support" On \
 		NLS	"Enable localization" On \
 		SERVER "Enable server" On \
 		TOOLS "Enable extra tools for artists and translators" On
@@ -76,6 +77,12 @@ CONFIGURE_ARGS+=	--disable-editor
 PLIST_SUB+=		EDITOR=""
 .endif
 
+.if defined(WITHOUT_FRIBIDI)
+CONFIGURE_ARGS+=	--without-fribidi
+.else
+LIB_DEPENDS+=		fribidi.0:${PORTSDIR}/converters/fribidi
+.endif
+
 .if defined(WITHOUT_NLS)
 CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=		NLS="@comment "
@@ -99,10 +106,6 @@ CONFIGURE_ARGS+=	--enable-tools
 PLIST_SUB+=		TOOLS=""
 .endif
 
-.if defined(WITH_FRIBIDI) || exists(${LOCALBASE}/bin/fribidi-config)
-LIB_DEPENDS+=		fribidi.0:${PORTSDIR}/converters/fribidi
-.endif
-
 .if (defined(WITH_CAMPAIGN) || defined(WITH_SERVER) || defined(WITH_TOOLS)) && defined(WITHOUT_NLS)
 BROKEN=		you need NLS support for `campaignd' or `wesnothd' or tools to link against gettext
 .endif
Index: games/wesnoth-devel/distinfo
===================================================================
RCS file: /home/csup/ports/games/wesnoth-devel/distinfo,v
retrieving revision 1.48
diff -u -p -r1.48 distinfo
--- games/wesnoth-devel/distinfo	22 Mar 2009 19:03:41 -0000	1.48
+++ games/wesnoth-devel/distinfo	22 Mar 2009 22:00:12 -0000
@@ -1,3 +1,3 @@
-MD5 (wesnoth-1.5.14.tar.bz2) = 9386a2abc4f442f1e05e44b6e0dc6852
-SHA256 (wesnoth-1.5.14.tar.bz2) = 530b112955aab57ccf136e9f8f87a7949176bf2b9fa24544452798ef9693c0ad
-SIZE (wesnoth-1.5.14.tar.bz2) = 225489555
+MD5 (wesnoth-1.6.tar.bz2) = ac636a0f0f6e1f346a99a0495e57b1de
+SHA256 (wesnoth-1.6.tar.bz2) = 22eb64ea4e1e84c37fc16008a568dd5ae515446531e89ad57e2218db33ea9020
+SIZE (wesnoth-1.6.tar.bz2) = 225406601
Index: games/wesnoth-devel/pkg-plist
===================================================================
RCS file: /home/csup/ports/games/wesnoth-devel/pkg-plist,v
retrieving revision 1.54
diff -u -p -r1.54 pkg-plist
--- games/wesnoth-devel/pkg-plist	22 Mar 2009 19:03:41 -0000	1.54
+++ games/wesnoth-devel/pkg-plist	23 Mar 2009 02:46:03 -0000
@@ -8,8 +8,6 @@ bin/wesnoth
 %%TOOLS%%bin/wmllint
 %%TOOLS%%bin/wmlscope
 share/applications/wesnoth.desktop
-share/pixmaps/wesnoth-icon.png
-share/pixmaps/wesnoth_editor-icon.png
 %%EDITOR%%share/applications/wesnoth_editor.desktop
 %%DOCSDIR%%/manual/CMakeLists.txt
 %%DOCSDIR%%/manual/images/de/game-screen-1.5.7.jpg
@@ -60,6 +58,7 @@ share/pixmaps/wesnoth_editor-icon.png
 %%DOCSDIR%%/manual/manual.hu.html
 %%DOCSDIR%%/manual/manual.it.html
 %%DOCSDIR%%/manual/manual.pl.html
+%%DOCSDIR%%/manual/manual.pt_BR.html
 %%DOCSDIR%%/manual/manual.ru.html
 %%DOCSDIR%%/manual/manual.sv.html
 %%DOCSDIR%%/manual/manual.tr.html
@@ -2107,6 +2106,10 @@ share/pixmaps/wesnoth_editor-icon.png
 %%DATADIR%%/data/core/images/attacks/web.png
 %%DATADIR%%/data/core/images/attacks/whip.png
 %%DATADIR%%/data/core/images/attacks/woodensword.png
+%%DATADIR%%/data/core/images/editor/brush-1.png
+%%DATADIR%%/data/core/images/editor/brush-2.png
+%%DATADIR%%/data/core/images/editor/brush-3.png
+%%DATADIR%%/data/core/images/editor/brush-nw-se.png
 %%DATADIR%%/data/core/images/halo/elven/druid-healing1.png
 %%DATADIR%%/data/core/images/halo/elven/druid-healing2.png
 %%DATADIR%%/data/core/images/halo/elven/druid-healing3.png
@@ -2231,7 +2234,6 @@ share/pixmaps/wesnoth_editor-icon.png
 %%DATADIR%%/data/core/images/halo/saurian-magic-halo-5.png
 %%DATADIR%%/data/core/images/halo/saurian-magic-halo-6.png
 %%DATADIR%%/data/core/images/halo/saurian-magic-halo-7.png
-%%DATADIR%%/data/core/images/halo/siren-naia-touch-halo.png
 %%DATADIR%%/data/core/images/halo/teleport-1.png
 %%DATADIR%%/data/core/images/halo/teleport-2.png
 %%DATADIR%%/data/core/images/halo/teleport-3.png
@@ -2344,6 +2346,7 @@ share/pixmaps/wesnoth_editor-icon.png
 %%DATADIR%%/data/core/images/items/storm-trident.png
 %%DATADIR%%/data/core/images/items/straw-bale1.png
 %%DATADIR%%/data/core/images/items/straw-bale2.png
+%%DATADIR%%/data/core/images/items/sword.png
 %%DATADIR%%/data/core/images/maps/EDITING-HOWTO
 %%DATADIR%%/data/core/images/maps/wesnoth.png
 %%DATADIR%%/data/core/images/misc/blank-hex.png
@@ -5981,24 +5984,7 @@ share/pixmaps/wesnoth_editor-icon.png
 %%DATADIR%%/data/core/images/units/human-peasants/woodsman-melee-1.png
 %%DATADIR%%/data/core/images/units/human-peasants/woodsman-melee-2.png
 %%DATADIR%%/data/core/images/units/human-peasants/woodsman.png
-%%DATADIR%%/data/core/images/units/merfolk/diviner-defend.png
-%%DATADIR%%/data/core/images/units/merfolk/diviner-magic1.png
-%%DATADIR%%/data/core/images/units/merfolk/diviner-magic2.png
-%%DATADIR%%/data/core/images/units/merfolk/diviner-magic3.png
-%%DATADIR%%/data/core/images/units/merfolk/diviner-magic4.png
-%%DATADIR%%/data/core/images/units/merfolk/diviner-magic5.png
-%%DATADIR%%/data/core/images/units/merfolk/diviner-magic6.png
-%%DATADIR%%/data/core/images/units/merfolk/diviner-staff-attack.png
 %%DATADIR%%/data/core/images/units/merfolk/diviner.png
-%%DATADIR%%/data/core/images/units/merfolk/enchantress-defend.png
-%%DATADIR%%/data/core/images/units/merfolk/enchantress-staff-attack.png
-%%DATADIR%%/data/core/images/units/merfolk/enchantress-water-attack1.png
-%%DATADIR%%/data/core/images/units/merfolk/enchantress-water-attack2.png
-%%DATADIR%%/data/core/images/units/merfolk/enchantress-water-attack3.png
-%%DATADIR%%/data/core/images/units/merfolk/enchantress-water-attack4.png
-%%DATADIR%%/data/core/images/units/merfolk/enchantress-water-attack5.png
-%%DATADIR%%/data/core/images/units/merfolk/enchantress-water-attack6.png
-%%DATADIR%%/data/core/images/units/merfolk/enchantress-water-attack7.png
 %%DATADIR%%/data/core/images/units/merfolk/enchantress.png
 %%DATADIR%%/data/core/images/units/merfolk/entangler.png
 %%DATADIR%%/data/core/images/units/merfolk/fighter.png
@@ -6013,27 +5999,7 @@ share/pixmaps/wesnoth_editor-icon.png
 %%DATADIR%%/data/core/images/units/merfolk/initiate.png
 %%DATADIR%%/data/core/images/units/merfolk/javelineer.png
 %%DATADIR%%/data/core/images/units/merfolk/netcaster.png
-%%DATADIR%%/data/core/images/units/merfolk/priestess-defend.png
-%%DATADIR%%/data/core/images/units/merfolk/priestess-magic1.png
-%%DATADIR%%/data/core/images/units/merfolk/priestess-magic2.png
-%%DATADIR%%/data/core/images/units/merfolk/priestess-magic3.png
-%%DATADIR%%/data/core/images/units/merfolk/priestess-magic4.png
-%%DATADIR%%/data/core/images/units/merfolk/priestess-magic5.png
-%%DATADIR%%/data/core/images/units/merfolk/priestess-magic6.png
-%%DATADIR%%/data/core/images/units/merfolk/priestess-staff-attack.png
 %%DATADIR%%/data/core/images/units/merfolk/priestess.png
-%%DATADIR%%/data/core/images/units/merfolk/siren-defend.png
-%%DATADIR%%/data/core/images/units/merfolk/siren-naia-touch-attack1.png
-%%DATADIR%%/data/core/images/units/merfolk/siren-naia-touch-attack2.png
-%%DATADIR%%/data/core/images/units/merfolk/siren-naia-touch-attack3.png
-%%DATADIR%%/data/core/images/units/merfolk/siren-naia-touch-attack4.png
-%%DATADIR%%/data/core/images/units/merfolk/siren-water-attack1.png
-%%DATADIR%%/data/core/images/units/merfolk/siren-water-attack2.png
-%%DATADIR%%/data/core/images/units/merfolk/siren-water-attack3.png
-%%DATADIR%%/data/core/images/units/merfolk/siren-water-attack4.png
-%%DATADIR%%/data/core/images/units/merfolk/siren-water-attack5.png
-%%DATADIR%%/data/core/images/units/merfolk/siren-water-attack6.png
-%%DATADIR%%/data/core/images/units/merfolk/siren-water-attack7.png
 %%DATADIR%%/data/core/images/units/merfolk/siren.png
 %%DATADIR%%/data/core/images/units/merfolk/spearman.png
 %%DATADIR%%/data/core/images/units/merfolk/triton.png
@@ -7016,7 +6982,6 @@ share/pixmaps/wesnoth_editor-icon.png
 %%DATADIR%%/data/core/images/units/woses/wose-elder-die-fall-9.png
 %%DATADIR%%/data/core/images/units/woses/wose-elder.png
 %%DATADIR%%/data/core/images/units/woses/wose.png
-%%DATADIR%%/data/core/images/wesnoth-icon-small.png
 %%DATADIR%%/data/core/images/wesnoth-icon.png
 %%DATADIR%%/data/core/macros/abilities.cfg
 %%DATADIR%%/data/core/macros/ai_controller.cfg
@@ -8170,10 +8135,6 @@ share/pixmaps/wesnoth_editor-icon.png
 %%DATADIR%%/images/dialogs/translucent65-border-top.png
 %%DATADIR%%/images/dialogs/translucent65-border-topleft.png
 %%DATADIR%%/images/dialogs/translucent65-border-topright.png
-%%DATADIR%%/images/editor/brush-1.png
-%%DATADIR%%/images/editor/brush-2.png
-%%DATADIR%%/images/editor/brush-3.png
-%%DATADIR%%/images/editor/brush-nw-se.png
 %%DATADIR%%/images/editor/selection-overlay.png
 %%DATADIR%%/images/editor/tool-overlay-select-brush.png
 %%DATADIR%%/images/editor/tool-overlay-select-wand.png
@@ -9594,6 +9555,7 @@ share/pixmaps/wesnoth_editor-icon.png
 @dirrm %%DATADIR%%/data/campaigns
 @dirrm %%DATADIR%%/data/core/editor
 @dirrm %%DATADIR%%/data/core/images/attacks
+@dirrm %%DATADIR%%/data/core/images/editor
 @dirrm %%DATADIR%%/data/core/images/halo/elven
 @dirrm %%DATADIR%%/data/core/images/halo/holy
 @dirrm %%DATADIR%%/data/core/images/halo/merfolk
--- wesnoth-devel.diff ends here ---
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->philip 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Mon Mar 23 07:50:13 UTC 2009 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/132957: commit references a PR
Date: Tue, 24 Mar 2009 20:09:24 +0000 (UTC)

 philip      2009-03-24 20:09:03 UTC
 
   FreeBSD ports repository
 
   Modified files:
     games/wesnoth        Makefile distinfo pkg-plist 
   Added files:
     games/wesnoth/files  patch-Makefile.in patch-configure 
                          patch-multiplayer_connect.cpp 
                          patch-src-Makefile.in 
                          patch-window_builder.cpp 
   Removed files:
     games/wesnoth/files  patch-src::help.cpp 
                          patch-src::language.cpp 
   Log:
   Update to 1.6.
   
   See also: http://www.wesnoth.org/start/1.6/
   
   PR:             ports/132957
   Submitted by:   "Anonymous" <swell.k -at- gmail.com>
   
   Revision  Changes      Path
   1.63      +36 -13      ports/games/wesnoth/Makefile
   1.46      +3 -3        ports/games/wesnoth/distinfo
   1.1       +11 -0       ports/games/wesnoth/files/patch-Makefile.in (new)
   1.3       +11 -0       ports/games/wesnoth/files/patch-configure (new)
   1.1       +11 -0       ports/games/wesnoth/files/patch-multiplayer_connect.cpp (new)
   1.1       +11 -0       ports/games/wesnoth/files/patch-src-Makefile.in (new)
   1.7       +0 -11       ports/games/wesnoth/files/patch-src::help.cpp (dead)
   1.3       +0 -15       ports/games/wesnoth/files/patch-src::language.cpp (dead)
   1.1       +13 -0       ports/games/wesnoth/files/patch-window_builder.cpp (new)
   1.52      +8634 -7670  ports/games/wesnoth/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->closed 
State-Changed-By: philip 
State-Changed-When: Tue Mar 24 20:11:45 UTC 2009 
State-Changed-Why:  
Committed. Thanks! 

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