Index: games/wesnoth-devel/Makefile =================================================================== RCS file: /a/.cvsup/ports/games/wesnoth-devel/Makefile,v retrieving revision 1.95 diff -u -p -r1.95 Makefile --- games/wesnoth-devel/Makefile 18 Jan 2011 10:54:53 -0000 1.95 +++ games/wesnoth-devel/Makefile 1 Apr 2011 09:39:30 -0000 @@ -6,7 +6,7 @@ # PORTNAME= wesnoth -PORTVERSION= 1.9.4 +PORTVERSION= 1.9.5 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} \ http://files.wesnoth.org/ @@ -36,7 +36,6 @@ PORTDATA= * OPTIONS= ANA "Enable Asynchronous Network API (WIP)" On \ CAMPAIGN "Enable campaign server" On \ - EDITOR "Enable map editor" On \ FRIBIDI "Enable bidirectional support" On \ LOWMEM "Reduce memory usage (disables animations)" Off \ NOTIFY "Enable desktop notifications" On \ @@ -45,7 +44,6 @@ OPTIONS= ANA "Enable Asynchronous Netwo RAWSOCKETS "Use raw receiving sockets in multiplayer" Off \ SERVER "Enable server" On \ TESTS "Enable unit tests" Off \ - TINYGUI "Enable tiny gui (down to 320x200)" Off \ TOOLS "Enable extra tools for artists and translators" On .include @@ -73,14 +71,6 @@ CMAKE_ARGS+= -DENABLE_CAMPAIGN_SERVER=on PLIST_SUB+= CAMPAIGN="" .endif -.if defined(WITHOUT_EDITOR) -CMAKE_ARGS+= -DENABLE_EDITOR=off -PLIST_SUB+= EDITOR="@comment " -.else -CMAKE_ARGS+= -DENABLE_EDITOR=on -PLIST_SUB+= EDITOR="" -.endif - .if defined(WITHOUT_FRIBIDI) CMAKE_ARGS+= -DENABLE_FRIBIDI=off .else @@ -152,11 +142,6 @@ CMAKE_ARGS+= -DENABLE_TESTS=on PLIST_SUB+= TESTS="" .endif -.if !defined(WITHOUT_TINYGUI) -CMAKE_ARGS+= -DGUI=tiny -BUILD_DEPENDS+= convert:${PORTSDIR}/graphics/ImageMagick -.endif - .if defined(WITHOUT_TOOLS) CMAKE_ARGS+= -DENABLE_TOOLS=off PLIST_SUB+= TOOLS="@comment " Index: games/wesnoth-devel/distinfo =================================================================== RCS file: /a/.cvsup/ports/games/wesnoth-devel/distinfo,v retrieving revision 1.60 diff -u -p -r1.60 distinfo --- games/wesnoth-devel/distinfo 18 Jan 2011 10:54:53 -0000 1.60 +++ games/wesnoth-devel/distinfo 31 Mar 2011 23:17:45 -0000 @@ -1,2 +1,2 @@ -SHA256 (wesnoth-1.9.4.tar.bz2) = 8644fc2efe071c91a306ca91419ccd11221c6930a1889d356c3a31501765e8d0 -SIZE (wesnoth-1.9.4.tar.bz2) = 334376625 +SHA256 (wesnoth-1.9.5.tar.bz2) = 5b0e06c7abce1910be9bcdd13c61f625ba7682d421af980c6fbaffd08d491448 +SIZE (wesnoth-1.9.5.tar.bz2) = 333572871 Index: games/wesnoth-devel/pkg-plist =================================================================== RCS file: /a/.cvsup/ports/games/wesnoth-devel/pkg-plist,v retrieving revision 1.63 diff -u -p -r1.63 pkg-plist --- games/wesnoth-devel/pkg-plist 18 Jan 2011 10:54:53 -0000 1.63 +++ games/wesnoth-devel/pkg-plist 1 Apr 2011 11:58:34 -0000 @@ -33,7 +33,7 @@ bin/wesnoth %%PYTHON%%%%PYTHON_SITELIBDIR%%/wesnoth/wmltools.pyc %%PYTHON%%%%PYTHON_SITELIBDIR%%/wesnoth/wmltools.pyo share/applications/wesnoth.desktop -%%EDITOR%%share/applications/wesnoth_editor.desktop +share/applications/wesnoth_editor.desktop %%NLS%%share/locale/af/LC_MESSAGES/wesnoth-anl.mo %%NLS%%share/locale/af/LC_MESSAGES/wesnoth-aoi.mo %%NLS%%share/locale/af/LC_MESSAGES/wesnoth-did.mo @@ -59,6 +59,56 @@ share/applications/wesnoth.desktop %%NLS%%share/locale/af/LC_MESSAGES/wesnoth-units.mo %%NLS%%share/locale/af/LC_MESSAGES/wesnoth-utbs.mo %%NLS%%share/locale/af/LC_MESSAGES/wesnoth.mo +%%NLS%%share/locale/ang/LC_MESSAGES/wesnoth-anl.mo +%%NLS%%share/locale/ang/LC_MESSAGES/wesnoth-aoi.mo +%%NLS%%share/locale/ang/LC_MESSAGES/wesnoth-did.mo +%%NLS%%share/locale/ang/LC_MESSAGES/wesnoth-dm.mo +%%NLS%%share/locale/ang/LC_MESSAGES/wesnoth-dw.mo +%%NLS%%share/locale/ang/LC_MESSAGES/wesnoth-editor.mo +%%NLS%%share/locale/ang/LC_MESSAGES/wesnoth-ei.mo +%%NLS%%share/locale/ang/LC_MESSAGES/wesnoth-help.mo +%%NLS%%share/locale/ang/LC_MESSAGES/wesnoth-httt.mo +%%NLS%%share/locale/ang/LC_MESSAGES/wesnoth-l.mo +%%NLS%%share/locale/ang/LC_MESSAGES/wesnoth-lib.mo +%%NLS%%share/locale/ang/LC_MESSAGES/wesnoth-low.mo +%%NLS%%share/locale/ang/LC_MESSAGES/wesnoth-multiplayer.mo +%%NLS%%share/locale/ang/LC_MESSAGES/wesnoth-nr.mo +%%NLS%%share/locale/ang/LC_MESSAGES/wesnoth-sof.mo +%%NLS%%share/locale/ang/LC_MESSAGES/wesnoth-sotbe.mo +%%NLS%%share/locale/ang/LC_MESSAGES/wesnoth-tb.mo +%%NLS%%share/locale/ang/LC_MESSAGES/wesnoth-test.mo +%%NLS%%share/locale/ang/LC_MESSAGES/wesnoth-thot.mo +%%NLS%%share/locale/ang/LC_MESSAGES/wesnoth-trow.mo +%%NLS%%share/locale/ang/LC_MESSAGES/wesnoth-tsg.mo +%%NLS%%share/locale/ang/LC_MESSAGES/wesnoth-tutorial.mo +%%NLS%%share/locale/ang/LC_MESSAGES/wesnoth-units.mo +%%NLS%%share/locale/ang/LC_MESSAGES/wesnoth-utbs.mo +%%NLS%%share/locale/ang/LC_MESSAGES/wesnoth.mo +%%NLS%%share/locale/ang@latin/LC_MESSAGES/wesnoth-anl.mo +%%NLS%%share/locale/ang@latin/LC_MESSAGES/wesnoth-aoi.mo +%%NLS%%share/locale/ang@latin/LC_MESSAGES/wesnoth-did.mo +%%NLS%%share/locale/ang@latin/LC_MESSAGES/wesnoth-dm.mo +%%NLS%%share/locale/ang@latin/LC_MESSAGES/wesnoth-dw.mo +%%NLS%%share/locale/ang@latin/LC_MESSAGES/wesnoth-editor.mo +%%NLS%%share/locale/ang@latin/LC_MESSAGES/wesnoth-ei.mo +%%NLS%%share/locale/ang@latin/LC_MESSAGES/wesnoth-help.mo +%%NLS%%share/locale/ang@latin/LC_MESSAGES/wesnoth-httt.mo +%%NLS%%share/locale/ang@latin/LC_MESSAGES/wesnoth-l.mo +%%NLS%%share/locale/ang@latin/LC_MESSAGES/wesnoth-lib.mo +%%NLS%%share/locale/ang@latin/LC_MESSAGES/wesnoth-low.mo +%%NLS%%share/locale/ang@latin/LC_MESSAGES/wesnoth-multiplayer.mo +%%NLS%%share/locale/ang@latin/LC_MESSAGES/wesnoth-nr.mo +%%NLS%%share/locale/ang@latin/LC_MESSAGES/wesnoth-sof.mo +%%NLS%%share/locale/ang@latin/LC_MESSAGES/wesnoth-sotbe.mo +%%NLS%%share/locale/ang@latin/LC_MESSAGES/wesnoth-tb.mo +%%NLS%%share/locale/ang@latin/LC_MESSAGES/wesnoth-test.mo +%%NLS%%share/locale/ang@latin/LC_MESSAGES/wesnoth-thot.mo +%%NLS%%share/locale/ang@latin/LC_MESSAGES/wesnoth-trow.mo +%%NLS%%share/locale/ang@latin/LC_MESSAGES/wesnoth-tsg.mo +%%NLS%%share/locale/ang@latin/LC_MESSAGES/wesnoth-tutorial.mo +%%NLS%%share/locale/ang@latin/LC_MESSAGES/wesnoth-units.mo +%%NLS%%share/locale/ang@latin/LC_MESSAGES/wesnoth-utbs.mo +%%NLS%%share/locale/ang@latin/LC_MESSAGES/wesnoth.mo %%NLS%%share/locale/ar/LC_MESSAGES/wesnoth-anl.mo %%NLS%%share/locale/ar/LC_MESSAGES/wesnoth-aoi.mo %%NLS%%share/locale/ar/LC_MESSAGES/wesnoth-did.mo @@ -1360,10 +1410,14 @@ share/applications/wesnoth.desktop %%NLS%%share/locale/zh_TW/LC_MESSAGES/wesnoth-utbs.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/wesnoth.mo share/pixmaps/wesnoth-icon.png -%%EDITOR%%share/pixmaps/wesnoth_editor-icon.png +share/pixmaps/wesnoth_editor-icon.png %%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/wesnoth @dirrmtry man/af/man6 @dirrmtry man/af +@dirrmtry man/ang/man6 +@dirrmtry man/ang +@dirrmtry man/ang@latin/man6 +@dirrmtry man/ang@latin @dirrmtry man/ar/man6 @dirrmtry man/ar @dirrmtry man/bg/man6 @@ -1467,6 +1521,10 @@ share/pixmaps/wesnoth-icon.png @dirrmtry man/zh_TW/man6 @dirrmtry man/zh_TW @dirrmtry share/applications +%%NLS%%@dirrmtry share/locale/ang/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/ang +%%NLS%%@dirrmtry share/locale/ang@latin/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/ang@latin %%NLS%%@dirrmtry share/locale/ca_ES@valencia/LC_MESSAGES %%NLS%%@dirrmtry share/locale/ca_ES@valencia %%NLS%%@dirrmtry share/locale/en@shaw/LC_MESSAGES Index: games/wesnoth-devel/files/patch-CMakeLists.txt =================================================================== RCS file: /a/.cvsup/ports/games/wesnoth-devel/files/patch-CMakeLists.txt,v retrieving revision 1.1 diff -u -p -r1.1 patch-CMakeLists.txt --- games/wesnoth-devel/files/patch-CMakeLists.txt 18 Jan 2011 10:54:53 -0000 1.1 +++ games/wesnoth-devel/files/patch-CMakeLists.txt 1 Apr 2011 11:18:10 -0000 @@ -15,9 +15,9 @@ find_package(X11) @@ -68,7 +67,7 @@ option(ENABLE_GAME "Enable compilation o + option(ENABLE_GAME "Enable compilation of the game" ON) option(ENABLE_CAMPAIGN_SERVER "Enable compilation of campaign server") option(ENABLE_SERVER "Enable compilation of server" ON) - option(ENABLE_EDITOR "Enable compilation of the new map editor into the game executable" ON) -option(ENABLE_TOOLS "Enable building and installation of tools for artists and WML maintainers") +option(ENABLE_TOOLS "Enable building and installation of tools for artists and WML maintainers" OFF) option(ENABLE_TESTS "Build unit tests") @@ -48,22 +48,14 @@ CACHE STRING "Flags used by the CXX compiler during release builds." FORCE) endif(NOT CONFIGURED) -@@ -151,9 +150,15 @@ if(X11_FOUND) - add_definitions(-D_X11) - endif(X11_FOUND) - -+if(IS_ABSOLUTE ${LOCALEDIR}) -+ set(LOCALE_INSTALL ${LOCALEDIR}) -+ add_definitions(-DLOCALEDIR=\\\"${LOCALE_INSTALL}\\\") +@@ -154,6 +153,7 @@ add_definitions(-DLOCALEDIR=\\\"${LOCALE + if(LOCALEDIR MATCHES "^/") + add_definitions(-DHAS_RELATIVE_LOCALEDIR=0) + set(LOCALE_INSTALL ${LOCALEDIR}) + set(LOCALEDIR "translations") -+else(IS_ABSOLUTE ${LOCALEDIR}) - add_definitions(-DHAS_RELATIVE_LOCALEDIR=1) - add_definitions(-DLOCALEDIR=\\\"${LOCALEDIR}\\\") - set(LOCALE_INSTALL ${DATADIR}/${LOCALEDIR}) -+endif(IS_ABSOLUTE ${LOCALEDIR}) - - add_definitions(-DFIFODIR=\\\"${FIFO_DIR}\\\") - + else(LOCALEDIR MATCHES "^/") + add_definitions(-DHAS_RELATIVE_LOCALEDIR=1) + set(LOCALE_INSTALL ${DATADIR}/${LOCALEDIR}) @@ -201,10 +206,14 @@ if(ENABLE_GAME) pkg_check_modules( FONTCONFIG REQUIRED fontconfig>=2.4.1 ) endif(NOT MSVC) Index: games/wesnoth-devel/files/patch-src-ana-src-CMakeLists.txt =================================================================== RCS file: /a/.cvsup/ports/games/wesnoth-devel/files/patch-src-ana-src-CMakeLists.txt,v retrieving revision 1.1 diff -u -p -r1.1 patch-src-ana-src-CMakeLists.txt --- games/wesnoth-devel/files/patch-src-ana-src-CMakeLists.txt 18 Jan 2011 10:54:53 -0000 1.1 +++ games/wesnoth-devel/files/patch-src-ana-src-CMakeLists.txt 1 Apr 2011 11:11:59 -0000 @@ -1,32 +1,34 @@ --- src/ana/src/CMakeLists.txt~ +++ src/ana/src/CMakeLists.txt -@@ -4,7 +4,7 @@ include_directories( ../api ) +@@ -4,7 +4,7 @@ include_directories(../api) - find_package( Boost 1.35 REQUIRED COMPONENTS thread system) + find_package(Boost 1.35 REQUIRED COMPONENTS thread system) --set ( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -ggdb3" ) -+set ( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}" ) +-set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -ggdb3") ++set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}") - set ( common_srcs asio_listener.cpp asio_sender.cpp asio_timers.cpp ) + set(common_srcs asio_listener.cpp asio_sender.cpp asio_timers.cpp) -@@ -20,19 +20,9 @@ target_link_libraries( ana-static ${Boos - - set ( CMAKE_INSTALL_PREFIX /usr/local ) - --IF(NOT MSVC) -- set ( CMAKE_INSTALL_PREFIX /usr/local ) -- install ( TARGETS ana LIBRARY DESTINATION lib ) -- install ( TARGETS ana-static ARCHIVE DESTINATION lib ) --ENDIF(NOT MSVC) -- - set ( ana_headers ../api/ana.hpp - ../api/common.hpp - ../api/timers.hpp - ../api/buffers.hpp - ../api/predicates.hpp - ../api/binary_streams.hpp ) -- --IF(NOT MSVC) -- install ( FILES ${ana_headers} DESTINATION include/ana ) --ENDIF(NOT MSVC) -\ No newline at end of file +@@ -20,11 +20,11 @@ target_link_libraries( ana-static ${Boos + + set(CMAKE_INSTALL_PREFIX /usr/local) + +-if(NOT MSVC) ++if(FALSE) + set(CMAKE_INSTALL_PREFIX /usr/local) + install(TARGETS ana LIBRARY DESTINATION lib) + install(TARGETS ana-static ARCHIVE DESTINATION lib) +-endif(NOT MSVC) ++endif(FALSE) + + set(ana_headers + ../api/ana.hpp +@@ -35,6 +35,6 @@ set(ana_headers + ../api/binary_streams.hpp + ) + +-if(NOT MSVC) ++if(FALSE) + install(FILES ${ana_headers} DESTINATION include/ana) +-endif(NOT MSVC) ++endif(FALSE)