Honor LDFLAGS; should fix Linux build.

4 files changed, 28 insertions, 12 deletions

diff --git a/games/powwow/Makefile b/games/powwow/Makefile
index aad98350021..b01f50ee831 100644
--- a/games/powwow/Makefile
+++ b/games/powwow/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2012/04/15 22:01:01 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2012/05/23 06:23:02 dholland Exp $
 
 DISTNAME=	powwow-1.2.5
 PKGREVISION=	1
@@ -17,7 +17,8 @@ POWWOW_DIR=	${PREFIX}/share/powwow
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man6
 
 do-build:
-	cd ${WRKSRC} && POWWOW_DIR=${POWWOW_DIR} CFLAGS=${CFLAGS:Q} ./make_it
+	cd ${WRKSRC} && POWWOW_DIR=${POWWOW_DIR} CFLAGS=${CFLAGS:Q} \
+		LDFLAGS=${LDFLAGS:Q} ./make_it
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/powwow ${DESTDIR}${PREFIX}/bin
diff --git a/games/powwow/distinfo b/games/powwow/distinfo
index 2d5bbd9121b..2755183b678 100644
--- a/games/powwow/distinfo
+++ b/games/powwow/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.7 2011/10/03 04:37:05 dholland Exp $
+$NetBSD: distinfo,v 1.8 2012/05/23 06:23:02 dholland Exp $
 
 SHA1 (powwow-1.2.5.tar.gz) = 505bf2f269011970e450b2877646e6ff037ba992
 RMD160 (powwow-1.2.5.tar.gz) = f48363c42863a71384f329c2701712f911dd46f4
 Size (powwow-1.2.5.tar.gz) = 169159 bytes
-SHA1 (patch-aa) = c8359ddb3770aa6520dd50638f4dc6b183943566
-SHA1 (patch-ab) = 0ed2c51416e2fde2aa3e2813dea742c90c7ff855
+SHA1 (patch-aa) = c271348e756f3718c5238fa7d72849dcd39a4a8d
+SHA1 (patch-ab) = d5e96d03bb66d661bdac057c0b8ddd19ecdf6fec
 SHA1 (patch-ac) = 706a8bb8a9e58a26542248facf2859ba311c5b25
 SHA1 (patch-ad) = b6457008ca461255d2d3e60ed401b10bb0c4fdd5
 SHA1 (patch-ae) = 95df9c6c03a9fb48c6b133f8348faf7f8f57a957
diff --git a/games/powwow/patches/patch-aa b/games/powwow/patches/patch-aa
index d1f6e6750f1..5f04cb1ca74 100644
--- a/games/powwow/patches/patch-aa
+++ b/games/powwow/patches/patch-aa
@@ -1,8 +1,20 @@
-$NetBSD: patch-aa,v 1.1 2002/02/13 18:43:39 jdolecek Exp $
+$NetBSD: patch-aa,v 1.2 2012/05/23 06:23:02 dholland Exp $
 
---- Makefile.orig	Sat Dec  5 00:17:38 1998
-+++ Makefile	Wed Feb 13 15:56:45 2002
-@@ -61,8 +61,7 @@
+- don't overwrite pkgsrc LDFLAGS
+- remove interactive stall during build
+
+--- Makefile.orig	1998-12-04 23:17:38.000000000 +0000
++++ Makefile
+@@ -42,7 +42,7 @@ CFLAGS=$(CDEFS)
+ CC=cc
+ 
+ # Libraries: if VT100 is defined above, you don't need -ltermcap.
+-LDFLAGS= -ltermcap
++LDFLAGS+= -ltermcap
+ 
+ # TERM support
+ # term directory.  where you have term's client.a and client.h hidden
+@@ -61,8 +61,7 @@ echo:
  	@echo "WARNING: if you are coming from a 1.0.x version,"
  	@echo "re-read Changelog and powwow.doc as many things have changed."
  	@echo "In particular, syntax and effects of #prompt and #isprompt changed in 1.1.7"
diff --git a/games/powwow/patches/patch-ab b/games/powwow/patches/patch-ab
index ae0267ff913..a3b6f64633e 100644
--- a/games/powwow/patches/patch-ab
+++ b/games/powwow/patches/patch-ab
@@ -1,4 +1,7 @@
-$NetBSD: patch-ab,v 1.5 2005/12/19 15:45:01 joerg Exp $
+$NetBSD: patch-ab,v 1.6 2012/05/23 06:23:02 dholland Exp $
+
+- support NetBSD, MacOS, DragonFly
+- honor pkgsrc CFLAGS and LDFLAGS
 
 --- make_it.orig	2002-06-01 10:33:35.000000000 +0000
 +++ make_it
@@ -19,8 +22,8 @@ $NetBSD: patch-ab,v 1.5 2005/12/19 15:45:01 joerg Exp $
  		echo 'UNSUPPORTED OS!!! Trying with defaults.';;
  esac
 -echo "make" $* "CC='$CC' CDEFS='$CF' LDFLAGS='$LF' "
-+echo "make" $* "CC='$CC' CDEFS='$CF $CFLAGS' LDFLAGS='$LF' "
++echo "make" $* "CC='$CC' CDEFS='$CF $CFLAGS' LDFLAGS='$LF $LDFLAGS' "
  
 -make $* CC="${CC}" CDEFS="${CF}" LDFLAGS="${LF}"
-+make $* CC="${CC}" CDEFS="${CF} ${CFLAGS}" LDFLAGS="${LF}"
++make $* CC="${CC}" CDEFS="${CF} ${CFLAGS}" LDFLAGS="${LF} ${LDFLAGS}"