Fix build of OpenAFS userland on at least NetBSD/amd64 7.0.

Hopefully NetBSD/x86 -current also works.

Should merely be a build fix, but bump PKGREVISION anyway.

This commit allocates sysname numbers that have not yet been submitted
upstream.

7 files changed, 103 insertions, 3 deletions

diff --git a/filesystems/openafs/Makefile b/filesystems/openafs/Makefile
index 31db4b60b0d..789396c5c6e 100644
--- a/filesystems/openafs/Makefile
+++ b/filesystems/openafs/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2016/03/18 17:11:37 jakllsch Exp $
+# $NetBSD: Makefile,v 1.12 2016/04/04 12:48:29 jakllsch Exp $
 
 DISTNAME=	openafs-1.6.17-src
 PKGNAME=	${DISTNAME:C/-src//}
+PKGREVISION=	1
 CATEGORIES=	filesystems net sysutils
 MASTER_SITES=	http://www.openafs.org/dl/openafs/1.6.17/
 EXTRACT_SUFX=	.tar.bz2
@@ -45,13 +46,18 @@ FILES_SUBST+=		HOSTNAME_CMD=${HOSTNAME_CMD:Q}
 BUILD_DEFS+= VARBASE
 
 # attempt to future-proof configuration
-pre-build:
+pre-patch:
 	cd ${WRKSRC}/src/config && for i in 70 80 90; do \
 		${SED} -e 's|nbsd60|nbsd'$$i'|g' param.i386_nbsd60.h > param.i386_nbsd$$i.h; \
 		${SED} -e 's|nbsd60|nbsd'$$i'|g' param.amd64_nbsd60.h > param.amd64_nbsd$$i.h; \
 		${CP} param.nbsd60.h param.nbsd$$i.h; \
 	done
 
+post-patch:
+	cd ${WRKSRC}/src/config && for i in 80 90; do \
+		${CP} param.nbsd70.h param.nbsd$$i.h; \
+	done
+
 MAKE_ENV+=	LD_RUN_PATH=${PREFIX}/lib
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/filesystems/openafs/distinfo b/filesystems/openafs/distinfo
index 218bf833127..9a8dc0fff03 100644
--- a/filesystems/openafs/distinfo
+++ b/filesystems/openafs/distinfo
@@ -1,7 +1,12 @@
-$NetBSD: distinfo,v 1.13 2016/03/18 17:11:37 jakllsch Exp $
+$NetBSD: distinfo,v 1.14 2016/04/04 12:48:29 jakllsch Exp $
 
 SHA1 (openafs-1.6.17-src.tar.bz2) = 1898679226a87659eb71e073de29384e4d8d4739
 RMD160 (openafs-1.6.17-src.tar.bz2) = b21fc9986cae46385c6440b14ac562d08cbc59c9
 SHA512 (openafs-1.6.17-src.tar.bz2) = 3ca61a7731c9bd9bae7da2f7b3900438fcc9f75c95b354574389c2203af2ec0a7b4dcaaf13a437743477fcad8a46c3bbb8c68255a976b9a9917b8f0a0cdf028f
 Size (openafs-1.6.17-src.tar.bz2) = 14607107 bytes
+SHA1 (patch-acinclude.m4) = 16efdc809c134698a0a834c3e8064d201f61ca68
+SHA1 (patch-configure) = be58e44c599e2c424a7b561010d890c97e5d871a
+SHA1 (patch-src_cf_osconf.m4) = 2ae23bc82dd3f19cfa3fecf50dcca514e09d7a4b
 SHA1 (patch-src_comerr_Makefile.in) = dd5e996481d7ef908710868aa9dc1b65feb98717
+SHA1 (patch-src_config_afs__sysnames.h) = b1b9da619b37e03d1be2bd6da6073332028b0227
+SHA1 (patch-src_config_param.nbsd70.h) = bebb86bd5c01e25befbb800f6ae43058e13524d4
diff --git a/filesystems/openafs/patches/patch-acinclude.m4 b/filesystems/openafs/patches/patch-acinclude.m4
new file mode 100644
index 00000000000..4f487f6c056
--- /dev/null
+++ b/filesystems/openafs/patches/patch-acinclude.m4
@@ -0,0 +1,14 @@
+$NetBSD: patch-acinclude.m4,v 1.1 2016/04/04 12:48:29 jakllsch Exp $
+
+--- acinclude.m4.orig	2016-03-16 14:31:22.000000000 +0000
++++ acinclude.m4
+@@ -777,6 +777,9 @@ case $AFS_SYSNAME in
+     *_nbsd40)   AFS_PARAM_COMMON=param.nbsd40.h  ;;
+     *_nbsd50)   AFS_PARAM_COMMON=param.nbsd50.h  ;;
+     *_nbsd60)   AFS_PARAM_COMMON=param.nbsd60.h  ;;
++    *_nbsd70)   AFS_PARAM_COMMON=param.nbsd70.h  ;;
++    *_nbsd80)   AFS_PARAM_COMMON=param.nbsd80.h  ;;
++    *_nbsd90)   AFS_PARAM_COMMON=param.nbsd90.h  ;;
+     *_obsd31)   AFS_PARAM_COMMON=param.obsd31.h  ;;
+     *_obsd32)   AFS_PARAM_COMMON=param.obsd32.h  ;;
+     *_obsd33)   AFS_PARAM_COMMON=param.obsd33.h  ;;
diff --git a/filesystems/openafs/patches/patch-configure b/filesystems/openafs/patches/patch-configure
new file mode 100644
index 00000000000..8d98491b93f
--- /dev/null
+++ b/filesystems/openafs/patches/patch-configure
@@ -0,0 +1,23 @@
+$NetBSD: patch-configure,v 1.1 2016/04/04 12:48:29 jakllsch Exp $
+
+--- configure.orig	2016-03-16 14:32:21.000000000 +0000
++++ configure
+@@ -7559,6 +7559,9 @@ case $AFS_SYSNAME in
+     *_nbsd40)   AFS_PARAM_COMMON=param.nbsd40.h  ;;
+     *_nbsd50)   AFS_PARAM_COMMON=param.nbsd50.h  ;;
+     *_nbsd60)   AFS_PARAM_COMMON=param.nbsd60.h  ;;
++    *_nbsd70)   AFS_PARAM_COMMON=param.nbsd70.h  ;;
++    *_nbsd80)   AFS_PARAM_COMMON=param.nbsd80.h  ;;
++    *_nbsd90)   AFS_PARAM_COMMON=param.nbsd90.h  ;;
+     *_obsd31)   AFS_PARAM_COMMON=param.obsd31.h  ;;
+     *_obsd32)   AFS_PARAM_COMMON=param.obsd32.h  ;;
+     *_obsd33)   AFS_PARAM_COMMON=param.obsd33.h  ;;
+@@ -23865,7 +23868,7 @@ case $AFS_SYSNAME in
+ 		XCFLAGS="-O2 -pipe -fPIC"
+ 		;;
+ 
+-	*nbsd2*|*nbsd3*|*nbsd4*|*nbsd5*|*nbsd6*)
++	*nbsd2*|*nbsd3*|*nbsd4*|*nbsd5*|*nbsd6*|*nbsd*0)
+ 		MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
+ 		MT_LIBS="-pthread"
+ 		PAM_OPTMZ=-O2
diff --git a/filesystems/openafs/patches/patch-src_cf_osconf.m4 b/filesystems/openafs/patches/patch-src_cf_osconf.m4
new file mode 100644
index 00000000000..b217a690e50
--- /dev/null
+++ b/filesystems/openafs/patches/patch-src_cf_osconf.m4
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_cf_osconf.m4,v 1.1 2016/04/04 12:48:29 jakllsch Exp $
+
+--- src/cf/osconf.m4.orig	2016-03-16 14:31:22.000000000 +0000
++++ src/cf/osconf.m4
+@@ -205,7 +205,7 @@ case $AFS_SYSNAME in
+ 		XCFLAGS="-O2 -pipe -fPIC"
+ 		;;
+ 
+-	*nbsd2*|*nbsd3*|*nbsd4*|*nbsd5*|*nbsd6*)
++	*nbsd2*|*nbsd3*|*nbsd4*|*nbsd5*|*nbsd6*|*nbsd*0)
+ 		MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
+ 		MT_LIBS="-pthread"
+ 		PAM_OPTMZ=-O2
diff --git a/filesystems/openafs/patches/patch-src_config_afs__sysnames.h b/filesystems/openafs/patches/patch-src_config_afs__sysnames.h
new file mode 100644
index 00000000000..31ad49d73d8
--- /dev/null
+++ b/filesystems/openafs/patches/patch-src_config_afs__sysnames.h
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_config_afs__sysnames.h,v 1.3 2016/04/04 12:48:29 jakllsch Exp $
+
+--- src/config/afs_sysnames.h.orig	2016-03-16 14:31:22.000000000 +0000
++++ src/config/afs_sysnames.h
+@@ -267,6 +267,12 @@
+ #define SYS_NAME_ID_macppc_nbsd50       2541
+ #define SYS_NAME_ID_amd64_nbsd60        2542
+ #define SYS_NAME_ID_i386_nbsd60         2543
++#define SYS_NAME_ID_amd64_nbsd70        2544
++#define SYS_NAME_ID_i386_nbsd70         2545
++#define SYS_NAME_ID_amd64_nbsd80        2546
++#define SYS_NAME_ID_i386_nbsd80         2547
++#define SYS_NAME_ID_amd64_nbsd90        2548
++#define SYS_NAME_ID_i386_nbsd90         2549
+ 
+ #define SYS_NAME_ID_i386_obsd31		2600
+ #define SYS_NAME_ID_i386_obsd32		2601
diff --git a/filesystems/openafs/patches/patch-src_config_param.nbsd70.h b/filesystems/openafs/patches/patch-src_config_param.nbsd70.h
new file mode 100644
index 00000000000..69ee6ca0026
--- /dev/null
+++ b/filesystems/openafs/patches/patch-src_config_param.nbsd70.h
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_config_param.nbsd70.h,v 1.1 2016/04/04 12:48:29 jakllsch Exp $
+
+--- src/config/param.nbsd70.h.orig	2016-04-03 18:39:15.000000000 +0000
++++ src/config/param.nbsd70.h
+@@ -41,6 +41,8 @@
+ #define AFS_NBSD30_ENV 1
+ #define AFS_NBSD40_ENV 1
+ #define AFS_NBSD50_ENV 1
++#define AFS_NBSD60_ENV 1
++#define AFS_NBSD70_ENV 1
+ #undef  AFS_NONFSTRANS
+ #define AFS_NONFSTRANS 1
+ 
+@@ -52,6 +54,8 @@
+ #define AFS_HAVE_STATVFS    1	/* System supports statvfs */
+ #endif
+ 
++#define ROOTINO UFS_ROOTINO
++
+ #ifndef UKERNEL
+ 
+ #if	!defined(ASSEMBLER) && !defined(__LANGUAGE_ASSEMBLY__) && !defined(IGNORE_STDS_H)