update to 0.40 - still broken (compiles on 5, but overwrites files from

security/heimdal, does not compile on 6, and won't compile on 4 because
security/heimdal is broken)

11 files changed, 329 insertions, 68 deletions

diff --git a/net/arla/Makefile b/net/arla/Makefile
index efecb1d4e68c..4a7701316100 100644
--- a/net/arla/Makefile
+++ b/net/arla/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	arla
-PORTVERSION=	0.38
+PORTVERSION=	0.40
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.stacken.kth.se/pub/arla/
 
@@ -18,7 +18,15 @@ USE_RC_SUBR=	arla.sh
 USE_INC_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
 
-BROKEN=		Broken pkg-plist
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 500000
+BROKEN=		"security/heimdal is broken"
+.elif ${OSVERSION} < 600007
+BROKEN=		"compiles but overwrites files from a dependency (security/heimdal)"
+.else
+BROKEN=		"does not compile"
+.endif
 
 .if !exists(/usr/src/sys/kern/vnode_if.src)
 IGNORE=		requires kernel source
@@ -38,14 +46,11 @@ CONFIGURE_ARGS+=--with-krb5=/usr
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=
 
-.include <bsd.port.pre.mk>
-.if ${OSVERSION} > 500000
-WITHOUT_NNPFS=	YES
-.endif
+MAKE_ENV+=	OSVERSION=${OSVERSION}
 
 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 \
+MAN3=		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
diff --git a/net/arla/distinfo b/net/arla/distinfo
index 0970564a6d5f..3f4b19f0f031 100644
--- a/net/arla/distinfo
+++ b/net/arla/distinfo
@@ -1,2 +1,2 @@
-MD5 (arla-0.38.tar.gz) = 6fa131f2c1ad4528bef21e0a840d3e70
-SIZE(arla-0.38.tar.gz) = 2138444
+MD5 (arla-0.40.tar.gz) = 5b2008573d6f0232b53c76c7b549c17c
+SIZE (arla-0.40.tar.gz) = 2151739
diff --git a/net/arla/files/patch-configure b/net/arla/files/patch-configure
index 7c73145bc8fb..e1570b1b86cf 100644
--- a/net/arla/files/patch-configure
+++ b/net/arla/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Sat Dec 25 17:45:33 2004
-+++ configure	Sun May  8 12:15:13 2005
-@@ -6685,8 +6685,8 @@
+--- configure.orig	Mon Jun 20 19:44:58 2005
++++ configure	Sat Jun 25 15:08:54 2005
+@@ -6727,14 +6727,18 @@
    echo "$as_me:$LINENO: result: DragonFly" >&5
  echo "${ECHO_T}DragonFly" >&6
    ;;
@@ -11,7 +11,18 @@
  echo "${ECHO_T}FreeBSD [345].x" >&6
    KERNEL_INCLUDE=-I`(cd $srcdir; pwd)`/nnpfs/bsd
    KERNEL_SRCS='bsd-subr.c'
-@@ -26111,7 +26111,7 @@
+   KERNEL_HDRS=''
+-  KERNEL=`sysctl -n kern.bootfile`
+ 
++  case $nnpfs_target in
++    freebsd[3-4]*) KERNEL=/kernel;;
++    freebsd[5-9]*) KERNEL=/boot/kernel/kernel;;
++  esac
++      
+ if test X"$GCC" = Xyes ; then
+   BSD_WERROR=-Werror
+ fi
+@@ -26266,7 +26270,7 @@
  
  
  # This can be used to rebuild libtool when needed
@@ -20,7 +31,66 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -55595,7 +55595,14 @@
+@@ -55270,10 +55274,37 @@
+     eval "ac_cv_kernel_func_$ac_func=no"
+   fi
+ elif expr "$target_os" : "freebsd" >/dev/null 2>&1; then
+-  if nm  $KERNEL | egrep "T $ac_func" > /dev/null 2>&1; then
+-    eval "ac_cv_kernel_func_$ac_func=yes"
++  if [ -f $KERNEL ] ; then
++    if nm  $KERNEL | egrep "T $ac_func" > /dev/null 2>&1; then
++      eval "ac_cv_kernel_func_$ac_func=yes"
++    else
++      eval "ac_cv_kernel_func_$ac_func=no"
++    fi
+   else
+-    eval "ac_cv_kernel_func_$ac_func=no"
++      case $ac_func in
++         lockmgr|vop_stdpathconf|lf_advlock|vfs_getvfs|vgonel|uma_zfree_arg|\
++         vfs_cache_lookup|vnode_pager_generic_putpages|vnode_pager_generic_getpages|\
++         vnode_pager_setsize|devtoname|snprintf|nosys|cache_purgevfs)
++            eval "ac_cv_kernel_func_$ac_func=yes"
++            ;;
++         *)
++            case $nnpfs_target in
++               freebsd5*)
++                  case $ac_func in
++                     findcdev|vop_revoke|vfs_add_vnodeops|vfs_register)
++                        eval "ac_cv_kernel_func_$ac_func=yes"
++                        ;;
++                     *)
++                        eval "ac_cv_kernel_func_$ac_func=no"
++                        ;;
++                  esac
++                  ;;
++               *)
++                  eval "ac_cv_kernel_func_$ac_func=no"
++                  ;;
++            esac
++            ;;
++      esac
+   fi
+ elif expr "$target_os" : "dragonfly" >/dev/null 2>&1; then
+   if nm  $KERNEL | egrep "T $ac_func" > /dev/null 2>&1; then
+@@ -55526,10 +55557,14 @@
+     eval "ac_cv_kernel_func_memcpy=no"
+   fi
+ elif expr "$target_os" : "freebsd" >/dev/null 2>&1; then
+-  if nm  $KERNEL | egrep "T memcpy" > /dev/null 2>&1; then
+-    eval "ac_cv_kernel_func_memcpy=yes"
++  if [ -f "${KERNEL}" ] ; then
++    if nm  $KERNEL | egrep "T memcpy" > /dev/null 2>&1; then
++      eval "ac_cv_kernel_func_memcpy=yes"
++    else
++      eval "ac_cv_kernel_func_memcpy=no"
++    fi
+   else
+-    eval "ac_cv_kernel_func_memcpy=no"
++    eval "ac_cv_kernel_func_memcpy=yes"
+   fi
+ elif expr "$target_os" : "dragonfly" >/dev/null 2>&1; then
+   if nm  $KERNEL | egrep "T memcpy" > /dev/null 2>&1; then
+@@ -55750,7 +55785,14 @@
  elif test -f $SYS/kern/vnode_if.sh; then
    /bin/sh $SYS/kern/vnode_if.sh $SYS/kern/vnode_if.src
  elif test -f $SYS/tools/vnode_if.awk ; then
@@ -36,3 +106,33 @@
  else
    { { echo "$as_me:$LINENO: error: unable to find any vnode_if script" >&5
  echo "$as_me: error: unable to find any vnode_if script" >&2;}
+@@ -56693,10 +56735,26 @@
+     eval "ac_cv_kernel_func_$ac_func=no"
+   fi
+ elif expr "$target_os" : "freebsd" >/dev/null 2>&1; then
+-  if nm  $KERNEL | egrep "T $ac_func" > /dev/null 2>&1; then
+-    eval "ac_cv_kernel_func_$ac_func=yes"
++  if [ -f $KERNEL ] ; then
++    if nm  $KERNEL | egrep "T $ac_func" > /dev/null 2>&1; then
++      eval "ac_cv_kernel_func_$ac_func=yes"
++    else
++      eval "ac_cv_kernel_func_$ac_func=no"
++    fi
+   else
+-    eval "ac_cv_kernel_func_$ac_func=no"
++    case $nnpfs_target in
++       freebsd5*)
++          case $ac_func in
++             vfs_object_create)
++                eval "ac_cv_kernel_func_$ac_func=yes"
++                ;;
++             *)
++                eval "ac_cv_kernel_func_$ac_func=no"
++          esac
++          ;;
++       *)
++          eval "ac_cv_kernel_func_$ac_func=no"
++    esac
+   fi
+ elif expr "$target_os" : "dragonfly" >/dev/null 2>&1; then
+   if nm  $KERNEL | egrep "T $ac_func" > /dev/null 2>&1; then
diff --git a/net/arla/files/patch-nnpfs-bsd-Makefile.in b/net/arla/files/patch-nnpfs-bsd-Makefile.in
new file mode 100644
index 000000000000..f84fe3d31f92
--- /dev/null
+++ b/net/arla/files/patch-nnpfs-bsd-Makefile.in
@@ -0,0 +1,22 @@
+--- nnpfs/bsd/Makefile.in.orig	Sat Mar 26 11:58:45 2005
++++ nnpfs/bsd/Makefile.in	Sat Jun 25 12:05:51 2005
+@@ -40,7 +40,7 @@
+ 		  -I$(srcdir)/../include
+ 
+ DEFS		   = @DEFS@ $(INCDEFS) -DNNPFS_DEBUG @ARLA_KNFS@
+-CFLAGS = @CFLAGS@ @KERNEL_CFLAGS@ @KERNEL_CPPFLAGS@ -Wno-unused @BSD_WERROR@
++CFLAGS = -fno-builtin @CFLAGS@ @KERNEL_CFLAGS@ @KERNEL_CPPFLAGS@ -Wno-unused @BSD_WERROR@
+ 
+ SYS		= @SYS@
+ 
+@@ -182,6 +182,10 @@
+           fi; \
+ 	elif test -f $(SYS)/tools/vnode_if.awk ; then \
+ 	  awk -f $(SYS)/tools/vnode_if.awk $(SYS)/kern/vnode_if.src -h ; \
++	  if [ "${OSVERSION}" -gt 600000 ] ; then \
++	    awk -f $(SYS)/tools/vnode_if.awk $(SYS)/kern/vnode_if.src -q ; \
++	    awk -f $(SYS)/tools/vnode_if.awk $(SYS)/kern/vnode_if.src -p ; \
++          fi ; \
+ 	else \
+ 	  echo "cannot find any vnode_if script"; exit 1; \
+ 	fi
diff --git a/net/arla/files/patch-nnpfs-bsd-nnpfs_dev-bsd.c b/net/arla/files/patch-nnpfs-bsd-nnpfs_dev-bsd.c
new file mode 100644
index 000000000000..968c6e254063
--- /dev/null
+++ b/net/arla/files/patch-nnpfs-bsd-nnpfs_dev-bsd.c
@@ -0,0 +1,56 @@
+--- nnpfs/bsd/nnpfs_dev-bsd.c.orig	Sat Jun 25 15:14:30 2005
++++ nnpfs/bsd/nnpfs_dev-bsd.c	Sat Jun 25 15:13:42 2005
+@@ -43,8 +43,13 @@
+ int
+ nnpfs_devopen(nnpfs_dev_t dev, int flag, int devtype, d_thread_t *proc)
+ {
++#if __FreeBSD_version < 600007
+     NNPFSDEB(XDEBDEV, ("nnpfsopen dev = %d.%d, flag = %d, devtype = %d\n", 
+ 		     major(dev), minor(dev), flag, devtype));
++#else
++    NNPFSDEB(XDEBDEV, ("nnpfsopen dev = %d, flag = %d, devtype = %d\n",
++                      minor(dev), flag, devtype));
++#endif
+     return nnpfs_devopen_common(dev);
+ }
+ 
+@@ -72,10 +77,17 @@
+ 	     int flags,
+ 	     d_thread_t *p)
+ {
++#if __FreeBSD_version < 600007
+     NNPFSDEB(XDEBDEV, ("nnpfs_devioctl dev = %d.%d, cmd = %lu, "
+ 		     "data = %lx, flags = %x\n", 
+ 		     major(dev), minor(dev), (unsigned long)cmd,
+ 		     (unsigned long)data, flags));
++#else
++    NNPFSDEB(XDEBDEV, ("nnpfs_devioctl dev = %d, cmd = %lu, "
++                     "data = %lx, flags = %x\n",
++                     minor(dev), (unsigned long)cmd,
++                     (unsigned long)data, flags));
++#endif
+     return ENOTTY;
+ }
+ 
+@@ -257,7 +269,9 @@
+ #ifdef HAVE_STRUCT_CDEVSW_D_SPARE
+     d_spare: NULL,
+ #endif
++#if __FreeBSD_version < 600007
+     d_maj: 128,			/* XXX */
++#endif
+ #ifdef HAVE_STRUCT_CDEVSW_D_DUMP
+     d_dump: nodump,
+ #endif
+@@ -346,8 +360,10 @@
+ 	if (chan->status & CHANNEL_OPENED) {
+ #if defined(__DragonFly__)
+             nnpfs_devclose(make_adhoc_dev(&nnpfs_cdev, i), 0, 0, NULL);
+-#elif defined(__FreeBSD__) && __FreeBSD_version >= 502103
++#elif defined(__FreeBSD__) && __FreeBSD_version >= 502103 && __FreeBSD_version < 600007
+ 	    nnpfs_devclose(findcdev(makedev(0, i)), 0, 0, NULL);
++#elif defined(__FreeBSD__) && __FreeBSD_version > 600006
++            nnpfs_devclose(nnpfs_dev[i].dev, 0, 0, NULL);
+ #else
+ 	    nnpfs_devclose(makedev(0, i), 0, 0, NULL);
+ #endif
diff --git a/net/arla/files/patch-nnpfs-bsd-nnpfs_message.c b/net/arla/files/patch-nnpfs-bsd-nnpfs_message.c
new file mode 100644
index 000000000000..217b952be977
--- /dev/null
+++ b/net/arla/files/patch-nnpfs-bsd-nnpfs_message.c
@@ -0,0 +1,22 @@
+--- nnpfs/bsd/nnpfs_message.c.orig	Sat Jun 25 11:50:04 2005
++++ nnpfs/bsd/nnpfs_message.c	Sat Jun 25 11:51:06 2005
+@@ -40,6 +40,7 @@
+ #include <nnpfs/nnpfs_vfsops.h>
+ #include <nnpfs/nnpfs_vnodeops.h>
+ #include <nnpfs/nnpfs_dev.h>
++#include <sys/param.h>
+ 
+ RCSID("$Id: nnpfs_message.c,v 1.96 2004/12/22 19:37:45 lha Exp $");
+ 
+@@ -336,7 +337,11 @@
+ 	nnpfs_dnlc_purge(vp);
+     if (vp->v_usecount == 0) {
+ 	NNPFSDEB(XDEBVNOPS, ("nnpfs_message_invalidnode: vrecycle\n"));
++#if __FreeBSD_version > 600006
++	vrecycle(vp, p);
++#else
+ 	vrecycle(vp, 0, p);
++#endif
+     }
+ 
+     return 0;
diff --git a/net/arla/files/patch-nnpfs-bsd-nnpfs_node-bsd.c b/net/arla/files/patch-nnpfs-bsd-nnpfs_node-bsd.c
new file mode 100644
index 000000000000..eb4586ef73d3
--- /dev/null
+++ b/net/arla/files/patch-nnpfs-bsd-nnpfs_node-bsd.c
@@ -0,0 +1,14 @@
+--- nnpfs/bsd/nnpfs_node-bsd.c.orig	Sat Jun 25 15:17:37 2005
++++ nnpfs/bsd/nnpfs_node-bsd.c	Sat Jun 25 15:19:32 2005
+@@ -39,7 +39,11 @@
+ 
+ RCSID("$Id: nnpfs_node-bsd.c,v 1.84 2005/01/30 22:42:15 lha Exp $");
+ 
++#if defined(__FreeBSD__) && __FreeBSD_version > 600006
++extern struct vop_vector *nnpfs_vnodeop_p;
++#else
+ extern vop_t **nnpfs_vnodeop_p;
++#endif
+ 
+ #ifndef LK_NOPAUSE
+ #define LK_NOPAUSE 0
diff --git a/net/arla/files/patch-nnpfs-bsd-nnpfs_vnodeops-common.c b/net/arla/files/patch-nnpfs-bsd-nnpfs_vnodeops-common.c
new file mode 100644
index 000000000000..3633467ad75d
--- /dev/null
+++ b/net/arla/files/patch-nnpfs-bsd-nnpfs_vnodeops-common.c
@@ -0,0 +1,22 @@
+--- nnpfs/bsd/nnpfs_vnodeops-common.c.orig	Sat Jun 25 11:52:35 2005
++++ nnpfs/bsd/nnpfs_vnodeops-common.c	Sat Jun 25 11:52:21 2005
+@@ -43,6 +43,7 @@
+ #include <nnpfs/nnpfs_deb.h>
+ #include <nnpfs/nnpfs_syscalls.h>
+ #include <nnpfs/nnpfs_vnodeops.h>
++#include <sys/param.h>
+ 
+ RCSID("$Id: nnpfs_vnodeops-common.c,v 1.108 2005/01/08 16:31:43 lha Exp $");
+ 
+@@ -1036,7 +1037,11 @@
+     {
+ 	nnpfs_vfs_unlock(vp, p);
+         NNPFSDEB(XDEBVNOPS, ("nnpfs_inactive: vrecycle\n"));
++#if __FreeBSD_version > 600006
++	vrecycle(vp, p);
++#else
+         vrecycle(vp, 0, p);
++#endif
+     } else {
+ 	nnpfs_vfs_unlock(vp, p);
+ 	xn->flags &= ~NNPFS_STALE;
diff --git a/net/arla/files/patch-nnpfs-bsd-nnpfs_wrap-bsd.c b/net/arla/files/patch-nnpfs-bsd-nnpfs_wrap-bsd.c
new file mode 100644
index 000000000000..3b2c6d88ad3d
--- /dev/null
+++ b/net/arla/files/patch-nnpfs-bsd-nnpfs_wrap-bsd.c
@@ -0,0 +1,33 @@
+--- nnpfs/bsd/nnpfs_wrap-bsd.c.orig	Sat Jun 25 13:30:29 2005
++++ nnpfs/bsd/nnpfs_wrap-bsd.c	Sat Jun 25 13:32:31 2005
+@@ -38,6 +38,7 @@
+ #include <nnpfs/nnpfs_syscalls.h>
+ #include <nnpfs/nnpfs_deb.h>
+ #include <nnpfs/nnpfs_wrap.h>
++#include <sys/param.h>
+ 
+ RCSID("$Id: nnpfs_wrap-bsd.c,v 1.52 2005/03/30 07:14:18 lha Exp $");
+ 
+@@ -52,8 +53,12 @@
+ int
+ nnpfs_is_nnpfs_dev (nnpfs_dev_t dev)
+ {
++#if __FreeBSD_version > 600006
++    return nnpfs_minor(dev) >= 0 && nnpfs_minor(dev) < NNNPFS;
++#else
+     return nnpfs_major (dev) == nnpfs_dev_major
+ 	&& nnpfs_minor(dev) >= 0 && nnpfs_minor(dev) < NNNPFS;
++#endif
+ }
+ 
+ static int
+@@ -166,7 +171,9 @@
+ 	ret = nnpfs_install ();
+ 	if (ret == 0) {
+ 	    make_devices (&nnpfs_cdev);
++#if __FreeBSD_version < 600007
+ 	    nnpfs_dev_major = nnpfs_cdev.d_maj;
++#endif
+ 	    printf ("nnpfs: cdev: %d, syscall: %d\n",
+ 		    nnpfs_dev_major, nnpfs_syscall_num);
+ 	}
diff --git a/net/arla/files/patch-nnpfs::bsd::nnpfs_syscalls-wrap-freebsd.c b/net/arla/files/patch-nnpfs::bsd::nnpfs_syscalls-wrap-freebsd.c
deleted file mode 100644
index 83575f15c038..000000000000
--- a/net/arla/files/patch-nnpfs::bsd::nnpfs_syscalls-wrap-freebsd.c
+++ /dev/null
@@ -1,27 +0,0 @@
---- nnpfs/bsd/nnpfs_syscalls-wrap-freebsd.c.orig	Sun Jun 27 00:39:27 2004
-+++ nnpfs/bsd/nnpfs_syscalls-wrap-freebsd.c	Fri Jan  7 14:09:32 2005
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1995 - 2002 Kungliga Tekniska Högskolan
-+ * Copyright (c) 1995 - 2004 Kungliga Tekniska Högskolan
-  * (Royal Institute of Technology, Stockholm, Sweden).
-  * All rights reserved.
-  *
-@@ -33,7 +33,7 @@
- 
- #include <nnpfs/nnpfs_locl.h>
- 
--RCSID("$Id: nnpfs_syscalls-wrap-freebsd.c,v 1.15 2004/06/26 22:39:27 lha Exp $");
-+RCSID("$Id: nnpfs_syscalls-wrap-freebsd.c,v 1.17 2005/01/07 13:09:32 lha Exp $");
- 
- /*
-  * NNPFS system calls.
-@@ -68,7 +68,7 @@
- static int
- nnpfs_setgroups_freebsd (d_thread_t *proc, void *varg)
- {
--    int retval = 0;
-+    register_t retval = 0;
-     int ret;
- 
-     ret = nnpfs_setgroups(proc, varg, &retval);
diff --git a/net/arla/pkg-plist b/net/arla/pkg-plist
index 7d48795de2ea..9d33df6c1380 100644
--- a/net/arla/pkg-plist
+++ b/net/arla/pkg-plist
@@ -22,68 +22,79 @@ 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/arla/afs_uuid.h
+include/arla/agetarg.h
+include/arla/cellconfig.h
+include/arla/ko.h
+include/arla/part.h
+include/arla/ports.h
+include/arla/uae.h
 include/arlamath.h
 include/atypes.h
-include/base64.h
 include/bool.h
-include/bos.cs.h
-include/cb.cs.h
-include/cb.h
-include/cb.ss.h
-include/fs.cs.h
-include/fs.h
-include/fs.ss.h
 include/fs_errors.h
-include/getarg.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
-include/parse_units.h
 include/preempt.h
-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-new.h
+include/rx/rx.h
+include/rx/rx_clock.h
+include/rx/rx_event.h
+include/rx/rx_globs.h
+include/rx/rx_kern.h
+include/rx/rx_kmutex.h
+include/rx/rx_locl.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_strm.h
+include/rx/rx_trace.h
+include/rx/rx_user.h
+include/rx/rxgencon.h
+include/rxkad/rxkad.h
 include/sl.h
 include/ss/ss.h
 include/timer.h
-include/ubik.cs.h
-include/ubik.ss.h
-include/vldb.cs.h
-include/vldb.h
-include/vldb.ss.h
-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/libbosclient.la
 lib/libbosserver.a
+lib/libbosserver.la
 lib/libbufdir.a
 lib/libkaclient.a
+lib/libkaclient.la
 lib/libkaserver.a
+lib/libkaserver.la
 lib/liblwp.a
 lib/libptclient.a
+lib/libptclient.la
 lib/libptserver.a
-lib/libroken.a
-lib/libroken.la
+lib/libptserver.la
 lib/librx.a
 lib/librx.la
 lib/librxcbclient.a
+lib/librxcbclient.la
 lib/librxcbserver.a
+lib/librxcbserver.la
 lib/librxdefclient.a
+lib/librxdefclient.la
 lib/librxfsserver.a
+lib/librxfsserver.la
 lib/librxvlserver.a
+lib/librxvlserver.la
 lib/librxvolserver.a
+lib/librxvolserver.la
 lib/libsl.a
 lib/libsl.la
 lib/libss.a
@@ -95,6 +106,9 @@ sbin/arla-cli
 %%NNPFS%%sbin/startarla
 %%NNPFS%%sbin/umount_nnpfs
 share/gnats/stacken
+@dirrm include/arla
+@dirrm include/rx
+@dirrm include/rxkad
 @dirrm include/ss
 @dirrm share/gnats
 @unexec rmdir %D/cache 2>/dev/null || true