bmkdep updated to 20131215.

   PkgSrc patches for SunOS/Linux were applied.

4 files changed, 6 insertions, 109 deletions

diff --git a/devel/bmkdep/Makefile b/devel/bmkdep/Makefile
index a4bdd925d8e..342b1e82938 100644
--- a/devel/bmkdep/Makefile
+++ b/devel/bmkdep/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2013/12/08 16:33:35 cheusov Exp $
+# $NetBSD: Makefile,v 1.3 2014/01/02 00:19:22 cheusov Exp $
 
-DISTNAME=	bmkdep-20131009
+DISTNAME=	bmkdep-20131215
 CATEGORIES=	devel
 MASTER_SITES=	http://bmkdep.googlecode.com/files/
 
@@ -9,8 +9,6 @@ HOMEPAGE=	https://code.google.com/p/bmkdep/
 COMMENT=	NetBSD version of mkdep(1)
 LICENSE=	2-clause-bsd
 
-CPPFLAGS=	-Dlint=
-
 MAKE_ENV=	BINOWN=${BINOWN} BINGRP=${BINGRP} \
 		MANOWN=${MANOWN} MANGRP=${MANGRP} \
 		MKHTML=no MKCATPAGES=no
diff --git a/devel/bmkdep/distinfo b/devel/bmkdep/distinfo
index b9ca2d50ef5..3cbccdcb410 100644
--- a/devel/bmkdep/distinfo
+++ b/devel/bmkdep/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.3 2013/12/14 17:56:22 cheusov Exp $
+$NetBSD: distinfo,v 1.4 2014/01/02 00:19:22 cheusov Exp $
 
-SHA1 (bmkdep-20131009.tar.gz) = ee39788129f1f755718aeb63ede9214c17fe8e33
-RMD160 (bmkdep-20131009.tar.gz) = 4fb5ce80f88ee6b342830805a5ce15bd82e38160
-Size (bmkdep-20131009.tar.gz) = 7389 bytes
-SHA1 (patch-findcc.c) = c4b373f7f0a7967c76bc7c2be169eb4161605e3d
-SHA1 (patch-mkdep.c) = 22bfb9801e216e4e02802c534244f466d523dd9b
+SHA1 (bmkdep-20131215.tar.gz) = 6bfea86a97f71ec53374dcf9ca20e3785a468194
+RMD160 (bmkdep-20131215.tar.gz) = 3834c6593c78e48e118390c465b02209cc252686
+Size (bmkdep-20131215.tar.gz) = 7570 bytes
diff --git a/devel/bmkdep/patches/patch-findcc.c b/devel/bmkdep/patches/patch-findcc.c
deleted file mode 100644
index d0199c373e5..00000000000
--- a/devel/bmkdep/patches/patch-findcc.c
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-findcc.c,v 1.3 2013/12/14 17:56:22 cheusov Exp $
-
---- findcc.c.orig	2013-10-09 14:38:38.000000000 +0000
-+++ findcc.c
-@@ -33,7 +33,6 @@
- #include "nbtool_config.h"
- #endif
- 
--#include <sys/cdefs.h>
- #if !defined(lint)
- __COPYRIGHT("@(#) Copyright (c) 1999 The NetBSD Foundation, Inc.\
-  All rights reserved.");
diff --git a/devel/bmkdep/patches/patch-mkdep.c b/devel/bmkdep/patches/patch-mkdep.c
deleted file mode 100644
index 62d032d1f4c..00000000000
--- a/devel/bmkdep/patches/patch-mkdep.c
+++ /dev/null
@@ -1,87 +0,0 @@
-$NetBSD: patch-mkdep.c,v 1.3 2013/12/14 17:56:22 cheusov Exp $
-
-For better portability
---- mkdep.c.orig	2013-10-09 14:38:38.000000000 +0000
-+++ mkdep.c
-@@ -33,7 +33,6 @@
- #include "nbtool_config.h"
- #endif
- 
--#include <sys/cdefs.h>
- #if !defined(lint)
- __COPYRIGHT("@(#) Copyright (c) 1999 The NetBSD Foundation, Inc.\
-  All rights reserved.");
-@@ -48,15 +47,28 @@ __RCSID("$NetBSD: mkdep.c,v 1.43 2013/03
- #include <fcntl.h>
- #include <getopt.h>
- #include <locale.h>
-+
-+#ifndef __sun
- #include <paths.h>
- #define _WITH_DPRINTF
-+#endif
-+
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
- #include <unistd.h>
-+#include <limits.h>
- 
- #include "findcc.h"
- 
-+#ifndef _PATH_TMP
-+#define _PATH_TMP "/tmp"
-+#endif
-+
-+#ifndef _PATH_DEFPATH
-+#define _PATH_DEFPATH "/usr/bin:/bin:/usr/local/bin"
-+#endif
-+
- typedef struct opt opt_t;
- struct opt {
- 	opt_t	*left;
-@@ -89,13 +101,13 @@ deconst(const void *p)
- 	return (const char *)p - (const char *)0 + (char *)0;
- }
- 
--__dead2 static void
-+static void
- usage(void)
- {
- 	(void)fprintf(stderr,
- 	    "usage: %s [-aDdiopqv] [-f file] [-P prefix] [-s suffixes] "
- 	    "-- [flags] file ...\n",
--	    getprogname());
-+	    "bmkdep");
- 	exit(EXIT_FAILURE);
- }
- 
-@@ -229,12 +241,12 @@ main(int argc, char **argv)
- 	const char *prefix = NULL;
- 	const char *suffixes = NULL, *s;
- 	suff_list_t *suff_list = NULL, *sl;
-+	char incl [PATH_MAX+100];
- 
- 	suf = NULL;		/* XXXGCC -Wuninitialized [sun2] */
- 	sl = NULL;		/* XXXGCC -Wuninitialized [sun2] */
- 
- 	setlocale(LC_ALL, "");
--	setprogname(argv[0]);
- 
- 	aflag = O_WRONLY | O_APPEND | O_CREAT | O_TRUNC;
- 	dflag = 0;
-@@ -329,8 +341,14 @@ main(int argc, char **argv)
- 			} else
- 				fname = *argv++;
- 			if (iflag) {
-+#ifdef _WITH_DPRINTF
- 				if (dprintf(dependfile, ".-include \"%s\"\n",
- 				    fname) < 0)
-+#else
-+				snprintf (incl, sizeof (incl),
-+				    ".-include \"%s\"\n", fname);
-+				if (write(dependfile, incl, strlen(incl)) < 0)
-+#endif
- 					goto wrerror;
- 				continue;
- 			}