Hi ports --
Attached is a long-awaited update to armagetronad. You can see the
news item on their main site: http://www.armagetronad.org/
The diff is a bit complex because upstream has done some moving around
of things, including MASTER_SITES.
This works on my amd64 machine; testing elsewhere appreciated.
OK?
~Brian
Index: Makefile
===================================================================
RCS file: /cvs/ports/games/armagetronad/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- Makefile 22 Feb 2020 19:56:05 -0000 1.15
+++ Makefile 17 Aug 2020 22:33:43 -0000
@@ -1,11 +1,13 @@
# $OpenBSD: Makefile,v 1.15 2020/02/22 19:56:05 bcallah Exp $
+V = 0.2.9
+P = 0.1
COMMENT = 3D light cycle game
-DISTNAME = armagetronad-0.2.8.3.5.src
-PKGNAME = ${DISTNAME:S/.src//}
+DISTNAME = armagetronad-${V}.${P}
+EXTRACT_SUFX = .tbz
-CATEGORIES = games
+CATEGORIES = games x11
HOMEPAGE = http://armagetronad.org/
MAINTAINER = Brian Callahan <bcal...@openbsd.org>
@@ -13,27 +15,24 @@ MAINTAINER = Brian Callahan <bcallah@op
# GPLv2+
PERMIT_PACKAGE = Yes
-WANTLIB += GL GLU SDL SDL_image c iconv jpeg lzma m png pthread ${COMPILER_LIBCXX}
-WANTLIB += xml2 z
+WANTLIB += ${COMPILER_LIBCXX} GL GLU SDL SDL_image c m png xml2
-COMPILER = base-clang ports-gcc base-gcc
+# C++11
+COMPILER = base-clang ports-gcc
-MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=armagetronad/}
+MASTER_SITES = https://launchpad.net/armagetronad/${V}/${V}.${P}/+download/
BUILD_DEPENDS = shells/bash
-LIB_DEPENDS = converters/libiconv \
- devel/sdl-image \
+LIB_DEPENDS = devel/sdl-image \
textproc/libxml
USE_GMAKE = Yes
CONFIGURE_STYLE = gnu
-CONFIGURE_ARGS += --enable-games=no \
+CONFIGURE_ARGS = --enable-games=no \
--enable-uninstall=no \
--disable-useradd \
--disable-initscripts \
--disable-sysinstall \
--disable-binreloc
-
-WRKDIST = ${WRKDIR}/${DISTNAME:S/.src//}
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/games/armagetronad/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo 22 Feb 2020 19:56:05 -0000 1.5
+++ distinfo 17 Aug 2020 22:33:43 -0000
@@ -1,2 +1,2 @@
-SHA256 (armagetronad-0.2.8.3.5.src.tar.gz) = tMmTVYwIgGxA48cJVDdFH/6bw9P4wDEOWMUKgRU0Rvw=
-SIZE (armagetronad-0.2.8.3.5.src.tar.gz) = 2096771
+SHA256 (armagetronad-0.2.9.0.1.tbz) = n/VqDROC1xk76epXa0rwkRUxgOCRbCTDPBncRx6FLqc=
+SIZE (armagetronad-0.2.9.0.1.tbz) = 1907392
Index: patches/patch-config_Makefile_in
===================================================================
RCS file: /cvs/ports/games/armagetronad/patches/patch-config_Makefile_in,v
retrieving revision 1.3
diff -u -p -r1.3 patch-config_Makefile_in
--- patches/patch-config_Makefile_in 7 Jun 2017 15:00:05 -0000 1.3
+++ patches/patch-config_Makefile_in 17 Aug 2020 22:33:43 -0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-config_Makefile_in,v 1.3
Index: config/Makefile.in
--- config/Makefile.in.orig
+++ config/Makefile.in
-@@ -243,7 +243,7 @@ top_srcdir = @top_srcdir@
+@@ -328,7 +328,7 @@ top_srcdir = @top_srcdir@
version = @version@
# configuration location
Index: patches/patch-src_tron_gGame_cpp
===================================================================
RCS file: patches/patch-src_tron_gGame_cpp
diff -N patches/patch-src_tron_gGame_cpp
--- patches/patch-src_tron_gGame_cpp 4 Aug 2019 02:47:10 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_tron_gGame_cpp,v 1.1 2019/08/04 02:47:10 bcallah Exp $
-
-Index: src/tron/gGame.cpp
---- src/tron/gGame.cpp.orig
-+++ src/tron/gGame.cpp
-@@ -2173,7 +2173,7 @@ void ConnectToServer(nServerInfoBase *server)
- std::auto_ptr< nServerInfoBase > redirectTo( sn_GetRedirectTo() );
-
- // abort loop
-- if ( !(&(*redirectTo)) )
-+ if ( !(redirectTo.get()) )
- {
- break;
- }
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/games/armagetronad/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 12 Oct 2012 18:13:38 -0000 1.1.1.1
+++ pkg/PLIST 17 Aug 2020 22:33:43 -0000
@@ -56,6 +56,8 @@ share/armagetronad/resource/included/map
share/armagetronad/resource/included/map-0.1.dtd
share/armagetronad/resource/included/map-0.2.8_beta3.dtd
share/armagetronad/scripts/
+share/armagetronad/scripts/rcd_config
+share/armagetronad/scripts/rcd_startstop
share/armagetronad/scripts/relocate
share/armagetronad/scripts/sysinstall
share/armagetronad/sound/
@@ -78,6 +80,9 @@ share/armagetronad/textures/shadow.png
share/armagetronad/textures/sky.png
share/armagetronad/textures/title.jpg
share/doc/armagetronad/
+share/doc/armagetronad/COPYING.txt
+share/doc/armagetronad/Howto-Maps.txt
+share/doc/armagetronad/commands.txt
share/doc/armagetronad/html/
share/doc/armagetronad/html/bugs.html
share/doc/armagetronad/html/changelog.html
@@ -129,6 +134,12 @@ share/examples/armagetronad/examples/sin
@sample ${SYSCONFDIR}/armagetronad/examples/single_use_turbo.cfg
share/examples/armagetronad/examples/teamsumo.cfg
@sample ${SYSCONFDIR}/armagetronad/examples/teamsumo.cfg
+share/examples/armagetronad/keys_cursor.cfg
+share/examples/armagetronad/keys_cursor_single.cfg
+share/examples/armagetronad/keys_twohand.cfg
+share/examples/armagetronad/keys_wasd.cfg
+share/examples/armagetronad/keys_x.cfg
+share/examples/armagetronad/keys_zqsd.cfg
share/examples/armagetronad/master.srv
@sample ${SYSCONFDIR}/armagetronad/master.srv
share/examples/armagetronad/rc.config
