* [gentoo-commits] repo/gentoo:master commit in: games-board/xgammon/files/, games-board/xgammon/
@ 2016-08-01 19:09 Austin English
0 siblings, 0 replies; 4+ messages in thread
From: Austin English @ 2016-08-01 19:09 UTC (permalink / raw
To: gentoo-commits
commit: 27ceecbc68bc9256aeec93babb25ea544f8c52c4
Author: Austin English <wizardedit <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 1 18:39:02 2016 +0000
Commit: Austin English <wizardedit <AT> gentoo <DOT> org>
CommitDate: Mon Aug 1 18:39:02 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27ceecbc
games-board/xgammon: remove deprecated games eclass
Also update to EAPI 6
Gentoo-Bug: https://bugs.gentoo.org/574082
Package-Manager: portage-2.3.0
games-board/xgammon/files/gcc33.patch | 4 +-
.../xgammon/files/xgammon-0.98-broken.patch | 2 +-
.../xgammon/files/xgammon-0.98-config.patch | 4 +-
games-board/xgammon/xgammon-0.98-r1.ebuild | 45 ++++++++++++++++++++++
4 files changed, 50 insertions(+), 5 deletions(-)
diff --git a/games-board/xgammon/files/gcc33.patch b/games-board/xgammon/files/gcc33.patch
index 90b001f..82dcadd 100644
--- a/games-board/xgammon/files/gcc33.patch
+++ b/games-board/xgammon/files/gcc33.patch
@@ -1,5 +1,5 @@
---- xgammon.c.orig 2004-05-07 14:44:07.000000000 -0700
-+++ xgammon.c 2004-05-07 14:45:52.000000000 -0700
+--- a/xgammon.c 2004-05-07 14:44:07.000000000 -0700
++++ b/xgammon.c 2004-05-07 14:45:52.000000000 -0700
@@ -944,31 +944,31 @@
for (option=1; option<argc; option++) {
if (strcmp (argv[option], "-?") == 0 ||
diff --git a/games-board/xgammon/files/xgammon-0.98-broken.patch b/games-board/xgammon/files/xgammon-0.98-broken.patch
index e02ac10..e94afa0 100644
--- a/games-board/xgammon/files/xgammon-0.98-broken.patch
+++ b/games-board/xgammon/files/xgammon-0.98-broken.patch
@@ -1,4 +1,4 @@
---- xgammon/lib/db.c.orig Sat Jan 6 12:14:12 2001
+--- xgammon/lib/db.c Sat Jan 6 12:14:12 2001
+++ xgammon/lib/db.c Sat Jan 6 12:13:56 2001
@@ -259,10 +259,11 @@
close(fid);
diff --git a/games-board/xgammon/files/xgammon-0.98-config.patch b/games-board/xgammon/files/xgammon-0.98-config.patch
index 363d173..1cedd03 100644
--- a/games-board/xgammon/files/xgammon-0.98-config.patch
+++ b/games-board/xgammon/files/xgammon-0.98-config.patch
@@ -1,4 +1,4 @@
---- xgammon-0.98/xgammon.ad.rhconfig Tue Aug 29 01:35:39 1995
+--- xgammon-0.98/xgammon.ad Tue Aug 29 01:35:39 1995
+++ xgammon-0.98/xgammon.ad Wed Aug 12 18:22:25 1998
@@ -67,4 +67,4 @@
xgammon.buttonmove: false
@@ -6,7 +6,7 @@
xgammon.delaytime: 5
-xgammon.database: lib/xgammon.db
+xgammon.database: /usr/lib/X11/xgammon/xgammon.db
---- xgammon-0.98/Imakefile.rhconfig Wed Aug 23 15:26:39 1995
+--- xgammon-0.98/Imakefile Wed Aug 23 15:26:39 1995
+++ xgammon-0.98/Imakefile Wed Aug 12 18:42:55 1998
@@ -12,9 +12,9 @@
diff --git a/games-board/xgammon/xgammon-0.98-r1.ebuild b/games-board/xgammon/xgammon-0.98-r1.ebuild
new file mode 100644
index 0000000..1c2aeed
--- /dev/null
+++ b/games-board/xgammon/xgammon-0.98-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit toolchain-funcs eutils
+
+DESCRIPTION="very nice backgammon game for X"
+HOMEPAGE="http://fawn.unibw-hamburg.de/steuer/xgammon/xgammon.html"
+SRC_URI="http://fawn.unibw-hamburg.de/steuer/xgammon/Downloads/${P}a.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libXaw"
+DEPEND="${RDEPEND}
+ app-text/rman
+ x11-misc/imake"
+
+S=${WORKDIR}/${P}a
+
+PATCHES=(
+ "${FILESDIR}/${P}-broken.patch"
+ "${FILESDIR}/${P}-config.patch"
+ "${FILESDIR}/gcc33.patch"
+)
+
+src_configure() {
+ xmkmf || die
+}
+
+src_compile() {
+ env PATH=".:${PATH}" emake \
+ EXTRA_LDOPTIONS="${LDFLAGS}" \
+ CDEBUGFLAGS="${CFLAGS}" \
+ CC=$(tc-getCC)
+}
+
+pkg_postinst() {
+ einfo "xgammon need helvetica fonts"
+ einfo "They can be loaded emerging media-fonts/font-adobe-100dpi"
+ einfo "or similar. Remember to restart X after loading fonts"
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-board/xgammon/files/, games-board/xgammon/
@ 2020-08-26 22:07 David Seifert
0 siblings, 0 replies; 4+ messages in thread
From: David Seifert @ 2020-08-26 22:07 UTC (permalink / raw
To: gentoo-commits
commit: 54e123ebc9020f0ae7c93dd972ad970049ad38c7
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 26 22:07:19 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Aug 26 22:07:19 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54e123eb
games-board/xgammon: Fix building against glibc 2.32
Closes: https://bugs.gentoo.org/715452
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: David Seifert <soap <AT> gentoo.org>
.../xgammon/files/xgammon-0.98-glibc-2.32.patch | 19 +++++++++++++++
games-board/xgammon/xgammon-0.98-r1.ebuild | 27 +++++++++++++---------
2 files changed, 35 insertions(+), 11 deletions(-)
diff --git a/games-board/xgammon/files/xgammon-0.98-glibc-2.32.patch b/games-board/xgammon/files/xgammon-0.98-glibc-2.32.patch
new file mode 100644
index 00000000000..538f873b413
--- /dev/null
+++ b/games-board/xgammon/files/xgammon-0.98-glibc-2.32.patch
@@ -0,0 +1,19 @@
+--- a/save.c
++++ b/save.c
+@@ -20,6 +20,7 @@
+
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include <signal.h>
+ #include <X11/Intrinsic.h>
+
+@@ -142,7 +143,7 @@
+ fclose(save_file);
+
+ #ifndef AIX
+- fprintf (stderr, "xgammon: %s. Sorry and bye!\n", sys_siglist[n]);
++ fprintf (stderr, "xgammon: %s. Sorry and bye!\n", strsignal(n));
+ #else
+ fprintf (stderr, "xgammon: Caught signal %d. Sorry and bye!\n", n);
+ #endif
diff --git a/games-board/xgammon/xgammon-0.98-r1.ebuild b/games-board/xgammon/xgammon-0.98-r1.ebuild
index d00b4f94fe5..cdbeed6484b 100644
--- a/games-board/xgammon/xgammon-0.98-r1.ebuild
+++ b/games-board/xgammon/xgammon-0.98-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-inherit toolchain-funcs eutils
+EAPI=7
+
+inherit toolchain-funcs
DESCRIPTION="very nice backgammon game for X"
HOMEPAGE="http://fawn.unibw-hamburg.de/steuer/xgammon/xgammon.html"
@@ -11,19 +12,23 @@ SRC_URI="http://fawn.unibw-hamburg.de/steuer/xgammon/Downloads/${P}a.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE=""
-RDEPEND="x11-libs/libXaw"
-DEPEND="${RDEPEND}
+RDEPEND="
+ x11-libs/libX11
+ x11-libs/libXaw
+ x11-libs/libXt"
+DEPEND="${RDEPEND}"
+BDEPEND="
app-text/rman
x11-misc/imake"
-S=${WORKDIR}/${P}a
+S="${WORKDIR}/${P}a"
PATCHES=(
- "${FILESDIR}/${P}-broken.patch"
- "${FILESDIR}/${P}-config.patch"
- "${FILESDIR}/gcc33.patch"
+ "${FILESDIR}"/${P}-broken.patch
+ "${FILESDIR}"/${P}-config.patch
+ "${FILESDIR}"/gcc33.patch
+ "${FILESDIR}"/${P}-glibc-2.32.patch
)
src_configure() {
@@ -34,7 +39,7 @@ src_compile() {
env PATH=".:${PATH}" emake \
EXTRA_LDOPTIONS="${LDFLAGS}" \
CDEBUGFLAGS="${CFLAGS}" \
- CC=$(tc-getCC)
+ CC="$(tc-getCC)"
}
pkg_postinst() {
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-board/xgammon/files/, games-board/xgammon/
@ 2020-08-26 22:07 David Seifert
0 siblings, 0 replies; 4+ messages in thread
From: David Seifert @ 2020-08-26 22:07 UTC (permalink / raw
To: gentoo-commits
commit: e83b529b07bb3c1a07692dcb78d02f68822a9288
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 26 22:07:22 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Aug 26 22:07:22 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e83b529b
games-board/xgammon: Fix building with -fno-common
Closes: https://bugs.gentoo.org/706872
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: David Seifert <soap <AT> gentoo.org>
.../xgammon/files/xgammon-0.98-fno-common.patch | 97 ++++++++++++++++++++++
games-board/xgammon/xgammon-0.98-r1.ebuild | 1 +
2 files changed, 98 insertions(+)
diff --git a/games-board/xgammon/files/xgammon-0.98-fno-common.patch b/games-board/xgammon/files/xgammon-0.98-fno-common.patch
new file mode 100644
index 00000000000..924f0e549c0
--- /dev/null
+++ b/games-board/xgammon/files/xgammon-0.98-fno-common.patch
@@ -0,0 +1,97 @@
+--- a/allow.c
++++ b/allow.c
+@@ -34,6 +34,8 @@
+ MOVE current_move[4] = {{0, 0}, {0, 0},
+ {0, 0}, {0, 0}}; /* global only for un_do() */
+
++MOVE possible_moves[8000], *list;
++
+ int test_move (void);
+ int create_possible_moves (int dice_to_set, int *w, int actual_pin);
+ int move_is_allowed (int from_pin, int to_pin);
+--- a/gammon.h
++++ b/gammon.h
+@@ -117,12 +117,14 @@
+ MoveFunc MoveFunction;
+ BOARD board;
+ X11SET X11Set;
+-} Player[2];
++};
++extern struct _Player Player[2];
+
+ struct _PinTable {
+ int count;
+ int color;
+-} Pin[29], rollout_position[29]; /* 0, 25 = bar, 1 - 24 = board and 26, 27 finished[color] */
++};
++extern struct _PinTable Pin[29], rollout_position[29]; /* 0, 25 = bar, 1 - 24 = board and 26, 27 finished[color] */
+
+
+ /* if you have the dice values 1 and 1 and all stones are on different
+@@ -137,7 +139,7 @@
+ int to;
+ } MOVE;
+
+-MOVE possible_moves[8000], *list;
++extern MOVE possible_moves[8000], *list;
+
+ struct _move_hist {
+ int from [4];
+@@ -151,16 +153,17 @@
+ struct _Tournament {
+ unsigned int game_number;
+ unsigned int winning_point;
+-} tournament;
++};
++extern struct _Tournament tournament;
+
+ struct _RolloutSave {
+ int turn;
+ int doubler_value;
+ int doubler_owner;
+ int roll[2];
+-} rollout_save;
++};
+
+-FILE *endgame_database;
++extern FILE *endgame_database;
+
+ extern void switch_turn();
+
+--- a/rollout.c
++++ b/rollout.c
+@@ -48,6 +48,9 @@
+ void rollout_roll_dice ();
+ void exec_rollout ();
+
++struct _PinTable Pin[29], rollout_position[29];
++struct _RolloutSave rollout_save;
++
+ void RollOut (void)
+ {
+ Widget toplevel = Player[0].X11Set.toplevel;
+--- a/xgammon.c
++++ b/xgammon.c
+@@ -178,6 +178,10 @@
+ MOVE *compi_choice;
+
+ FILE* protokol_file = NULL;
++FILE* endgame_database;
++struct _gammon_resource gammon_resource;
++struct _Tournament tournament;
++struct _Player Player[2];
+
+ char * greetings = "Wellcome to xgammon version 0.98\n (C) 1994 Lambert Klasen Detlef Steuer\n We hope you enjoy it\n\n";
+
+--- a/xgammon.h
++++ b/xgammon.h
+@@ -70,7 +70,8 @@
+ char *server;
+ int port;
+ int button_move;
+-} gammon_resource;
++};
++extern struct _gammon_resource gammon_resource;
+
+ /* diawin.c */
+ extern void AppendDialogText ();
diff --git a/games-board/xgammon/xgammon-0.98-r1.ebuild b/games-board/xgammon/xgammon-0.98-r1.ebuild
index cdbeed6484b..330e8ff486f 100644
--- a/games-board/xgammon/xgammon-0.98-r1.ebuild
+++ b/games-board/xgammon/xgammon-0.98-r1.ebuild
@@ -29,6 +29,7 @@ PATCHES=(
"${FILESDIR}"/${P}-config.patch
"${FILESDIR}"/gcc33.patch
"${FILESDIR}"/${P}-glibc-2.32.patch
+ "${FILESDIR}"/${P}-fno-common.patch
)
src_configure() {
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-board/xgammon/files/, games-board/xgammon/
@ 2020-09-06 20:24 James Le Cuirot
0 siblings, 0 replies; 4+ messages in thread
From: James Le Cuirot @ 2020-09-06 20:24 UTC (permalink / raw
To: gentoo-commits
commit: 8d44378c078bcf7236358d775d9158dda983fd94
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 6 20:24:25 2020 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Sep 6 20:24:25 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d44378c
games-board/xgammon: Drop old 0.98-r1
Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
.../xgammon/files/xgammon-0.98-config.patch | 23 ----------
games-board/xgammon/xgammon-0.98-r1.ebuild | 49 ----------------------
2 files changed, 72 deletions(-)
diff --git a/games-board/xgammon/files/xgammon-0.98-config.patch b/games-board/xgammon/files/xgammon-0.98-config.patch
deleted file mode 100644
index 6546cd6f90a..00000000000
--- a/games-board/xgammon/files/xgammon-0.98-config.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/xgammon.ad
-+++ b/xgammon.ad
-@@ -67,4 +67,4 @@
- xgammon.buttonmove: false
- xgammon.stonesteps: 5
- xgammon.delaytime: 5
--xgammon.database: lib/xgammon.db
-+xgammon.database: /usr/lib/X11/xgammon/xgammon.db
---- a/Imakefile
-+++ b/Imakefile
-@@ -12,9 +12,9 @@
-
- ComplexProgramTarget(xgammon)
- InstallAppDefaults(XGammon)
--MakeDirectories(install, $(LIBDIR)/xgammon)
--InstallNonExec(lib/xgammon.db, $(LIBDIR)/xgammon)
--MANSUFFIX = 6
-+MakeDirectories(install,$(LIBDIR)/xgammon)
-+InstallNonExec(lib/xgammon.db,$(LIBDIR)/xgammon)
-+MANSUFFIX = 1
-
- xgammon.o: xgammon.c
- $(CC) $(CFLAGS) -DDATABASE=\"$(LIBDIR)/xgammon/xgammon.db\" -c xgammon.c
diff --git a/games-board/xgammon/xgammon-0.98-r1.ebuild b/games-board/xgammon/xgammon-0.98-r1.ebuild
deleted file mode 100644
index 9e8b8fb2d55..00000000000
--- a/games-board/xgammon/xgammon-0.98-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="very nice backgammon game for X"
-HOMEPAGE="http://fawn.unibw-hamburg.de/steuer/xgammon/xgammon.html"
-SRC_URI="http://fawn.unibw-hamburg.de/steuer/xgammon/Downloads/${P}a.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
- x11-libs/libX11
- x11-libs/libXaw
- x11-libs/libXt"
-DEPEND="${RDEPEND}"
-BDEPEND="
- app-text/rman
- x11-misc/imake"
-
-S="${WORKDIR}/${P}a"
-
-PATCHES=(
- "${FILESDIR}"/${P}-broken.patch
- "${FILESDIR}"/${P}-config.patch
- "${FILESDIR}"/${P}-glibc-2.32.patch
- "${FILESDIR}"/${P}-fno-common.patch
-)
-
-src_configure() {
- xmkmf || die
-}
-
-src_compile() {
- env PATH=".:${PATH}" emake \
- EXTRA_LDOPTIONS="${LDFLAGS}" \
- CDEBUGFLAGS="${CFLAGS}" \
- CC="$(tc-getCC)"
-}
-
-pkg_postinst() {
- einfo "xgammon need helvetica fonts"
- einfo "They can be loaded emerging media-fonts/font-adobe-100dpi"
- einfo "or similar. Remember to restart X after loading fonts"
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-09-06 20:24 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-08-01 19:09 [gentoo-commits] repo/gentoo:master commit in: games-board/xgammon/files/, games-board/xgammon/ Austin English
-- strict thread matches above, loose matches on Subject: below --
2020-08-26 22:07 David Seifert
2020-08-26 22:07 David Seifert
2020-09-06 20:24 James Le Cuirot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox