From nobody@FreeBSD.org  Sat Mar  2 14:07:50 2013
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
	by hub.freebsd.org (Postfix) with ESMTP id 669A6776
	for <freebsd-gnats-submit@FreeBSD.org>; Sat,  2 Mar 2013 14:07:50 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 43EB4D3B
	for <freebsd-gnats-submit@FreeBSD.org>; Sat,  2 Mar 2013 14:07:50 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.5/8.14.5) with ESMTP id r22E7oUp026947
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 2 Mar 2013 14:07:50 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.5/8.14.5/Submit) id r22E7oSW026946;
	Sat, 2 Mar 2013 14:07:50 GMT
	(envelope-from nobody)
Message-Id: <201303021407.r22E7oSW026946@red.freebsd.org>
Date: Sat, 2 Mar 2013 14:07:50 GMT
From: Green Dog <fiziologus@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [games/py-fife] update to 0.3.4
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         176602
>Category:       ports
>Synopsis:       [games/py-fife] update to 0.3.4
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    miwi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Mar 02 14:10:00 UTC 2013
>Closed-Date:    Sun Mar 03 06:45:44 UTC 2013
>Last-Modified:  Sun Mar 03 06:45:44 UTC 2013
>Originator:     Green Dog
>Release:        
>Organization:
>Environment:
>Description:
games/py-fife update to 0.3.4
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN py-fife.orig/Makefile py-fife/Makefile
--- py-fife.orig/Makefile	2013-01-31 18:01:28.000000000 +0400
+++ py-fife/Makefile	2013-03-02 17:42:57.000000000 +0400
@@ -2,50 +2,52 @@
 # $FreeBSD: ports/games/py-fife/Makefile,v 1.5 2013/01/31 14:01:28 svnexp Exp $
 
 PORTNAME=		fife
-PORTVERSION=		0.3.3r3
-PORTREVISION=		3
+PORTVERSION=		0.3.4
 CATEGORIES=		games
 MASTER_SITES=		http://sourceforge.net/projects/${PORTNAME}/files/active/src/:source \
-			http://sourceforge.net/projects/${PORTNAME}/files/active/demos/:demo
+			http://sourceforge.net/projects/${PORTNAME}/files/active/demos/:demo \
+			http://sourceforge.net/projects/${PORTNAME}/files/active/tools/:tools
 DISTNAME=		${PORTNAME}_${PORTVERSION}
 DISTFILES+=	      	${DISTNAME}.tar.gz:source \
-			${DISTNAME}_demos.tar.gz:demo
+			${DISTNAME}_demos.tar.gz:demo \
+			${DISTNAME}_tools.tar.gz:tools
 
 MAINTAINER=		fiziologus@gmail.com
 COMMENT=		Flexible Isometric Free Engine
 
-FETCH_ARGS=		-Fpr
-
 BUILD_DEPENDS=		${LOCALBASE}/bin/swig:${PORTSDIR}/devel/swig13
 
-LIB_DEPENDS=		vorbisfile.6:${PORTSDIR}/audio/libvorbis \
-			guichan.2:${PORTSDIR}/devel/guichan \
+LIB_DEPENDS=		vorbisfile:${PORTSDIR}/audio/libvorbis \
+			guichan:${PORTSDIR}/devel/guichan \
 			boost_filesystem:${PORTSDIR}/devel/boost-libs \
 			png15:${PORTSDIR}/graphics/png
 
+FETCH_ARGS=		-Fpr
+
 USE_SDL=		sdl ttf image
 USE_OPENAL=		al
 
 USE_SCONS=		yes
+SCONS_ARGS=		--prefix=${PREFIX} --python-prefix=${PYTHON_SITELIBDIR}
 SCONS_BUILDENV=		SWIG=${LOCALBASE}/bin/swig \
-			CXX=${CXX} CPP=${CPP}
+			CXX=${CXX}
 SCONS_TARGET=		fife-python
 SCONS_INSTALL_TARGET=	install-python
 
-USE_PYTHON=		yes
+USE_PYTHON=		2.7
 
 USE_XORG=		xcursor
 USE_GL=			gl
 
-USE_GNOME=		pkgconfig
+USE_PKGCONFIG=		build
 
 post-patch:
-	${REINPLACE_CMD} -e 's/X11R6/local/g' ${WRKSRC}/build/openbsd4-config.py && \
+	${REINPLACE_CMD} -e 's/X11R6/local/g; s/libpng/ligpng15/g' ${WRKSRC}/build/openbsd4-config.py && \
 		${MV} ${WRKSRC}/build/openbsd4-config.py ${WRKSRC}/build/${PYTHON_PLATFORM}-config.py
 
 post-install:
 	${MKDIR} ${DATADIR}
-	${MV} ${WRKSRC}/tools ${DATADIR}
+	${MV} ${WRKDIR}/tools ${DATADIR}
 	${MV} ${WRKDIR}/demos ${DATADIR}
 	${MKDIR} ${DOCSDIR}
 .for FILE in README AUTHORS CHANGES COPYING
diff -ruN py-fife.orig/distinfo py-fife/distinfo
--- py-fife.orig/distinfo	2012-05-25 17:57:29.000000000 +0400
+++ py-fife/distinfo	2013-03-02 13:20:12.000000000 +0400
@@ -1,4 +1,6 @@
-SHA256 (fife_0.3.3r3.tar.gz) = 172bd6ececa37c3e98689f5b4b00cb86bcf611bca714cf88aef91ba6d05ea16e
-SIZE (fife_0.3.3r3.tar.gz) = 4930412
-SHA256 (fife_0.3.3r3_demos.tar.gz) = 07b454c3174e686b49080292fa77d18b196941ed65dd7e3bf62b4d9b40347177
-SIZE (fife_0.3.3r3_demos.tar.gz) = 23351591
+SHA256 (fife_0.3.4.tar.gz) = 8a28d570ef8166b0b571047b8bdc482b09c05c4f9bb754f5564964b8c06dd6f7
+SIZE (fife_0.3.4.tar.gz) = 1398594
+SHA256 (fife_0.3.4_demos.tar.gz) = 4f76b921f2a8782ebaf168b24cdc2c94099084e260a61fa30a467b5edf3b5fc6
+SIZE (fife_0.3.4_demos.tar.gz) = 23355196
+SHA256 (fife_0.3.4_tools.tar.gz) = 90a3ea6c1b15ce87a535209f3f726e82fb06b518f3bbcf985b6950782227f98f
+SIZE (fife_0.3.4_tools.tar.gz) = 506204
diff -ruN py-fife.orig/files/patch-SConstruct py-fife/files/patch-SConstruct
--- py-fife.orig/files/patch-SConstruct	2012-05-25 17:57:29.000000000 +0400
+++ py-fife/files/patch-SConstruct	1970-01-01 03:00:00.000000000 +0300
@@ -1,15 +0,0 @@
---- SConstruct.orig	2012-05-21 16:35:59.000000000 +0400
-+++ SConstruct	2012-05-21 16:43:47.000000000 +0400
-@@ -308,6 +308,12 @@
- if os.environ.has_key('SWIG'):
- 	env['SWIG'] = os.environ['SWIG']
- 
-+if os.environ.has_key('CXX'):
-+	env['CXX'] = os.environ['CXX']
-+
-+if os.environ.has_key('CPP'):
-+	env['CPP'] = os.environ['CPP']
-+
- haveusercxxflags = False
- 
- if os.environ.has_key('CXXFLAGS'):
diff -ruN py-fife.orig/pkg-plist py-fife/pkg-plist
--- py-fife.orig/pkg-plist	2012-05-25 17:57:29.000000000 +0400
+++ py-fife/pkg-plist	2013-03-02 14:52:04.000000000 +0400
@@ -104,11 +104,13 @@
 %%DATADIR%%/demos/rio_de_hola/maps/shrine.xml
 %%DATADIR%%/demos/rio_de_hola/maps/tourist_beach.xml
 %%DATADIR%%/demos/rio_de_hola/maps/tourist_beach_test.xml
+%%DATADIR%%/demos/rio_de_hola/misc/black_cell.png
 %%DATADIR%%/demos/rio_de_hola/misc/current_rendersetup/LICENSE
 %%DATADIR%%/demos/rio_de_hola/misc/current_rendersetup/non-animated_object_rendersetup.blend
 %%DATADIR%%/demos/rio_de_hola/misc/current_rendersetup/rendering_setup.blend
 %%DATADIR%%/demos/rio_de_hola/misc/diamond_160x96_template_v01.blend
 %%DATADIR%%/demos/rio_de_hola/misc/infotext.txt
+%%DATADIR%%/demos/rio_de_hola/misc/mask_cell.png
 %%DATADIR%%/demos/rio_de_hola/misc/mask_diamond_126_96.png
 %%DATADIR%%/demos/rio_de_hola/misc/rotation+location_test/facing000/045r.png
 %%DATADIR%%/demos/rio_de_hola/misc/rotation+location_test/facing000/135r.png
@@ -376,6 +378,7 @@
 %%DATADIR%%/tools/atlas/stable.h
 %%DATADIR%%/tools/editor/fonts/FreeSans.ttf
 %%DATADIR%%/tools/editor/gui/cameradialog.xml
+%%DATADIR%%/tools/editor/gui/cellview.xml
 %%DATADIR%%/tools/editor/gui/eleveditor.xml
 %%DATADIR%%/tools/editor/gui/error.xml
 %%DATADIR%%/tools/editor/gui/filebrowser.xml
@@ -421,10 +424,12 @@
 %%DATADIR%%/tools/editor/gui/selection.xml
 %%DATADIR%%/tools/editor/gui/statuspanel.xml
 %%DATADIR%%/tools/editor/gui/tools.xml
+%%DATADIR%%/tools/editor/lang/help_cellview.txt
 %%DATADIR%%/tools/editor/lang/help_object_edit.txt
 %%DATADIR%%/tools/editor/lang/infotext.txt
 %%DATADIR%%/tools/editor/LICENSE
 %%DATADIR%%/tools/editor/plugins/CameraEdit.py
+%%DATADIR%%/tools/editor/plugins/CellView.py
 %%DATADIR%%/tools/editor/plugins/HistoryManager.py
 %%DATADIR%%/tools/editor/plugins/InstanceHighlighter.py
 %%DATADIR%%/tools/editor/plugins/LayerTool.py


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->freebsd-python 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sat Mar 2 14:10:08 UTC 2013 
Responsible-Changed-Why:  
freebsd-python@ wants this port PRs (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=176602 
Responsible-Changed-From-To: freebsd-python->miwi 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Sat Mar 2 18:06:27 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/176602: commit references a PR
Date: Sat,  2 Mar 2013 18:06:32 +0000 (UTC)

 Author: miwi
 Date: Sat Mar  2 18:06:24 2013
 New Revision: 313283
 URL: http://svnweb.freebsd.org/changeset/ports/313283
 
 Log:
   - Update to 0.3.4
   
   PR:		176602
   Submitted by:	maintainer
 
 Deleted:
   head/games/py-fife/files/
 Modified:
   head/games/py-fife/Makefile   (contents, props changed)
   head/games/py-fife/distinfo   (contents, props changed)
   head/games/py-fife/pkg-plist   (contents, props changed)
 
 Modified: head/games/py-fife/Makefile
 ==============================================================================
 --- head/games/py-fife/Makefile	Sat Mar  2 16:58:46 2013	(r313282)
 +++ head/games/py-fife/Makefile	Sat Mar  2 18:06:24 2013	(r313283)
 @@ -2,50 +2,52 @@
  # $FreeBSD$
  
  PORTNAME=		fife
 -PORTVERSION=		0.3.3r3
 -PORTREVISION=		3
 +PORTVERSION=		0.3.4
  CATEGORIES=		games
  MASTER_SITES=		http://sourceforge.net/projects/${PORTNAME}/files/active/src/:source \
 -			http://sourceforge.net/projects/${PORTNAME}/files/active/demos/:demo
 +			http://sourceforge.net/projects/${PORTNAME}/files/active/demos/:demo \
 +			http://sourceforge.net/projects/${PORTNAME}/files/active/tools/:tools
  DISTNAME=		${PORTNAME}_${PORTVERSION}
  DISTFILES+=	      	${DISTNAME}.tar.gz:source \
 -			${DISTNAME}_demos.tar.gz:demo
 +			${DISTNAME}_demos.tar.gz:demo \
 +			${DISTNAME}_tools.tar.gz:tools
  
  MAINTAINER=		fiziologus@gmail.com
  COMMENT=		Flexible Isometric Free Engine
  
 -FETCH_ARGS=		-Fpr
 -
  BUILD_DEPENDS=		${LOCALBASE}/bin/swig:${PORTSDIR}/devel/swig13
  
 -LIB_DEPENDS=		vorbisfile.6:${PORTSDIR}/audio/libvorbis \
 -			guichan.2:${PORTSDIR}/devel/guichan \
 +LIB_DEPENDS=		vorbisfile:${PORTSDIR}/audio/libvorbis \
 +			guichan:${PORTSDIR}/devel/guichan \
  			boost_filesystem:${PORTSDIR}/devel/boost-libs \
  			png15:${PORTSDIR}/graphics/png
  
 +FETCH_ARGS=		-Fpr
 +
  USE_SDL=		sdl ttf image
  USE_OPENAL=		al
  
  USE_SCONS=		yes
 +SCONS_ARGS=		--prefix=${PREFIX} --python-prefix=${PYTHON_SITELIBDIR}
  SCONS_BUILDENV=		SWIG=${LOCALBASE}/bin/swig \
 -			CXX=${CXX} CPP=${CPP}
 +			CXX=${CXX}
  SCONS_TARGET=		fife-python
  SCONS_INSTALL_TARGET=	install-python
  
 -USE_PYTHON=		yes
 +USE_PYTHON=		2.7
  
  USE_XORG=		xcursor
  USE_GL=			gl
  
 -USE_GNOME=		pkgconfig
 +USE_PKGCONFIG=		build
  
  post-patch:
 -	${REINPLACE_CMD} -e 's/X11R6/local/g' ${WRKSRC}/build/openbsd4-config.py && \
 +	${REINPLACE_CMD} -e 's/X11R6/local/g; s/libpng/ligpng15/g' ${WRKSRC}/build/openbsd4-config.py && \
  		${MV} ${WRKSRC}/build/openbsd4-config.py ${WRKSRC}/build/${PYTHON_PLATFORM}-config.py
  
  post-install:
  	${MKDIR} ${DATADIR}
 -	${MV} ${WRKSRC}/tools ${DATADIR}
 +	${MV} ${WRKDIR}/tools ${DATADIR}
  	${MV} ${WRKDIR}/demos ${DATADIR}
  	${MKDIR} ${DOCSDIR}
  .for FILE in README AUTHORS CHANGES COPYING
 
 Modified: head/games/py-fife/distinfo
 ==============================================================================
 --- head/games/py-fife/distinfo	Sat Mar  2 16:58:46 2013	(r313282)
 +++ head/games/py-fife/distinfo	Sat Mar  2 18:06:24 2013	(r313283)
 @@ -1,4 +1,6 @@
 -SHA256 (fife_0.3.3r3.tar.gz) = 172bd6ececa37c3e98689f5b4b00cb86bcf611bca714cf88aef91ba6d05ea16e
 -SIZE (fife_0.3.3r3.tar.gz) = 4930412
 -SHA256 (fife_0.3.3r3_demos.tar.gz) = 07b454c3174e686b49080292fa77d18b196941ed65dd7e3bf62b4d9b40347177
 -SIZE (fife_0.3.3r3_demos.tar.gz) = 23351591
 +SHA256 (fife_0.3.4.tar.gz) = 8a28d570ef8166b0b571047b8bdc482b09c05c4f9bb754f5564964b8c06dd6f7
 +SIZE (fife_0.3.4.tar.gz) = 1398594
 +SHA256 (fife_0.3.4_demos.tar.gz) = 4f76b921f2a8782ebaf168b24cdc2c94099084e260a61fa30a467b5edf3b5fc6
 +SIZE (fife_0.3.4_demos.tar.gz) = 23355196
 +SHA256 (fife_0.3.4_tools.tar.gz) = 90a3ea6c1b15ce87a535209f3f726e82fb06b518f3bbcf985b6950782227f98f
 +SIZE (fife_0.3.4_tools.tar.gz) = 506204
 
 Modified: head/games/py-fife/pkg-plist
 ==============================================================================
 --- head/games/py-fife/pkg-plist	Sat Mar  2 16:58:46 2013	(r313282)
 +++ head/games/py-fife/pkg-plist	Sat Mar  2 18:06:24 2013	(r313283)
 @@ -104,11 +104,13 @@
  %%DATADIR%%/demos/rio_de_hola/maps/shrine.xml
  %%DATADIR%%/demos/rio_de_hola/maps/tourist_beach.xml
  %%DATADIR%%/demos/rio_de_hola/maps/tourist_beach_test.xml
 +%%DATADIR%%/demos/rio_de_hola/misc/black_cell.png
  %%DATADIR%%/demos/rio_de_hola/misc/current_rendersetup/LICENSE
  %%DATADIR%%/demos/rio_de_hola/misc/current_rendersetup/non-animated_object_rendersetup.blend
  %%DATADIR%%/demos/rio_de_hola/misc/current_rendersetup/rendering_setup.blend
  %%DATADIR%%/demos/rio_de_hola/misc/diamond_160x96_template_v01.blend
  %%DATADIR%%/demos/rio_de_hola/misc/infotext.txt
 +%%DATADIR%%/demos/rio_de_hola/misc/mask_cell.png
  %%DATADIR%%/demos/rio_de_hola/misc/mask_diamond_126_96.png
  %%DATADIR%%/demos/rio_de_hola/misc/rotation+location_test/facing000/045r.png
  %%DATADIR%%/demos/rio_de_hola/misc/rotation+location_test/facing000/135r.png
 @@ -376,6 +378,7 @@
  %%DATADIR%%/tools/atlas/stable.h
  %%DATADIR%%/tools/editor/fonts/FreeSans.ttf
  %%DATADIR%%/tools/editor/gui/cameradialog.xml
 +%%DATADIR%%/tools/editor/gui/cellview.xml
  %%DATADIR%%/tools/editor/gui/eleveditor.xml
  %%DATADIR%%/tools/editor/gui/error.xml
  %%DATADIR%%/tools/editor/gui/filebrowser.xml
 @@ -421,10 +424,12 @@
  %%DATADIR%%/tools/editor/gui/selection.xml
  %%DATADIR%%/tools/editor/gui/statuspanel.xml
  %%DATADIR%%/tools/editor/gui/tools.xml
 +%%DATADIR%%/tools/editor/lang/help_cellview.txt
  %%DATADIR%%/tools/editor/lang/help_object_edit.txt
  %%DATADIR%%/tools/editor/lang/infotext.txt
  %%DATADIR%%/tools/editor/LICENSE
  %%DATADIR%%/tools/editor/plugins/CameraEdit.py
 +%%DATADIR%%/tools/editor/plugins/CellView.py
  %%DATADIR%%/tools/editor/plugins/HistoryManager.py
  %%DATADIR%%/tools/editor/plugins/InstanceHighlighter.py
  %%DATADIR%%/tools/editor/plugins/LayerTool.py
 _______________________________________________
 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"
 
State-Changed-From-To: open->closed 
State-Changed-By: miwi 
State-Changed-When: Sun Mar 3 06:45:44 UTC 2013 
State-Changed-Why:  
Committed. Thanks! 

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