Bug 154101 - [patch] games/wesnoth-devel: update to 1.9.3
Summary: [patch] games/wesnoth-devel: update to 1.9.3
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Philip Paeps
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-01-18 03:30 UTC by swell.k
Modified: 2011-01-18 11:00 UTC (History)
0 users

See Also:


Attachments
a.diff (46.47 KB, patch)
2011-01-18 03:30 UTC, swell.k
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description swell.k 2011-01-18 03:30:11 UTC
- update (no more autotools)
- prune BWMON (no-op) and PROFILE (was untested)
- mark PYTHON as BROKEN (for now)
- use bsd.port.options.mk instead of including bsd.python.mk directly.
  USE_PYTHON is checked just after, in bsd.port.pre.mk.
- remove BROKEN for no longer supported OSVERSION
- reindent (cosmetic)
Comment 1 swell.k 2011-01-18 03:55:08 UTC
Anonymous <swell.k@gmail.com> writes:

>>Synopsis:       [patch] games/wesnoth-devel: update to 1.9.3

Doh, template version.

> ++set(tools_data ../data/tools/wmlscope
> ++               ../data/tools/wmllint
> ++               ../data/tools/wmlindent
> ++               ../data/tools/wesnoth_addon_manager )
> ++
> ++install(FILES ${tools_data} DESTINATION ${BINDIR})

They don't work, so hide them behind %%PYTHON%%.

--- b.diff begins here ---
diff --git games/wesnoth-devel/files/patch-src-CMakeLists.txt games/wesnoth-devel/files/patch-src-CMakeLists.txt
index 5f1d76d..cb90981 100644
--- games/wesnoth-devel/files/patch-src-CMakeLists.txt
+++ games/wesnoth-devel/files/patch-src-CMakeLists.txt
@@ -9,20 +9,6 @@
  	set(game-external-libs ${game-external-libs} ${FRIBIDI_LIBRARIES})
  endif(ENABLE_FRIBIDI AND FRIBIDI_LIBRARIES)
  
-@@ -782,6 +782,13 @@ set_target_properties(cutter PROPERTIES 
- 
- install(TARGETS cutter DESTINATION ${BINDIR})
- 
-+set(tools_data ../data/tools/wmlscope
-+               ../data/tools/wmllint
-+               ../data/tools/wmlindent
-+               ../data/tools/wesnoth_addon_manager )
-+
-+install(FILES ${tools_data} DESTINATION ${BINDIR})
-+
- endif(ENABLE_TOOLS)
- 
- ########### Unit tests ###############
 @@ -826,7 +833,9 @@ if(ENABLE_TESTS)
  		boost_unit_test_framework
  	)
diff --git games/wesnoth-devel/pkg-plist games/wesnoth-devel/pkg-plist
index 456de06..723cc15 100644
--- games/wesnoth-devel/pkg-plist
+++ games/wesnoth-devel/pkg-plist
@@ -2,12 +2,12 @@
 %%TOOLS%%bin/cutter
 %%TOOLS%%bin/exploder
 bin/wesnoth
-%%TOOLS%%bin/wesnoth_addon_manager
+%%PYTHON%%%%TOOLS%%bin/wesnoth_addon_manager
 %%TESTS%%bin/wesnoth_test
 %%SERVER%%bin/wesnothd
-%%TOOLS%%bin/wmlindent
-%%TOOLS%%bin/wmllint
-%%TOOLS%%bin/wmlscope
+%%PYTHON%%%%TOOLS%%bin/wmlindent
+%%PYTHON%%%%TOOLS%%bin/wmllint
+%%PYTHON%%%%TOOLS%%bin/wmlscope
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/wesnoth/__init__.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/wesnoth/__init__.pyc
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/wesnoth/__init__.pyo
--- b.diff ends here ---
Comment 2 dfilter service freebsd_committer freebsd_triage 2011-01-18 10:54:58 UTC
philip      2011-01-18 10:54:53 UTC

  FreeBSD ports repository

  Modified files:
    games/wesnoth-devel  Makefile distinfo pkg-plist 
  Added files:
    games/wesnoth-devel/files patch-CMakeLists.txt 
                              patch-doc-CMakeLists.txt 
                              patch-po-CMakeLists.txt 
                              patch-src-CMakeLists.txt 
                              patch-src-ana-src-CMakeLists.txt 
  Removed files:
    games/wesnoth-devel/files patch-Makefile.am patch-configure.ac 
                              patch-m4-boost.m4 patch-m4-zlib.m4 
                              patch-src-Makefile.am 
                              patch-src-tests-main.cpp 
  Log:
  Update to 1.9.4.
  
  PR:             ports/154101
  Submitted by:   Anonymous <swell.k -at- gmail.com>
  Feature safe:   yes
  
  Revision  Changes    Path
  1.95      +62 -98    ports/games/wesnoth-devel/Makefile
  1.60      +2 -2      ports/games/wesnoth-devel/distinfo
  1.1       +82 -0     ports/games/wesnoth-devel/files/patch-CMakeLists.txt (new)
  1.3       +0 -18     ports/games/wesnoth-devel/files/patch-Makefile.am (dead)
  1.5       +0 -14     ports/games/wesnoth-devel/files/patch-configure.ac (dead)
  1.1       +7 -0      ports/games/wesnoth-devel/files/patch-doc-CMakeLists.txt (new)
  1.2       +0 -11     ports/games/wesnoth-devel/files/patch-m4-boost.m4 (dead)
  1.2       +0 -15     ports/games/wesnoth-devel/files/patch-m4-zlib.m4 (dead)
  1.1       +24 -0     ports/games/wesnoth-devel/files/patch-po-CMakeLists.txt (new)
  1.1       +22 -0     ports/games/wesnoth-devel/files/patch-src-CMakeLists.txt (new)
  1.3       +0 -38     ports/games/wesnoth-devel/files/patch-src-Makefile.am (dead)
  1.1       +32 -0     ports/games/wesnoth-devel/files/patch-src-ana-src-CMakeLists.txt (new)
  1.2       +0 -10     ports/games/wesnoth-devel/files/patch-src-tests-main.cpp (dead)
  1.63      +83 -4     ports/games/wesnoth-devel/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"
Comment 3 Philip Paeps freebsd_committer freebsd_triage 2011-01-18 10:57:39 UTC
State Changed
From-To: open->closed

Committed. Thanks!