diff options
author | Chris Gianelloni <wolf31o2@gentoo.org> | 2006-10-06 16:28:34 +0000 |
---|---|---|
committer | Chris Gianelloni <wolf31o2@gentoo.org> | 2006-10-06 16:28:34 +0000 |
commit | 6a96ca03f04f1e160383b0f369222f066695a0e9 (patch) | |
tree | 9c8d27bafd36576d482636da6ff09983215cf0d9 | |
parent | Added patch for saving by Pekka Rousu <prousu@users.sourceforge.net>. Closin... (diff) | |
download | historical-6a96ca03f04f1e160383b0f369222f066695a0e9.tar.gz historical-6a96ca03f04f1e160383b0f369222f066695a0e9.tar.bz2 historical-6a96ca03f04f1e160383b0f369222f066695a0e9.zip |
Added patch for saving by Pekka Rousu <prousu@users.sourceforge.net>. Closing bug #103586.
Package-Manager: portage-2.1.2_pre1-r4
-rw-r--r-- | games-roguelike/slashem/Manifest | 58 | ||||
-rw-r--r-- | games-roguelike/slashem/files/0.0.6E4F8-errno.patch | 197 | ||||
-rw-r--r-- | games-roguelike/slashem/files/0.0.6E4F8-gentoo-paths.patch | 26 | ||||
-rw-r--r-- | games-roguelike/slashem/files/0.0.6E4F8-makefile.patch | 219 | ||||
-rw-r--r-- | games-roguelike/slashem/files/0.0.7E7/gentoo-paths.patch | 26 | ||||
-rw-r--r-- | games-roguelike/slashem/files/X11.configure | 28 | ||||
-rw-r--r-- | games-roguelike/slashem/files/dot.slashemrc | 105 | ||||
-rw-r--r-- | games-roguelike/slashem/files/gnome.configure | 14 | ||||
-rw-r--r-- | games-roguelike/slashem/files/gtk.configure | 14 | ||||
-rw-r--r-- | games-roguelike/slashem/files/qt.configure | 10 |
10 files changed, 11 insertions, 686 deletions
diff --git a/games-roguelike/slashem/Manifest b/games-roguelike/slashem/Manifest index d48ec653f40d..238771e273d5 100644 --- a/games-roguelike/slashem/Manifest +++ b/games-roguelike/slashem/Manifest @@ -1,18 +1,6 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX 0.0.6E4F8-errno.patch 4788 RMD160 247311f74d49efcb95796b2126f585a215413a25 SHA1 fcaa0bba7cf7fc38877d2d7b1c8f412659a30eaa SHA256 0e9995cd71e8fa600f3ee31e5bb5318313d705fa596071f4fabaf5bf763d511c -MD5 7042d07dab18e8ce6bf5f99c2497db44 files/0.0.6E4F8-errno.patch 4788 -RMD160 247311f74d49efcb95796b2126f585a215413a25 files/0.0.6E4F8-errno.patch 4788 -SHA256 0e9995cd71e8fa600f3ee31e5bb5318313d705fa596071f4fabaf5bf763d511c files/0.0.6E4F8-errno.patch 4788 -AUX 0.0.6E4F8-gentoo-paths.patch 818 RMD160 ac25382130a4b9075edfa7fa6b8ba34631ec00d0 SHA1 73d161375902c25fe84b21fed89cbbe41acf1179 SHA256 760f9c4bd1ff346fa6e5422be19991021ad357b1a7d32815b5ca357ef4ce55da -MD5 c0702cf01cb9b34fb41418616181e7e8 files/0.0.6E4F8-gentoo-paths.patch 818 -RMD160 ac25382130a4b9075edfa7fa6b8ba34631ec00d0 files/0.0.6E4F8-gentoo-paths.patch 818 -SHA256 760f9c4bd1ff346fa6e5422be19991021ad357b1a7d32815b5ca357ef4ce55da files/0.0.6E4F8-gentoo-paths.patch 818 -AUX 0.0.6E4F8-makefile.patch 6981 RMD160 f40efbd409f0e5a4f2c9a3a6f8079a3c39dbd907 SHA1 54ead43ee14cc83f03d2f6fcf1d3946c7afc44fd SHA256 5a7e642efd9bba232b05dde7b9d47301414f463e82301b413095106f08f462a3 -MD5 a7d2ae8f086e4eaf658e35e261ac9766 files/0.0.6E4F8-makefile.patch 6981 -RMD160 f40efbd409f0e5a4f2c9a3a6f8079a3c39dbd907 files/0.0.6E4F8-makefile.patch 6981 -SHA256 5a7e642efd9bba232b05dde7b9d47301414f463e82301b413095106f08f462a3 files/0.0.6E4F8-makefile.patch 6981 AUX 0.0.7E6/GTK.configure 426 RMD160 ae77acb4cefbb97af3de9925b39cd9714f7fbd9c SHA1 1127101c065fc50cccb84f0279f1caf529fc13c0 SHA256 1f5ed587c7d6e6b3bcd2a5d7e3b41bc36519ea32dc066eea736349d0d208683b MD5 57e259af161fb4cd14a21274e271a075 files/0.0.7E6/GTK.configure 426 RMD160 ae77acb4cefbb97af3de9925b39cd9714f7fbd9c files/0.0.7E6/GTK.configure 426 @@ -89,10 +77,6 @@ AUX 0.0.7E7/dot.slashemrc 3721 RMD160 6751f7395e17c42ea04c3bff15408b6bcea1418a S MD5 a27b3edac6eefbb0c4e45ef0474125ee files/0.0.7E7/dot.slashemrc 3721 RMD160 6751f7395e17c42ea04c3bff15408b6bcea1418a files/0.0.7E7/dot.slashemrc 3721 SHA256 6bc574f5ba67c6999f2680087fecf9edbc8c3848bcc493f0e753afd039027673 files/0.0.7E7/dot.slashemrc 3721 -AUX 0.0.7E7/gentoo-paths.patch 818 RMD160 ac25382130a4b9075edfa7fa6b8ba34631ec00d0 SHA1 73d161375902c25fe84b21fed89cbbe41acf1179 SHA256 760f9c4bd1ff346fa6e5422be19991021ad357b1a7d32815b5ca357ef4ce55da -MD5 c0702cf01cb9b34fb41418616181e7e8 files/0.0.7E7/gentoo-paths.patch 818 -RMD160 ac25382130a4b9075edfa7fa6b8ba34631ec00d0 files/0.0.7E7/gentoo-paths.patch 818 -SHA256 760f9c4bd1ff346fa6e5422be19991021ad357b1a7d32815b5ca357ef4ce55da files/0.0.7E7/gentoo-paths.patch 818 AUX 0.0.7E7/gnome.configure 380 RMD160 95cb4f15f69245a94e5744327a407a8fb2f97d01 SHA1 5f18a3311d5bf0d9a36b2d3e3f5c895823a3f82d SHA256 45be8cb6a7bbdac20c96849439a22ba237e597a97bbdca7101af48e4167e1cb2 MD5 a390d1fc8a476b52da0e6e45e01001b1 files/0.0.7E7/gnome.configure 380 RMD160 95cb4f15f69245a94e5744327a407a8fb2f97d01 files/0.0.7E7/gnome.configure 380 @@ -121,26 +105,6 @@ AUX 0.0.7E7/sdl.configure 258 RMD160 50b0e3667f767ac3e54f45f2fcfa8c55926b3624 SH MD5 517442a1ef6bed1c0a4547422d3fe256 files/0.0.7E7/sdl.configure 258 RMD160 50b0e3667f767ac3e54f45f2fcfa8c55926b3624 files/0.0.7E7/sdl.configure 258 SHA256 3c2e408764f93d46c024f309e20379bb5f87ddd3518a078029ba2532bd5d8554 files/0.0.7E7/sdl.configure 258 -AUX X11.configure 630 RMD160 2e8a499a45ab0485a0a50b135fb590cf3f74e5b3 SHA1 cf837408fd06493ef2e74b6c4ef6f4e3e9e460dc SHA256 a47dc928e8da9ea99e8a2a90325a4e67d8c99574b95e863e25333114fee3c1c0 -MD5 18340044152321018649d5b65c31278b files/X11.configure 630 -RMD160 2e8a499a45ab0485a0a50b135fb590cf3f74e5b3 files/X11.configure 630 -SHA256 a47dc928e8da9ea99e8a2a90325a4e67d8c99574b95e863e25333114fee3c1c0 files/X11.configure 630 -AUX dot.slashemrc 3491 RMD160 063f7cbb0d0b7ec1ddf014b8e7b91b4f579ae2b8 SHA1 95983f1d486596ef26f99c9fff82ea56e2d279d0 SHA256 c42763e4a35178fcf87a96837b1e709b6b2bc21f45444daa5680caf293e8722c -MD5 7e5fae501e9a74fb3bc3eb1569308cdc files/dot.slashemrc 3491 -RMD160 063f7cbb0d0b7ec1ddf014b8e7b91b4f579ae2b8 files/dot.slashemrc 3491 -SHA256 c42763e4a35178fcf87a96837b1e709b6b2bc21f45444daa5680caf293e8722c files/dot.slashemrc 3491 -AUX gnome.configure 275 RMD160 7f0259a56bf6b5ea0fb284000496df3f72d7503f SHA1 62ccf4ba04ec9f05fe9cd32525841d2a4614745a SHA256 f7e01b77fe438392f6aad097e8f2891b74cfcda5fd050029b0cae19ddbfeceae -MD5 582f28b3c2d30a80415ff9c92ca6e77b files/gnome.configure 275 -RMD160 7f0259a56bf6b5ea0fb284000496df3f72d7503f files/gnome.configure 275 -SHA256 f7e01b77fe438392f6aad097e8f2891b74cfcda5fd050029b0cae19ddbfeceae files/gnome.configure 275 -AUX gtk.configure 238 RMD160 80050d7a1e1a8ed79ac510eee0d2e14e0a83b703 SHA1 ea435532bda959aa75dfba8ca4e007ce970f8e12 SHA256 24d07c2c678929ad99dd0a2c65e1f70be94c31972558fc10559e682a831643d7 -MD5 b38854e3518f58d3deb1751abf1049d9 files/gtk.configure 238 -RMD160 80050d7a1e1a8ed79ac510eee0d2e14e0a83b703 files/gtk.configure 238 -SHA256 24d07c2c678929ad99dd0a2c65e1f70be94c31972558fc10559e682a831643d7 files/gtk.configure 238 -AUX qt.configure 182 RMD160 743b422c17a9d5d7998e30d1e3fb06ca931365fd SHA1 483e0e2382e6d28f001a8f40eb1d41a9b2f250fd SHA256 c4a51751d8bf30b910e3a157a4782d4630c08967dd01671f4e7e099f6e648ea0 -MD5 07f0de2a5c98da1af7a9e3ca3ce377fd files/qt.configure 182 -RMD160 743b422c17a9d5d7998e30d1e3fb06ca931365fd files/qt.configure 182 -SHA256 c4a51751d8bf30b910e3a157a4782d4630c08967dd01671f4e7e099f6e648ea0 files/qt.configure 182 DIST conf12s.tar.gz 4788 RMD160 3ca60651585d2377c1eeea60dd398eae00a8ad16 SHA1 581261315cd7dd005bdabcbd275b772371487a47 SHA256 76b5d0527434276db4876610651a0dc73698012b1cf93449c63a516355cd06f5 DIST se007e6f3.tar.gz 5213184 DIST se007e7f2.tar.gz 5218698 RMD160 805198ea444a2e0e3b0218f09cf47198784435a0 SHA1 b71911bfded49b0e71c796b5ceac4032acbd139e SHA256 a520817f1fe19302f27db22a9c1762c27a669f7491e84bd22790ea4f67136b49 @@ -148,14 +112,14 @@ EBUILD slashem-0.0.760.ebuild 4595 RMD160 14ff871fd276a2245bddb1d6321dbc14b85a37 MD5 dd05c3668af8c4a6ed683a2a132e9adf slashem-0.0.760.ebuild 4595 RMD160 14ff871fd276a2245bddb1d6321dbc14b85a3752 slashem-0.0.760.ebuild 4595 SHA256 9ec23368c49ecc93116fda84efe5f3f313c8927107d4d7fc73d5927fb32fa1c6 slashem-0.0.760.ebuild 4595 -EBUILD slashem-0.0.772.ebuild 5142 RMD160 ce17d76d4709a7d40242d197291610724fa26f56 SHA1 a17245425087e039829042aa033c2d2dee535192 SHA256 352d9125007564a764e26a81492686bc5c190e3c3903e136b201d27cf666f51a -MD5 7ab1f03255c7823b5aefa6275840940b slashem-0.0.772.ebuild 5142 -RMD160 ce17d76d4709a7d40242d197291610724fa26f56 slashem-0.0.772.ebuild 5142 -SHA256 352d9125007564a764e26a81492686bc5c190e3c3903e136b201d27cf666f51a slashem-0.0.772.ebuild 5142 -MISC ChangeLog 2545 RMD160 131f7591f120a063904a922dc2c8ee75382d9a9f SHA1 ef680108c393fc52891f232a1366b7d0dfb37de7 SHA256 464c6a2622d8a2f72abd292c05a493e7428714cb213f93f6b145b51fac19844b -MD5 86190c22c0660c1cd79a952f09b8e350 ChangeLog 2545 -RMD160 131f7591f120a063904a922dc2c8ee75382d9a9f ChangeLog 2545 -SHA256 464c6a2622d8a2f72abd292c05a493e7428714cb213f93f6b145b51fac19844b ChangeLog 2545 +EBUILD slashem-0.0.772.ebuild 5016 RMD160 4886512d2bda05986f1bc8e17382871e393efba3 SHA1 f5b7c5ec728ddf8f7953327d1e590653fe56235d SHA256 702e089e210b5243a0991b73271c72cd5a362ca521f83d8e019364cbced5e0e6 +MD5 073a96fda5aeaaab0fbdb60a2af63fb0 slashem-0.0.772.ebuild 5016 +RMD160 4886512d2bda05986f1bc8e17382871e393efba3 slashem-0.0.772.ebuild 5016 +SHA256 702e089e210b5243a0991b73271c72cd5a362ca521f83d8e019364cbced5e0e6 slashem-0.0.772.ebuild 5016 +MISC ChangeLog 2973 RMD160 6297bfa89a2219341d861f7ea3e29acedaf8c5af SHA1 4024e629534aed45ec48def0879b9afb85101db6 SHA256 0e2304773a4d67c3bcd9b51e1a9100d966935d2a2fa2025fc49baa8a2e4d2572 +MD5 9f16c11d17bdc118ab86c41b1d6b238b ChangeLog 2973 +RMD160 6297bfa89a2219341d861f7ea3e29acedaf8c5af ChangeLog 2973 +SHA256 0e2304773a4d67c3bcd9b51e1a9100d966935d2a2fa2025fc49baa8a2e4d2572 ChangeLog 2973 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158 @@ -169,7 +133,7 @@ SHA256 a9cde26c65c5a9fbef997e01cbfdf7f725302adddc4485d6f4a3e5c442b51e40 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) -iD8DBQFFJS4rkT4lNIS36YERAuXIAKCJyqOPqQ0dZOtfvZueDS/EuYAusQCfbnP5 -P83Kow/q10r8uj13Udl1+dU= -=5GbH +iD8DBQFFJoQwkT4lNIS36YERAvNUAKChaa/FA97B+ZyjctSOJNu4md6SvwCgr+dO +8YJlcaijIqux+7VyK1YTuhQ= +=3CwZ -----END PGP SIGNATURE----- diff --git a/games-roguelike/slashem/files/0.0.6E4F8-errno.patch b/games-roguelike/slashem/files/0.0.6E4F8-errno.patch deleted file mode 100644 index 5c05c6f5e4e6..000000000000 --- a/games-roguelike/slashem/files/0.0.6E4F8-errno.patch +++ /dev/null @@ -1,197 +0,0 @@ -diff -Naurd slashem-0.0.6E4F8-old/src/do.c slashem-0.0.6E4F8/src/do.c ---- slashem-0.0.6E4F8-old/src/do.c 2002-04-01 01:05:53.000000000 +0300 -+++ slashem-0.0.6E4F8/src/do.c 2003-07-28 17:21:50.000000000 +0300 -@@ -17,7 +17,7 @@ - #ifdef _DCC - const - #endif --extern int errno; -+#include <errno.h> - #endif - - #ifdef SINKS -diff -Naurd slashem-0.0.6E4F8-old/src/files.c slashem-0.0.6E4F8/src/files.c ---- slashem-0.0.6E4F8-old/src/files.c 2002-04-01 01:05:54.000000000 +0300 -+++ slashem-0.0.6E4F8/src/files.c 2003-07-28 17:21:33.000000000 +0300 -@@ -17,7 +17,7 @@ - #if defined(UNIX) || defined(VMS) - #include <errno.h> - # ifndef SKIP_ERRNO --extern int errno; -+#include <errno.h> - # endif - #include <signal.h> - #endif -diff -Naurd slashem-0.0.6E4F8-old/sys/unix/cpp2.shr slashem-0.0.6E4F8/sys/unix/cpp2.shr ---- slashem-0.0.6E4F8-old/sys/unix/cpp2.shr 2002-04-01 01:06:10.000000000 +0300 -+++ slashem-0.0.6E4F8/sys/unix/cpp2.shr 2003-07-28 17:21:01.000000000 +0300 -@@ -348,6 +348,7 @@ - X#endif - X - X#include <stdio.h> -+X#include <errno.h> - X#include <ctype.h> - X#include "cppdef.h" - X#include "cpp.h" -@@ -1113,7 +1114,6 @@ - X int i; /* argv[] index */ - X int j; /* Output index */ - X int file; /* File_descriptor */ --X extern int errno; /* Last vms i/o error */ - X - X for (j = i = 1; i < argc; i++) { /* Do all arguments */ - X switch (*(ap = argv[i])) { -diff -Naurd slashem-0.0.6E4F8-old/sys/unix/unixres.c slashem-0.0.6E4F8/sys/unix/unixres.c ---- slashem-0.0.6E4F8-old/sys/unix/unixres.c 2002-04-01 01:06:10.000000000 +0300 -+++ slashem-0.0.6E4F8/sys/unix/unixres.c 2003-07-28 17:19:23.000000000 +0300 -@@ -13,51 +13,47 @@ - * so temporarily dropping privileges on these systems is sufficient to - * hide them. - */ -+#ifdef __GNUC__ -+#define _GNU_SOURCE -+#endif - - #include "config.h" - - #ifdef GETRES_SUPPORT - --#if defined(LINUX) -+# if defined(LINUX) - --static _syscall3(int, getresuid, unsigned short *, ruid, \ -- unsigned short *, euid, unsigned short *, suid) --static _syscall3(int, getresgid, unsigned short *, rgid, \ -- unsigned short *, egid, unsigned short *, sgid) -+/* requires dynamic linking with libc */ -+#include <dlfcn.h> - - static int - real_getresuid(ruid, euid, suid) - uid_t *ruid, *euid, *suid; - { -- int retval; -- unsigned short r, e, s; -- retval = getresuid(&r, &e, &s); -- if (!retval) { -- *ruid = r; -- *euid = e; -- *suid = s; -- } -- return retval; -+ int (*f)(uid_t *, uid_t *, uid_t *); /* getresuid signature */ -+ -+ f = dlsym(RTLD_NEXT, "getresuid"); -+ if (!f) return -1; -+ -+ return f(ruid, euid, suid); - } - - static int - real_getresgid(rgid, egid, sgid) - gid_t *rgid, *egid, *sgid; - { -- int retval; -- unsigned short r, e, s; -- retval = getresgid(&r, &e, &s); -- if (!retval) { -- *rgid = r; -- *egid = e; -- *sgid = s; -- } -- return retval; -+ int (*f)(gid_t *, gid_t *, gid_t *); /* getresgid signature */ -+ -+ f = dlsym(RTLD_NEXT, "getresgid"); -+ if (!f) return -1; -+ -+ return f(rgid, egid, sgid); - } - --#elif defined(BSD) || defined(SVR4) -+# else -+# if defined(BSD) || defined(SVR4) - --#ifdef SYS_getresuid -+# ifdef SYS_getresuid - - static int - real_getresuid(ruid, euid, suid) -@@ -66,7 +62,7 @@ - return syscall(SYS_getresuid, ruid, euid, suid); - } - --#else /* SYS_getresuid */ -+# else /* SYS_getresuid */ - - static int - real_getresuid(ruid, euid, suid) -@@ -88,9 +84,9 @@ - return retval; - } - --#endif /* SYS_getresuid */ -+# endif /* SYS_getresuid */ - --#ifdef SYS_getresgid -+# ifdef SYS_getresgid - - static int - real_getresgid(rgid, egid, sgid) -@@ -99,7 +95,7 @@ - return syscall(SYS_getresgid, rgid, egid, sgid); - } - --#else /* SYS_getresgid */ -+# else /* SYS_getresgid */ - - static int - real_getresgid(rgid, egid, sgid) -@@ -121,8 +117,9 @@ - return retval; - } - --#endif /* SYS_getresgid */ --#endif /* LINUX || BSD || SVR4 */ -+# endif /* SYS_getresgid */ -+# endif /* BSD || SVR4 */ -+# endif /* LINUX */ - - static unsigned int hiding_privileges = 0; - -@@ -199,11 +196,13 @@ - - #else /* GETRES_SUPPORT */ - -+# ifdef GNOME_GRAPHICS - int - hide_privileges(flag) - boolean flag; - { - return 0; - } -+# endif - - #endif /* GETRES_SUPPORT */ -diff -Naurd slashem-0.0.6E4F8-old/sys/unix/unixunix.c slashem-0.0.6E4F8/sys/unix/unixunix.c ---- slashem-0.0.6E4F8-old/sys/unix/unixunix.c 2002-04-01 01:06:10.000000000 +0300 -+++ slashem-0.0.6E4F8/sys/unix/unixunix.c 2003-07-28 17:25:21.000000000 +0300 -@@ -134,7 +134,7 @@ - #endif - if(date - buf.st_mtime < 3L*24L*60L*60L) { /* recent */ - #ifndef NETWORK -- extern int errno; -+#include <errno.h> - #endif - int lockedpid; /* should be the same size as hackpid */ - -@@ -188,7 +188,8 @@ - void - getlock() - { -- extern int errno; -+/*#include <errno.h> -+ extern int errno;*/ - register int i = 0, fd, c; - #ifndef FILE_AREAS - const char *fq_lock; diff --git a/games-roguelike/slashem/files/0.0.6E4F8-gentoo-paths.patch b/games-roguelike/slashem/files/0.0.6E4F8-gentoo-paths.patch deleted file mode 100644 index d170854f68f0..000000000000 --- a/games-roguelike/slashem/files/0.0.6E4F8-gentoo-paths.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- include/unixconf.h.orig 2003-08-14 21:40:11.533226120 -0400 -+++ include/unixconf.h 2003-08-14 21:40:46.557901560 -0400 -@@ -154,13 +154,7 @@ - - /* #define NO_FILE_LINKS */ /* if no hard links */ - --#ifdef NO_FILE_LINKS --# ifdef FILE_AREAS --# define LOCKDIR FILE_AREA_VAR /* where to put locks */ --# else --# define LOCKDIR "/usr/games/lib/nethackdir" /* where to put locks */ --# endif --#endif -+# define LOCKDIR "GENTOO_STATEDIR" /* where to put locks */ - - /* - * Define DEF_PAGER as your default pager, e.g. "/bin/cat" or "/usr/ucb/more" -@@ -174,7 +168,7 @@ - * If you want the static parts of your playground on a read-only file - * system, define VAR_PLAYGROUND to be where the variable parts are kept. - */ --/* #define VAR_PLAYGROUND "/var/lib/games/nethack" */ -+#define VAR_PLAYGROUND "GENTOO_STATEDIR" - - - diff --git a/games-roguelike/slashem/files/0.0.6E4F8-makefile.patch b/games-roguelike/slashem/files/0.0.6E4F8-makefile.patch deleted file mode 100644 index 5d461a5e331a..000000000000 --- a/games-roguelike/slashem/files/0.0.6E4F8-makefile.patch +++ /dev/null @@ -1,219 +0,0 @@ -diff -Naurd slashem-0.0.6E4F8-old/sys/unix/Makefile.src slashem-0.0.6E4F8/sys/unix/Makefile.src ---- slashem-0.0.6E4F8-old/sys/unix/Makefile.src 2002-04-01 01:06:31.000000000 +0300 -+++ slashem-0.0.6E4F8/sys/unix/Makefile.src 2003-07-28 20:06:27.000000000 +0300 -@@ -134,25 +134,35 @@ - #LD = gcc - #LFLAGS = -Xlinker -soname=_APP_ - -+# flags for debugging: -+# CFLAGS = -g -I../include -+ -+CFLAGS = -O -I../include -+LFLAGS = -+ -+TTY_SUPPORT=y -+#X11_SUPPORT=y -+#QT_SUPPORT=y -+#GNOME_SUPPORT=y -+#GTK_SUPPORT=y -+ - # Only used for the Gnome interface. - # When including the Gnome interface, you need to include gnome specific - # directories. The ones given below is the usual spot for linux systems. - # The paths are for glibconfig.h and gnomesupport.h respectively. - # -+ifdef GNOME_SUPPORT - #GNOMEINC=-I/usr/lib/glib/include -I/usr/lib/gnome-libs/include -I../win/gnome - GNOMEINC=`gnome-config gnome --cflags` -I../win/gnome -+endif # GNOME_SUPPORT - --# flags for debugging: --# CFLAGS = -g -I../include -- --CFLAGS = -O -I../include --LFLAGS = -+ifdef QT_SUPPORT - - # QT windowing system - # SuSE 6.1 --# QTDIR=/usr/lib/qt -+# QTDIR = /usr/qt/2 - # RedHat 6.1 --# QTDIR=/usr/lib/qt-2.0.1 -+# QTDIR = /usr/lib/qt-2.0.1 - # - QTLIBDIR=$(QTDIR)/lib - QTINCDIR=$(QTDIR)/include -@@ -174,18 +184,25 @@ - CXX=g++ - #LD=g++ - -+endif # QT_SUPPORT -+ -+ifdef GTK_SUPPORT - # GTK windowing system - WINGTKCONFIG=gtk-config - WINGTKCFLAGS=`$(WINGTKCONFIG) --cflags` -+endif #GTK_SUPPORT - - # Set the WINSRC, WINOBJ, and WINLIB lines to correspond to your desired - # combination of windowing systems. Also set windowing systems in config.h. - # - # files for a straight tty port using no native windowing system -+ifdef TTY_SUPPORT - WINTTYSRC = ../win/tty/getline.c ../win/tty/termcap.c ../win/tty/topl.c \ - ../win/tty/wintty.c - WINTTYOBJ = getline.o termcap.o topl.o wintty.o --# -+endif # TTY_SUPPORT -+ -+ifdef X11_SUPPORT - # files for an X11 port - # (tile.c is included in the defn. for WINCSRC, below) - WINX11SRC = ../win/X11/Window.c ../win/X11/dialogs.c ../win/X11/winX.c \ -@@ -194,23 +211,32 @@ - ../win/X11/winval.c - WINX11OBJ = Window.o dialogs.o winX.o winmap.o winmenu.o winmesg.o \ - winmisc.o winstat.o wintext.o winval.o nhwin.a -+endif # X11_SUPPORT -+ -+ifdef QT_SUPPORT - # - # Files for a Qt port - # - WINQTSRC = ../win/Qt/qt_win.cpp ../win/Qt/qt_clust.cpp - WINQTOBJ = qt_win.o qt_clust.o nhwin.a -+endif # QT_SUPPORT -+ - # - # files for a GTK port - # -+ifdef GTK_SUPPORT - WINGTKSRC = ../win/gtk/gtk.c ../win/gtk/gtkgetlin.c ../win/gtk/gtkstatus.c \ - ../win/gtk/gtkmenu.c ../win/gtk/gtkyn.c ../win/gtk/gtkextcmd.c \ - ../win/gtk/gtkmap.c ../win/gtk/gtkmessage.c ../win/gtk/gtkmisc.c \ - ../win/gtk/xshmmap.c ../win/gtk/xshm.c - WINGTKOBJ = gtk.o gtkgetlin.o gtkstatus.o gtkmenu.o gtkyn.o gtkextcmd.o \ - gtkmap.o gtkmessage.o gtkmisc.o xshmmap.o xshm.o nhwin.a -+endif # GTK_SUPPORT -+ - # - # Files for a Gnome port - # -+ifdef GNOME_SUPPORT - WINGNOMESRC = ../win/gnome/gnaskstr.c ../win/gnome/gnbind.c \ - ../win/gnome/gnglyph.c ../win/gnome/gnmain.c ../win/gnome/gnmap.c \ - ../win/gnome/gnmenu.c ../win/gnome/gnmesg.c ../win/gnome/gnopts.c \ -@@ -219,6 +245,8 @@ - WINGNOMEOBJ = gnaskstr.o gnbind.o gnglyph.o gnmain.o gnmap.o gnmenu.o \ - gnmesg.o gnopts.o gnplayer.o gnsignal.o gnstatus.o gntext.o \ - gnyesno.o nhwin.a -+endif # GNOME_SUPPORT -+ - # - # Files for a Gem port - WINGEMSRC = ../win/gem/wingem.c ../win/gem/wingem1.c ../win/gem/load_img.c -@@ -235,8 +263,8 @@ - WINSRC = $(WINTTYSRC) - WINOBJ = $(WINTTYOBJ) - # Use these declarations if you want to support the X11 windowing system --# WINSRC = $(WINTTYSRC) $(WINX11SRC) --# WINOBJ = $(WINTTYOBJ) $(WINX11OBJ) -+# WINSRC = $(WINTTYSRC) $(WINX11SRC) $(WINGTKSRC) $(WINQTSRC) $(WINGNOMESRC) -+# WINOBJ = $(WINTTYOBJ) $(WINX11OBJ) $(WINGTKOBJ) $(WINQTOBJ) $(WINGNOMEOBJ) - # Use these declarations if you want to support the Qt windowing system - # WINSRC = $(WINTTYSRC) $(WINQTSRC) - # WINOBJ = $(WINTTYOBJ) $(WINQTOBJ) -@@ -255,32 +283,42 @@ - # Linux uses -ltermcap or -lncurses - # Be uses -ltermcap - # -+ifdef TTY_SUPPORT - # libraries for tty ports - # WINTTYLIB = -ltermcap - # WINTTYLIB = -lcurses - # WINTTYLIB = -lcurses16 - # WINTTYLIB = -lncurses - WINTTYLIB = -ltermlib --# -+endif # TTY_SUPPORT -+ -+ifdef X11_SUPPORT - # libraries for X11 - # If USE_XPM is defined in config.h, you will also need -lXpm here. - WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11 - # WINX11LIB = -lXaw -lXmu -lXt -lX11 - # WINX11LIB = -lXaw -lXmu -lXext -lXt -lXpm -lX11 -lm - # WINX11LIB = -lXaw -lXmu -lXpm -lXext -lXt -lX11 -lSM -lICE -lm # BSD/OS 2.0 --# -+endif # X11_SUPPORT -+ -+ifdef QT_SUPPORT - # libraries for Qt - WINQTLIB = -L$(QTLIBDIR) -lqt - # - # libraries for KDE (with Qt) - WINKDELIB = -lkdecore -lkdeui -lXext --# -+endif # QT_SUPPORT -+ -+ifdef GTK_SUPPORT - # libraries for GTK - WINGTKLIB = `$(WINGTKCONFIG) --libs` --# -+endif #GTK_SUPPORT -+ -+ifdef GNOME_SUPPORT - # libraries for Gnome - WINGNOMELIB = -lgnomeui -lgnome -lart_lgpl -lgtk -lgdk -lpopt --# -+endif # GNOME_SUPPORT -+ - # libraries for Gem port - WINGEMLIB = -le_gem -lgem - # -@@ -290,7 +328,7 @@ - # Use this declaration if you only want to support the TTY windowing system - WINLIB = $(WINTTYLIB) - # Use this declaration if you want to support the X11 windowing system --# WINLIB = $(WINTTYLIB) $(WINX11LIB) -+# WINLIB = $(WINTTYLIB) $(WINX11LIB) $(WINGTKLIB) $(WINQTLIB) $(WINGNOMELIB) - # Use this declaration if you want to support the Qt windowing system - # WINLIB = $(WINTTYLIB) $(WINQTLIB) - # Use these declarations if you want to support the GTK windowing system -diff -Naurd slashem-0.0.6E4F8-old/sys/unix/Makefile.top slashem-0.0.6E4F8/sys/unix/Makefile.top ---- slashem-0.0.6E4F8-old/sys/unix/Makefile.top 2002-04-01 01:06:10.000000000 +0300 -+++ slashem-0.0.6E4F8/sys/unix/Makefile.top 2003-07-28 20:06:39.000000000 +0300 -@@ -72,6 +72,14 @@ - # KDEDIR = /opt/kde - # SHELLDIR = $(KDEDIR)/bin - -+#SMALLTILES=x11tiles -+#BIGTILES=x11bigtiles -+#BIG3DTILES=x11big3dtiles -+#PETMARK=pet_mark.xbm -+#RIP=rip.xpm -+#GTKFILES=credit.xpm gtkrc -+#MAPBG=mapbg.xpm -+ - # Shareable (architecture independent) data files which are not candidates - # for inclusion in DLB libraries (ND) and which are (D). Port specific files - # per discussions in Install.X11, Install.Qt and Install.GTK -@@ -89,7 +97,7 @@ - # CNF_SHARE_DATND = $(CNF_SHARE_X11ND) - # CNF_SHARE_DATND = $(CNF_SHARE_QTND) - # CNF_SHARE_DATND = $(CNF_SHARE_GTKND) --CNF_SHARE_DATND = -+CNF_SHARE_DATND = $(SMALLTILES) $(BIGTILES) $(BIG3DTILES) $(PETMARK) $(RIP) $(GTKFILES) $(MAPBG) - - CNF_SHARE_DATD = data oracles options quest.dat rumors - CNF_SHARE_DAT = $(CNF_SHARE_DATD) $(CNF_SHARE_DATND) -@@ -239,7 +247,7 @@ - -e '$$s/.*/nodlb/p' < dat/options` ; \ - $(MAKE) dofiles-$${target-nodlb} - cp src/$(GAME) $(FILE_AREA_UNSHARE) -- cp license doc/Guidebook.txt $(FILE_AREA_DOC) -+# cp license doc/Guidebook.txt $(FILE_AREA_DOC) - # cp win/Qt/KDE/kslashem.kdelnk $(KDEDIR)/share/applnk/Games - -rm -f $(SHELLDIR)/$(GAME) - sed -e 's;/usr/games/lib/nethackdir;$(FILE_AREA_UNSHARE);' \ diff --git a/games-roguelike/slashem/files/0.0.7E7/gentoo-paths.patch b/games-roguelike/slashem/files/0.0.7E7/gentoo-paths.patch deleted file mode 100644 index d170854f68f0..000000000000 --- a/games-roguelike/slashem/files/0.0.7E7/gentoo-paths.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- include/unixconf.h.orig 2003-08-14 21:40:11.533226120 -0400 -+++ include/unixconf.h 2003-08-14 21:40:46.557901560 -0400 -@@ -154,13 +154,7 @@ - - /* #define NO_FILE_LINKS */ /* if no hard links */ - --#ifdef NO_FILE_LINKS --# ifdef FILE_AREAS --# define LOCKDIR FILE_AREA_VAR /* where to put locks */ --# else --# define LOCKDIR "/usr/games/lib/nethackdir" /* where to put locks */ --# endif --#endif -+# define LOCKDIR "GENTOO_STATEDIR" /* where to put locks */ - - /* - * Define DEF_PAGER as your default pager, e.g. "/bin/cat" or "/usr/ucb/more" -@@ -174,7 +168,7 @@ - * If you want the static parts of your playground on a read-only file - * system, define VAR_PLAYGROUND to be where the variable parts are kept. - */ --/* #define VAR_PLAYGROUND "/var/lib/games/nethack" */ -+#define VAR_PLAYGROUND "GENTOO_STATEDIR" - - - diff --git a/games-roguelike/slashem/files/X11.configure b/games-roguelike/slashem/files/X11.configure deleted file mode 100644 index 16d478452d52..000000000000 --- a/games-roguelike/slashem/files/X11.configure +++ /dev/null @@ -1,28 +0,0 @@ -configure config_h $toplevel/include/config.h -BEGIN - define X11_GRAPHICS - undefine QT_GRAPHICS - undefine GTK_GRAPHICS - undefine GNOME_GRAPHICS - define USE_XPM -END - -configure src_Makefile $toplevel/src/Makefile -BEGIN - undefine WINSRC - undefine WINOBJ - undefine WINLIB - define -C "to support the X11 windowing system" WINSRC - define -C "to support the X11 windowing system" WINOBJ - define -C "to support the X11 windowing system" WINLIB - redefine WINX11LIB "-lXaw -lXmu -lXext -lXt -lXpm -lX11" - define X11_SUPPORT -END - -configure Makefile $toplevel/Makefile -BEGIN - define SMALLTILES - define BIGTILES - define PETMARK - define RIP -END diff --git a/games-roguelike/slashem/files/dot.slashemrc b/games-roguelike/slashem/files/dot.slashemrc deleted file mode 100644 index d61a983025b5..000000000000 --- a/games-roguelike/slashem/files/dot.slashemrc +++ /dev/null @@ -1,105 +0,0 @@ -# -# Slash'EM configuration file. -# -# Naming this file $(HOME)/.slashemrc (for UNIX) or setting the environment -# variable SLASHEMOPTIONS to point to its full path name elsewhere tells -# Slash'EM to use X11 windowing and fonts (provided the executable was -# compiled with that ability). -# -# SET YOUR WINDOW TYPE -# Your windowtype choices are: GENTOO_WINDOWTYPES -# -OPTIONS=windowtype:tty -TILESET=name:Small, file:x11tiles -TILESET=name:Big, file:x11bigtiles, transparent -TILESET=name:Big 3D, file:x11big3dtiles, transparent, pseudo3D -OPTIONS=tiles:Big -# -# -#OPTIONS=toptenwin,hilite_pet,color,number_pad,verbose,news -#OPTIONS=confirm,fixinv,noautopickup,safe_pet,sortpack,tombstone -#OPTIONS=fruit:pineapple,dogname:Dhairrhuwyth -#OPTIONS=male,catname:Ghisteslwchlohm -# -# There are 17 object symbols and various graphics symbols. -# The descriptions of these symbols can be found in dat/opthelp. -# -# -# Font: nh10 (10x20) -# -#OBJECTS= 180 183 188 192 181 184 182 189 190 196 \ -# 191 194 193 187 185 186 195 -# -#DUNGEON= 032 025 018 013 012 014 011 015 023 024 \ -# 022 021 128 129 130 131 132 035 035 133 \ -# 134 135 136 137 145 146 144 124 143 142 \ -# 143 141 140 149 150 031 031 147 148 031 \ -# 161 140 -# -#TRAPS= 138 138 138 138 138 138 138 138 138 138 \ -# 138 138 138 138 138 139 138 138 138 138 \ -# 138 138 -# -#EFFECTS= 151 152 153 154 155 156 157 158 \ -# 159 160 161 162 \ -# 163 164 165 166 167 168 169 170 \ -# 171 172 173 174 175 176 177 178 179 \ -# 171 172 173 174 175 176 177 178 179 \ -# 171 172 173 174 175 176 177 178 179 \ -# 171 172 173 174 175 176 177 178 179 \ -# 171 172 173 174 175 176 177 178 179 \ -# 171 172 173 174 175 176 177 178 179 \ -# 171 172 173 174 175 176 177 178 179 -# -# -# Font: ibm (8x14) -# -#OBJECTS= 207 210 215 219 208 211 209 216 217 223 \ -# 218 221 220 214 212 213 222 -# -#DUNGEON= 032 128 129 130 131 132 133 134 135 136 \ -# 137 138 139 045 124 142 143 035 035 144 \ -# 145 146 147 148 155 156 227 124 154 153 \ -# 154 152 151 159 160 200 200 157 158 250 \ -# 170 151 -# -#TRAPS= 149 149 149 149 149 149 149 149 149 149 \ -# 149 149 149 149 149 150 149 149 149 149 \ -# 149 149 -# -#EFFECTS= 161 162 163 164 165 166 167 168 \ -# 169 170 171 172 \ -# 173 174 175 176 177 178 179 180 \ -# 181 182 183 184 185 186 187 188 189 \ -# 181 182 183 184 185 186 187 188 189 \ -# 181 182 183 184 185 186 187 188 189 \ -# 181 182 183 184 185 186 187 188 189 \ -# 181 182 183 184 185 186 187 188 189 \ -# 181 182 183 184 185 186 187 188 189 \ -# 181 182 183 184 185 186 187 188 189 -# -# -# Font: a "standard" font like 6x13 -# Note that this version is unlikely to work on a tty on a Unix system because -# many of these characters are also control characters. -# -#DUNGEON = 032 025 018 013 012 014 011 015 023 024 \ -# 022 021 031 045 124 043 043 035 035 031 \ -# 035 001 060 062 060 062 019 124 092 035 \ -# 092 123 125 031 125 046 046 035 035 046 \ -# 127 125 -# -#TRAPS= 094 094 094 094 094 094 094 094 094 094 \ -# 094 094 094 094 094 002 094 094 094 094 \ -# 094 094 -# -#EFFECTS= 124 045 092 047 042 033 041 040 \ -# 048 035 064 042 \ -# 047 045 092 124 124 092 045 047 \ -# 047 064 092 064 064 064 092 064 047 \ -# 047 064 092 064 064 064 092 064 047 \ -# 047 064 092 064 064 064 092 064 047 \ -# 047 064 092 064 064 064 092 064 047 \ -# 047 064 092 064 064 064 092 064 047 \ -# 047 064 092 064 064 064 092 064 047 \ -# 047 064 092 064 064 064 092 064 047 diff --git a/games-roguelike/slashem/files/gnome.configure b/games-roguelike/slashem/files/gnome.configure deleted file mode 100644 index 37d9ee3049e6..000000000000 --- a/games-roguelike/slashem/files/gnome.configure +++ /dev/null @@ -1,14 +0,0 @@ -configure config_h $toplevel/include/config.h -BEGIN - define GNOME_GRAPHICS -END -configure src_Makefile $toplevel/src/Makefile -BEGIN - define GNOME_SUPPORT - redefine GNOMEINC "\`gnome-config --cflags gnomeui\`" -END - -configure Makefile $toplevel/Makefile -BEGIN - define MAPBG -END diff --git a/games-roguelike/slashem/files/gtk.configure b/games-roguelike/slashem/files/gtk.configure deleted file mode 100644 index 91d278f907b9..000000000000 --- a/games-roguelike/slashem/files/gtk.configure +++ /dev/null @@ -1,14 +0,0 @@ -configure config_h $toplevel/include/config.h -BEGIN - define GTK_GRAPHICS -END -configure src_Makefile $toplevel/src/Makefile -BEGIN - define GTK_SUPPORT -END - -configure Makefile $toplevel/Makefile -BEGIN - define BIG3DTILES - define GTKFILES -END diff --git a/games-roguelike/slashem/files/qt.configure b/games-roguelike/slashem/files/qt.configure deleted file mode 100644 index 9fe9531c4236..000000000000 --- a/games-roguelike/slashem/files/qt.configure +++ /dev/null @@ -1,10 +0,0 @@ -configure config_h $toplevel/include/config.h -BEGIN - define QT_GRAPHICS -END -configure src_Makefile $toplevel/src/Makefile -BEGIN - define QT_SUPPORT - define QTDIR - define LD "g++" -END |