[gentoo-commits] repo/gentoo:master commit in: games-simulation/pmars-sdl/
commit: 931c46f8d29dfa16c138da2587d4a8deb22d7f88 Author: Michael Sterrett gentoo org> AuthorDate: Fri May 6 02:43:23 2016 + Commit: Michael Sterrett gentoo org> CommitDate: Fri May 6 02:49:06 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=931c46f8 games-simulation/pmars-sdl: set RDEPEND Package-Manager: portage-2.2.26 games-simulation/pmars-sdl/pmars-sdl-0.9.2e.ebuild | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/games-simulation/pmars-sdl/pmars-sdl-0.9.2e.ebuild b/games-simulation/pmars-sdl/pmars-sdl-0.9.2e.ebuild index 3429dd0..1826340 100644 --- a/games-simulation/pmars-sdl/pmars-sdl-0.9.2e.ebuild +++ b/games-simulation/pmars-sdl/pmars-sdl-0.9.2e.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 -inherit toolchain-funcs games eutils +inherit toolchain-funcs eutils games MY_PN="${PN/-sdl/}" MY_PV="${PV/e/-5}" @@ -21,6 +21,7 @@ IUSE="sdl X" DEPEND="sdl? ( x11-libs/libX11 media-libs/libsdl[video] ) X? ( x11-libs/libX11 ) !sdl? ( !X? ( sys-libs/ncurses ) )" +RDEPEND=${DEPEND} S=${WORKDIR}/${MY_P}
[gentoo-commits] repo/gentoo:master commit in: games-simulation/pmars-sdl/
commit: 79d57486b7eb17684a0fcd4c94cc081322f0edbb Author: Michael Sterrett gentoo org> AuthorDate: Fri May 6 17:01:06 2016 + Commit: Michael Sterrett gentoo org> CommitDate: Fri May 6 17:09:59 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79d57486 games-simulation/pmars-sdl: add slot to sys-libs/ncurses Package-Manager: portage-2.2.26 games-simulation/pmars-sdl/pmars-sdl-0.9.2e.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/games-simulation/pmars-sdl/pmars-sdl-0.9.2e.ebuild b/games-simulation/pmars-sdl/pmars-sdl-0.9.2e.ebuild index 1826340..c4489d1 100644 --- a/games-simulation/pmars-sdl/pmars-sdl-0.9.2e.ebuild +++ b/games-simulation/pmars-sdl/pmars-sdl-0.9.2e.ebuild @@ -20,7 +20,7 @@ IUSE="sdl X" DEPEND="sdl? ( x11-libs/libX11 media-libs/libsdl[video] ) X? ( x11-libs/libX11 ) - !sdl? ( !X? ( sys-libs/ncurses ) )" + !sdl? ( !X? ( sys-libs/ncurses:0 ) )" RDEPEND=${DEPEND} S=${WORKDIR}/${MY_P}
[gentoo-commits] repo/gentoo:master commit in: games-simulation/pmars-sdl/
commit: 9b6d1597fdb53feea15ad8de5c4e24d14ed3972e Author: Pacho Ramos gentoo org> AuthorDate: Tue May 1 18:36:17 2018 + Commit: Pacho Ramos gentoo org> CommitDate: Tue May 1 19:35:48 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b6d1597 games-simulation/pmars-sdl: Drop old Package-Manager: Portage-2.3.31, Repoman-2.3.9 games-simulation/pmars-sdl/pmars-sdl-0.9.2e.ebuild | 91 -- 1 file changed, 91 deletions(-) diff --git a/games-simulation/pmars-sdl/pmars-sdl-0.9.2e.ebuild b/games-simulation/pmars-sdl/pmars-sdl-0.9.2e.ebuild deleted file mode 100644 index 2df3782e391..000 --- a/games-simulation/pmars-sdl/pmars-sdl-0.9.2e.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit toolchain-funcs eutils games - -MY_PN="${PN/-sdl/}" -MY_PV="${PV/e/-5}" -MY_P="${MY_PN}-${MY_PV}" - -DESCRIPTION="Portable redcode simulator's sdl port for core war" -HOMEPAGE="http://corewar.co.uk/pihlaja/pmars-sdl/"; -SRC_URI="http://corewar.co.uk/pihlaja/pmars-sdl/${MY_P}.tar.gz"; - -LICENSE="BSD GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="sdl X" - -DEPEND="sdl? ( x11-libs/libX11 media-libs/libsdl[video] ) - X? ( x11-libs/libX11 ) - !sdl? ( !X? ( sys-libs/ncurses:0 ) )" -RDEPEND=${DEPEND} - -S=${WORKDIR}/${MY_P} - -src_prepare() { - epatch "${FILESDIR}"/${P}-format.patch -} - -src_compile() { - CFLAGS="${CFLAGS} -DEXT94 -DPERMUTATE" - LFLAGS="-x" - - if use sdl ; then - CFLAGS="${CFLAGS} -DSDLGRAPHX `sdl-config --cflags`" - LIB=`sdl-config --libs` - elif use X ; then - CFLAGS="${CFLAGS} -DXWINGRAPHX" - LIB="-L/usr/X11R6/lib -lX11" - else - CFLAGS="${CFLAGS} -DCURSESGRAPHX" - LIB="-lcurses" - fi - - cd src - - SRC="asm.c -cdb.c -clparse.c -disasm.c -eval.c -global.c -pmars.c -sim.c -pos.c -str_eng.c -token.c" - - for x in ${SRC}; do - einfo "compiling ${x}" - $(tc-getCC) ${CFLAGS} ${x} -c || die - done - - echo - einfo "linking with LIB: ${LIB}" - $(tc-getCC) ${LDFLAGS} *.o ${LIB} -o ${MY_PN} || die -} - -src_install() { - dogamesbin src/${MY_PN} - doman doc/${MY_PN}.6 - - dodoc AUTHORS CONTRIB ChangeLog README doc/redcode.ref - - insinto "${GAMES_DATADIR}/${MY_PN}/warriors" - doins warriors/* - - insinto "${GAMES_DATADIR}/${MY_PN}/macros" - doins config/*.mac - - prepgamesdirs -} - -pkg_postinst() { - games_pkg_postinst - echo - ewarn "There are some macros in ${GAMES_DATADIR}/${MY_PN}/macros" - ewarn "which you should make accessible to pmars by typing" - ewarn "export PMARSHOME=${GAMES_DATADIR}/${MY_PN}/macros\n" -}
[gentoo-commits] repo/gentoo:master commit in: games-simulation/pmars-sdl/
commit: de21028b4b08aaafcb3a5a7076f9575bcc9db5d5 Author: Pacho Ramos gentoo org> AuthorDate: Tue May 1 18:36:07 2018 + Commit: Pacho Ramos gentoo org> CommitDate: Tue May 1 19:35:47 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de21028b games-simulation/pmars-sdl: make repoman happy Package-Manager: Portage-2.3.31, Repoman-2.3.9 games-simulation/pmars-sdl/pmars-sdl-0.9.2e-r1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/games-simulation/pmars-sdl/pmars-sdl-0.9.2e-r1.ebuild b/games-simulation/pmars-sdl/pmars-sdl-0.9.2e-r1.ebuild index 05129c0d1c7..b7f96156df9 100644 --- a/games-simulation/pmars-sdl/pmars-sdl-0.9.2e-r1.ebuild +++ b/games-simulation/pmars-sdl/pmars-sdl-0.9.2e-r1.ebuild @@ -29,9 +29,9 @@ S="${WORKDIR}/${MY_P}" PATCHES=( "${FILESDIR}"/${P}-format.patch ) DOC_CONTENTS=" - There are some macros in ${GAMES_DATADIR}/${MY_PN}/macros + There are some macros in /usr/share/pmars/macros which you should make accessible to pmars by typing - export PMARSHOME=${GAMES_DATADIR}/${MY_PN}/macros\n + export PMARSHOME=/usr/share/pmars/macros\n " src_compile() {
[gentoo-commits] repo/gentoo:master commit in: games-simulation/pmars-sdl/
commit: e57fd1a66b68c7271320b43b6e61416971bb Author: Stefan Strogin gentoo org> AuthorDate: Thu Aug 1 11:06:07 2019 + Commit: Stefan Strogin gentoo org> CommitDate: Thu Aug 1 11:06:25 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e57fd1a6 games-simulation/pmars-sdl: fix building with ncurses[tinfo] Closes: https://bugs.gentoo.org/689984 Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Stefan Strogin gentoo.org> games-simulation/pmars-sdl/pmars-sdl-0.9.2e-r1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/games-simulation/pmars-sdl/pmars-sdl-0.9.2e-r1.ebuild b/games-simulation/pmars-sdl/pmars-sdl-0.9.2e-r1.ebuild index b7f96156df9..b52f266d523 100644 --- a/games-simulation/pmars-sdl/pmars-sdl-0.9.2e-r1.ebuild +++ b/games-simulation/pmars-sdl/pmars-sdl-0.9.2e-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -46,7 +46,7 @@ src_compile() { LIB="-L/usr/X11R6/lib -lX11" else CFLAGS="${CFLAGS} -DCURSESGRAPHX" - LIB="-lcurses" + LIB="-lcurses -ltinfo" fi cd src
[gentoo-commits] repo/gentoo:master commit in: games-simulation/pmars-sdl/
commit: e0cf7e09ea6ae0b0ce6e4bf9429e80f1fbbf90e6 Author: Sam James gentoo org> AuthorDate: Fri Jun 18 21:07:05 2021 + Commit: David Seifert gentoo org> CommitDate: Fri Jun 18 21:07:05 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0cf7e09 games-simulation/pmars-sdl: modernise ebuild * EAPI 7 * Use ${ESYSROOT} * Use append-flags, append-cppflags * General bash tidying * Add missing die * Remove overquoting * Use subshells, not backticks * Respect CPPFLAGS Signed-off-by: Sam James gentoo.org> Signed-off-by: David Seifert gentoo.org> .../pmars-sdl/pmars-sdl-0.9.2e-r1.ebuild | 77 -- 1 file changed, 43 insertions(+), 34 deletions(-) diff --git a/games-simulation/pmars-sdl/pmars-sdl-0.9.2e-r1.ebuild b/games-simulation/pmars-sdl/pmars-sdl-0.9.2e-r1.ebuild index 6e25ce586a2..ae564aa94c0 100644 --- a/games-simulation/pmars-sdl/pmars-sdl-0.9.2e-r1.ebuild +++ b/games-simulation/pmars-sdl/pmars-sdl-0.9.2e-r1.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit readme.gentoo-r1 toolchain-funcs +EAPI=7 + +inherit flag-o-matic toolchain-funcs readme.gentoo-r1 MY_PN="${PN/-sdl/}" MY_PV="${PV/e/-5}" @@ -11,6 +12,7 @@ MY_P="${MY_PN}-${MY_PV}" DESCRIPTION="Portable redcode simulator's sdl port for core war" HOMEPAGE="https://corewar.co.uk/pihlaja/pmars-sdl/"; SRC_URI="https://corewar.co.uk/pihlaja/pmars-sdl/${MY_P}.tar.gz"; +S="${WORKDIR}/${MY_P}" LICENSE="BSD GPL-2" SLOT="0" @@ -24,9 +26,9 @@ RDEPEND=" " DEPEND="${RDEPEND}" -S="${WORKDIR}/${MY_P}" - -PATCHES=( "${FILESDIR}"/${P}-format.patch ) +PATCHES=( + "${FILESDIR}"/${P}-format.patch +) DOC_CONTENTS=" There are some macros in /usr/share/pmars/macros @@ -35,41 +37,48 @@ DOC_CONTENTS=" " src_compile() { - CFLAGS="${CFLAGS} -DEXT94 -DPERMUTATE" - LFLAGS="-x" + local LIB="" + export LFLAGS="-x" + + append-cppflags -DEXT94 -DPERMUTATE if use sdl ; then - CFLAGS="${CFLAGS} -DSDLGRAPHX `sdl-config --cflags`" - LIB=`sdl-config --libs` + append-cflags $(sdl-config --cflags) + append-cppflags -DSDLGRAPHX + + LIB=$(sdl-config --libs) elif use X ; then - CFLAGS="${CFLAGS} -DXWINGRAPHX" - LIB="-L/usr/X11R6/lib -lX11" + append-cppflags -DXWINGRAPHX + + LIB="-L${ESYSROOT}/usr/X11R6/lib -lX11" else - CFLAGS="${CFLAGS} -DCURSESGRAPHX" + append-cppflags -DCURSESGRAPHX + LIB="-lcurses -ltinfo" fi - cd src - - SRC="asm.c -cdb.c -clparse.c -disasm.c -eval.c -global.c -pmars.c -sim.c -pos.c -str_eng.c -token.c" - - for x in ${SRC}; do - einfo "compiling ${x}" - $(tc-getCC) ${CFLAGS} ${x} -c || die + cd src || die + + local programs=( + asm.c + cdb.c + clparse.c + disasm.c + eval.c + global.c + pmars.c + sim.c + pos.c + str_eng.c + token.c + ) + + for program in "${programs[@]}" ; do + einfo "Compiling ${program}" + $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${program} -c || die done - echo - einfo "linking with LIB: ${LIB}" + einfo "Linking with LIB: ${LIB}" $(tc-getCC) ${LDFLAGS} *.o ${LIB} -o ${MY_PN} || die } @@ -80,10 +89,10 @@ src_install() { dodoc AUTHORS CONTRIB ChangeLog README doc/redcode.ref readme.gentoo_create_doc - insinto "/usr/share/${MY_PN}/warriors" + insinto /usr/share/${MY_PN}/warriors doins warriors/* - insinto "/usr/share/${MY_PN}/macros" + insinto /usr/share/${MY_PN}/macros doins config/*.mac }
[gentoo-commits] repo/gentoo:master commit in: games-simulation/pmars-sdl/
commit: c2c24ad694d76c541d680eb671a34dd04838cbf4 Author: Sam James gentoo org> AuthorDate: Fri Jun 18 21:07:08 2021 + Commit: David Seifert gentoo org> CommitDate: Fri Jun 18 21:07:08 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2c24ad6 games-simulation/pmars-sdl: use pkg-config to find ncurses, x11 Signed-off-by: Sam James gentoo.org> Signed-off-by: David Seifert gentoo.org> games-simulation/pmars-sdl/pmars-sdl-0.9.2e-r1.ebuild | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/games-simulation/pmars-sdl/pmars-sdl-0.9.2e-r1.ebuild b/games-simulation/pmars-sdl/pmars-sdl-0.9.2e-r1.ebuild index ae564aa94c0..df1ca5fb51e 100644 --- a/games-simulation/pmars-sdl/pmars-sdl-0.9.2e-r1.ebuild +++ b/games-simulation/pmars-sdl/pmars-sdl-0.9.2e-r1.ebuild @@ -25,6 +25,7 @@ RDEPEND=" !sdl? ( !X? ( sys-libs/ncurses:0= ) ) " DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${P}-format.patch @@ -46,15 +47,15 @@ src_compile() { append-cflags $(sdl-config --cflags) append-cppflags -DSDLGRAPHX - LIB=$(sdl-config --libs) + LIB="$(sdl-config --libs)" elif use X ; then append-cppflags -DXWINGRAPHX - LIB="-L${ESYSROOT}/usr/X11R6/lib -lX11" + LIB="$($(tc-getPKG_CONFIG) --libs x11)" else append-cppflags -DCURSESGRAPHX - LIB="-lcurses -ltinfo" + LIB="$($(tc-getPKG_CONFIG) --libs ncurses)" fi cd src || die
[gentoo-commits] repo/gentoo:master commit in: games-simulation/pmars-sdl/files/, games-simulation/pmars-sdl/
commit: cd699b6b53a171ea727bddd3c73298339fd70b74 Author: Tupone Alfredo gentoo org> AuthorDate: Wed Oct 28 12:29:54 2015 + Commit: Alfredo Tupone gentoo org> CommitDate: Wed Oct 28 12:30:10 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd699b6b games-simulation/pmars-sdl: compile with format-security. Bug #544358 Package-Manager: portage-2.2.20.1 .../pmars-sdl/files/pmars-sdl-0.9.2e-format.patch | 65 ++ games-simulation/pmars-sdl/pmars-sdl-0.9.2e.ebuild | 6 +- 2 files changed, 70 insertions(+), 1 deletion(-) diff --git a/games-simulation/pmars-sdl/files/pmars-sdl-0.9.2e-format.patch b/games-simulation/pmars-sdl/files/pmars-sdl-0.9.2e-format.patch new file mode 100644 index 000..d8c588a --- /dev/null +++ b/games-simulation/pmars-sdl/files/pmars-sdl-0.9.2e-format.patch @@ -0,0 +1,65 @@ +--- src/asm.c.old 2015-10-28 13:23:53.465014342 +0100 src/asm.c 2015-10-28 13:23:10.502813377 +0100 +@@ -652,7 +652,7 @@ + macputs(str); + #else + if (!inCdb) +-fprintf(stderr, str); ++fprintf(stderr, "%s", str); + #if defined DOSALLGRAPHX + else { + if (displayMode == TEXT) +@@ -833,7 +833,7 @@ + #ifdef __MAC__ + textout(notEnoughMemErr); + #else +-fprintf(stderr, notEnoughMemErr); ++fprintf(stderr, "%s", notEnoughMemErr); + #endif + Exit(MEMERR); + break; +@@ -916,7 +916,7 @@ + } + + if (ierr >= ERRMAX) { +-sprintf(outs, tooManyMsgErr); ++sprintf(outs, "%s", tooManyMsgErr); + #ifndef VMS + textout(outs); + #else +--- src/cdb.c.old 2015-10-28 13:24:04.669805966 +0100 src/cdb.c 2015-10-28 13:23:10.502813377 +0100 +@@ -2760,7 +2760,7 @@ + fprintf(outp, nameByAuthorScores, warrior[idxV[i]].name, warrior[idxV[i]].authorName, + scrV[idxV[i]]); + if (warriors > 2) { +-fprintf(outp, resultsAre); ++fprintf(outp, "%s", resultsAre); + for (j = 0; j < warriors; ++j) { + fprintf(outp, " %d", warrior[idxV[i]].score[j]); + } +--- src/clparse.c.old 2015-10-28 13:24:10.648694768 +0100 src/clparse.c 2015-10-28 13:23:10.502813377 +0100 +@@ -289,7 +289,7 @@ + if (next_input(filep, inputs)) { + if (!strcmp(inputs, "-")) { + newFile = stdin; +- fprintf(stderr, readingStdin); ++ fprintf(stderr, "%s", readingStdin); + } else { + if ((newFile = fopen(inputs, "r")) == NULL) { + code = FILENAME;/* command file not found */ +@@ -430,11 +430,11 @@ + errout(outs); + break; + case MEMORY: +-sprintf(outs, outOfMemory); ++sprintf(outs, "%s", outOfMemory); + errout(outs); + break; + case FILENAME: +-sprintf(outs, cannotOpenParameterFile); ++sprintf(outs, "%s", cannotOpenParameterFile); + errout(outs); + break; + } diff --git a/games-simulation/pmars-sdl/pmars-sdl-0.9.2e.ebuild b/games-simulation/pmars-sdl/pmars-sdl-0.9.2e.ebuild index 3efe83a..3429dd0 100644 --- a/games-simulation/pmars-sdl/pmars-sdl-0.9.2e.ebuild +++ b/games-simulation/pmars-sdl/pmars-sdl-0.9.2e.ebuild @@ -3,7 +3,7 @@ # $Id$ EAPI=5 -inherit toolchain-funcs games +inherit toolchain-funcs games eutils MY_PN="${PN/-sdl/}" MY_PV="${PV/e/-5}" @@ -24,6 +24,10 @@ DEPEND="sdl? ( x11-libs/libX11 media-libs/libsdl[video] ) S=${WORKDIR}/${MY_P} +src_prepare() { + epatch "${FILESDIR}"/${P}-format.patch +} + src_compile() { CFLAGS="${CFLAGS} -DEXT94 -DPERMUTATE" LFLAGS="-x"
[gentoo-commits] repo/gentoo:master commit in: games-simulation/pmars-sdl/files/, games-simulation/pmars-sdl/
commit: c4fa2142be333dc8177959fe71d88d8dfda52a7b Author: Pacho Ramos gentoo org> AuthorDate: Tue May 1 18:34:57 2018 + Commit: Pacho Ramos gentoo org> CommitDate: Tue May 1 19:35:46 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4fa2142 games-simulation/pmars-sdl: Stop using games.eclass Package-Manager: Portage-2.3.31, Repoman-2.3.9 .../pmars-sdl/files/pmars-sdl-0.9.2e-format.patch | 12 +-- .../pmars-sdl/pmars-sdl-0.9.2e-r1.ebuild | 92 ++ 2 files changed, 98 insertions(+), 6 deletions(-) diff --git a/games-simulation/pmars-sdl/files/pmars-sdl-0.9.2e-format.patch b/games-simulation/pmars-sdl/files/pmars-sdl-0.9.2e-format.patch index d8c588a3220..4e02da8a82a 100644 --- a/games-simulation/pmars-sdl/files/pmars-sdl-0.9.2e-format.patch +++ b/games-simulation/pmars-sdl/files/pmars-sdl-0.9.2e-format.patch @@ -1,5 +1,5 @@ src/asm.c.old 2015-10-28 13:23:53.465014342 +0100 -+++ src/asm.c 2015-10-28 13:23:10.502813377 +0100 +--- a/src/asm.c.old2015-10-28 13:23:53.465014342 +0100 b/src/asm.c2015-10-28 13:23:10.502813377 +0100 @@ -652,7 +652,7 @@ macputs(str); #else @@ -27,8 +27,8 @@ #ifndef VMS textout(outs); #else src/cdb.c.old 2015-10-28 13:24:04.669805966 +0100 -+++ src/cdb.c 2015-10-28 13:23:10.502813377 +0100 +--- a/src/cdb.c.old2015-10-28 13:24:04.669805966 +0100 b/src/cdb.c2015-10-28 13:23:10.502813377 +0100 @@ -2760,7 +2760,7 @@ fprintf(outp, nameByAuthorScores, warrior[idxV[i]].name, warrior[idxV[i]].authorName, scrV[idxV[i]]); @@ -38,8 +38,8 @@ for (j = 0; j < warriors; ++j) { fprintf(outp, " %d", warrior[idxV[i]].score[j]); } src/clparse.c.old 2015-10-28 13:24:10.648694768 +0100 -+++ src/clparse.c 2015-10-28 13:23:10.502813377 +0100 +--- a/src/clparse.c.old2015-10-28 13:24:10.648694768 +0100 b/src/clparse.c2015-10-28 13:23:10.502813377 +0100 @@ -289,7 +289,7 @@ if (next_input(filep, inputs)) { if (!strcmp(inputs, "-")) { diff --git a/games-simulation/pmars-sdl/pmars-sdl-0.9.2e-r1.ebuild b/games-simulation/pmars-sdl/pmars-sdl-0.9.2e-r1.ebuild new file mode 100644 index 000..05129c0d1c7 --- /dev/null +++ b/games-simulation/pmars-sdl/pmars-sdl-0.9.2e-r1.ebuild @@ -0,0 +1,92 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit readme.gentoo-r1 toolchain-funcs + +MY_PN="${PN/-sdl/}" +MY_PV="${PV/e/-5}" +MY_P="${MY_PN}-${MY_PV}" + +DESCRIPTION="Portable redcode simulator's sdl port for core war" +HOMEPAGE="http://corewar.co.uk/pihlaja/pmars-sdl/"; +SRC_URI="http://corewar.co.uk/pihlaja/pmars-sdl/${MY_P}.tar.gz"; + +LICENSE="BSD GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="sdl X" + +RDEPEND=" + sdl? ( x11-libs/libX11 media-libs/libsdl[video] ) + X? ( x11-libs/libX11 ) + !sdl? ( !X? ( sys-libs/ncurses:0= ) ) +" +DEPEND="${RDEPEND}" + +S="${WORKDIR}/${MY_P}" + +PATCHES=( "${FILESDIR}"/${P}-format.patch ) + +DOC_CONTENTS=" + There are some macros in ${GAMES_DATADIR}/${MY_PN}/macros + which you should make accessible to pmars by typing + export PMARSHOME=${GAMES_DATADIR}/${MY_PN}/macros\n +" + +src_compile() { + CFLAGS="${CFLAGS} -DEXT94 -DPERMUTATE" + LFLAGS="-x" + + if use sdl ; then + CFLAGS="${CFLAGS} -DSDLGRAPHX `sdl-config --cflags`" + LIB=`sdl-config --libs` + elif use X ; then + CFLAGS="${CFLAGS} -DXWINGRAPHX" + LIB="-L/usr/X11R6/lib -lX11" + else + CFLAGS="${CFLAGS} -DCURSESGRAPHX" + LIB="-lcurses" + fi + + cd src + + SRC="asm.c +cdb.c +clparse.c +disasm.c +eval.c +global.c +pmars.c +sim.c +pos.c +str_eng.c +token.c" + + for x in ${SRC}; do + einfo "compiling ${x}" + $(tc-getCC) ${CFLAGS} ${x} -c || die + done + + echo + einfo "linking with LIB: ${LIB}" + $(tc-getCC) ${LDFLAGS} *.o ${LIB} -o ${MY_PN} || die +} + +src_install() { + dobin src/${MY_PN} + doman doc/${MY_PN}.6 + + dodoc AUTHORS CONTRIB ChangeLog README doc/redcode.ref + readme.gentoo_create_doc + + insinto "/usr/share/${MY_PN}/warriors" + doins warriors/* + + insinto "/usr/share/${MY_PN}/macros" + doins config/*.mac +} + +pkg_postinst() { + readme.gentoo_print_elog +}