svn commit: r322286 - in head/net/openafs: . files

[Benjamin Kaduk]

Author: bjk (doc committer)
Date: Thu Jul  4 18:40:01 2013
New Revision: 322286
URL: http://svnweb.freebsd.org/changeset/ports/322286

Log:
  Update to 1.6.4
  
  Build fixes for 10-CURRENT will come in a separate commit.
  
  Approved by:	hrs (mentor, ports committer)

Deleted:
  head/net/openafs/files/patch-src__libafs__MakefileProto.FBSD.in
  head/net/openafs/files/patch-src__libuafs__MakefileProto.FBSD.in
Modified:
  head/net/openafs/Makefile
  head/net/openafs/distinfo
  head/net/openafs/files/patch-acinclude.m4
  head/net/openafs/files/patch-src__budb__Makefile.in
  head/net/openafs/files/patch-src__tbudb__Makefile.in

Modified: head/net/openafs/Makefile
==============================================================================
--- head/net/openafs/Makefile	Thu Jul  4 18:08:34 2013	(r322285)
+++ head/net/openafs/Makefile	Thu Jul  4 18:40:01 2013	(r322286)
@@ -21,7 +21,7 @@ LICENSE_NAME=	IBM Public License Version
 LICENSE_FILE=	${WRKSRC}/doc/LICENSE
 LICENSE_PERMS=	auto-accept
 
-AFS_DISTVERSION=	1.6.2
+AFS_DISTVERSION=	1.6.4
 DBVERSION=	2013-01-28
 
 OPTIONS_DEFINE=	FUSE
@@ -44,10 +44,6 @@ PLIST_SUB+=	AFSMNTDIR=${AFSMNTDIR:C,^/,,
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} > 1000000
-BROKEN=		Does not build
-.endif
-
 KERNCONF?=	GENERIC
 KERNCONFDIR?=	${SRC_BASE}/sys/${ARCH}/conf
 KMODDIR=	/boot/modules
@@ -65,6 +61,9 @@ IGNORE=	requires kernel configuration fi
 .if ${OSVERSION} < 800000
 IGNORE=	supports FreeBSD 8.0 and later
 .endif
+.if ${OSVERSION} > 1000000
+IGNORE=	Does not build
+.endif
 
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
 	--localstatedir=/var \

Modified: head/net/openafs/distinfo
==============================================================================
--- head/net/openafs/distinfo	Thu Jul  4 18:08:34 2013	(r322285)
+++ head/net/openafs/distinfo	Thu Jul  4 18:40:01 2013	(r322286)
@@ -1,6 +1,6 @@
-SHA256 (openafs-1.6.2-src.tar.bz2) = 0db0877cd42131a744472ad0abfa26a4402a5bad94adb4d1eada75c8b6895bc9
-SIZE (openafs-1.6.2-src.tar.bz2) = 14378378
-SHA256 (openafs-1.6.2-doc.tar.bz2) = 3b1fecde4cea104d62fde9d4ac78bc4f28c64bc2c4f527bfefd27789facaae1e
-SIZE (openafs-1.6.2-doc.tar.bz2) = 3483994
+SHA256 (openafs-1.6.4-src.tar.bz2) = a724d23c0cf942e2c463487b4ce213db41ac5801c8a8d74d372d5757313224d7
+SIZE (openafs-1.6.4-src.tar.bz2) = 14562800
+SHA256 (openafs-1.6.4-doc.tar.bz2) = e0953c67dc9eee6bb4494d935e4e7ae560332405f670315ecc86c178fde2c93e
+SIZE (openafs-1.6.4-doc.tar.bz2) = 3493373
 SHA256 (CellServDB.2013-01-28) = faa755c6e13d8a71182a4036d1cee01bce49fb2a93feb6499683f22049391a17
 SIZE (CellServDB.2013-01-28) = 36787

Modified: head/net/openafs/files/patch-acinclude.m4
==============================================================================
--- head/net/openafs/files/patch-acinclude.m4	Thu Jul  4 18:08:34 2013	(r322285)
+++ head/net/openafs/files/patch-acinclude.m4	Thu Jul  4 18:40:01 2013	(r322286)
@@ -26,6 +26,6 @@
 +fi
 +AC_SUBST(INSTALL_KAUTH)
 +
- AC_CHECK_FUNCS(snprintf strlcat strlcpy flock getrlimit strnlen tsearch)
- AC_CHECK_FUNCS(setprogname getprogname sigaction mkstemp vsnprintf strerror strcasestr)
- AC_CHECK_FUNCS(setvbuf vsyslog getcwd)
+ AC_CHECK_FUNCS([ \
+	daemon \
+	flock \

Modified: head/net/openafs/files/patch-src__budb__Makefile.in
==============================================================================
--- head/net/openafs/files/patch-src__budb__Makefile.in	Thu Jul  4 18:08:34 2013	(r322285)
+++ head/net/openafs/files/patch-src__budb__Makefile.in	Thu Jul  4 18:40:01 2013	(r322286)
@@ -1,16 +1,10 @@
---- openafs-1.6.1/src/budb/Makefile.in	2012-06-24 06:49:53.000000000 +0900
-+++ openafs-1.6.1/src/budb/Makefile.in	2012-06-24 06:50:00.000000000 +0900
-@@ -76,10 +76,9 @@
- #
- budb_errs.o: budb_errs.c budb_client.h budb_errs.h
-
--budb_client.h: budb_errs.c
--
--budb_errs.c: budb_errs.et budb_client.p.h
--	$(RM) -f budb_client.h budb_errs.c; ${COMPILE_ET} -p ${srcdir} budb_errs -h budb_client
-+budb_errs.c budb_client.h: budb_errs.et budb_client.p.h
-+	$(RM) -f budb_client.h budb_errs.c
-+	${COMPILE_ET} -p ${srcdir} budb_errs -h budb_client
-
- budb_errs.h: budb_errs.et
- 	${COMPILE_ET} -p ${srcdir} budb_errs
+--- a/src/budb/Makefile.in	2013-06-19 16:52:25.000000000 -0400
++++ b/src/budb/Makefile.in	2013-06-19 16:53:06.000000000 -0400
+@@ -80,6 +80,7 @@
+ 
+ database.o: database.c budb_errs.h globals.h ${INCLS}
+ db_alloc.o: db_alloc.c budb_errs.h ${INCLS}
++db_dump.o: dbs_dump.c budb_errs.h ${INCLS}
+ dbs_dump.o: dbs_dump.c budb_errs.h ${INCLS}
+ db_lock.o:  db_lock.c budb_errs.h ${INCLS}
+ db_text.o:  db_text.c budb_errs.h ${INCLS}

Modified: head/net/openafs/files/patch-src__tbudb__Makefile.in
==============================================================================
--- head/net/openafs/files/patch-src__tbudb__Makefile.in	Thu Jul  4 18:08:34 2013	(r322285)
+++ head/net/openafs/files/patch-src__tbudb__Makefile.in	Thu Jul  4 18:40:01 2013	(r322286)
@@ -1,14 +1,11 @@
---- openafs-1.6.1/src/tbudb/Makefile.in.orig	2012-03-27 08:03:34.000000000 +0900
-+++ openafs-1.6.1/src/tbudb/Makefile.in	2012-06-24 06:44:51.000000000 +0900
-@@ -62,8 +62,9 @@
- #
- budb_errs.o: budb_errs.c budb_client.h budb_errs.h
-
--budb_errs.c budb_client.h: ${BUDB}/budb_errs.et ${BUDB}/budb_client.p.h
--	$(RM) -f budb_client.h budb_errs.c; ${COMPILE_ET} -p ${srcdir}/${BUDB} budb_errs -h budb_client
-+budb_errs.c budb_client.h: budb_errs.h ${BUDB}/budb_errs.et ${BUDB}/budb_client.p.h
-+	$(RM) -f budb_client.h budb_errs.c
-+	${COMPILE_ET} -p ${srcdir}/${BUDB} budb_errs -h budb_client
-
- budb_errs.h: ${BUDB}/budb_errs.et
- 	${COMPILE_ET} -p ${srcdir}/${BUDB} budb_errs
+--- a/src/tbudb/Makefile.in	2013-06-19 16:52:31.000000000 -0400
++++ b/src/tbudb/Makefile.in	2013-06-19 16:54:02.000000000 -0400
+@@ -122,7 +122,7 @@
+ db_alloc.o: ${BUDB}/db_alloc.c budb_errs.h ${INCLS}
+ 	${CCRULE} ${srcdir}/${BUDB}/db_alloc.c
+ 
+-db_dump.o: ${BUDB}/db_dump.c
++db_dump.o: ${BUDB}/db_dump.c budb_errs.h ${INCLS}
+ 	${CCRULE} ${srcdir}/${BUDB}/db_dump.c
+ 
+ dbs_dump.o: ${BUDB}/dbs_dump.c budb_errs.h ${INCLS}