ports/158961: [maintainer] upgrade net/openafs to 1.6.0pre7

[Ben Kaduk]

>Number:         158961
>Category:       ports
>Synopsis:       [maintainer] upgrade net/openafs to 1.6.0pre7
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jul 16 00:30:09 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Ben Kaduk
>Release:        9-current
>Organization:
MIT SIPB
>Environment:
n/a
>Description:
OpenAFS released the 1.6.0pre7 release candidate.
The attached patch updates our port to that version, as well as setting the SRC_BASE variable if not already defined, and devnulling config(8) output that might confuse users building the port.
Please note that all files/patch-* have been removed.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN openafs.old/Makefile openafs.submit/Makefile
--- openafs.old/Makefile	2011-07-03 22:48:03.000000000 -0400
+++ openafs.submit/Makefile	2011-07-15 20:18:00.000000000 -0400
@@ -3,12 +3,11 @@
 # Whom:                                 Ben Kaduk <kaduk at mit.edu>
 # Based on:                             port by Alec Kloss <alec at setfilepointer.com>
 #
-# $FreeBSD: ports/net/openafs/Makefile,v 1.4 2011/07/04 02:48:03 sunpoet Exp $
+# $FreeBSD$
 #
 
 PORTNAME=	openafs
-DISTVERSION=	1.6.0pre6
-PORTREVISION=	2
+DISTVERSION=	1.6.0pre7
 CATEGORIES=	net kld
 MASTER_SITES=	http://dl.central.org/dl/openafs/candidate/${DISTVERSION}/:openafs \
 		http://dl.openafs.org/dl/openafs/candidate/${DISTVERSION}/:openafs \
@@ -43,6 +42,7 @@
 .include <bsd.port.pre.mk>
 
 KERNCONF?=	GENERIC
+SRC_BASE?=	/usr/src
 KERNCONFDIR?=	${SRC_BASE}/sys/${ARCH}/conf
 KMODDIR=	/boot/modules
 PLIST_SUB+=	KMODDIR=${KMODDIR:C,^/,,}
@@ -85,9 +85,10 @@
 
 .include "Makefile.man"
 
+# do not show users the reminder about cleandepend and depend
 post-extract:
 	${MKDIR} ${WRKDIR}/conf
-	cd ${KERNCONFDIR} && /usr/sbin/config -d ${WRKDIR}/conf ${_KERNCONF}
+	cd ${KERNCONFDIR} && /usr/sbin/config -d ${WRKDIR}/conf ${_KERNCONF} >/dev/null
 
 create-sample-files:
 	@${ECHO_CMD} openafs.org > ${WRKDIR}/ThisCell
diff -ruN openafs.old/distinfo openafs.submit/distinfo
--- openafs.old/distinfo	2011-06-20 03:09:35.000000000 -0400
+++ openafs.submit/distinfo	2011-07-15 20:11:53.000000000 -0400
@@ -1,6 +1,6 @@
-SHA256 (openafs-1.6.0pre6-src.tar.bz2) = 34a9c959949b1a8395bc299656fb7aaae1087ee85d00d9823606db9d4d8413e5
-SIZE (openafs-1.6.0pre6-src.tar.bz2) = 14308775
-SHA256 (openafs-1.6.0pre6-doc.tar.bz2) = 53db2ee049a00522072c79ea63916e8621ae4498a68e9002157c4ecaa8d61216
-SIZE (openafs-1.6.0pre6-doc.tar.bz2) = 3474552
+SHA256 (openafs-1.6.0pre7-src.tar.bz2) = cad4faea83ab0ab8049930fdc1abf1208f5250cfb08bda1c406f62213e2893cc
+SIZE (openafs-1.6.0pre7-src.tar.bz2) = 14305674
+SHA256 (openafs-1.6.0pre7-doc.tar.bz2) = 5f9281aad3f00d589101e28d2b426158aabd2076c5c6d622622f3e86a447b8c7
+SIZE (openafs-1.6.0pre7-doc.tar.bz2) = 3475388
 SHA256 (CellServDB) = 3a1c77b82e714a6e131dfd93397f08bd2ba5f5cede7997494a39b3d61fe31f8b
 SIZE (CellServDB) = 36891
diff -ruN openafs.old/files/patch-src__afs__Makefile.in openafs.submit/files/patch-src__afs__Makefile.in
--- openafs.old/files/patch-src__afs__Makefile.in	2011-06-20 03:09:36.000000000 -0400
+++ openafs.submit/files/patch-src__afs__Makefile.in	1969-12-31 19:00:00.000000000 -0500
@@ -1,26 +0,0 @@
---- ./src/afs/Makefile.in.orig	2011-05-27 13:35:30.000000000 -0400
-+++ ./src/afs/Makefile.in	2011-06-16 13:27:08.000000000 -0400
-@@ -36,8 +36,6 @@
- 			gencat --new afszcm.cat afs_trace.msf ;; \
- 		*_darwin_* ) \
- 			gencat -new afszcm.cat afs_trace.msf ;; \
--		i386_fbsd*) \
--			echo No gencat for ${SYS_NAME} ;; \
- 		* ) \
- 			gencat afszcm.cat afs_trace.msf ;; \
- 	esac
-@@ -87,13 +85,7 @@
- 	    ${DESTDIR}${includedir}/afs/osi_inode.h
- 	${INSTALL_DATA} ${srcdir}/sysctl.h ${DESTDIR}${includedir}/afs/sysctl.h
- 	${INSTALL_DATA} unified_afs.h ${DESTDIR}${includedir}/afs/unified_afs.h
--	case ${SYS_NAME} in \
--	    i386_fbsd*) \
--		echo skipping afszcm.cat install for ${SYS_NAME} ;; \
--	    *) \
--		${INSTALL_DATA} afszcm.cat \
--		    ${DESTDIR}${afsdatadir}/C/afszcm.cat ;; \
--	esac
-+	${INSTALL_DATA} afszcm.cat ${DESTDIR}${afsdatadir}/C/afszcm.cat
- 	case ${SYS_NAME} in \
- 	    *linux*) \
- 		${INSTALL_DATA} ${srcdir}/${MKAFS_OSTYPE}/osi_vfs.h \
diff -ruN openafs.old/files/patch-src__afs__afs_call.c openafs.submit/files/patch-src__afs__afs_call.c
--- openafs.old/files/patch-src__afs__afs_call.c	2011-06-20 03:09:36.000000000 -0400
+++ openafs.submit/files/patch-src__afs__afs_call.c	1969-12-31 19:00:00.000000000 -0500
@@ -1,12 +0,0 @@
---- ./src/afs/afs_call.c.orig	2011-06-16 13:25:10.000000000 -0400
-+++ ./src/afs/afs_call.c	2011-06-16 13:26:19.000000000 -0400
-@@ -1253,7 +1253,9 @@
- 	afs_warn("afs: WARM ");
-     afs_warn("shutting down of: vcaches... ");
- 
-+#if !defined(AFS_FBSD_ENV)
-     afs_FlushAllVCaches();
-+#endif
- 
-     afs_warn("CB... ");
- 
diff -ruN openafs.old/files/patch-src__venus__Makefile.in openafs.submit/files/patch-src__venus__Makefile.in
--- openafs.old/files/patch-src__venus__Makefile.in	2011-06-20 03:09:36.000000000 -0400
+++ openafs.submit/files/patch-src__venus__Makefile.in	1969-12-31 19:00:00.000000000 -0500
@@ -1,11 +0,0 @@
---- ./src/venus/Makefile.in.orig	2011-06-16 13:45:41.000000000 -0400
-+++ ./src/venus/Makefile.in	2011-06-16 13:53:49.000000000 -0400
-@@ -298,6 +298,8 @@
- 	hp_ux11* ) \
- 		${INSTALL_SCRIPT} kdump.sh.hp_ux11 ${DESTDIR}${sbindir}/kdump; \
- 		${INSTALL_PROGRAM} kdump-build ${DESTDIR}${sbindir}/kdump ;; \
-+	*_fbsd* ) \
-+		;; \
- 	*) \
- 		${INSTALL_PROGRAM} kdump-build ${DESTDIR}${sbindir}/kdump ;; \
- 	esac


>Release-Note:
>Audit-Trail:
>Unformatted: