Import of pkgsrc-2016Q3

sysutils/bsdinstall/Makefile

@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.4 2015/06/04 17:21:06 ryoon Exp $
+# $NetBSD: Makefile,v 1.6 2016/01/28 13:38:53 jperkin Exp $
 
-DISTNAME=	bsdinstall-20130905
+DISTNAME=	bsdinstall-20160108
 CATEGORIES=	sysutils
 MASTER_SITES=	# empty
 DISTFILES=	# empty
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Portable version of the BSD install(1) program
+LICENSE=	modified-bsd
 
 BOOTSTRAP_PKG=	yes
 
@@ -22,6 +23,8 @@ do-extract:
 CPPFLAGS+=	-D_PATH_DEVNULL=\"/dev/null\"
 CPPFLAGS+=	-DTARGET_STRIP=\"${TOOLS_PLATFORM.strip:Q}\"
 
+CPPFLAGS.SunOS+=	-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+
 .include "../../mk/bsd.prefs.mk"
 .if !empty(MACHINE_PLATFORM:MSunOS-5.11-*)
 MAKE_ENV+=	NOGCCERROR=yes

sysutils/bsdinstall/files/bsdinstall.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: bsdinstall.c,v 1.2 2013/09/03 15:27:38 jperkin Exp $	*/
+/*	$NetBSD: bsdinstall.c,v 1.3 2015/11/18 12:12:49 jperkin Exp $	*/
 /*	NetBSD: xinstall.c,v 1.114 2009/11/12 10:10:49 tron Exp	*/
 
 /*
@@ -71,26 +71,22 @@ __RCSID("NetBSD: xinstall.c,v 1.114 2009/11/12 10:10:49 tron Exp");
 #endif
 #include <errno.h>
 #include <fcntl.h>
-#include <grp.h>
 #include <libgen.h>
-#if defined(HAVE_NBCOMPAT_H)
-#include <nbcompat/paths.h>
-#else
-#include <paths.h>
-#endif
-#include <pwd.h>
 #include <stdio.h>
-#if defined(HAVE_NBCOMPAT_H)
-#include <nbcompat/stdlib.h>
-#else
-#include <stdlib.h>
-#endif
 #include <string.h>
 #include <unistd.h>
 #if defined(HAVE_NBCOMPAT_H)
+#include <nbcompat/grp.h>
+#include <nbcompat/paths.h>
+#include <nbcompat/pwd.h>
+#include <nbcompat/stdlib.h>
 #include <nbcompat/util.h>
 #include <nbcompat/vis.h>
 #else
+#include <grp.h>
+#include <paths.h>
+#include <pwd.h>
+#include <stdlib.h>
 #include <util.h>
 #include <vis.h>
 #endif