summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Heaven <tristan@gentoo.org>2009-06-13 16:53:39 +0000
committerTristan Heaven <tristan@gentoo.org>2009-06-13 16:53:39 +0000
commit9d2ca331cfe183ae3e71f8fbaf15626e26d8781a (patch)
treea259a6691f451208e5440472c9e4735108285213 /games-misc/bsd-games
parentFix building with glibc-2.10, bug #273398 (diff)
downloadhistorical-9d2ca331cfe183ae3e71f8fbaf15626e26d8781a.tar.gz
historical-9d2ca331cfe183ae3e71f8fbaf15626e26d8781a.tar.bz2
historical-9d2ca331cfe183ae3e71f8fbaf15626e26d8781a.zip
Fix building with glibc-2.10, bug #273402
Package-Manager: portage-2.2_rc33/cvs/Linux i686
Diffstat (limited to 'games-misc/bsd-games')
-rw-r--r--games-misc/bsd-games/ChangeLog6
-rw-r--r--games-misc/bsd-games/Manifest15
-rw-r--r--games-misc/bsd-games/bsd-games-2.17-r3.ebuild5
-rw-r--r--games-misc/bsd-games/files/bsd-games-2.17-glibc2.10.patch185
4 files changed, 206 insertions, 5 deletions
diff --git a/games-misc/bsd-games/ChangeLog b/games-misc/bsd-games/ChangeLog
index 541f70043969..1f08ea9cf713 100644
--- a/games-misc/bsd-games/ChangeLog
+++ b/games-misc/bsd-games/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-misc/bsd-games
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/bsd-games/ChangeLog,v 1.36 2009/05/20 16:38:29 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/bsd-games/ChangeLog,v 1.37 2009/06/13 16:53:38 nyhm Exp $
+
+ 13 Jun 2009; Tristan Heaven <nyhm@gentoo.org> bsd-games-2.17-r3.ebuild,
+ +files/bsd-games-2.17-glibc2.10.patch:
+ Fix building with glibc-2.10, bug #273402
20 May 2009; nixnut <nixnut@gentoo.org> bsd-games-2.17-r3.ebuild:
ppc stable #267663
diff --git a/games-misc/bsd-games/Manifest b/games-misc/bsd-games/Manifest
index 434558af589e..e948449f8d39 100644
--- a/games-misc/bsd-games/Manifest
+++ b/games-misc/bsd-games/Manifest
@@ -1,12 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX bsd-games-2.17-64bit.patch 1322 RMD160 c987b732b83cdf55bb15c6c3ddbc59212f28773d SHA1 0bd044bff85f18cf188dd6068c297dda17196865 SHA256 cbe649fa75bc3e16f27032d05b8ce770ae036df83435211e429379852528fcfe
AUX bsd-games-2.17-bg.patch 732 RMD160 c7f5c44b151111e1da8b493c6e376b61e187a6b9 SHA1 197ae9a7ce927bbc1331aaa4f7b28eb971e75f4e SHA256 d25eb2b0e6790b6a852bce08f384994fed7b37a9d33d12d01b65e67fbd8f67d7
AUX bsd-games-2.17-gcc4.patch 893 RMD160 d48cde21ad4dd239e802cf08e1e94c91a12296bb SHA1 adbdf06c228ee81ccc0a694db979ae4aab7591bc SHA256 96639f25206401c0dde3f9f28ac287c9e26c3efb526481fa48b482f8c9ab4ac0
AUX bsd-games-2.17-gcc43.patch 741 RMD160 11c2be32ee2d610f7e379bf724bb0b7272247b2c SHA1 7bfa30aefe38340ea8a2c214f39a23d259b45cd6 SHA256 7b07a21db2d5198f8a698ad3772b355424dd58cab04dc12cf2a4c749c9eed7ee
+AUX bsd-games-2.17-glibc2.10.patch 4213 RMD160 57c70071e302618ca800cdff030ce862b1a8668e SHA1 60fcb6ef63f4baf83caac2432d908339a048228d SHA256 ff5b298e1e4599b02ad42dda648a4d940fc98e8446db2d90a8513cfbb1721992
AUX bsd-games-2.17-headers.patch 268 RMD160 cc0e97f981581c0635e549ce41d97549c2f7ed33 SHA1 ebce73dc15fc11859fb4ca577dbdd977628b1501 SHA256 c21d06479c6758b6091b04676d636298c01d9709dabd5587111c74ad1db662d7
AUX bsd-games-2.17-tetris.patch 1125 RMD160 1647a0e7231da97c420e28facd30584557567b75 SHA1 77400661025d9567e129f66fc902471d853a0cb6 SHA256 53ee0ee8114bf6450f18f86c70916711bad3409220e78fe2751d01e6897e8725
AUX config.params-gentoo 1204 RMD160 2a76258f9da2641d0c2465d40dba461eb3a91452 SHA1 3cba205238ab8cb08347bff219fa66dedb376fca SHA256 74737471f9fa6a3f523d8e91af65a175cccfa94ce162eb8e5ecef08372047414
DIST bsd-games-2.17.tar.gz 2563311 RMD160 a8f9c829bb09dfa071ecafbd6cb15560dba888d8 SHA1 8e48a9808908e2898126fdd285196ab71c9a59c0 SHA256 066f924aef6c1c5ea946f588e36f303021f5dfc093944738f025d8edbc6fff60
DIST bsdgames_2.17-7.diff.gz 12530 RMD160 4c213632111ac8035058214889fd9229723b9785 SHA1 e19b34faeea0941395e07d78e74939837f5aa70c SHA256 41b4b99ae96f1b42beb37818f377cc194ab4146fe845818e8d29663d4f52ff88
-EBUILD bsd-games-2.17-r3.ebuild 4086 RMD160 6ae281effc16deb8eef0a38a61086ffbdec09ee2 SHA1 31d0363668d6b049e10af3a6e1b77d0d7ca7deb5 SHA256 845af2e5cd7355e46c5cfcb837e9c684d417688402034e51e5d46aba95771d4f
-MISC ChangeLog 5138 RMD160 b90c9398929d39e2f7ef96ff7063acac315406aa SHA1 f51d2c1a7411c770768b314c381c32d23c0f86bd SHA256 883f25725069fbb98b8935aeed4e39918649f544a0f171702d748658c588ed03
+EBUILD bsd-games-2.17-r3.ebuild 4123 RMD160 8543e73bfab8bfdff9bfe8d9d328bc2c75be143f SHA1 996da5ed1c330d858537c0ecf971a9e4b75a554e SHA256 e74c484319161d0980ff2881a913003d4138344bd94fcac30931ec97caa0514e
+MISC ChangeLog 5296 RMD160 f51b254a047f114eea6b7f19910c4fd4b08414b4 SHA1 cbb07e0e55aa84fc407e66a67309a2affde7a224 SHA256 26ee81c0eeff619799641e601e88c259f5fbf02598af22afbbfdd20f14c149fb
MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkoz2ZgACgkQdz7hIScOURFqfwCfecOvRo3h9EecuszflsW1h4B7
+uOYAoJsXW6uUsqHqqAL7h5i76eXGa9bb
+=ft9g
+-----END PGP SIGNATURE-----
diff --git a/games-misc/bsd-games/bsd-games-2.17-r3.ebuild b/games-misc/bsd-games/bsd-games-2.17-r3.ebuild
index e74edbf9d198..dadc55e2699d 100644
--- a/games-misc/bsd-games/bsd-games-2.17-r3.ebuild
+++ b/games-misc/bsd-games/bsd-games-2.17-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/bsd-games/bsd-games-2.17-r3.ebuild,v 1.7 2009/05/20 16:38:29 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/bsd-games/bsd-games-2.17-r3.ebuild,v 1.8 2009/06/13 16:53:38 nyhm Exp $
inherit eutils games
@@ -40,7 +40,8 @@ src_unpack() {
"${FILESDIR}"/${P}-headers.patch \
"${FILESDIR}"/${P}-bg.patch \
"${FILESDIR}"/${P}-gcc4.patch \
- "${FILESDIR}"/${P}-gcc43.patch
+ "${FILESDIR}"/${P}-gcc43.patch \
+ "${FILESDIR}"/${P}-glibc2.10.patch
sed -i \
-e "s:/usr/games:${GAMES_BINDIR}:" \
diff --git a/games-misc/bsd-games/files/bsd-games-2.17-glibc2.10.patch b/games-misc/bsd-games/files/bsd-games-2.17-glibc2.10.patch
new file mode 100644
index 000000000000..2efdc57490d8
--- /dev/null
+++ b/games-misc/bsd-games/files/bsd-games-2.17-glibc2.10.patch
@@ -0,0 +1,185 @@
+--- boggle/boggle/bog.c
++++ boggle/boggle/bog.c
+@@ -336,7 +336,7 @@
+ }
+
+ while (1) {
+- if (getline(buf) == NULL) {
++ if (get_line(buf) == NULL) {
+ if (feof(stdin))
+ clearerr(stdin);
+ break;
+--- boggle/boggle/extern.h
++++ boggle/boggle/extern.h
+@@ -43,7 +43,7 @@
+ long dictseek(FILE *, long, int);
+ void findword(void);
+ void flushin(FILE *);
+-char *getline(char *);
++char *get_line(char *);
+ void getword(char *);
+ int help(void);
+ int inputch(void);
+--- boggle/boggle/mach.c
++++ boggle/boggle/mach.c
+@@ -168,7 +168,7 @@
+ * - doesn't accept words longer than MAXWORDLEN or containing caps
+ */
+ char *
+-getline(q)
++get_line(q)
+ char *q;
+ {
+ int ch, done;
+--- cribbage/cribbage.h
++++ cribbage/cribbage.h
+@@ -77,7 +77,7 @@
+ int fifteens(const CARD [], int);
+ void game(void);
+ void gamescore(void);
+-char *getline(void);
++char *get_line(void);
+ int getuchar(void);
+ int incard(CARD *);
+ int infrom(const CARD [], int, const char *);
+--- cribbage/crib.c
++++ cribbage/crib.c
+@@ -221,7 +221,7 @@
+ if (!rflag) { /* player cuts deck */
+ msg(quiet ? "Cut for crib? " :
+ "Cut to see whose crib it is -- low card wins? ");
+- getline();
++ get_line();
+ }
+ i = (rand() >> 4) % CARDS; /* random cut */
+ do { /* comp cuts deck */
+@@ -397,7 +397,7 @@
+ if (!rflag) { /* random cut */
+ msg(quiet ? "Cut the deck? " :
+ "How many cards down do you wish to cut the deck? ");
+- getline();
++ get_line();
+ }
+ i = (rand() >> 4) % (CARDS - pos);
+ turnover = deck[i + pos];
+--- cribbage/io.c
++++ cribbage/io.c
+@@ -245,7 +245,7 @@
+
+ retval = FALSE;
+ rnk = sut = EMPTY;
+- if (!(line = getline()))
++ if (!(line = get_line()))
+ goto gotit;
+ p = p1 = line;
+ while (*p1 != ' ' && *p1 != '\0')
+@@ -346,7 +346,7 @@
+
+ for (sum = 0;;) {
+ msg(prompt);
+- if (!(p = getline()) || *p == '\0') {
++ if (!(p = get_line()) || *p == '\0') {
+ msg(quiet ? "Not a number" :
+ "That doesn't look like a number");
+ continue;
+@@ -528,12 +528,12 @@
+ }
+
+ /*
+- * getline:
++ * get_line:
+ * Reads the next line up to '\n' or EOF. Multiple spaces are
+ * compressed to one space; a space is inserted before a ','
+ */
+ char *
+-getline()
++get_line()
+ {
+ char *sp;
+ int c, oy, ox;
+--- gomoku/bdisp.c
++++ gomoku/bdisp.c
+@@ -241,7 +241,7 @@
+ }
+
+ int
+-getline(buf, size)
++get_line(buf, size)
+ char *buf;
+ int size;
+ {
+--- gomoku/gomoku.h
++++ gomoku/gomoku.h
+@@ -263,7 +263,7 @@
+
+ void bdinit(struct spotstr *);
+ void init_overlap(void);
+-int getline(char *, int);
++int get_line(char *, int);
+ void ask(const char *);
+ void dislog(const char *);
+ void bdump(FILE *);
+--- gomoku/main.c
++++ gomoku/main.c
+@@ -155,7 +155,7 @@
+ if (inputfp == NULL && test == 0) {
+ for (;;) {
+ ask("black or white? ");
+- getline(buf, sizeof(buf));
++ get_line(buf, sizeof(buf));
+ if (buf[0] == 'b' || buf[0] == 'B') {
+ color = BLACK;
+ break;
+@@ -172,7 +172,7 @@
+ }
+ } else {
+ setbuf(stdout, 0);
+- getline(buf, sizeof(buf));
++ get_line(buf, sizeof(buf));
+ if (strcmp(buf, "black") == 0)
+ color = BLACK;
+ else if (strcmp(buf, "white") == 0)
+@@ -244,7 +244,7 @@
+ getinput:
+ if (interactive)
+ ask("move? ");
+- if (!getline(buf, sizeof(buf))) {
++ if (!get_line(buf, sizeof(buf))) {
+ curmove = RESIGN;
+ break;
+ }
+@@ -256,7 +256,7 @@
+ FILE *fp;
+
+ ask("save file name? ");
+- (void)getline(buf, sizeof(buf));
++ (void)get_line(buf, sizeof(buf));
+ if ((fp = fopen(buf, "w")) == NULL) {
+ glog("cannot create save file");
+ goto getinput;
+@@ -309,14 +309,14 @@
+ if (i != RESIGN) {
+ replay:
+ ask("replay? ");
+- if (getline(buf, sizeof(buf)) &&
++ if (get_line(buf, sizeof(buf)) &&
+ (buf[0] == 'y' || buf[0] == 'Y'))
+ goto again;
+ if (strcmp(buf, "save") == 0) {
+ FILE *fp;
+
+ ask("save file name? ");
+- (void)getline(buf, sizeof(buf));
++ (void)get_line(buf, sizeof(buf));
+ if ((fp = fopen(buf, "w")) == NULL) {
+ glog("cannot create save file");
+ goto replay;
+@@ -367,7 +367,7 @@
+ quit();
+ top:
+ ask("cmd? ");
+- if (!getline(fmtbuf, sizeof(fmtbuf)))
++ if (!get_line(fmtbuf, sizeof(fmtbuf)))
+ quit();
+ switch (*fmtbuf) {
+ case '\0':