diff options
Diffstat (limited to 'games-action/battalion')
-rw-r--r-- | games-action/battalion/Manifest | 3 | ||||
-rw-r--r-- | games-action/battalion/battalion-1.4b-r1.ebuild | 69 | ||||
-rw-r--r-- | games-action/battalion/battalion-1.4b-r2.ebuild | 78 | ||||
-rw-r--r-- | games-action/battalion/files/battalion-1.4b-clang16.patch | 8 | ||||
-rw-r--r-- | games-action/battalion/files/battalion-1.4b-fix-build-system.patch | 8 | ||||
-rw-r--r-- | games-action/battalion/files/battalion-1.4b-warning.patch | 5 | ||||
-rw-r--r-- | games-action/battalion/metadata.xml | 2 |
7 files changed, 95 insertions, 78 deletions
diff --git a/games-action/battalion/Manifest b/games-action/battalion/Manifest index 5714ea243683..b4d48a78dd50 100644 --- a/games-action/battalion/Manifest +++ b/games-action/battalion/Manifest @@ -1 +1,2 @@ -DIST battalion1.4b.tar.bz2 942342 BLAKE2B 6a4bd9afc7202d68c2cf62fbfe5b3b8377069263d71adaad006d2b4803d5989b130e0ef7fd5b1479a7698d79c819bc463ab19f2fa1493d4caf616708091e2c83 SHA512 c3c615772012c63a709aaeaf4f23246760bf577b82eeec7cf5b2a479c6240fe4a2f839aca50540299ed4bee9b297f61fb8b7e1f5af74ea357f0d7e749d86f84b +DIST battalion1.4b-r1.tar.bz2 1103031 BLAKE2B 393561b879813244c90cba1fe1186a65920bf383926c06c28f1ce3a04afa66eab08f3b35925495bf4ca9b0d37eb1925bad5cbace602a8cb575cc4d6c5410fd01 SHA512 5c2acf7941cfd4ae4c7f46b3df7c7e6090dfd099276c67b0de83a4e6e14de00b099814980a12bddf1349407e7e1e62f91da5d0da842fd26f240b9a6cb37ecb04 +DIST battalionSUN4.tar.gz 1593265 BLAKE2B 239dff49c4d2c33a440594c113f45d347e598935257e30a04a18bd0f6b440b7790436000213fcbacfa862187f4760b9927539977f144ff5e92d7dfddbb7f3d7e SHA512 1e1ea7c7232b99b01a85fdf0660877944d64172b751df1dcd63a6cbeb4179078e80879aca77d84bb37b68fcf082680243987d5b65c77e5ea48e8f5645f9b2ef0 diff --git a/games-action/battalion/battalion-1.4b-r1.ebuild b/games-action/battalion/battalion-1.4b-r1.ebuild deleted file mode 100644 index d601672cf212..000000000000 --- a/games-action/battalion/battalion-1.4b-r1.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs - -DESCRIPTION="Be a rampaging monster and destroy the city" -HOMEPAGE="http://evlweb.eecs.uic.edu/aej/AndyBattalion.html" -SRC_URI="http://evlweb.eecs.uic.edu/aej/BATTALION/${PN}${PV}.tar.bz2" - -LICENSE="battalion HPND" -SLOT="0" -KEYWORDS="~x86" -IUSE="" - -DEPEND=" - virtual/glu - virtual/opengl - x11-libs/libX11" -RDEPEND=${DEPEND} - -S=${WORKDIR}/${PN}${PV} -PATCHES=( - "${FILESDIR}"/${P}-warning.patch - "${FILESDIR}"/${PN}-1.4b-fix-build-system.patch -) - -src_prepare() { - default - - # Modify data paths - sed -i \ - -e "s:SOUNDS/:${EPREFIX}/usr/share/${PN}/SOUNDS/:" \ - -e "s:MUSIC/:${EPREFIX}/usr/share/${PN}/MUSIC/:" \ - audio.c || die - sed -i \ - -e "s:DATA/:${EPREFIX}/usr/share/${PN}/DATA/:" \ - -e "s:/usr/tmp:${EPREFIX}/var/${PN}:" \ - battalion.c || die - sed -i \ - -e "s:TEXTURES/:${EPREFIX}/usr/share/${PN}/TEXTURES/:" \ - graphics.c || die - - # Only .raw sound files are used on Linux. The .au files are not needed. - rm {SOUNDS,MUSIC}/*.au || die -} - -src_configure() { - tc-export CC -} - -src_install() { - dobin battalion - einstalldocs - - insinto /usr/share/${PN} - doins -r DATA MUSIC SOUNDS TEXTURES - - dodir /var/${PN} - touch "${ED%/}"/var/${PN}/battalion_hiscore || die - fperms 660 /var/${PN}/battalion_hiscore -} - -pkg_postinst() { - elog "Sound and music are not enabled by default." - elog "Use the S and M keys to enable them in-game, or start the game with" - elog "the -s and -m switches: battalion -s -m" -} diff --git a/games-action/battalion/battalion-1.4b-r2.ebuild b/games-action/battalion/battalion-1.4b-r2.ebuild new file mode 100644 index 000000000000..db2d3d24992f --- /dev/null +++ b/games-action/battalion/battalion-1.4b-r2.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop toolchain-funcs + +DESCRIPTION="Be a rampaging monster and destroy the city" +HOMEPAGE="https://www.evl.uic.edu/aej/AndyBattalion.html" +SRC_URI=" + https://www.evl.uic.edu/aej/BATTALION/${PN}${PV}.tar.bz2 -> ${PN}${PV}-r1.tar.bz2 + https://www.evl.uic.edu/aej/BATTALION/${PN}SUN4.tar.gz" +S="${WORKDIR}/${PN}${PV}" + +LICENSE="battalion HPND" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + acct-group/gamestat + virtual/glu + virtual/opengl + x11-libs/libX11" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto" +BDEPEND="virtual/pkgconfig" + +PATCHES=( + "${FILESDIR}"/${P}-warning.patch + "${FILESDIR}"/${P}-fix-build-system.patch + "${FILESDIR}"/${P}-clang16.patch +) + +src_prepare() { + default + + sed -e "/getenv.*DATADIR/s|= .*|= \"${EPREFIX}/usr/share/${PN}\";|" \ + -e "/getenv.*SCOREDIR/s|= .*|= \"${EPREFIX}/var/games\";|" \ + -i battalion.c || die + + sed '1s/1/6/' ../${PN}SUN4/${PN}.man > "${T}"/${PN}.6 || die + + # Only .raw sound files are used on Linux. The .au files are not needed. + rm {SOUNDS,MUSIC}/*.au || die +} + +src_compile() { + tc-export CC PKG_CONFIG + + emake clean + emake +} + +src_install() { + dobin ${PN} + doman "${T}"/${PN}.6 + einstalldocs + + insinto /usr/share/${PN} + doins -r DATA MUSIC SOUNDS TEXTURES ../${PN}SUN4/${PN}.data/${PN}.sho + + dodir /var/games + > "${ED}"/var/games/${PN}_hiscore || die + + fowners :gamestat /usr/bin/${PN} /var/games/${PN}_hiscore + fperms g+s /usr/bin/${PN} + fperms 660 /var/games/${PN}_hiscore + + make_desktop_entry ${PN} ${PN^} applications-games +} + +pkg_postinst() { + if [[ ! ${REPLACING_VERSIONS} ]]; then + elog "Note that sound and music are not enabled by default," + elog "and require OSS support (/dev/dsp) to function." + fi +} diff --git a/games-action/battalion/files/battalion-1.4b-clang16.patch b/games-action/battalion/files/battalion-1.4b-clang16.patch new file mode 100644 index 000000000000..866e6227de05 --- /dev/null +++ b/games-action/battalion/files/battalion-1.4b-clang16.patch @@ -0,0 +1,8 @@ +https://bugs.gentoo.org/874987 +--- a/battalion.c ++++ b/battalion.c +@@ -5471,3 +5471,3 @@ + +-main (int argc, char*argv[]) ++int main (int argc, char*argv[]) + { diff --git a/games-action/battalion/files/battalion-1.4b-fix-build-system.patch b/games-action/battalion/files/battalion-1.4b-fix-build-system.patch index fe209e1db953..3ebfb15f4b09 100644 --- a/games-action/battalion/files/battalion-1.4b-fix-build-system.patch +++ b/games-action/battalion/files/battalion-1.4b-fix-build-system.patch @@ -13,8 +13,8 @@ #GLIB = -lMesaGL -lMesaGLU # or -GLIB = -lGL -lGLU -+GLIB_CFLAGS = `pkg-config --cflags gl` `pkg-config --cflags glu` -+GLIB_LIBS = `pkg-config --libs gl` `pkg-config --libs glu` ++GLIB_CFLAGS = `${PKG_CONFIG} --cflags gl` `${PKG_CONFIG} --cflags glu` ++GLIB_LIBS = `${PKG_CONFIG} --libs gl` `${PKG_CONFIG} --libs glu` # STEP 4: CHOOSE WHICH HARDWARE / OS YOU ARE RUNNING @@ -37,8 +37,8 @@ OBJ = battalion.o audio.o net.o gprim.o graphics.o objects.o text.o update.o tk.o font.o soundIt.o -LIBS = -L./. -L/usr/X11R6/lib -lm -lX11 -lXext -+my_CPPFLAGS = -lm `pkg-config --cflags x11` `pkg-config --cflags xext` -I./. $(AUDIODEF) $(OS) -+my_LIBS = -lm `pkg-config --libs x11` `pkg-config --libs xext` ++my_CPPFLAGS = -lm `${PKG_CONFIG} --cflags x11` `${PKG_CONFIG} --cflags xext` -I./. $(AUDIODEF) $(OS) ++my_LIBS = -lm `${PKG_CONFIG} --libs x11` `${PKG_CONFIG} --libs xext` all: $(TARGET) diff --git a/games-action/battalion/files/battalion-1.4b-warning.patch b/games-action/battalion/files/battalion-1.4b-warning.patch index 91fd8ee51d3b..d27ae5ceb9a1 100644 --- a/games-action/battalion/files/battalion-1.4b-warning.patch +++ b/games-action/battalion/files/battalion-1.4b-warning.patch @@ -1,6 +1,5 @@ -diff -ru battalion1.4b.orig/net.c battalion1.4b/net.c ---- battalion1.4b.orig/net.c 2002-05-06 09:57:01.000000000 -0400 -+++ battalion1.4b/net.c 2015-03-30 18:29:23.885306334 -0400 +--- a/net.c ++++ b/net.c @@ -378,7 +378,7 @@ /* nother copy of this elsewhere */ diff --git a/games-action/battalion/metadata.xml b/games-action/battalion/metadata.xml index 78274e0fa550..1c3ba213c494 100644 --- a/games-action/battalion/metadata.xml +++ b/games-action/battalion/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>games@gentoo.org</email> |