update to 0.38

PR:		ports/76908
Submitted by:	Karsten Kretschmer <kkretsch@physik.tu-muenchen.de>

7 files changed, 108 insertions, 150 deletions

diff --git a/net/arla/Makefile b/net/arla/Makefile
index 370032179f46..98a70198d2e8 100644
--- a/net/arla/Makefile
+++ b/net/arla/Makefile
@@ -6,33 +6,43 @@
 #
 
 PORTNAME=	arla
-PORTVERSION=	0.35.6
+PORTVERSION=	0.38
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.stacken.kth.se/pub/arla/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A free AFS client implementation
 
-BROKEN=		"Does not build"
-EXPIRATION_DATE=2005-02-18
-DEPRECATED=	${BROKEN}
-
 USE_XLIB=	yes
-
-.if !exists(/usr/lib/libkafs.a)
-IGNORE=		requires kerberos
-.endif
+USE_RC_SUBR=	arla.sh
+USE_INC_LIBTOOL_VER=15
+INSTALLS_SHLIB=	yes
 
 .if !exists(/usr/src/sys/kern/vnode_if.src)
 IGNORE=		requires kernel source
 .endif
 
+.if defined(WITHOUT_KRB5)
+CONFIGURE_ARGS+=--without-krb5
+.elif !defined(WITH_SYSTEM_HEIMDAL)
+LIB_DEPENDS+=	krb5.20:${PORTSDIR}/security/heimdal
+CONFIGURE_ARGS+=--with-krb5=${LOCALBASE}
+.else
+CONFIGURE_ARGS+=--with-krb5=/usr
+.endif
+
 GNU_CONFIGURE=	yes
-MAN1=		rxdebug.1 tokens.1 unlog.1 aklog.1 klog.1 fs.1 kalog.1 pts.1 \
-		udebug.1
-MAN3=		cmd.3
-MAN5=		CellServDB.5 DynRootDB.5 ThisCell.5 SuidCells.5
-MAN8=		mount_xfs.8 umount_xfs.8 arlad.8 arla-cli.8 vos.8 bos.8
-INFO=		arla
+CONFIGURE_TARGET=
+MAN1=		afstool.1 arla-send-pr.1 kalog.1 pts.1 rxdebug.1 \
+		tokens.1 udebug.1
+MAN3=		arg_printusage.3 getarg.3 log_close.3 log_get_mask.3 \
+		log_log.3 log_mask2str.3 log_open.3 log_set_mask.3 \
+		log_set_mask_str.3 log_unit_free.3 log_unit_init.3 \
+		log_vlog.3
+MAN4=		nnpfs.4
+MAN5=		AliasDB.5 CellServDB.5 DynRootDB.5 SuidCells.5 \
+		ThisCell.5 arla.conf.5
+MAN8=		arla-cli.8 arlad.8 mount_nnpfs.8 umount_nnpfs.8 vos.8
+INFO=		arla send-pr
 
 .include <bsd.port.mk>
diff --git a/net/arla/distinfo b/net/arla/distinfo
index 8deb9a69fef7..0970564a6d5f 100644
--- a/net/arla/distinfo
+++ b/net/arla/distinfo
@@ -1,2 +1,2 @@
-MD5 (arla-0.35.6.tar.gz) = 42dbf03c908faf72ae38dfb3cfdffe53
-SIZE (arla-0.35.6.tar.gz) = 1290419
+MD5 (arla-0.38.tar.gz) = 6fa131f2c1ad4528bef21e0a840d3e70
+SIZE(arla-0.38.tar.gz) = 2138444
diff --git a/net/arla/files/arla.sh.in b/net/arla/files/arla.sh.in
new file mode 100644
index 000000000000..8a2c30a399e7
--- /dev/null
+++ b/net/arla/files/arla.sh.in
@@ -0,0 +1,51 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: arla
+# REQUIRE: NETWORKING
+# KEYWORD: FreeBSD
+
+# Add the following line to /etc/rc.conf to enable `arla':
+#
+#arla_enable="YES"
+#
+# See arla(1) for arla_flags
+#
+
+. "%%RC_SUBR%%"
+
+name="arla"
+rcvar=`set_rcvar`
+
+command="%%PREFIX%%/sbin/startarla"
+procname="%%PREFIX%%/libexec/arlad"
+pidfile="/var/run/arlad.pid"
+required_files="%%PREFIX%%/etc/$name.conf
+	%%PREFIX%%/etc/ThisCell
+	%%PREFIX%%/etc/CellServDB"
+
+stop_precmd="stop_precmd"
+
+stop_precmd()
+{
+	mount | grep -q 'arla on /afs (nnpfs)' && umount /afs
+}
+
+stop_postcmd="stop_postcmd"
+
+stop_postcmd()
+{
+	kldstat | grep -q ' nnpfs.ko$' && kldunload nnpfs
+	if ! rm "$pidfile" 2>/dev/null; then
+		warn "Couldn't remove $pidfile"
+	fi
+}
+
+# read settings, set default values
+load_rc_config "$name"
+: ${arla_enable="NO"}
+: ${arla_flags=""}
+
+run_rc_command "$1"
diff --git a/net/arla/files/patch-aa b/net/arla/files/patch-aa
deleted file mode 100644
index d9ddd96833de..000000000000
--- a/net/arla/files/patch-aa
+++ /dev/null
@@ -1,34 +0,0 @@
---- util/Makefile.in.orig	Sat Sep  8 18:55:41 2001
-+++ util/Makefile.in	Sat Sep  8 18:56:07 2001
-@@ -78,31 +78,8 @@
- libutil_LIB:	$(libutil_OBJS)
- 
- install:	all
--		$(MKINSTALLDIRS) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)
--		$(INSTALL_DATA) $(LIB) $(DESTDIR)$(libdir)/$(LIB)
--		for i in $(HEADERS); do \
--		  $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(includedir)/$$i; \
--		done ; \
--		MANPAGES='$(MANPAGES)'; for x in $$MANPAGES; do \
--			n=`echo $$x | sed 's/\(.*\)\.[1-9a-zA-Z]*$$/\1/'`; \
--			e=`echo $$x | sed 's/.*\.\([1-9a-zA-Z]*\)$$/\1/'`; \
--			f=`echo $$n | sed '$(transform)'`; \
--			$(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$$e ; \
--			$(INSTALL_DATA) $(srcdir)/$$x \
--				$(DESTDIR)$(mandir)/man$$e/$$f.$$e; \
--		done
- 
- uninstall:
--		rm -f $(DESTDIR)$(libdir)/$(LIB)
--		for i in $(HEADERS); do \
--			rm -f $(DESTDIR)$(includedir)/$$i; \
--		done ; \
--		MANPAGES='$(MANPAGES)'; for x in $$MANPAGES; do \
--			n=`echo $$x | sed 's/\(.*\)\.[1-9a-zA-Z]*$$/\1/'`; \
--			e=`echo $$x | sed 's/.*\.\([1-9a-zA-Z]*\)$$/\1/'`; \
--			f=`echo $$n | sed '$(transform)'`; \
--			rm -rf $(DESTDIR)$(mandir)/$$f.$$e; \
--		done
- 
- libutil.a:	$(libutil_OBJS)
- 		$(AR) cr $@ $(libutil_OBJS)
diff --git a/net/arla/files/patch-ac b/net/arla/files/patch-ac
deleted file mode 100644
index f7b804a4b06c..000000000000
--- a/net/arla/files/patch-ac
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: xfs/bsd/xfs_message.c
-===================================================================
-RCS file: /afs/stacken.kth.se/src/SourceRepository/arla/xfs/bsd/xfs_message.c,v
-retrieving revision 1.64.2.3
-diff -u -w -r1.64.2.3 xfs_message.c
---- xfs/bsd/xfs_message.c	2001/10/19 04:29:31	1.64.2.3
-+++ xfs/bsd/xfs_message.c	2002/01/07 04:28:29
-@@ -473,6 +473,15 @@
- 	/* XXX see comment in xfs_node_find */
- 	/* XXXSMP do gone[l] need to get mntvnode_slock ? */
- 
-+#if __FreeBSD_version >= 440002
-+	for(vp = TAILQ_FIRST(&XFS_TO_VFS(&xfs[fd])->mnt_nvnodelist);
-+	    vp != NULL; 
-+	    vp = next) {
-+
-+	    next = TAILQ_NEXT(vp, v_nmntvnodes);
-+	    gc_vnode (vp, p);
-+	}
-+#else
- 	for(vp = XFS_TO_VFS(&xfs[fd])->mnt_vnodelist.lh_first;
- 	    vp != NULL; 
- 	    vp = next) {
-@@ -480,6 +489,7 @@
- 	    next = vp->v_mntvnodes.le_next;
- 	    gc_vnode (vp, p);
- 	}
-+#endif
-     } else {
- 	struct xfs_node *t;
- 	int i;
diff --git a/net/arla/files/patch-ad b/net/arla/files/patch-ad
deleted file mode 100644
index f97c4eaaee57..000000000000
--- a/net/arla/files/patch-ad
+++ /dev/null
@@ -1,32 +0,0 @@
-Index: xfs/bsd/xfs_node-bsd.c
-===================================================================
-RCS file: /afs/stacken.kth.se/src/SourceRepository/arla/xfs/bsd/xfs_node-bsd.c,v
-retrieving revision 1.47.2.4
-diff -u -w -r1.47.2.4 xfs_node-bsd.c
---- xfs/bsd/xfs_node-bsd.c	2001/09/17 01:57:20	1.47.2.4
-+++ xfs/bsd/xfs_node-bsd.c	2002/01/07 04:31:03
-@@ -272,6 +272,15 @@
-      *       on FreeBSD once.
-      */
- 
-+#if __FreeBSD_version >= 440002
-+    for(t = TAILQ_FIRST(&XFS_TO_VFS(xfsp)->mnt_nvnodelist);
-+	t != NULL; 
-+	t = TAILQ_NEXT(t, v_nmntvnodes)) {
-+	xn = VNODE_TO_XNODE(t);
-+	if (xn && xfs_handle_eq(&xn->handle, handlep))
-+	    break;
-+    }
-+#else
-     for(t = XFS_TO_VFS(xfsp)->mnt_vnodelist.lh_first;
- 	t != NULL; 
- 	t = t->v_mntvnodes.le_next) {
-@@ -279,7 +288,7 @@
- 	if (xn && xfs_handle_eq(&xn->handle, handlep))
- 	    break;
-     }
--
-+#endif
-     if (t != NULL)
- 	return xn;
-     else
diff --git a/net/arla/pkg-plist b/net/arla/pkg-plist
index 92c7c1e20bce..464bab490e04 100644
--- a/net/arla/pkg-plist
+++ b/net/arla/pkg-plist
@@ -1,18 +1,18 @@
-bin/aklog
+bin/afsfsperf
+bin/afstool
 bin/amon
+bin/arla-send-pr
 bin/bos
 bin/fs
 bin/kalog
-bin/klog
 bin/mk_cmds
+bin/nnpfs.ko
 bin/pts
 bin/rxdebug
+bin/rxperf
 bin/tokens
 bin/udebug
-bin/unlog
-bin/up
 bin/vos
-bin/xfs.ko
 bin/ydr
 @unexec if cmp -s %D/etc/CellServDB %D/etc/CellServDB.default; then rm -f %D/etc/CellServDB; fi
 etc/CellServDB.default
@@ -22,23 +22,24 @@ etc/SuidCells.default
 etc/ThisCell.default
 @unexec if cmp -s %D/etc/arla.conf %D/etc/arla.conf.default; then rm -f %D/etc/arla.conf; fi
 etc/arla.conf.default
-include/afs/cmd.h
-include/arlalib.h
+include/arlamath.h
 include/atypes.h
-include/auth.h
 include/base64.h
+include/bool.h
 include/bos.cs.h
 include/cb.cs.h
 include/cb.h
 include/cb.ss.h
-include/cellconfig.h
 include/fs.cs.h
 include/fs.h
 include/fs.ss.h
 include/fs_errors.h
 include/getarg.h
-include/ka-procs.h
+include/hash.h
+include/heap.h
+include/list.h
 include/lock.h
+include/log.h
 include/lwp.h
 include/parse_bytes.h
 include/parse_time.h
@@ -48,22 +49,10 @@ include/pts.cs.h
 include/pts.h
 include/pts.ss.h
 include/resolve.h
+include/roken-common.h
 include/roken.h
 include/rtbl.h
-include/rx/rx.h
-include/rx/rx_clock.h
-include/rx/rx_event.h
-include/rx/rx_globs.h
-include/rx/rx_mach.h
-include/rx/rx_misc.h
-include/rx/rx_multi.h
-include/rx/rx_null.h
-include/rx/rx_pkt.h
-include/rx/rx_queue.h
-include/rx/rx_trace.h
-include/rx/rx_user.h
-include/rx/rxgencon.h
-include/rx/rxkad.h
+include/sl.h
 include/ss/ss.h
 include/timer.h
 include/ubik.cs.h
@@ -71,36 +60,41 @@ include/ubik.ss.h
 include/vldb.cs.h
 include/vldb.h
 include/vldb.ss.h
-info/arla.info
-lib/libacl.a
+include/xdbm.h
+lib/emacs/site-lisp/send-pr.el
 lib/libarlalib.a
+lib/libarlalib.la
+lib/libarlautil.a
+lib/libarlautil.la
 lib/libbosclient.a
 lib/libbosserver.a
 lib/libbufdir.a
-lib/libcmd.a
 lib/libkaclient.a
 lib/libkaserver.a
-lib/libko.a
 lib/liblwp.a
 lib/libptclient.a
 lib/libptserver.a
 lib/libroken.a
+lib/libroken.la
 lib/librx.a
+lib/librx.la
+lib/librxcbclient.a
+lib/librxcbserver.a
 lib/librxdefclient.a
 lib/librxfsserver.a
-lib/librxkad.a
 lib/librxvlserver.a
 lib/librxvolserver.a
 lib/libsl.a
+lib/libsl.la
 lib/libss.a
+lib/libss.la
 libexec/arlad
 sbin/arla-cli
-sbin/rxperf
-sbin/mount_xfs
+sbin/mount_nnpfs
+sbin/nnpfs_makedev
 sbin/startarla
-sbin/umount_xfs
-sbin/xfs_makedev
-@dirrm include/afs
-@dirrm include/rx
+sbin/umount_nnpfs
+share/gnats/stacken
 @dirrm include/ss
-@unexec rmdir cache 2>/dev/null || true
+@dirrm share/gnats
+@unexec rmdir %D/cache 2>/dev/null || true