update cyphesis to 0.5.21

Feature safe:	yes

4 files changed, 7 insertions, 257 deletions

diff --git a/net/cyphesis/Makefile b/net/cyphesis/Makefile
index 8d789dcbf766..0103449f5ee8 100644
--- a/net/cyphesis/Makefile
+++ b/net/cyphesis/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	cyphesis
-PORTVERSION=	0.5.20
-PORTREVISION=	1
+PORTVERSION=	0.5.21
 CATEGORIES=	net
 MASTER_SITES=	SF/worldforge/${PORTNAME}%20%28server%29/${PORTVERSION}
 
diff --git a/net/cyphesis/distinfo b/net/cyphesis/distinfo
index c9e3aad50d7d..ad41d26329f0 100644
--- a/net/cyphesis/distinfo
+++ b/net/cyphesis/distinfo
@@ -1,3 +1,3 @@
-MD5 (cyphesis-0.5.20.tar.bz2) = 48fe22b8661d59698ffa417721086829
-SHA256 (cyphesis-0.5.20.tar.bz2) = ed39eca9d93a34f250e91bd6bc71f26246ea7c0d2e45d7bc280659eb480d6d93
-SIZE (cyphesis-0.5.20.tar.bz2) = 594351
+MD5 (cyphesis-0.5.21.tar.bz2) = d2018813bfe827af7991075d799786e3
+SHA256 (cyphesis-0.5.21.tar.bz2) = 55c64d7b291f50d89a2f4dd364cb562fd288fb550dcab3bd4fd3618dce323a73
+SIZE (cyphesis-0.5.21.tar.bz2) = 621623
diff --git a/net/cyphesis/files/patch-configure b/net/cyphesis/files/patch-configure
deleted file mode 100644
index 70f39e726269..000000000000
--- a/net/cyphesis/files/patch-configure
+++ /dev/null
@@ -1,252 +0,0 @@
---- configure.orig	2009-05-31 11:22:02.000000000 +0200
-+++ configure	2009-05-31 11:22:33.000000000 +0200
-@@ -4565,8 +4565,7 @@
- fi
- 
- 
--
--python_prefix=/usr
-+python_prefix=%%LOCALBASE%%
- 
- # Check whether --with-python was given.
- if test "${with_python+set}" = set; then
-@@ -6196,6 +6195,153 @@
- 
- 
- 
-+
-+if test "${ac_cv_header_python2_6_Python_h+set}" = set; then
-+  { echo "$as_me:$LINENO: checking for python2.6/Python.h" >&5
-+echo $ECHO_N "checking for python2.6/Python.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_python2_6_Python_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_python2_6_Python_h" >&5
-+echo "${ECHO_T}$ac_cv_header_python2_6_Python_h" >&6; }
-+else
-+  # Is the header compilable?
-+{ echo "$as_me:$LINENO: checking python2.6/Python.h usability" >&5
-+echo $ECHO_N "checking python2.6/Python.h usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+#include <python2.6/Python.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_cxx_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+  ac_header_compiler=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_header_compiler=no
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-+
-+# Is the header present?
-+{ echo "$as_me:$LINENO: checking python2.6/Python.h presence" >&5
-+echo $ECHO_N "checking python2.6/Python.h presence... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <python2.6/Python.h>
-+_ACEOF
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } >/dev/null && {
-+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-+	 test ! -s conftest.err
-+       }; then
-+  ac_header_preproc=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+  ac_header_preproc=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-+
-+# So?  What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-+  yes:no: )
-+    { echo "$as_me:$LINENO: WARNING: python2.6/Python.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: python2.6/Python.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: python2.6/Python.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: python2.6/Python.h: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: python2.6/Python.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: python2.6/Python.h: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: python2.6/Python.h:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: python2.6/Python.h:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: python2.6/Python.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: python2.6/Python.h: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: python2.6/Python.h:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: python2.6/Python.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: python2.6/Python.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: python2.6/Python.h: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: python2.6/Python.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: python2.6/Python.h: in the future, the compiler will take precedence" >&2;}
-+    ( cat <<\_ASBOX
-+## --------------------------------------- ##
-+## Report this to alriddoch@googlemail.com ##
-+## --------------------------------------- ##
-+_ASBOX
-+     ) | sed "s/^/$as_me: WARNING:     /" >&2
-+    ;;
-+esac
-+{ echo "$as_me:$LINENO: checking for python2.6/Python.h" >&5
-+echo $ECHO_N "checking for python2.6/Python.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_python2_6_Python_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_cv_header_python2_6_Python_h=$ac_header_preproc
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_python2_6_Python_h" >&5
-+echo "${ECHO_T}$ac_cv_header_python2_6_Python_h" >&6; }
-+
-+fi
-+if test $ac_cv_header_python2_6_Python_h = yes; then
-+
-+    python_include_path=-I${python_prefix}/include/python2.6
-+    python_version=2.6
-+
-+else
-+
-+
-+
-+
-+
-+
-+
-+
-+
-+
- if test "${ac_cv_header_python2_5_Python_h+set}" = set; then
-   { echo "$as_me:$LINENO: checking for python2.5/Python.h" >&5
- echo $ECHO_N "checking for python2.5/Python.h... $ECHO_C" >&6; }
-@@ -6771,6 +6917,9 @@
- fi
- 
- 
-+fi
-+
-+
- 
- PYTHON_VERSION=${python_version}
- PYTHON_INCLUDES=${python_include_path}
-@@ -7175,13 +7324,13 @@
- if test x"$link_static" = "xfalse"; then
- 
- as_ac_Lib=`echo "ac_cv_lib_python${python_version}''_Py_Initialize" | $as_tr_sh`
--{ echo "$as_me:$LINENO: checking for Py_Initialize in -lpython${python_version}" >&5
--echo $ECHO_N "checking for Py_Initialize in -lpython${python_version}... $ECHO_C" >&6; }
-+{ echo "$as_me:$LINENO: checking for Py_Initialize in -pthread -lpython${python_version}" >&5
-+echo $ECHO_N "checking for Py_Initialize in -pthread -lpython${python_version}... $ECHO_C" >&6; }
- if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lpython${python_version}  $LIBS"
-+LIBS="-pthread -lpython${python_version}  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -7239,19 +7388,19 @@
- echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_Lib'}'` = yes; then
- 
--    python_libs="-lpython${python_version}"
-+    python_libs="-pthread -lpython${python_version}"
-     PYTHON_UTIL_LIBS=
- 
- else
- 
-     as_ac_Lib=`echo "ac_cv_lib_python${python_version}''_Py_Initialize" | $as_tr_sh`
--{ echo "$as_me:$LINENO: checking for Py_Initialize in -lpython${python_version}" >&5
--echo $ECHO_N "checking for Py_Initialize in -lpython${python_version}... $ECHO_C" >&6; }
-+{ echo "$as_me:$LINENO: checking for Py_Initialize in -pthread -lpython${python_version}" >&5
-+echo $ECHO_N "checking for Py_Initialize in -pthread -lpython${python_version}... $ECHO_C" >&6; }
- if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lpython${python_version} -L${python_lib_path} ${PYTHON_UTIL_LIBS} $LIBS"
-+LIBS="-pthread -lpython${python_version} -L${python_lib_path} ${PYTHON_UTIL_LIBS} $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -7309,7 +7458,7 @@
- echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_Lib'}'` = yes; then
- 
--        python_libs="-L${python_lib_path} -lpython${python_version}"
-+        python_libs="-L${python_lib_path} -pthread -lpython${python_version}"
-         PYTHON_LINKER_FLAGS="-export-dynamic"
- 
- else
-@@ -7329,13 +7478,13 @@
- else
- 
- as_ac_Lib=`echo "ac_cv_lib_python${python_version}''_Py_Initialize" | $as_tr_sh`
--{ echo "$as_me:$LINENO: checking for Py_Initialize in -lpython${python_version}" >&5
--echo $ECHO_N "checking for Py_Initialize in -lpython${python_version}... $ECHO_C" >&6; }
-+{ echo "$as_me:$LINENO: checking for Py_Initialize in -pthread -lpython${python_version}" >&5
-+echo $ECHO_N "checking for Py_Initialize in -pthread -lpython${python_version}... $ECHO_C" >&6; }
- if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lpython${python_version} -L${python_lib_path} ${PYTHON_UTIL_LIBS} $LIBS"
-+LIBS="-pthread -lpython${python_version} -L${python_lib_path} ${PYTHON_UTIL_LIBS} $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -7393,7 +7542,7 @@
- echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_Lib'}'` = yes; then
- 
--    python_libs="-L${python_lib_path} -lpython${python_version}"
-+    python_libs="-L${python_lib_path} -pthread -lpython${python_version}"
-     PYTHON_LINKER_FLAGS="-export-dynamic"
- 
- else
diff --git a/net/cyphesis/pkg-plist b/net/cyphesis/pkg-plist
index 70e80869fb97..5be37da2e5f2 100644
--- a/net/cyphesis/pkg-plist
+++ b/net/cyphesis/pkg-plist
@@ -59,6 +59,7 @@ etc/cyphesis/mason.d/weapons.xml
 %%DATADIR%%/rulesets/mason/benchmarks.py
 %%DATADIR%%/rulesets/mason/define_world.py
 %%DATADIR%%/rulesets/mason/define_world_aglanor.py
+%%DATADIR%%/rulesets/mason/regression.py
 %%DATADIR%%/rulesets/mason/tests.py
 %%DATADIR%%/rulesets/mason/world/__init__.py
 %%DATADIR%%/rulesets/mason/world/objects/Pile.py
@@ -107,11 +108,13 @@ etc/cyphesis/mason.d/weapons.xml
 %%DATADIR%%/rulesets/mason/world/tasks/Cultivate.py
 %%DATADIR%%/rulesets/mason/world/tasks/Delve.py
 %%DATADIR%%/rulesets/mason/world/tasks/Dig.py
+%%DATADIR%%/rulesets/mason/world/tasks/Fishing.py
 %%DATADIR%%/rulesets/mason/world/tasks/Logging.py
 %%DATADIR%%/rulesets/mason/world/tasks/Raise.py
 %%DATADIR%%/rulesets/mason/world/tasks/Ram.py
 %%DATADIR%%/rulesets/mason/world/tasks/Reap.py
 %%DATADIR%%/rulesets/mason/world/tasks/Sharpen.py
+%%DATADIR%%/rulesets/mason/world/tasks/Sift.py
 %%DATADIR%%/rulesets/mason/world/tasks/Slaughter.py
 %%DATADIR%%/rulesets/mason/world/tasks/Slice.py
 %%DATADIR%%/rulesets/mason/world/tasks/Trailblaze.py