From 501cb54dd6a9062484802998cef05659805fae16 Mon Sep 17 00:00:00 2001 From: adam Date: Wed, 23 Feb 2011 10:20:26 +0000 Subject: Changes 1.01-r1914: Fix building on 32- and 64-bit machines. --- games/enigma/Makefile | 7 +++--- games/enigma/distinfo | 14 +++++++----- games/enigma/patches/patch-aq | 4 ++-- .../patches/patch-lib-src_enigma-core_ecl_alist.hh | 15 +++++++++++++ .../patches/patch-lib-src_enigma-core_ecl_dict.hh | 14 ++++++++++++ .../patches/patch-lib-src_enigma-core_ecl_font.cc | 15 +++++++++++++ games/enigma/patches/patch-src_oxyd.cc | 26 ++++++++++++++++++++++ 7 files changed, 85 insertions(+), 10 deletions(-) create mode 100644 games/enigma/patches/patch-lib-src_enigma-core_ecl_alist.hh create mode 100644 games/enigma/patches/patch-lib-src_enigma-core_ecl_dict.hh create mode 100644 games/enigma/patches/patch-lib-src_enigma-core_ecl_font.cc create mode 100644 games/enigma/patches/patch-src_oxyd.cc (limited to 'games') diff --git a/games/enigma/Makefile b/games/enigma/Makefile index 52a34c6a031..6f04842f64d 100644 --- a/games/enigma/Makefile +++ b/games/enigma/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.23 2011/02/01 00:09:08 wiz Exp $ +# $NetBSD: Makefile,v 1.24 2011/02/23 10:20:26 adam Exp $ -DISTNAME= enigma-1.01 -PKGREVISION= 5 +DISTNAME= enigma-1.01-r1914 +PKGNAME= ${DISTNAME:S/-r/./} CATEGORIES= games MASTER_SITES= http://download.berlios.de/enigma-game/ @@ -15,6 +15,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews DEPENDS+= gettext-tools-[0-9]*:../../devel/gettext-tools +WRKSRC= ${WRKDIR}/${DISTNAME:S/-r1914//} GCC_REQD+= 3.3 USE_LANGUAGES= c c++ USE_PKGLOCALEDIR= yes diff --git a/games/enigma/distinfo b/games/enigma/distinfo index 6c538aa3a60..a9e36d6602d 100644 --- a/games/enigma/distinfo +++ b/games/enigma/distinfo @@ -1,8 +1,12 @@ -$NetBSD: distinfo,v 1.9 2011/02/01 00:08:48 wiz Exp $ +$NetBSD: distinfo,v 1.10 2011/02/23 10:20:26 adam Exp $ -SHA1 (enigma-1.01.tar.gz) = 93f96ddd152e7474488cbb27ce0923312a851a9c -RMD160 (enigma-1.01.tar.gz) = 9dd91152cfced5352a669e8921fdbb270c0abc4e -Size (enigma-1.01.tar.gz) = 10847953 bytes +SHA1 (enigma-1.01-r1914.tar.gz) = f0c4b3e8fbbcc246044fbdf0ff474a005e9905a1 +RMD160 (enigma-1.01-r1914.tar.gz) = 205e11ecc87b3a46911782366043ce80079b9918 +Size (enigma-1.01-r1914.tar.gz) = 10902129 bytes SHA1 (patch-aa) = c0a337a1d1098815812e117f5ca49d9ed248a446 -SHA1 (patch-aq) = 113580c3063cdfa11ee212f922edd5b40f229eea +SHA1 (patch-aq) = a58f97c78c4ee2a98c29b53265dbc5d2993cd8df SHA1 (patch-lib-src_enigma-core_IMG__SavePNG.c) = 7377498a9be1425cb7c683147b37ceb894a305c8 +SHA1 (patch-lib-src_enigma-core_ecl_alist.hh) = 15c0d90cecb60010f85074d28c907f4ba416a972 +SHA1 (patch-lib-src_enigma-core_ecl_dict.hh) = 64dfc60a4a805a4b1f3af8ca3726efd14d1d7cfd +SHA1 (patch-lib-src_enigma-core_ecl_font.cc) = 132504419ed9b045f021dc3b2023116d57ab51e9 +SHA1 (patch-src_oxyd.cc) = e70a5b6049db22be42be438c08ccfed677907a20 diff --git a/games/enigma/patches/patch-aq b/games/enigma/patches/patch-aq index b63d6b97bc0..ab8fc5792df 100644 --- a/games/enigma/patches/patch-aq +++ b/games/enigma/patches/patch-aq @@ -1,8 +1,8 @@ -$NetBSD: patch-aq,v 1.1 2007/06/14 17:55:05 heinz Exp $ +$NetBSD: patch-aq,v 1.2 2011/02/23 10:20:26 adam Exp $ --- lib-src/enet/Makefile.in.orig 2006-12-13 22:51:46.000000000 +0100 +++ lib-src/enet/Makefile.in -@@ -551,7 +551,8 @@ installdirs-am: +@@ -557,7 +557,8 @@ installdirs-am: for dir in "$(DESTDIR)$(libdir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done diff --git a/games/enigma/patches/patch-lib-src_enigma-core_ecl_alist.hh b/games/enigma/patches/patch-lib-src_enigma-core_ecl_alist.hh new file mode 100644 index 00000000000..507e364a0d7 --- /dev/null +++ b/games/enigma/patches/patch-lib-src_enigma-core_ecl_alist.hh @@ -0,0 +1,15 @@ +$NetBSD: patch-lib-src_enigma-core_ecl_alist.hh,v 1.1 2011/02/23 10:20:26 adam Exp $ + +Fix C++ error. + +--- lib-src/enigma-core/ecl_alist.hh.orig 2011-02-22 13:22:18.000000000 +0000 ++++ lib-src/enigma-core/ecl_alist.hh +@@ -61,7 +61,7 @@ namespace ecl + VAL &operator[] (const key_type &key) { + iterator i=find(key); + if (i==this->end()) +- i=insert(this->end(), make_pair(key, VAL())); ++ i=this->insert(this->end(), make_pair(key, VAL())); + return i->second; + } + }; diff --git a/games/enigma/patches/patch-lib-src_enigma-core_ecl_dict.hh b/games/enigma/patches/patch-lib-src_enigma-core_ecl_dict.hh new file mode 100644 index 00000000000..7fef5302dcf --- /dev/null +++ b/games/enigma/patches/patch-lib-src_enigma-core_ecl_dict.hh @@ -0,0 +1,14 @@ +$NetBSD: patch-lib-src_enigma-core_ecl_dict.hh,v 1.1 2011/02/23 10:20:26 adam Exp $ + +Fix C++ error. + +--- lib-src/enigma-core/ecl_dict.hh.orig 2011-02-22 13:20:39.000000000 +0000 ++++ lib-src/enigma-core/ecl_dict.hh +@@ -27,6 +27,7 @@ namespace ecl + extern unsigned hash(const std::string &key); + + class XInvalidKey : XGeneric { ++ public: + XInvalidKey () : XGeneric("invalid dictionary key") + {} + }; diff --git a/games/enigma/patches/patch-lib-src_enigma-core_ecl_font.cc b/games/enigma/patches/patch-lib-src_enigma-core_ecl_font.cc new file mode 100644 index 00000000000..e8b7abe8dee --- /dev/null +++ b/games/enigma/patches/patch-lib-src_enigma-core_ecl_font.cc @@ -0,0 +1,15 @@ +$NetBSD: patch-lib-src_enigma-core_ecl_font.cc,v 1.1 2011/02/23 10:20:26 adam Exp $ + +Fix comparison. + +--- lib-src/enigma-core/ecl_font.cc.orig 2011-02-22 13:18:46.000000000 +0000 ++++ lib-src/enigma-core/ecl_font.cc +@@ -114,7 +114,7 @@ BitmapFont::BitmapFont(Surface *s, const + char_rects[c].y = 0; + char_rects[c].h = s->height(); + advance[c] = adv; +- if (adv = 0) ++ if (adv == 0) + std::cout << "BitFont 0\n"; + } + } diff --git a/games/enigma/patches/patch-src_oxyd.cc b/games/enigma/patches/patch-src_oxyd.cc new file mode 100644 index 00000000000..c96520c0ed4 --- /dev/null +++ b/games/enigma/patches/patch-src_oxyd.cc @@ -0,0 +1,26 @@ +$NetBSD: patch-src_oxyd.cc,v 1.1 2011/02/23 10:20:26 adam Exp $ + +Fix name conflict. + +--- src/oxyd.cc.orig 2011-02-22 13:24:27.000000000 +0000 ++++ src/oxyd.cc +@@ -130,7 +130,7 @@ namespace + } + } + +- GridLoc to_gridloc (const SignalLocation &a) ++ GridLoc to_gridloc2 (const SignalLocation &a) + { + assert (a.getGridType() >= GridType_First && + a.getGridType() <= GridType_Last); +@@ -644,8 +644,8 @@ void OxydLoader::connect_signals () + int nrec = level.getNumRecipients(sender); + for (int irec=0; irec