[pkgsrc/trunk]: pkgsrc/games/xgalaga Fix build under Linux by removing local ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d89621a64699
branches:  trunk
changeset: 495586:d89621a64699
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Tue Jun 14 17:32:36 2005 +0000

description:
Fix build under Linux by removing local strdup(3) prototype and by using
LIBOSSAUDIO instead of hardcoding -lossaudio.  Closes PR pkg/29492 by
A L Meyers.

diffstat:

 games/xgalaga/Makefile         |   3 ++-
 games/xgalaga/distinfo         |   5 +++--
 games/xgalaga/patches/patch-aa |   4 ++--
 games/xgalaga/patches/patch-ad |  12 ++++++++++++
 4 files changed, 19 insertions(+), 5 deletions(-)

diffs (64 lines):

diff -r 7d2224b5a2da -r d89621a64699 games/xgalaga/Makefile
--- a/games/xgalaga/Makefile    Tue Jun 14 17:24:12 2005 +0000
+++ b/games/xgalaga/Makefile    Tue Jun 14 17:32:36 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/06/01 18:02:53 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2005/06/14 17:32:36 jmmv Exp $
 
 DISTNAME=              xgalaga-2.0.34
 PKGREVISION=           2
@@ -20,4 +20,5 @@
        ${INSTALL_MAN} ${WRKSRC}/README ${PREFIX}/share/xgalaga/README
 
 .include "../../graphics/xpm/buildlink3.mk"
+.include "../../mk/ossaudio.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 7d2224b5a2da -r d89621a64699 games/xgalaga/distinfo
--- a/games/xgalaga/distinfo    Tue Jun 14 17:24:12 2005 +0000
+++ b/games/xgalaga/distinfo    Tue Jun 14 17:32:36 2005 +0000
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.6 2005/02/23 23:12:04 agc Exp $
+$NetBSD: distinfo,v 1.7 2005/06/14 17:32:37 jmmv Exp $
 
 SHA1 (xgalaga-2.0.34.tar.gz) = 82dcb328af0d9e779c566f4225d7f072b1c17b7d
 RMD160 (xgalaga-2.0.34.tar.gz) = bf2cc91820c1cdb8e02bd35347b309cac27b3ba4
 Size (xgalaga-2.0.34.tar.gz) = 314189 bytes
-SHA1 (patch-aa) = 886d7c372e0b477f062402e5e919d32645c7deb2
+SHA1 (patch-aa) = 5c3bafdb21f2edbabb5efc6341f41d4b5c6318cb
 SHA1 (patch-ab) = 4131368cb7481ee20a753e0b45bd9560b157cf6f
 SHA1 (patch-ac) = ca85bafaa637fc03d1c53a527c7804a95c146fe3
+SHA1 (patch-ad) = 22b946b261c4d0969e48bf5de1ba0d55c3649bb8
diff -r 7d2224b5a2da -r d89621a64699 games/xgalaga/patches/patch-aa
--- a/games/xgalaga/patches/patch-aa    Tue Jun 14 17:24:12 2005 +0000
+++ b/games/xgalaga/patches/patch-aa    Tue Jun 14 17:32:36 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2001/09/08 00:09:10 hubertf Exp $
+$NetBSD: patch-aa,v 1.4 2005/06/14 17:32:37 jmmv Exp $
 
 --- Makefile.in.orig   Mon May 11 08:52:59 1998
 +++ Makefile.in
@@ -16,7 +16,7 @@
  
  $(SOUNDSRV): $(SOUNDOBJS)
 -      $(CC) $(LDFLAGS) -o $(SOUNDSRV) $(SOUNDOBJS) $(SOUNDLIBS)
-+      $(CC) $(LDFLAGS) -o $(SOUNDSRV) $(SOUNDOBJS) $(SOUNDLIBS) -lossaudio
++      $(CC) $(LDFLAGS) -o $(SOUNDSRV) $(SOUNDOBJS) $(SOUNDLIBS) $(LIBOSSAUDIO)
  
  install: all
        ./mkinstalldirs $(bindir)
diff -r 7d2224b5a2da -r d89621a64699 games/xgalaga/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/games/xgalaga/patches/patch-ad    Tue Jun 14 17:32:36 2005 +0000
@@ -0,0 +1,12 @@
+$NetBSD: patch-ad,v 1.1 2005/06/14 17:32:37 jmmv Exp $
+
+--- libsprite/data.c.orig      1998-04-12 08:03:22.000000000 +0200
++++ libsprite/data.c
+@@ -79,7 +79,6 @@ W_Font  W_HighlightFont = (W_Font) & two
+ W_Color W_White = WHITE, W_Black = BLACK, W_Red = RED, W_Green = GREEN;
+ W_Color W_Yellow = YELLOW, W_Cyan = CYAN, W_Grey = LIGHT_GREY, W_DarkGrey = DARK_GREY;
+ int     W_Textwidth, W_Textheight, W_BigTextwidth, W_BigTextheight;
+-char   *strdup();
+ 
+ int     W_in_message = 0;     /* jfy -- for Jerry's warp message hack */
+