Add a distfile patch kit to mop up legacy C. Will hopefully fix the

clang build. PKGREVISION -> 6.

Caution: while it builds, it does not build cleanly -- adding function
prototypes turned up some systemic issues.

If anyone uses this package it would be helpful to try building it
with -Wall and look in to how to fix things properly.

5 files changed, 12 insertions, 46 deletions

diff --git a/x11/xdm3d/Makefile b/x11/xdm3d/Makefile
index 4b05634ab58..67f37ccd6fe 100644
--- a/x11/xdm3d/Makefile
+++ b/x11/xdm3d/Makefile
@@ -1,10 +1,14 @@
-# $NetBSD: Makefile,v 1.27 2012/10/29 05:07:01 asau Exp $
+# $NetBSD: Makefile,v 1.28 2013/06/16 17:32:06 dholland Exp $
 
 DISTNAME=		xdm3d-1.0
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 
+PATCHFILES=		xdm3d-jumbo-patch-20130616.gz
+PATCH_SITES=		http://www.NetBSD.org/~dholland/patchkits/xdm3d/
+PATCH_DIST_STRIP= -p1
+
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.hijinks.com/~spade/linux/XBanner/
 COMMENT=		Replacement for xdm with 3D effects
diff --git a/x11/xdm3d/distinfo b/x11/xdm3d/distinfo
index 6256c6be579..99b9fcc5bf3 100644
--- a/x11/xdm3d/distinfo
+++ b/x11/xdm3d/distinfo
@@ -1,12 +1,13 @@
-$NetBSD: distinfo,v 1.9 2012/01/08 00:33:34 dholland Exp $
+$NetBSD: distinfo,v 1.10 2013/06/16 17:32:06 dholland Exp $
 
 SHA1 (xdm3d-1.0.tar.gz) = 494a33aefee0c1545331b657bf47b90634b69648
 RMD160 (xdm3d-1.0.tar.gz) = 6a60c3afaf0756fc2c04256a79c61d413ee1a473
 Size (xdm3d-1.0.tar.gz) = 157858 bytes
+SHA1 (xdm3d-jumbo-patch-20130616.gz) = 5a41cc4b03a47d49d4a864cd2395da077cb8582c
+RMD160 (xdm3d-jumbo-patch-20130616.gz) = a7d5f8ecc57b46aaa525c481d8b66f0af95b969a
+Size (xdm3d-jumbo-patch-20130616.gz) = 38677 bytes
 SHA1 (patch-Xresources_3D) = db96d677d89ee86bad76785ac2bd254d902a0876
-SHA1 (patch-aa) = 4a86a37ad238e502352346fa86090b7578d862ee
 SHA1 (patch-ab) = 512f3df37f5480203c99198760fe98e2e127ae15
 SHA1 (patch-ac) = 9ea05506db86d181d9826f5c668899b7e760a8aa
-SHA1 (patch-ad) = 99285953811fe2e67acc99b74d9f5a685c5eb978
+SHA1 (patch-ad) = 4a4b6f3f10df6f27c0fb98fee27e4166ab0333cc
 SHA1 (patch-rpcauth_c) = 39e849564f5027cf0e5d5116c873ca88da92462e
-SHA1 (patch-session_c) = fec5f1438210fbba8586bcd62391ab17d8b4a743
diff --git a/x11/xdm3d/patches/patch-aa b/x11/xdm3d/patches/patch-aa
deleted file mode 100644
index ccfaf518114..00000000000
--- a/x11/xdm3d/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2000/10/02 07:38:41 jlam Exp $
-
---- genauth.c.orig	Tue Aug 18 05:19:56 1998
-+++ genauth.c
-@@ -171,7 +171,7 @@
- */
-     {
- #ifndef __EMX__
--	long    time ();
-+	Time_t  time ();
- #endif
- 
- 	ldata[0] = time ((long *) 0);
diff --git a/x11/xdm3d/patches/patch-ad b/x11/xdm3d/patches/patch-ad
index 931480335f5..221ba4010ff 100644
--- a/x11/xdm3d/patches/patch-ad
+++ b/x11/xdm3d/patches/patch-ad
@@ -1,19 +1,9 @@
-$NetBSD: patch-ad,v 1.2 2011/09/29 09:10:42 dholland Exp $
+$NetBSD: patch-ad,v 1.3 2013/06/16 17:32:06 dholland Exp $
 
-- needs pwd.h
 - ...?
 
 --- greeter/greet.c.orig	1998-08-18 09:24:56.000000000 +0000
 +++ greeter/greet.c
-@@ -38,6 +38,8 @@ from the X Consortium.
-  *
-  */
- 
-+#include <pwd.h>
-+
- #include <X11/Intrinsic.h>
- #include <X11/StringDefs.h>
- #include <X11/Shell.h>
 @@ -122,6 +124,9 @@ struct display *d;
  
  d = (struct display *) closure;
diff --git a/x11/xdm3d/patches/patch-session_c b/x11/xdm3d/patches/patch-session_c
deleted file mode 100644
index 39796c5c04f..00000000000
--- a/x11/xdm3d/patches/patch-session_c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-session_c,v 1.1 2011/09/29 09:10:42 dholland Exp $
-
-- needs pwd.h unconditionally.
-
---- session.c~	1998-08-09 11:29:30.000000000 +0000
-+++ session.c
-@@ -68,8 +68,8 @@ from the X Consortium.
- #endif
- #ifdef HAS_SETUSERCONTEXT
- #include <login_cap.h>
--#include <pwd.h>
- #endif
-+#include <pwd.h>
- 
- extern	int	PingServer();
- extern	int	SessionPingFailed();