On 05/26/15 01:28, Michael wrote:
Hi ports,
Attached is an update for armagetronad.
Tested amd64 only, runs fine.
Comments or OKs?
Your patch doesn't apply here. And isn't totally correct.
Attached is a better one. Tested on i386.
~Brian
Index: Makefile
===================================================================
RCS file: /cvs/ports/games/armagetronad/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile 11 Mar 2013 11:07:37 -0000 1.3
+++ Makefile 26 May 2015 13:59:00 -0000
@@ -2,9 +2,8 @@
COMMENT = 3D light cycle game
-DISTNAME = armagetronad-0.2.8.3.2.src
+DISTNAME = armagetronad-0.2.8.3.3.src
PKGNAME = ${DISTNAME:S/.src//}
-REVISION = 0
CATEGORIES = games
@@ -13,15 +12,14 @@ HOMEPAGE = http://armagetronad.org/
# GPLv2+
PERMIT_PACKAGE_CDROM = Yes
-WANTLIB += GL GLU SDL SDL_image SDL_mixer c jpeg m png pthread
-WANTLIB += stdc++ xml2 z
+WANTLIB += GL GLU SDL SDL_image c jpeg m png pthread stdc++ xml2
+WANTLIB += z
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=armagetronad/}
MODULES = converters/libiconv
BUILD_DEPENDS = shells/bash
LIB_DEPENDS = devel/sdl-image \
- devel/sdl-mixer \
textproc/libxml
USE_GMAKE = Yes
Index: distinfo
===================================================================
RCS file: /cvs/ports/games/armagetronad/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo 18 Jan 2015 03:13:55 -0000 1.2
+++ distinfo 26 May 2015 13:59:00 -0000
@@ -1,2 +1,2 @@
-SHA256 (armagetronad-0.2.8.3.2.src.tar.gz) =
F+pkmoMxbRc5K8h4xIYuMG62DnkMsXoppVPTTclCntk=
-SIZE (armagetronad-0.2.8.3.2.src.tar.gz) = 2210610
+SHA256 (armagetronad-0.2.8.3.3.src.tar.gz) =
1ZouwQ7TZtDA6KtQ3ncipCCYFq9MQZbFj0rI8GhijpQ=
+SIZE (armagetronad-0.2.8.3.3.src.tar.gz) = 2230775
Index: patches/patch-config_Makefile_in
===================================================================
RCS file: /cvs/ports/games/armagetronad/patches/patch-config_Makefile_in,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-config_Makefile_in
--- patches/patch-config_Makefile_in 12 Oct 2012 18:13:38 -0000 1.1.1.1
+++ patches/patch-config_Makefile_in 26 May 2015 13:59:00 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-config_Makefile_in,v 1.1.1.1 2012/10/12 18:13:38 bentley Exp $
---- config/Makefile.in.orig Fri Oct 12 05:04:18 2012
-+++ config/Makefile.in Fri Oct 12 05:05:02 2012
-@@ -243,7 +243,7 @@ top_srcdir = @top_srcdir@
+--- config/Makefile.in.orig Thu Feb 26 14:38:11 2015
++++ config/Makefile.in Tue May 26 01:39:09 2015
+@@ -312,7 +312,7 @@ top_srcdir = @top_srcdir@
version = @version@
# configuration location
Index: patches/patch-configure
===================================================================
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- patches/patch-configure 12 Oct 2012 18:13:38 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-configure,v 1.1.1.1 2012/10/12 18:13:38 bentley Exp $
---- configure.orig Wed Aug 29 21:03:12 2012
-+++ configure Wed Aug 29 21:03:16 2012
-@@ -10629,8 +10629,8 @@ fi
- CPPFLAGS="$CPPFLAGS `libpng-config --cflags`"
- LIBS="$LIBS $PNGLIBS"
-
--ac_fn_c_check_func "$LINENO" "png_check_sig" "ac_cv_func_png_check_sig"
--if test "x$ac_cv_func_png_check_sig" = x""yes; then :
-+ac_fn_c_check_func "$LINENO" "png_sig_cmp" "ac_cv_func_png_sig_cmp"
-+if test "x$ac_cv_func_png_sig_cmp" = x""yes; then :
-
- else
- as_fn_error "You need libpng to compile Armagetron." "$LINENO" 5
