Fix build on -current. Fix a minor piece of pkglint.

4 files changed, 46 insertions, 3 deletions

diff --git a/games/powwow/Makefile b/games/powwow/Makefile
index 900759759e9..660ad4da97e 100644
--- a/games/powwow/Makefile
+++ b/games/powwow/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2011/01/03 15:06:38 obache Exp $
+# $NetBSD: Makefile,v 1.13 2011/10/03 04:37:05 dholland Exp $
 
 DISTNAME=	powwow-1.2.5
 PKGREVISION=	1
@@ -17,7 +17,7 @@ POWWOW_DIR=	${PREFIX}/share/powwow
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man6
 
 do-build:
-	cd ${WRKSRC} && POWWOW_DIR="${POWWOW_DIR}" CFLAGS="${CFLAGS}" ./make_it
+	cd ${WRKSRC} && POWWOW_DIR=${POWWOW_DIR} CFLAGS=${CFLAGS:Q} ./make_it
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/powwow ${DESTDIR}${PREFIX}/bin
diff --git a/games/powwow/distinfo b/games/powwow/distinfo
index 061e69c398f..2d5bbd9121b 100644
--- a/games/powwow/distinfo
+++ b/games/powwow/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2005/12/19 15:45:01 joerg Exp $
+$NetBSD: distinfo,v 1.7 2011/10/03 04:37:05 dholland Exp $
 
 SHA1 (powwow-1.2.5.tar.gz) = 505bf2f269011970e450b2877646e6ff037ba992
 RMD160 (powwow-1.2.5.tar.gz) = f48363c42863a71384f329c2701712f911dd46f4
@@ -9,3 +9,5 @@ SHA1 (patch-ac) = 706a8bb8a9e58a26542248facf2859ba311c5b25
 SHA1 (patch-ad) = b6457008ca461255d2d3e60ed401b10bb0c4fdd5
 SHA1 (patch-ae) = 95df9c6c03a9fb48c6b133f8348faf7f8f57a957
 SHA1 (patch-af) = 2cbe5149dce20edc31a623ea382cbf707e8b029a
+SHA1 (patch-ptr_c) = 31eee41c78932021c2e4f4166d24d60a24350af9
+SHA1 (patch-ptr_h) = 0078a4e5e26458b71fd1b8b0ad88841a21d6de86
diff --git a/games/powwow/patches/patch-ptr_c b/games/powwow/patches/patch-ptr_c
new file mode 100644
index 00000000000..93fde0f0dd4
--- /dev/null
+++ b/games/powwow/patches/patch-ptr_c
@@ -0,0 +1,25 @@
+$NetBSD: patch-ptr_c,v 1.1 2011/10/03 04:37:06 dholland Exp $
+
+- Avoid conflict with libc memrchr. Appears to have the same intent,
+but this is the path of least resistance.
+
+--- ptr.c~	2000-01-13 21:49:33.000000000 +0000
++++ ptr.c
+@@ -411,7 +411,7 @@ char *ptrchr __P2 (ptr,p, char,c)
+  * find last occurrence of c in p
+  * return NULL if none found.
+  */
+-char *memrchr __P3 (char *,p, int,lenp, char,c)
++char *memrchrx __P3 (char *,p, int,lenp, char,c)
+ {
+     char *v, *s = p;
+ 
+@@ -431,7 +431,7 @@ char *memrchr __P3 (char *,p, int,lenp, 
+ char *ptrrchr __P2 (ptr,p, char,c)
+ {
+     if (p)
+-	return memrchr(ptrdata(p), ptrlen(p), c);
++	return memrchrx(ptrdata(p), ptrlen(p), c);
+     return (char*)p; /* shortcut for NULL */
+ }
+ 
diff --git a/games/powwow/patches/patch-ptr_h b/games/powwow/patches/patch-ptr_h
new file mode 100644
index 00000000000..d1eec99ab33
--- /dev/null
+++ b/games/powwow/patches/patch-ptr_h
@@ -0,0 +1,16 @@
+$NetBSD: patch-ptr_h,v 1.1 2011/10/03 04:37:06 dholland Exp $
+
+- Avoid conflict with libc memrchr. Appears to have the same intent,
+but this is the path of least resistance.
+
+--- ptr.h~	1998-10-19 20:52:24.000000000 +0000
++++ ptr.h
+@@ -56,7 +56,7 @@ char *ptrmchrs  __P ((ptr p, char *q, in
+ char *ptrrchrs  __P ((ptr p, ptr q));
+ char *ptrmrchrs __P ((ptr p, char *q, int lenq));
+ 
+-char *memrchr   __P ((char *p, int lenp, char c));
++char *memrchrx   __P ((char *p, int lenp, char c));
+ char *memchrs   __P ((char *p, int lenp, char *q, int lenq));
+ char *memrchrs  __P ((char *p, int lenp, char *q, int lenq));
+ #ifdef _GNU_SOURCE