diff options
author | tonio <tonio> | 2008-07-22 21:25:00 +0000 |
---|---|---|
committer | tonio <tonio> | 2008-07-22 21:25:00 +0000 |
commit | 7334985664a4d74d2a7f8020ad992dc157624476 (patch) | |
tree | deea33287185467783017e71f779618a47026f52 | |
parent | a1c9b13b0775b28403c42a15cb1d4a8ac1f397d6 (diff) | |
download | pkgsrc-7334985664a4d74d2a7f8020ad992dc157624476.tar.gz |
Update games/xmahjongg to version 3.7
Changelog:
Version 3.7 8.Mar.2005
* Man page bug fixes from Debian via Dave Swegen.
* Source code reorganization.
-rw-r--r-- | games/xmahjongg/Makefile | 5 | ||||
-rw-r--r-- | games/xmahjongg/PLIST | 3 | ||||
-rw-r--r-- | games/xmahjongg/distinfo | 13 | ||||
-rw-r--r-- | games/xmahjongg/patches/patch-aa | 13 | ||||
-rw-r--r-- | games/xmahjongg/patches/patch-ab | 6 | ||||
-rw-r--r-- | games/xmahjongg/patches/patch-ac | 16 |
6 files changed, 21 insertions, 35 deletions
diff --git a/games/xmahjongg/Makefile b/games/xmahjongg/Makefile index 65536bf849c..2f7a0f6f8bf 100644 --- a/games/xmahjongg/Makefile +++ b/games/xmahjongg/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.25 2007/02/22 19:26:31 wiz Exp $ +# $NetBSD: Makefile,v 1.26 2008/07/22 21:25:00 tonio Exp $ # -DISTNAME= xmahjongg-3.6.1 -PKGREVISION= 1 +DISTNAME= xmahjongg-3.7 CATEGORIES= games x11 MASTER_SITES= http://www.lcdf.org/~eddietwo/xmahjongg/ diff --git a/games/xmahjongg/PLIST b/games/xmahjongg/PLIST index e06191bac1f..5d8ec0fb19b 100644 --- a/games/xmahjongg/PLIST +++ b/games/xmahjongg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2003/04/10 17:58:07 salo Exp $ +@comment $NetBSD: PLIST,v 1.5 2008/07/22 21:25:00 tonio Exp $ bin/xmahjongg man/man6/xmahjongg.6 share/xmahjongg/backgrounds/default.gif @@ -22,6 +22,7 @@ share/xmahjongg/layouts/papillon share/xmahjongg/layouts/ram share/xmahjongg/layouts/rat share/xmahjongg/layouts/rooster +share/xmahjongg/layouts/schoon share/xmahjongg/layouts/snake share/xmahjongg/layouts/theater share/xmahjongg/layouts/tiger diff --git a/games/xmahjongg/distinfo b/games/xmahjongg/distinfo index caf9e939804..5a3f8a0cfef 100644 --- a/games/xmahjongg/distinfo +++ b/games/xmahjongg/distinfo @@ -1,8 +1,7 @@ -$NetBSD: distinfo,v 1.8 2006/11/09 13:45:33 martin Exp $ +$NetBSD: distinfo,v 1.9 2008/07/22 21:25:00 tonio Exp $ -SHA1 (xmahjongg-3.6.1.tar.gz) = 35e380e53412568e6af7f4fcc1677693f52fc60e -RMD160 (xmahjongg-3.6.1.tar.gz) = acfc0161322b22296639dff313bae8d57e012618 -Size (xmahjongg-3.6.1.tar.gz) = 462833 bytes -SHA1 (patch-aa) = 5305cfb0c0c8c0fcc507bc3730043331255a94a5 -SHA1 (patch-ab) = d3c2574c8de7e85c8e38670017d0eda64fe3b0be -SHA1 (patch-ac) = ea3083eff9216833153c1ad68e31a4282938e9d9 +SHA1 (xmahjongg-3.7.tar.gz) = 2693a0a90d9cb127f7b98cbeca9a2b832b3bb718 +RMD160 (xmahjongg-3.7.tar.gz) = 41b584ca39dcb80f96ea19b4a29c237f3919f785 +Size (xmahjongg-3.7.tar.gz) = 551834 bytes +SHA1 (patch-ab) = f014d6c399092f5b2910e690b296678cc4797ad3 +SHA1 (patch-ac) = 18262594c57f068478480183a6c84e29ab1f599c diff --git a/games/xmahjongg/patches/patch-aa b/games/xmahjongg/patches/patch-aa deleted file mode 100644 index 85721e5ffb4..00000000000 --- a/games/xmahjongg/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.5 2006/06/02 09:08:15 martin Exp $ - ---- permstr.hh.orig 2006-06-02 09:57:39.000000000 +0200 -+++ permstr.hh 2006-06-02 09:57:50.000000000 +0200 -@@ -93,7 +93,7 @@ operator!=(const char *a, PermString b) - inline int - hashcode(PermString s) - { -- return (int)(s.cc()); -+ return (int)(intptr_t)(s.cc()); - } - - #endif diff --git a/games/xmahjongg/patches/patch-ab b/games/xmahjongg/patches/patch-ab index 5f04f62b909..e53f7e1af07 100644 --- a/games/xmahjongg/patches/patch-ab +++ b/games/xmahjongg/patches/patch-ab @@ -1,7 +1,7 @@ -$NetBSD: patch-ab,v 1.4 2006/06/02 09:08:15 martin Exp $ +$NetBSD: patch-ab,v 1.5 2008/07/22 21:25:00 tonio Exp $ ---- giftoc.c.orig 1999-08-15 21:03:06.000000000 +0200 -+++ giftoc.c 2006-06-02 11:02:19.000000000 +0200 +--- liblcdf/giftoc.c.orig 2003-08-29 05:58:00.000000000 +0200 ++++ liblcdf/giftoc.c @@ -192,9 +192,9 @@ or: giftoc -makename [OPTIONS] FILE [ sin = strrchr(file_name, PATHNAME_SEPARATOR) + 1; if (!sin) sin = file_name; diff --git a/games/xmahjongg/patches/patch-ac b/games/xmahjongg/patches/patch-ac index 6c189076093..357eb18975f 100644 --- a/games/xmahjongg/patches/patch-ac +++ b/games/xmahjongg/patches/patch-ac @@ -1,18 +1,18 @@ -$NetBSD: patch-ac,v 1.2 2006/11/09 13:45:33 martin Exp $ +$NetBSD: patch-ac,v 1.3 2008/07/22 21:25:00 tonio Exp $ SunPro sees an overloading ambiguity between operator bool() and operator const char *(). ISO C++ and gcc 4.2 agree. ---- permstr.cc.orig 2001-09-06 20:30:10.000000000 +0200 -+++ permstr.cc 2006-11-09 14:35:55.000000000 +0100 -@@ -183,8 +183,8 @@ +--- liblcdf/permstr.cc.orig 2004-11-21 20:01:59.000000000 +0100 ++++ liblcdf/permstr.cc +@@ -160,8 +160,8 @@ PermString::PermString(char c) bool operator==(PermString a, const char *b) { -- if (!a || !b) -- return !a && !b; +- if (!a || !b) +- return !a && !b; + if (operator==(a, false) || !b) + return (operator==(a, false)) && !b; - int l = strlen(b); - return a.length() == l && memcmp(a.cc(), b, l) == 0; + int l = strlen(b); + return a.length() == l && memcmp(a.c_str(), b, l) == 0; } |