4 files changed, 126 insertions, 177 deletions

diff --git a/games/py-fife/Makefile b/games/py-fife/Makefile
index 7ac3bb5a2717..b1586dc753bc 100644
--- a/games/py-fife/Makefile
+++ b/games/py-fife/Makefile
@@ -1,66 +1,64 @@
 # Created by: GreenDog <fiziologus@gmail.com>
 # $FreeBSD$
 
-PORTNAME=		fife
-PORTVERSION=		0.4.1
-PORTREVISION=		15
-CATEGORIES=		games
-PKGNAMEPREFIX=		${PYTHON_PKGNAMEPREFIX}
+PORTNAME=	fife
+PORTVERSION=	0.4.2
+CATEGORIES=	games
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=		fiziologus@gmail.com
-COMMENT=		Flexible Isometric Free Engine
+MAINTAINER=	fiziologus@gmail.com
+COMMENT=	Flexible Isometric Free Engine
 
-LICENSE=		LGPL21
+LICENSE=	LGPL21+
+LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-LIB_DEPENDS=		libvorbisfile.so:audio/libvorbis \
-			libtinyxml.so:textproc/tinyxml \
-			libboost_filesystem.so:devel/boost-libs \
-			libpng.so:graphics/png
+LIB_DEPENDS=	libvorbisfile.so:audio/libvorbis \
+		libtinyxml.so:textproc/tinyxml \
+		libboost_filesystem.so:devel/boost-libs \
+		libpng.so:graphics/png
 
-USES=			cmake compiler:c++11-lang gl openal:al pkgconfig sdl xorg
-USE_GL=			gl
-USE_SDL=		sdl2 ttf2 image2
-USE_XORG=		xcursor
+USES=		cmake compiler:c++11-lang gl openal:al pkgconfig sdl xorg
+USE_GL=		gl glew
+USE_LDCONFIG=	yes
+USE_SDL=	sdl2 ttf2 image2
+USE_XORG=	xcursor
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	fifengine
 GH_PROJECT=	fifengine
 
-OPTIONS_DEFINE=		ZIP LOGGING
+OPTIONS_DEFINE=	LOGGING
 
 OPTIONS_MULTI=		GUISS COMP
+OPTIONS_MULTI_GUISS=	FIFECHAN CEGUI
+OPTIONS_MULTI_COMP=	PYTHON LIBRARY
+OPTIONS_DEFAULT=	FIFECHAN LOGGING PYTHON
 
 OPTIONS_SUB=		yes
 
-OPTIONS_MULTI_GUISS=	FIFECHAN CEGUI
 GUISS_DESC=		GUI subsystem
 FIFECHAN_DESC=		Fifechan GUI subsystem
 CEGUI_DESC=		Crazy Eddi's GUI subsystem (must be build with OpenGL)
 
-ZIP_DESC=		ZIP archive support
 LOGGING_DESC=		Logging
 
-OPTIONS_MULTI_COMP=	PYTHON LIBRARY
 COMP_DESC=		Building components
 PYTHON_DESC=		Build python extension module (need for unknown-horizons)
 LIBRARY_DESC=		Build and install files for directly develop with C++
 
-OPTIONS_DEFAULT=	FIFECHAN ZIP LOGGING PYTHON
-
 FIFECHAN_CMAKE_BOOL=	fifechan
 FIFECHAN_LIB_DEPENDS=	libfifechan_sdl.so:devel/fifechan
 
 CEGUI_CMAKE_BOOL=	cegui
 CEGUI_LIB_DEPENDS=	libCEGUIBase-0.so:graphics/cegui
-CEGUI_USE=		gl=glew
 
-ZIP_CMAKE_BOOL=		zip
 LOGGING_CMAKE_BOOL=	logging
 
 PYTHON_CMAKE_BOOL=	build-python
-PYTHON_USES=		python:2.7
+PYTHON_USES=		python
 PYTHON_USE=		python=flavors
 PYTHON_BUILD_DEPENDS=	${LOCALBASE}/bin/swig3.0:devel/swig30
+PYTHON_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${PY_FLAVOR}
 
 LIBRARY_CMAKE_BOOL=	build-library
 # For static library build
diff --git a/games/py-fife/distinfo b/games/py-fife/distinfo
index b8aabd4830e6..f46b9f47b656 100644
--- a/games/py-fife/distinfo
+++ b/games/py-fife/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1496751325
-SHA256 (fifengine-fifengine-0.4.1_GH0.tar.gz) = bae3fc591cc2891f7d1b3a656a5d8ad700ecc2e297ad453bf4f1bcbbf82e8cb2
-SIZE (fifengine-fifengine-0.4.1_GH0.tar.gz) = 15972607
+TIMESTAMP = 1575381835
+SHA256 (fifengine-fifengine-0.4.2_GH0.tar.gz) = e882b55befa36ae2f1a89ada16af0f814a1b78f7cbe6021ec5b1605604cf8ff8
+SIZE (fifengine-fifengine-0.4.2_GH0.tar.gz) = 15713939
diff --git a/games/py-fife/files/patch-CMakeLists.txt b/games/py-fife/files/patch-CMakeLists.txt
deleted file mode 100644
index d5b688370f36..000000000000
--- a/games/py-fife/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,74 +0,0 @@
---- CMakeLists.txt.orig	2017-02-07 21:39:46.000000000 +0300
-+++ CMakeLists.txt	2017-02-24 02:07:19.734433000 +0300
-@@ -33,7 +33,6 @@
- option(logging          "Enable logging"                                        ON)
- option(rend-camzone     "Enable camera zone renderer"                           OFF)
- option(rend-grid        "Enable camera grid renderer"                           OFF)
--option(use-githash      "Try to determine the git hash for the current commit"  ON)
- option(build-python     "Build the python extension module"                     ON)
- option(build-library    "Build and install files to directly develop with c++"  OFF)
- 
-@@ -690,6 +689,20 @@
- 
-   find_package(GLEW REQUIRED)
-   include_directories(${GLEW_INCLUDE_DIRS})
-+  add_definitions(-DHAVE_OPENGL)
-+  if(zip)
-+    set(FIFE_CORE_SRC ${FIFE_CORE_SRC} ${FIFE_ZIP_SRC})
-+    add_definitions(-DHAVE_ZIP)
-+  endif(zip)
-+  if(logging)
-+    add_definitions(-DLOG_ENABLED)
-+  endif(logging)
-+  if(rend-camzone)
-+    add_definitions(-DRENDER_CAMZONES)
-+  endif(rend-camzone)
-+  if(rend-grid)
-+    add_definitions(-DRENDER_GRID)
-+  endif(rend-grid)
- endif(cegui)
- 
- if(build-python)
-@@ -710,6 +723,8 @@
- 
-   find_package(FifeChan COMPONENTS sdl REQUIRED)
-  
-+  message("Using FifeChan")
-+  set(FIFE_CORE_SRC ${FIFE_CORE_SRC} ${FIFE_FCHAN_SRC})
-   if(build-python)
-     set(SWIG_MODULE_fifechan_EXTRA_DEPS)
-     foreach(filename ${FIFE_FCHAN_SWIG_LIB})
-@@ -742,15 +757,6 @@
-   if(rend-grid)
-     add_definitions(-DRENDER_GRID)
-   endif(rend-grid)
--  if(use-githash)
--    execute_process(
--      COMMAND git rev-parse --short=8 HEAD
--      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
--      OUTPUT_VARIABLE GIT_COMMIT_HASH
--      OUTPUT_STRIP_TRAILING_WHITESPACE
--    )
--    add_definitions(-DFIFE_GIT_HASH=${GIT_COMMIT_HASH})
--  endif(use-githash)
-   include_directories(${FIFECHAN_INCLUDE_DIR})
-   link_directories(${FIFECHAN_LIBRARIES})
-   if(build-python)
-@@ -846,7 +852,7 @@
- 
-   set_source_files_properties("${PROJECT_BINARY_DIR}/fife.i" PROPERTIES CPLUSPLUS ON)
- 
--  swig_add_module(fife python "${PROJECT_BINARY_DIR}/fife.i"  ${FIFE_CORE_SRC} ${FIFE_FCHAN_SRC})
-+  swig_add_module(fife python "${PROJECT_BINARY_DIR}/fife.i"  ${FIFE_CORE_SRC})
-   swig_link_libraries(fife ${PYTHON_LIBRARIES})
-   swig_link_libraries(fife ${SDL2_LIBRARY}
-                            ${SDL2_IMAGE_LIBRARIES}
-@@ -904,7 +910,7 @@
- #------------------------------------------------------------------------------
- 
- if(build-library)
--  add_library(fife ${FIFE_CORE_SRC} ${FIFE_FCHAN_SRC})
-+  add_library(fife ${FIFE_CORE_SRC})
-   set_target_properties(fife PROPERTIES SOVERSION ${FIFE_VERSION})
- 
-   target_link_libraries(fife ${SDL2_LIBRARY}
diff --git a/games/py-fife/pkg-plist b/games/py-fife/pkg-plist
index 24b0d95b2c01..a7612f4e9f14 100644
--- a/games/py-fife/pkg-plist
+++ b/games/py-fife/pkg-plist
@@ -1,3 +1,7 @@
+%%LIBRARY%%include/fife/core/audio/actionaudio.h
+%%LIBRARY%%include/fife/core/audio/effects/soundeffect.h
+%%LIBRARY%%include/fife/core/audio/effects/soundeffectmanager.h
+%%LIBRARY%%include/fife/core/audio/effects/soundfilter.h
 %%LIBRARY%%include/fife/core/audio/fife_openal.h
 %%LIBRARY%%include/fife/core/audio/soundclip.h
 %%LIBRARY%%include/fife/core/audio/soundclipmanager.h
@@ -5,37 +9,42 @@
 %%LIBRARY%%include/fife/core/audio/sounddecoder.h
 %%LIBRARY%%include/fife/core/audio/soundemitter.h
 %%LIBRARY%%include/fife/core/audio/soundmanager.h
+%%LIBRARY%%include/fife/core/audio/soundsource.h
 %%LIBRARY%%include/fife/core/controller/engine.h
 %%LIBRARY%%include/fife/core/controller/enginesettings.h
-%%LIBRARY%%include/fife/core/eventchannel/base/ec_event.h
-%%LIBRARY%%include/fife/core/eventchannel/base/ec_inputevent.h
-%%LIBRARY%%include/fife/core/eventchannel/command/ec_command.h
-%%LIBRARY%%include/fife/core/eventchannel/command/ec_commandids.h
-%%LIBRARY%%include/fife/core/eventchannel/command/ec_icommandcontroller.h
-%%LIBRARY%%include/fife/core/eventchannel/command/ec_icommandlistener.h
-%%LIBRARY%%include/fife/core/eventchannel/drop/ec_dropevent.h
-%%LIBRARY%%include/fife/core/eventchannel/drop/ec_idropcontroller.h
-%%LIBRARY%%include/fife/core/eventchannel/drop/ec_idroplistener.h
+%%LIBRARY%%include/fife/core/eventchannel/base/event.h
+%%LIBRARY%%include/fife/core/eventchannel/base/ilistener.h
+%%LIBRARY%%include/fife/core/eventchannel/base/inputevent.h
+%%LIBRARY%%include/fife/core/eventchannel/command/command.h
+%%LIBRARY%%include/fife/core/eventchannel/command/commandids.h
+%%LIBRARY%%include/fife/core/eventchannel/command/icommandcontroller.h
+%%LIBRARY%%include/fife/core/eventchannel/command/icommandlistener.h
+%%LIBRARY%%include/fife/core/eventchannel/drop/dropevent.h
+%%LIBRARY%%include/fife/core/eventchannel/drop/idropcontroller.h
+%%LIBRARY%%include/fife/core/eventchannel/drop/idroplistener.h
 %%LIBRARY%%include/fife/core/eventchannel/eventmanager.h
-%%LIBRARY%%include/fife/core/eventchannel/key/ec_ikeycontroller.h
-%%LIBRARY%%include/fife/core/eventchannel/key/ec_ikeyfilter.h
-%%LIBRARY%%include/fife/core/eventchannel/key/ec_ikeylistener.h
-%%LIBRARY%%include/fife/core/eventchannel/key/ec_key.h
-%%LIBRARY%%include/fife/core/eventchannel/key/ec_keyevent.h
-%%LIBRARY%%include/fife/core/eventchannel/mouse/ec_imousecontroller.h
-%%LIBRARY%%include/fife/core/eventchannel/mouse/ec_imousefilter.h
-%%LIBRARY%%include/fife/core/eventchannel/mouse/ec_imouselistener.h
-%%LIBRARY%%include/fife/core/eventchannel/mouse/ec_mouseevent.h
-%%LIBRARY%%include/fife/core/eventchannel/sdl/ec_isdleventcontroller.h
-%%LIBRARY%%include/fife/core/eventchannel/sdl/ec_isdleventlistener.h
-%%LIBRARY%%include/fife/core/eventchannel/source/ec_eventsourcetypes.h
-%%LIBRARY%%include/fife/core/eventchannel/source/ec_ieventsource.h
-%%LIBRARY%%include/fife/core/eventchannel/text/ec_itextcontroller.h
-%%LIBRARY%%include/fife/core/eventchannel/text/ec_itextlistener.h
-%%LIBRARY%%include/fife/core/eventchannel/text/ec_text.h
-%%LIBRARY%%include/fife/core/eventchannel/text/ec_textevent.h
+%%LIBRARY%%include/fife/core/eventchannel/joystick/ijoystickcontroller.h
+%%LIBRARY%%include/fife/core/eventchannel/joystick/ijoysticklistener.h
+%%LIBRARY%%include/fife/core/eventchannel/joystick/joystick.h
+%%LIBRARY%%include/fife/core/eventchannel/joystick/joystickevent.h
+%%LIBRARY%%include/fife/core/eventchannel/joystick/joystickmanager.h
+%%LIBRARY%%include/fife/core/eventchannel/key/ikeycontroller.h
+%%LIBRARY%%include/fife/core/eventchannel/key/ikeyfilter.h
+%%LIBRARY%%include/fife/core/eventchannel/key/ikeylistener.h
+%%LIBRARY%%include/fife/core/eventchannel/key/key.h
+%%LIBRARY%%include/fife/core/eventchannel/key/keyevent.h
+%%LIBRARY%%include/fife/core/eventchannel/mouse/imousecontroller.h
+%%LIBRARY%%include/fife/core/eventchannel/mouse/imouselistener.h
+%%LIBRARY%%include/fife/core/eventchannel/mouse/mouseevent.h
+%%LIBRARY%%include/fife/core/eventchannel/sdl/isdleventcontroller.h
+%%LIBRARY%%include/fife/core/eventchannel/sdl/isdleventlistener.h
+%%LIBRARY%%include/fife/core/eventchannel/source/eventsourcetypes.h
+%%LIBRARY%%include/fife/core/eventchannel/source/ieventsource.h
+%%LIBRARY%%include/fife/core/eventchannel/text/itextcontroller.h
+%%LIBRARY%%include/fife/core/eventchannel/text/itextlistener.h
+%%LIBRARY%%include/fife/core/eventchannel/text/text.h
+%%LIBRARY%%include/fife/core/eventchannel/text/textevent.h
 %%LIBRARY%%include/fife/core/export.h
-%%LIBRARY%%include/fife/core/ext/glee/GLee.h
 %%LIBRARY%%%%CEGUI%%include/fife/core/gui/cegui/base/ceguiinputprocessor.h
 %%LIBRARY%%%%CEGUI%%include/fife/core/gui/cegui/ceguimanager.h
 %%LIBRARY%%%%FIFECHAN%%include/fife/core/gui/fifechan/base/gui_font.h
@@ -46,16 +55,18 @@
 %%LIBRARY%%%%FIFECHAN%%include/fife/core/gui/fifechan/console/commandline.h
 %%LIBRARY%%%%FIFECHAN%%include/fife/core/gui/fifechan/console/console.h
 %%LIBRARY%%%%FIFECHAN%%include/fife/core/gui/fifechan/fifechanmanager.h
-%%LIBRARY%%include/fife/core/gui/fifechan/util/utf8/utf8stringeditor.h
-%%LIBRARY%%include/fife/core/gui/fifechan/widgets/clicklabel.h
-%%LIBRARY%%include/fife/core/gui/fifechan/widgets/icon2.h
-%%LIBRARY%%include/fife/core/gui/fifechan/widgets/percentagebar.h
-%%LIBRARY%%include/fife/core/gui/fifechan/widgets/togglebutton.h
-%%LIBRARY%%include/fife/core/gui/fifechan/widgets/twobutton.h
+%%LIBRARY%%%%FIFECHAN%%include/fife/core/gui/fifechan/util/utf8/utf8stringeditor.h
+%%LIBRARY%%%%FIFECHAN%%include/fife/core/gui/fifechan/widgets/animationicon.h
+%%LIBRARY%%%%FIFECHAN%%include/fife/core/gui/fifechan/widgets/clicklabel.h
+%%LIBRARY%%%%FIFECHAN%%include/fife/core/gui/fifechan/widgets/dockarea.h
+%%LIBRARY%%%%FIFECHAN%%include/fife/core/gui/fifechan/widgets/panel.h
+%%LIBRARY%%%%FIFECHAN%%include/fife/core/gui/fifechan/widgets/percentagebar.h
+%%LIBRARY%%%%FIFECHAN%%include/fife/core/gui/fifechan/widgets/resizablewindow.h
 %%LIBRARY%%include/fife/core/gui/guimanager.h
 %%LIBRARY%%include/fife/core/gui/hybrid/hybridguimanager.h
 %%LIBRARY%%include/fife/core/loaders/native/audio/ogg_loader.h
 %%LIBRARY%%include/fife/core/loaders/native/audio/sounddecoder_ogg.h
+%%LIBRARY%%include/fife/core/loaders/native/input/controllermappingloader.h
 %%LIBRARY%%include/fife/core/loaders/native/map/animationloader.h
 %%LIBRARY%%include/fife/core/loaders/native/map/atlasloader.h
 %%LIBRARY%%include/fife/core/loaders/native/map/ianimationloader.h
@@ -93,6 +104,7 @@
 %%LIBRARY%%include/fife/core/pathfinder/routepather/routepather.h
 %%LIBRARY%%include/fife/core/pathfinder/routepather/routepathersearch.h
 %%LIBRARY%%include/fife/core/pathfinder/routepather/singlelayersearch.h
+%%LIBRARY%%include/fife/core/savers/native/input/controllermappingsaver.h
 %%LIBRARY%%include/fife/core/savers/native/map/ianimationsaver.h
 %%LIBRARY%%include/fife/core/savers/native/map/iatlassaver.h
 %%LIBRARY%%include/fife/core/savers/native/map/imapsaver.h
@@ -182,58 +194,71 @@
 %%LIBRARY%%include/fife/core/view/renderitem.h
 %%LIBRARY%%include/fife/core/view/visual.h
 %%LIBRARY%%lib/libfife.so
-%%LIBRARY%%lib/libfife.so.0.4.1
+%%LIBRARY%%lib/libfife.so.0.4.2
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/fife/__init__.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/fife/_fife.so
 %%PYTHON%%%%FIFECHAN%%%%PYTHON_SITELIBDIR%%/fife/_fifechan.so
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/fife/extensions/__init__.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/fife/extensions/basicapplication.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/fife/extensions/cegui/__init__.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/fife/extensions/cegui/ceguibasicapplication.py
+%%CEGUI%%%%PYTHON%%%%PYTHON_SITELIBDIR%%/fife/extensions/cegui/__init__.py
+%%CEGUI%%%%PYTHON%%%%PYTHON_SITELIBDIR%%/fife/extensions/cegui/ceguibasicapplication.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/fife/extensions/fife_compat.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/fife/extensions/fife_settings.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/fife/extensions/fife_timer.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/fife/extensions/fife_utils.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/fife/extensions/fifelog.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/fife/extensions/librocket/__init__.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/fife/extensions/librocket/rocketbasicapplication.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/fife/extensions/loaders.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/__init__.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/attrs.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/autoposition.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/compat.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/dialog/__init__.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/dialog/filebrowser.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/dialogs.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/events.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/exceptions.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/fife_pychansettings.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/fonts.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/internal.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/properties.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/pychanbasicapplication.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/tools.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/widgets/__init__.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/widgets/basictextwidget.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/widgets/buttons.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/widgets/checkbox.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/widgets/common.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/widgets/containers.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/widgets/dropdown.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/widgets/ext/__init__.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/widgets/icon.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/widgets/iconprogressbar.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/widgets/label.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/widgets/layout.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/widgets/listbox.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/widgets/passwordfield.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/widgets/percentagebar.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/widgets/radiobutton.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/widgets/scrollarea.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/widgets/slider.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/widgets/textbox.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/widgets/textfield.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/widgets/widget.py
+%%PYTHON%%%%FIFECHAN%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/__init__.py
+%%PYTHON%%%%FIFECHAN%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/attrs.py
+%%PYTHON%%%%FIFECHAN%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/autoposition.py
+%%PYTHON%%%%FIFECHAN%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/compat.py
+%%PYTHON%%%%FIFECHAN%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/dialog/__init__.py
+%%PYTHON%%%%FIFECHAN%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/dialog/filebrowser.py
+%%PYTHON%%%%FIFECHAN%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/dialogs.py
+%%PYTHON%%%%FIFECHAN%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/events.py
+%%PYTHON%%%%FIFECHAN%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/exceptions.py
+%%PYTHON%%%%FIFECHAN%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/fife_pychansettings.py
+%%PYTHON%%%%FIFECHAN%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/fontfileparser.py
+%%PYTHON%%%%FIFECHAN%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/fonts.py
+%%PYTHON%%%%FIFECHAN%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/internal.py
+%%PYTHON%%%%FIFECHAN%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/properties.py
+%%PYTHON%%%%FIFECHAN%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/pychanbasicapplication.py
+%%PYTHON%%%%FIFECHAN%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/tools.py
+%%PYTHON%%%%FIFECHAN%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/widgets/__init__.py
+%%PYTHON%%%%FIFECHAN%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/widgets/adjustingcontainer.py
+%%PYTHON%%%%FIFECHAN%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/widgets/animationicon.py
+%%PYTHON%%%%FIFECHAN%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/widgets/bargraph.py
+%%PYTHON%%%%FIFECHAN%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/widgets/basictextwidget.py
+%%PYTHON%%%%FIFECHAN%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/widgets/buttons.py
+%%PYTHON%%%%FIFECHAN%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/widgets/checkbox.py
+%%PYTHON%%%%FIFECHAN%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/widgets/common.py
+%%PYTHON%%%%FIFECHAN%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/widgets/containers.py
+%%PYTHON%%%%FIFECHAN%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/widgets/curvegraph.py
+%%PYTHON%%%%FIFECHAN%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/widgets/dockarea.py
+%%PYTHON%%%%FIFECHAN%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/widgets/dropdown.py
+%%PYTHON%%%%FIFECHAN%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/widgets/ext/__init__.py
+%%PYTHON%%%%FIFECHAN%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/widgets/flowcontainer.py
+%%PYTHON%%%%FIFECHAN%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/widgets/icon.py
+%%PYTHON%%%%FIFECHAN%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/widgets/iconprogressbar.py
+%%PYTHON%%%%FIFECHAN%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/widgets/imageprogressbar.py
+%%PYTHON%%%%FIFECHAN%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/widgets/label.py
+%%PYTHON%%%%FIFECHAN%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/widgets/layout.py
+%%PYTHON%%%%FIFECHAN%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/widgets/linegraph.py
+%%PYTHON%%%%FIFECHAN%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/widgets/listbox.py
+%%PYTHON%%%%FIFECHAN%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/widgets/panel.py
+%%PYTHON%%%%FIFECHAN%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/widgets/passwordfield.py
+%%PYTHON%%%%FIFECHAN%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/widgets/percentagebar.py
+%%PYTHON%%%%FIFECHAN%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/widgets/piegraph.py
+%%PYTHON%%%%FIFECHAN%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/widgets/pointgraph.py
+%%PYTHON%%%%FIFECHAN%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/widgets/radiobutton.py
+%%PYTHON%%%%FIFECHAN%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/widgets/resizablewindow.py
+%%PYTHON%%%%FIFECHAN%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/widgets/scrollarea.py
+%%PYTHON%%%%FIFECHAN%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/widgets/slider.py
+%%PYTHON%%%%FIFECHAN%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/widgets/spacer.py
+%%PYTHON%%%%FIFECHAN%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/widgets/tabbedarea.py
+%%PYTHON%%%%FIFECHAN%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/widgets/textbox.py
+%%PYTHON%%%%FIFECHAN%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/widgets/textfield.py
+%%PYTHON%%%%FIFECHAN%%%%PYTHON_SITELIBDIR%%/fife/extensions/pychan/widgets/widget.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/fife/extensions/pythonize.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/fife/extensions/savers.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/fife/extensions/serializers/__init__.py
@@ -243,6 +268,6 @@
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/fife/extensions/serializers/xmlmap.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/fife/extensions/serializers/xmlmapsaver.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/fife/extensions/serializers/xmlobject.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/fife/extensions/soundmanager.py
+@comment x%%PYTHON%%%%PYTHON_SITELIBDIR%%/fife/extensions/soundmanager.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/fife/fife.py
 %%PYTHON%%%%FIFECHAN%%%%PYTHON_SITELIBDIR%%/fife/fifechan.py