Changes 0.92:

  * Added Spanish translation
  * Fixed bug: ice is now working
  * A few smaller bug fixes

Changes 0.91:
  * Fixed stupid bugs in Enigma 0.90
  * Two new levels

Changes 0.90:
  * New levels
  * Support for 800x600 and 1024x768 video modes
  * Support for non-English languages
  * Vastly improved Oxyd 1 and Per.Oxyd compatibility
  * Redesigned options menu
  * Countless smaller enhancements

14 files changed, 30 insertions, 266 deletions

diff --git a/games/enigma/patches/patch-aa b/games/enigma/patches/patch-aa
deleted file mode 100644
index f46c06c8b9e..00000000000
--- a/games/enigma/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/03/01 22:46:26 heinz Exp $
-
---- data/levels/Makefile.in.orig	Sat Oct 11 20:16:47 2003
-+++ data/levels/Makefile.in
-@@ -449,7 +449,7 @@ uninstall-info: uninstall-info-recursive
- 
- install-data-local:
- 	$(INSTALL) -d -m 0755 $(pkgdatadir)
--	cp -fp $(srcdir)/*.lua $(pkgdatadir)
-+	$(INSTALL_DATA) $(srcdir)/*.lua $(pkgdatadir)
- 
- uninstall-local:
- 	rm -f $(pkgdatadir)/*.lua
diff --git a/games/enigma/patches/patch-ab b/games/enigma/patches/patch-ab
deleted file mode 100644
index 93bb0316391..00000000000
--- a/games/enigma/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/03/01 22:46:26 heinz Exp $
-
---- data/levels/Sokoban/Makefile.in.orig	Sat Oct 11 20:16:53 2003
-+++ data/levels/Sokoban/Makefile.in
-@@ -301,7 +301,7 @@ uninstall-am: uninstall-info-am uninstal
- 
- install-data-local:
- 	$(INSTALL) -d -m 0755 $(pkgdatadir)
--	cp -fp $(srcdir)/*.lua $(pkgdatadir)
-+	$(INSTALL_DATA) $(srcdir)/*.lua $(pkgdatadir)
- 
- uninstall-local:
- 	rm -f $(pkgdatadir)/*.lua
diff --git a/games/enigma/patches/patch-ac b/games/enigma/patches/patch-ac
index 9434f93810e..e7988b2c2fa 100644
--- a/games/enigma/patches/patch-ac
+++ b/games/enigma/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.1.1.1 2004/03/01 22:46:26 heinz Exp $
+$NetBSD: patch-ac,v 1.2 2005/08/22 15:35:37 adam Exp $
 
---- doc/Makefile.in.orig	Sat Oct 11 19:19:50 2003
+--- doc/Makefile.in.orig	2005-05-29 22:03:37.000000000 +0000
 +++ doc/Makefile.in
-@@ -138,7 +138,7 @@ target_os = @target_os@
+@@ -169,7 +169,7 @@ target_os = @target_os@
  target_vendor = @target_vendor@
  SUBDIRS = manual refman
  
 -docdir = @datadir@/doc/enigma/reference
 +docdir = @datadir@/doc/html/enigma/reference
- doc_DATA = functions.html functions.css ant_lua.txt CREATING-LEVELS
+ doc_DATA = functions.html functions.css ant_lua.txt CREATING-LEVELS sounds.txt objects.txt sound.lua
  
- EXTRA_DIST = enigma.6 HACKING TODO $(doc_DATA)
+ EXTRA_DIST = enigma.6 HACKING TODO README.mingw32 $(doc_DATA)
diff --git a/games/enigma/patches/patch-ad b/games/enigma/patches/patch-ad
index 32750b2bed9..29ff7c813b4 100644
--- a/games/enigma/patches/patch-ad
+++ b/games/enigma/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1.1.1 2004/03/01 22:46:26 heinz Exp $
+$NetBSD: patch-ad,v 1.2 2005/08/22 15:35:37 adam Exp $
 
---- doc/manual/Makefile.in.orig	Sat Oct 11 19:19:56 2003
+--- doc/manual/Makefile.in.orig	2005-05-27 05:54:42.000000000 +0000
 +++ doc/manual/Makefile.in
-@@ -146,7 +146,7 @@ HTML = $(wildcard enigma_*.html) \
+@@ -177,7 +177,7 @@ HTML = $(wildcard enigma_*.html) \
  	index.html
  
  
diff --git a/games/enigma/patches/patch-ae b/games/enigma/patches/patch-ae
index 0a0265ca7f1..5cb76ac4f37 100644
--- a/games/enigma/patches/patch-ae
+++ b/games/enigma/patches/patch-ae
@@ -1,10 +1,10 @@
-$NetBSD: patch-ae,v 1.1.1.1 2004/03/01 22:46:26 heinz Exp $
+$NetBSD: patch-ae,v 1.2 2005/08/22 15:35:37 adam Exp $
 
---- doc/manual/images/Makefile.in.orig	Sat Oct 11 19:20:01 2003
+--- doc/manual/images/Makefile.in.orig	2005-05-27 05:54:43.000000000 +0000
 +++ doc/manual/images/Makefile.in
-@@ -139,7 +139,7 @@ target_vendor = @target_vendor@
- PNG = $(wildcard *.png)
- PDF = $(addsuffix .pdf, $(basename $(PNG)))
+@@ -170,7 +170,7 @@ target_vendor = @target_vendor@
+ PNG = $(wildcard $(srcdir)/*.png)
+ PDF = $(addprefix $(builddir), $(addsuffix .pdf, $(basename $(notdir $(PNG)))))
  
 -pngdir = @datadir@/doc/enigma/images
 +pngdir = @datadir@/doc/html/enigma/images
diff --git a/games/enigma/patches/patch-af b/games/enigma/patches/patch-af
index 4891ded8296..17d9918a6aa 100644
--- a/games/enigma/patches/patch-af
+++ b/games/enigma/patches/patch-af
@@ -1,10 +1,10 @@
-$NetBSD: patch-af,v 1.1.1.1 2004/03/01 22:46:26 heinz Exp $
+$NetBSD: patch-af,v 1.2 2005/08/22 15:35:37 adam Exp $
 
---- doc/refman/Makefile.in.orig	Sat Oct 11 19:20:08 2003
+--- doc/refman/Makefile.in.orig	2005-05-27 05:54:44.000000000 +0000
 +++ doc/refman/Makefile.in
-@@ -143,7 +143,7 @@ HTML = enigma-ref.html
+@@ -174,7 +174,7 @@ HTML = enigma-ref.html
  
- EXTRA_DIST = enigma-ref.texi $(HTML)
+ EXTRA_DIST = enigma-ref.texi texi2html.init $(HTML)
  
 -htmldir = @datadir@/doc/enigma/reference
 +htmldir = @datadir@/doc/html/enigma/reference
diff --git a/games/enigma/patches/patch-ag b/games/enigma/patches/patch-ag
index e06b169de23..1f685bff525 100644
--- a/games/enigma/patches/patch-ag
+++ b/games/enigma/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.1.1.1 2004/03/01 22:46:26 heinz Exp $
+$NetBSD: patch-ag,v 1.2 2005/08/22 15:35:37 adam Exp $
 
---- etc/Makefile.in.orig	Sat Oct 11 17:09:27 2003
+--- etc/Makefile.in.orig	2005-05-27 06:28:46.000000000 +0000
 +++ etc/Makefile.in
-@@ -328,7 +328,8 @@ info: info-am
+@@ -360,7 +360,8 @@ info: info-am
  
  info-am:
  
diff --git a/games/enigma/patches/patch-ah b/games/enigma/patches/patch-ah
deleted file mode 100644
index 4f7899edea2..00000000000
--- a/games/enigma/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.1.1.1 2004/03/01 22:46:26 heinz Exp $
-
---- lib-src/zipios++/src/directory.cpp.orig	Sat Oct  4 00:34:31 2003
-+++ lib-src/zipios++/src/directory.cpp
-@@ -24,7 +24,7 @@
- 
- #include "directory.h"
- 
--#if defined(unix) || defined(__unix) || defined(__unix__) || defined(MACOSX)
-+#if defined(unix) || defined(__unix) || defined(__unix__) || defined(MACOSX) || defined(__NetBSD__) || defined (__FreeBSD__) || defined (__OpenBSD__)
- #  define BOOST_UNIX 1
- #elif defined(_WINDOWS) || defined(__MINGW32__)
- #  define BOOST_WINNT 1
diff --git a/games/enigma/patches/patch-ai b/games/enigma/patches/patch-ai
deleted file mode 100644
index b4bf28579ab..00000000000
--- a/games/enigma/patches/patch-ai
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ai,v 1.1.1.1 2004/03/01 22:46:26 heinz Exp $
-
---- lib-src/zipios++/src/directory.h.orig	Sat Oct  4 00:34:31 2003
-+++ lib-src/zipios++/src/directory.h
-@@ -35,7 +35,7 @@
- // #include <boost.h>  Contents of boost.h
- 
- // Allow control over DLL version being built
--#if defined(unix) || defined(__unix) || defined(__unix__) || defined(MACOSX)
-+#if defined(unix) || defined(__unix) || defined(__unix__) || defined(MACOSX) || defined(__NetBSD__) || defined (__FreeBSD__) || defined (__OpenBSD__)
- #  define BOOST_DECL
- #elif defined(ZIPIOS_DLL)
- #  ifdef ZIPIOS_EXPORTS
-@@ -48,7 +48,7 @@
- #endif
- // end of contents of boost.h
- 
--#if defined(unix) || defined(__unix) || defined(__unix__) || defined(MACOSX)
-+#if defined(unix) || defined(__unix) || defined(__unix__) || defined(MACOSX) || defined(__NetBSD__) || defined (__FreeBSD__) || defined (__OpenBSD__)
- #include <sys/types.h>
- #endif
- 
-@@ -232,7 +232,7 @@ namespace boost
- 
- #endif
- 
--#if defined(unix) || defined(__unix) || defined(__unix__) || defined(MACOSX)
-+#if defined(unix) || defined(__unix) || defined(__unix__) || defined(MACOSX) || defined(__NetBSD__) || defined (__FreeBSD__) || defined (__OpenBSD__)
- 
-         struct is_link { typedef bool value_type; };
-         template <> bool get<is_link>(dir_it const &);
diff --git a/games/enigma/patches/patch-aj b/games/enigma/patches/patch-aj
deleted file mode 100644
index 5c51b299b6f..00000000000
--- a/games/enigma/patches/patch-aj
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-aj,v 1.2 2005/05/06 00:03:25 salo Exp $
-
---- src/object_mixins.hh	2003-07-12 12:04:47.000000000 +0200
-+++ src/object_mixins.hh	2004-11-11 00:05:24.000000000 +0100
-@@ -80,14 +80,14 @@
-     template <class T>
-     class OnOffBase : public T {
-     protected:
--        OnOffBase(const char *kind) : T(kind) { set_attrib("on", 0.0); }
-+        OnOffBase(const char *kind) : T(kind) { this->set_attrib("on", 0.0); }
- 
--        bool is_on() const { return int_attrib("on") == 1; }
-+        bool is_on() const { return this->int_attrib("on") == 1; }
- 
-         void set_on(bool newon) {
-             if (newon != is_on()) {
--                set_attrib("on", Value(newon));
--                init_model();
-+                this->set_attrib("on", Value(newon));
-+                this->init_model();
-                 notify_onoff(newon);
-             }
-         }
diff --git a/games/enigma/patches/patch-ak b/games/enigma/patches/patch-ak
deleted file mode 100644
index 797ecf77c7c..00000000000
--- a/games/enigma/patches/patch-ak
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-ak,v 1.2 2005/05/06 00:03:25 salo Exp $
-
---- src/px/alist.hh	2003-01-12 20:32:43.000000000 +0100
-+++ src/px/alist.hh	2004-11-11 00:04:26.855388248 +0100
-@@ -43,7 +43,7 @@
-         // Lookup of keys
-         //
-         iterator find (const key_type &key) {
--            iterator i=begin(), e=end();
-+            iterator i=this->begin(), e=this->end();
-             for (; i!=e; ++i) 
-                 if (i->first == key)
-                     break;
-@@ -51,7 +51,7 @@
-         }
- 
-         const_iterator find (const key_type &key) const {
--            const_iterator i=begin(), e=end();
-+            const_iterator i=this->begin(), e=this->end();
-             for (; i!=e; ++i) 
-                 if (i->first == key)
-                     break;
-@@ -60,8 +60,8 @@
- 
- 	VAL &operator[] (const key_type &key) { 
-             iterator i=find(key);
--            if (i==end())
--                i=insert(end(), make_pair(key, VAL()));
-+            if (i==this->end())
-+                i=insert(this->end(), make_pair(key, VAL()));
-             return i->second;
-         }
-     };
diff --git a/games/enigma/patches/patch-al b/games/enigma/patches/patch-al
deleted file mode 100644
index dd41a349b72..00000000000
--- a/games/enigma/patches/patch-al
+++ /dev/null
@@ -1,96 +0,0 @@
-$NetBSD: patch-al,v 1.2 2005/05/06 00:03:25 salo Exp $
-
---- src/px/array2.hh	2003-05-19 14:14:36.000000000 +0200
-+++ src/px/array2.hh	2004-11-11 00:04:26.855388248 +0100
-@@ -70,14 +70,14 @@
-         // Destructor
-         ~Array2() { destroy_elements(); }
- 
--        iterator begin() { return first; }
--        iterator end() { return last; }
--        const_iterator begin() const { return first; }
--        const_iterator end() const { return last; }
--        iterator row_begin(size_type y) { return first + y*w; }
--        iterator row_end(size_type y) { return first + y*w + w; }
--        const_iterator row_begin(size_type y) const { return first + y*w; }
--        const_iterator row_end(size_type y) const { return first + y*w + w; }
-+        iterator begin() { return this->first; }
-+        iterator end() { return this->last; }
-+        const_iterator begin() const { return this->first; }
-+        const_iterator end() const { return this->last; }
-+        iterator row_begin(size_type y) { return this->first + y*w; }
-+        iterator row_end(size_type y) { return this->first + y*w + w; }
-+        const_iterator row_begin(size_type y) const { return this->first + y*w; }
-+        const_iterator row_end(size_type y) const { return this->first + y*w + w; }
- 
- 
-         void swap(Array2<T,A> &a2);
-@@ -86,13 +86,13 @@
-         size_type height()const { return h; }
- 
- 
--        T&	 get(size_type x, size_type y) { return first[y*w+x]; }
--        const T& get(size_type x, size_type y) const { return first[y*w+x]; }
-+        T&	 get(size_type x, size_type y) { return this->first[y*w+x]; }
-+        const T& get(size_type x, size_type y) const { return this->first[y*w+x]; }
-         T& 	 operator()(size_type x, size_type y) { return get(x,y); }
-         const T& operator()(size_type x, size_type y) const { return get(x,y); }
- 
-         void 	 set(size_type x, size_type y, const T& val) {
--            first[y*w+x] = val;
-+            this->first[y*w+x] = val;
-         }
- 
-         /*! Fill the array with some value or the default value. */
-@@ -112,19 +112,19 @@
-     Array2<T,A>::Array2(int ww, int hh, const T& val, const A& a)
-     : Array2Base<T,A>(a, ww*hh), w(ww), h(hh)
-     {
--        std::uninitialized_fill(first, last, val);
-+        std::uninitialized_fill(this->first, this->last, val);
-     }
- 
-     template <class T, class A>
-     Array2<T,A>::Array2(const Array2<T,A> &a)
-     : Array2Base<T,A>(a.alloc, a.last-a.first)
-     {
--        std::uninitialized_copy(a.begin(), a.end(), first);
-+        std::uninitialized_copy(a.begin(), a.end(), this->first);
-     }
- 
-     template <class T, class A>
-     void Array2<T,A>::destroy_elements() {
--        for (T* p=first; p!=last; ++p)
-+        for (T* p=this->first; p!=this->last; ++p)
-             p->~T();
-     }
- 
-@@ -132,7 +132,7 @@
-     void Array2<T,A>::fill (const T& val)
-     {
-         destroy_elements();
--        std::uninitialized_fill(first, last, val);
-+        std::uninitialized_fill(this->first, this->last, val);
-     }
- 
-     /*! Resize the array in place, but discard any old array
-@@ -142,7 +142,7 @@
-     {
-         destroy_elements();
-         Array2Base<T,A>::resize(w_*h_);
--        std::uninitialized_fill(first, last, val);
-+        std::uninitialized_fill(this->first, this->last, val);
-         w = w_;
-         h = h_;
-     }
-@@ -150,8 +150,8 @@
-     template <class T, class A>
-     void Array2<T,A>::swap(Array2<T,A> &a2)
-     {
--        std::swap(first, a2.first);
--        std::swap(last, a2.last);
-+        std::swap(this->first, a2.first);
-+        std::swap(this->last, a2.last);
-         std::swap(w, a2.w);
-         std::swap(h, a2.h);
-     }
diff --git a/games/enigma/patches/patch-am b/games/enigma/patches/patch-am
index 692b89285e9..1043c45b70b 100644
--- a/games/enigma/patches/patch-am
+++ b/games/enigma/patches/patch-am
@@ -1,24 +1,10 @@
-$NetBSD: patch-am,v 1.2 2005/05/06 00:03:25 salo Exp $
+$NetBSD: patch-am,v 1.3 2005/08/22 15:35:37 adam Exp $
 
---- src/px/dict.hh.orig	Sun May 18 20:45:07 2003
+--- src/px/dict.hh.orig	2004-12-08 10:17:10.000000000 +0000
 +++ src/px/dict.hh
-@@ -101,8 +101,11 @@ namespace px
-     public:
- 	typedef Iter<value_type>                iterator;
-   	typedef Iter<const value_type>          const_iterator;
--        friend class iterator;
--        friend class const_iterator;        
-+	// pkgsrc: In order to still support gcc 2.95 we do not remove those
-+	// two friends (like the Fedora patch does). OTOH gcc3.4.3 does not
-+	// like using the typedef'ed types from above as friends.
-+	friend class Iter<value_type>;
-+	friend class Iter<const value_type>;        
- 
- 	Dict(size_type table_size = 257);
-         ~Dict();
-@@ -126,7 +129,8 @@ namespace px
+@@ -131,7 +131,8 @@ namespace px
  	
- 	const T& lookup(const std::string &key) const {
+ 	const T& lookup(const key_type &key) const {
  	    Entry *e = find_entry(key);
 -	    if (!e) throw XInvalidKey();
 +// rational: see above + XInvalidKey is not declared anywhere
diff --git a/games/enigma/patches/patch-an b/games/enigma/patches/patch-an
index 2f05b749507..f3b03daebd1 100644
--- a/games/enigma/patches/patch-an
+++ b/games/enigma/patches/patch-an
@@ -1,10 +1,10 @@
-$NetBSD: patch-an,v 1.2 2005/05/06 00:03:25 salo Exp $
+$NetBSD: patch-an,v 1.3 2005/08/22 15:35:37 adam Exp $
 
---- src/px/video.cc	2003-07-31 09:28:04.000000000 +0200
-+++ src/px/video.cc	2004-11-11 00:04:26.855388248 +0100
-@@ -207,16 +207,16 @@
-         void set_pixels(int n, const int* xlist, const int* ylist, Uint32 color)
-         {
+--- src/px/video.cc.orig	2004-12-30 13:21:35.000000000 +0000
++++ src/px/video.cc
+@@ -177,16 +177,16 @@ namespace
+ 
+         void set_pixels(const GS &gs, int n, const int* xlist, const int* ylist, Uint32 color) {
              const int *xp = xlist, *yp = ylist;
 -            if (NOCLIP(gs)) {
 +            if (NOCLIP(this->gs)) {