4 files changed, 89 insertions, 8 deletions

diff --git a/net/arla/Makefile b/net/arla/Makefile
index 98a70198d2e8..1ab82b8648de 100644
--- a/net/arla/Makefile
+++ b/net/arla/Makefile
@@ -17,6 +17,7 @@ USE_XLIB=	yes
 USE_RC_SUBR=	arla.sh
 USE_INC_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
+NOT_FOR_ARCH=	sparc64
 
 .if !exists(/usr/src/sys/kern/vnode_if.src)
 IGNORE=		requires kernel source
@@ -33,16 +34,31 @@ CONFIGURE_ARGS+=--with-krb5=/usr
 
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=
+
+.include <bsd.port.pre.mk>
+.if ${OSVERSION} > 500000
+WITHOUT_NNPFS=	YES
+.endif
+
 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
+MAN8=		arla-cli.8 arlad.8 vos.8
+
+.if defined(WITHOUT_NNPFS)
+CONFIGURE_ARGS+=--disable-nnpfs
+PLIST_SUB+=	NNPFS="@comment "
+.else
+PLIST_SUB+=	NNPFS=""
+MAN4=		nnpfs.4
+MAN8+=		mount_nnpfs.8 umount_nnpfs.8
+.endif
+
 INFO=		arla send-pr
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/net/arla/files/patch-configure b/net/arla/files/patch-configure
new file mode 100644
index 000000000000..7c73145bc8fb
--- /dev/null
+++ b/net/arla/files/patch-configure
@@ -0,0 +1,38 @@
+--- configure.orig	Sat Dec 25 17:45:33 2004
++++ configure	Sun May  8 12:15:13 2005
+@@ -6685,8 +6685,8 @@
+   echo "$as_me:$LINENO: result: DragonFly" >&5
+ echo "${ECHO_T}DragonFly" >&6
+   ;;
+-freebsd[345]* | freebsdelf[345]*)
+-  echo "$as_me:$LINENO: result: FreeBSD [345].x" >&5
++freebsd[3-9]* | freebsdelf[3-9]*)
++  echo "$as_me:$LINENO: result: FreeBSD [3-9].x" >&5
+ echo "${ECHO_T}FreeBSD [345].x" >&6
+   KERNEL_INCLUDE=-I`(cd $srcdir; pwd)`/nnpfs/bsd
+   KERNEL_SRCS='bsd-subr.c'
+@@ -26111,7 +26111,7 @@
+ 
+ 
+ # This can be used to rebuild libtool when needed
+-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++LIBTOOL_DEPS="--disable-ltlibs /usr/local/share/libtool15/ltmain.sh"
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -55595,7 +55595,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
+-  awk -f $SYS/tools/vnode_if.awk $SYS/kern/vnode_if.src -h
++  case "$nnpfs_target" in
++    freebsd[6-9]* | freebsdelf[6-9]*)
++      awk -f $SYS/tools/vnode_if.awk $SYS/kern/vnode_if.src -h -p -q
++      ;;
++    *)
++      awk -f $SYS/tools/vnode_if.awk $SYS/kern/vnode_if.src -h
++      ;;
++  esac
+ 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;}
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
new file mode 100644
index 000000000000..83575f15c038
--- /dev/null
+++ b/net/arla/files/patch-nnpfs::bsd::nnpfs_syscalls-wrap-freebsd.c
@@ -0,0 +1,27 @@
+--- 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 464bab490e04..7d48795de2ea 100644
--- a/net/arla/pkg-plist
+++ b/net/arla/pkg-plist
@@ -6,7 +6,7 @@ bin/bos
 bin/fs
 bin/kalog
 bin/mk_cmds
-bin/nnpfs.ko
+%%NNPFS%%bin/nnpfs.ko
 bin/pts
 bin/rxdebug
 bin/rxperf
@@ -90,10 +90,10 @@ lib/libss.a
 lib/libss.la
 libexec/arlad
 sbin/arla-cli
-sbin/mount_nnpfs
-sbin/nnpfs_makedev
-sbin/startarla
-sbin/umount_nnpfs
+%%NNPFS%%sbin/mount_nnpfs
+%%NNPFS%%sbin/nnpfs_makedev
+%%NNPFS%%sbin/startarla
+%%NNPFS%%sbin/umount_nnpfs
 share/gnats/stacken
 @dirrm include/ss
 @dirrm share/gnats