[pkgsrc/trunk]: pkgsrc/games/koth libggi is a threaded library, so enforce th...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4a47b0864f8a
branches:  trunk
changeset: 510392:4a47b0864f8a
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Wed Mar 29 22:38:30 2006 +0000

description:
libggi is a threaded library, so enforce thread linkage. Otherwise
configure bails out e.g. on DragonFly, since the linkage test fails.
Fix GCC 3.4+: label at end of compound statement.

diffstat:

 games/koth/Makefile         |   4 +++-
 games/koth/distinfo         |   4 +++-
 games/koth/patches/patch-aa |  12 ++++++++++++
 games/koth/patches/patch-ac |  20 ++++++++++++++++++++
 4 files changed, 38 insertions(+), 2 deletions(-)

diffs (77 lines):

diff -r 6a273e8deb73 -r 4a47b0864f8a games/koth/Makefile
--- a/games/koth/Makefile       Wed Mar 29 22:16:07 2006 +0000
+++ b/games/koth/Makefile       Wed Mar 29 22:38:30 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/03/04 21:29:42 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2006/03/29 22:38:30 joerg Exp $
 #
 
 DISTNAME=      koth-0.8.0
@@ -11,6 +11,7 @@
 HOMEPAGE=      http://www.nongnu.org/koth/
 COMMENT=       The classic "shoot the other tank" artillery game, networked
 
+PTHREAD_AUTO_VARS=     yes
 GNU_CONFIGURE= YES
 CPPFLAGS+=     -DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR:Q}\""
 
@@ -25,5 +26,6 @@
 
 .include "../../graphics/libggi/buildlink3.mk"
 .include "../../graphics/libgii/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff -r 6a273e8deb73 -r 4a47b0864f8a games/koth/distinfo
--- a/games/koth/distinfo       Wed Mar 29 22:16:07 2006 +0000
+++ b/games/koth/distinfo       Wed Mar 29 22:38:30 2006 +0000
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.6 2005/02/23 23:12:00 agc Exp $
+$NetBSD: distinfo,v 1.7 2006/03/29 22:38:30 joerg Exp $
 
 SHA1 (koth-0.8.0.tar.bz2) = 6cb04ae1f09c4fb521fb47465ab91a1d67986c41
 RMD160 (koth-0.8.0.tar.bz2) = 3ea8ef52cab309a764e0379031606d2a949e6553
 Size (koth-0.8.0.tar.bz2) = 140569 bytes
+SHA1 (patch-aa) = 74119d2ff66b3187c16e625abab7972cb686d484
 SHA1 (patch-ab) = 69ce8862b3cdba97f3a4040b0004254b89de3606
+SHA1 (patch-ac) = b02bae2f24776c0b1f0778e2ac8d0c9a76711173
diff -r 6a273e8deb73 -r 4a47b0864f8a games/koth/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/games/koth/patches/patch-aa       Wed Mar 29 22:38:30 2006 +0000
@@ -0,0 +1,12 @@
+$NetBSD: patch-aa,v 1.3 2006/03/29 22:38:30 joerg Exp $
+
+--- src/relay.c.orig   2006-03-29 20:50:19.000000000 +0000
++++ src/relay.c
+@@ -260,6 +260,7 @@ void rlMain(Relay_rl * rl, struct timeva
+                   else goto bail;
+                   goto nextpkt;
+               bail:
++                  ;
+               }
+           }   
+       }
diff -r 6a273e8deb73 -r 4a47b0864f8a games/koth/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/games/koth/patches/patch-ac       Wed Mar 29 22:38:30 2006 +0000
@@ -0,0 +1,20 @@
+$NetBSD: patch-ac,v 1.3 2006/03/29 22:38:30 joerg Exp $
+
+--- src/ballistics.c.orig      2006-03-29 20:56:34.000000000 +0000
++++ src/ballistics.c
+@@ -92,6 +92,7 @@ void balSetWall()
+           break;
+       case WALL_LAST:
+           /* just to satisfy gcc -Wall */
++          break;
+     }
+ }
+ 
+@@ -210,6 +211,7 @@ Shellstat_bal balEnvironmentAdjustProjPo
+               break;
+           case WALL_RANDOM:   /* both of this can't happen, */
+           case WALL_LAST:     /* so they are here to satisfy gcc -Wall */
++              break;
+ 
+       }
+     }