Update arla to 0.35.7

This new version fixes some (unnamed, sorry) bugs.
The main rationale for the upgrade is to get rid of the dependency on
kth-krb4 for NetBSD>=1.5 systems. For older systems, we provide full
functionality via (a now buildlinked) kth-krb4.

12 files changed, 25 insertions, 232 deletions

diff --git a/net/arla/Makefile b/net/arla/Makefile
index 064737b8abb..dde1d37d703 100644
--- a/net/arla/Makefile
+++ b/net/arla/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2002/02/18 15:14:35 seb Exp $
+# $NetBSD: Makefile,v 1.21 2002/04/05 11:46:03 wennmach Exp $
 #
 
-DISTNAME=		arla-0.35.5
+DISTNAME=		arla-0.35.7
 CATEGORIES=		net security
 MASTER_SITES=		ftp://ftp.stacken.kth.se/pub/arla/
 
@@ -9,9 +9,25 @@ MAINTAINER=		wennmach@netbsd.org
 HOMEPAGE=		http://www.stacken.kth.se/project/arla/
 COMMENT=		Free AFS implementation from KTH
 
-DEPENDS+=		kth-krb4>=1.0.9:../../security/kth-krb4
+.if exists(/usr/lib/libroken.a)
+CONFIGURE_ARGS+=	--with-krb4-lib=/usr
+CONFIGURE_ARGS+=	--with-krb4-include=/usr/include/kerberosIV
+CONFIGURE_ARGS+=	--with-roken=/usr
+CONFIGURE_ARGS+=	--with-roken-include=/usr/include/krb5
+.else
+.include "../../security/kth-krb4/buildlink.mk"
+USE_BUILDLINK_ONLY=	# defined
+CONFIGURE_ARGS+=	--with-krb4-lib=${BUILDLINK_DIR}
+CONFIGURE_ARGS+=	--with-krb4-include=${BUILDLINK_DIR}/include
+CONFIGURE_ARGS+=	--with-roken=${BUILDLINK_DIR}
+CONFIGURE_ARGS+=	--with-roken-include=${BUILDLINK_DIR}/include/kerberosIV
+.endif
+
+# for "amon":
+.include "../../mk/x11.buildlink.mk"
 
-CONFLICTS+=		lwp-[0-9]* rx-[0-9]*
+CONFLICTS+=		lwp-[0-9]*
+CONFLICTS+=		rx-[0-9]*
 
 OSVERSION_SPECIFIC=	yes
 GNU_CONFIGURE=		yes
@@ -19,7 +35,6 @@ INFO_FILES=		arla.info
 
 .include "../../mk/bsd.prefs.mk"
 
-CONFIGURE_ARGS+=	--with-krb4=${PREFIX}
 .if !exists(/sys/lib/libkern/libkern.h)
 .if exists(${BSDSRCDIR}/sys/lib/libkern/libkern.h)
 CONFIGURE_ARGS+=	--with-sys=${BSDSRCDIR}/sys
@@ -57,13 +72,13 @@ post-install:
 		${ECHO} "Creating arla cache directory ${CACHEDIR}";          \
 		${INSTALL_DATA_DIR} ${CACHEDIR};                              \
 		${CHMOD} 700 ${CACHEDIR};                                     \
-		${CHOWN} ${ROOT_USER} ${CACHEDIR};                                    \
+		${CHOWN} ${ROOT_USER} ${CACHEDIR};                            \
 	fi
 	@if [ -e /sbin/mount_xfs ]; then                                      \
 		${ECHO} "/sbin/mount_xfs already exists";                     \
 	else                                                                  \
 		${ECHO} "Creating /sbin/mount_xfs";                           \
-		${LN} -s ${PREFIX}/sbin/mount_xfs /sbin/mount_xfs;             \
+		${LN} -s ${PREFIX}/sbin/mount_xfs /sbin/mount_xfs;            \
 	fi
 	@-${INSTALL_DATA_DIR} ${PREFIX}/share/examples/arla
 	@${SED} -e 's|@PREFIX@|${PREFIX}|g'                                   \
diff --git a/net/arla/distinfo b/net/arla/distinfo
index 4d1b3fc2dac..45a8a71137e 100644
--- a/net/arla/distinfo
+++ b/net/arla/distinfo
@@ -1,22 +1,12 @@
-$NetBSD: distinfo,v 1.3 2001/08/09 13:48:58 wennmach Exp $
+$NetBSD: distinfo,v 1.4 2002/04/05 11:46:03 wennmach Exp $
 
-SHA1 (arla-0.35.5.tar.gz) = 19c672f9110dfeaf1bcbeef9d07016dd1c354a55
-Size (arla-0.35.5.tar.gz) = 1280277 bytes
-SHA1 (patch-aa) = b9fcc2e3692bdb39d15feb7de2939ac927728795
-SHA1 (patch-ab) = 54aa73e8bd1e81006d0d2bac36f4b152a9007fe3
+SHA1 (arla-0.35.7.tar.gz) = 4ece66e3b55869688d1ea8d65223711828dd7034
+Size (arla-0.35.7.tar.gz) = 1302042 bytes
 SHA1 (patch-ac) = a1d725edea6aaf3711c0d62a5ab5acd84d5fe4b7
 SHA1 (patch-ad) = c5c33c0daf8174b2f8f76119f97725cd61015bb6
 SHA1 (patch-ae) = f9255bc814f38cb8309380a44c1942d3d2cb233e
 SHA1 (patch-af) = 5df593de73674dd6a22d57df441b6e70ea145704
 SHA1 (patch-ah) = 8386d4062aedbfe24c66cad84cfdcf3a2617848e
 SHA1 (patch-ak) = 2ff053009ac94ea23b24494462e79e7507c0c1cb
-SHA1 (patch-an) = e03678a2bf21adb2dc283a960f67b993a4502b21
 SHA1 (patch-as) = 28d61906be25fc803882d4ccbe584f57e51dec63
 SHA1 (patch-at) = 190da9b9d9da90166845383856508187d9d1ca8f
-SHA1 (patch-aw) = 89e9853781b0f1980ef51b0a1bfb3ba98c9f508e
-SHA1 (patch-ax) = 2c7f019c5fa3c54c63fa7645d144a3d8a8a82896
-SHA1 (patch-ay) = 51796feb52dd3380fd4e4752445174dc11750652
-SHA1 (patch-az) = f74235d6d610db9b177e0f3c86ee5bf38d20a3dd
-SHA1 (patch-ba) = 8f51c21d55b8abdbb787ca8a3cab7f9915dd9709
-SHA1 (patch-bb) = dca7f0110b1d4476ecd40f0a0edc3dbfd09d8016
-SHA1 (patch-bc) = 60d9aa786e9ecd2eb319fccd13f1b8041d0f73a8
diff --git a/net/arla/patches/patch-aa b/net/arla/patches/patch-aa
deleted file mode 100644
index 99b6569079d..00000000000
--- a/net/arla/patches/patch-aa
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2001/08/09 13:48:59 wennmach Exp $
-
-Do not add a path to the library search path (-L) to find libsl.a. This will
-find kth-krb4's sl library, which is the wrong one.
-
---- appl/fs/Makefile.in.orig	Fri Aug  3 15:24:20 2001
-+++ appl/fs/Makefile.in	Fri Aug  3 15:27:23 2001
-@@ -54,12 +54,13 @@
- READLINE_lib	= @LIB_readline@
- KAFS_LIBS	= @AIX_EXTRA_KAFS@ @KAFS_LIBS@
- LIB_tgetent     = @LIB_tgetent@
--LIBS		= -L../lib -larlalib \
--		  -L../../rxdef -lrxdefclient \
--		  -L../../rx -lrx \
--		  -L../../lwp -llwp @PLWP_LIB_FLAGS@ \
--		  -L../../lib/ko -lko -L../../util -lutil \
--		  -L../../lib/sl -lsl \
-+LIBS		= ../lib/libarlalib.a \
-+		  ../../rxdef/librxdefclient.a \
-+		  ../../rx/librx.a \
-+		  ../../lwp/liblwp.a @PLWP_LIB_FLAGS@ \
-+		  ../../lib/ko/libko.a \
-+		  ../../util/libutil.a \
-+		  ../../lib/sl/libsl.a \
- 		  $(READLINE_lib) \
- 		  $(RXKAD_LIBS) \
- 		  $(KAFS_LIBS) \
diff --git a/net/arla/patches/patch-ab b/net/arla/patches/patch-ab
deleted file mode 100644
index 9d1013173fe..00000000000
--- a/net/arla/patches/patch-ab
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2001/08/09 13:48:59 wennmach Exp $
-
-Do not add a path to the library search path (-L) to find libsl.a. This will
-find kth-krb4's sl library, which is the wrong one. 
-
---- appl/vos/Makefile.in.orig	Fri Aug  3 15:29:25 2001
-+++ appl/vos/Makefile.in	Fri Aug  3 15:31:34 2001
-@@ -54,12 +54,13 @@
- READLINE_lib	= @LIB_readline@
- KAFS_LIBS	= @AIX_EXTRA_KAFS@ @KAFS_LIBS@
- LIB_tgetent     = @LIB_tgetent@
--LIBS		= -L../lib -larlalib \
--		  -L../../rxdef -lrxdefclient \
--		  -L../../rx -lrx \
--		  -L../../lwp -llwp @PLWP_LIB_FLAGS@ \
--		  -L../../lib/ko -lko -L../../util -lutil \
--		  -L../../lib/sl -lsl \
-+LIBS		= ../lib/libarlalib.a \
-+		  ../../rxdef/librxdefclient.a \
-+		  ../../rx/librx.a \
-+		  ../../lwp/liblwp.a @PLWP_LIB_FLAGS@ \
-+		  ../../lib/ko/libko.a \
-+		  ../../util/libutil.a \
-+		  ../../lib/sl/libsl.a \
- 		  $(READLINE_lib) \
- 		  @LIB_roken@ \
- 		  $(RXKAD_LIBS) \
diff --git a/net/arla/patches/patch-an b/net/arla/patches/patch-an
deleted file mode 100644
index 1e749acd598..00000000000
--- a/net/arla/patches/patch-an
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-an,v 1.3 2001/08/09 13:49:00 wennmach Exp $
-
-Do not add a path to the library search path (-L) to find libsl.a. This will
-find kth-krb4's sl library, which is the wrong one. The same for libroken.
-
---- appl/bos/Makefile.in.orig	Mon May 28 13:32:03 2001
-+++ appl/bos/Makefile.in	Sat Aug  4 19:12:32 2001
-@@ -55,14 +55,15 @@
- READLINE_lib	= @LIB_readline@
- KAFS_LIBS	= @AIX_EXTRA_KAFS@ @KAFS_LIBS@
- LIB_tgetent     = @LIB_tgetent@
--LIBS		= -L../lib -larlalib \
--		  -L../../rxdef -lrxdefclient \
--		  -L../../rx -lrx \
--		  -L../../lwp -llwp @PLWP_LIB_FLAGS@ \
--		  -L../../lib/ko -lko -L../../util -lutil \
--		  -L../../lib/sl -lsl \
-+LIBS		= ../lib/libarlalib.a \
-+		  ../../rxdef/librxdefclient.a \
-+		  ../../rx/librx.a \
-+		  ../../lwp/liblwp.a @PLWP_LIB_FLAGS@ \
-+		  ../../lib/ko/libko.a \
-+		  ../../util/libutil.a \
-+		  ../../lib/sl/libsl.a \
- 		  $(READLINE_lib) \
--		  @LIB_roken@ \
-+		  ../../lib/roken/libroken.a \
- 		  $(RXKAD_LIBS) \
- 		  $(KAFS_LIBS) \
- 		  $(RXKAD_LIBS) @LIBS@
diff --git a/net/arla/patches/patch-aw b/net/arla/patches/patch-aw
deleted file mode 100644
index 2d7e7af91cd..00000000000
--- a/net/arla/patches/patch-aw
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-aw,v 1.1 2001/08/09 13:49:01 wennmach Exp $
-
-Use absolute library paths for linking.
-
---- appl/afsutils/Makefile.in.orig	Mon May 28 13:31:49 2001
-+++ appl/afsutils/Makefile.in		Sat Aug  4 13:07:43 2001
-@@ -52,13 +52,14 @@
- RXKAD_LIBS	= @MILKO_RXKAD_LIBS@
- KERNEL_INCLUDE  = @KERNEL_INCLUDE@
- KAFS_LIBS	= @AIX_EXTRA_KAFS@ @KAFS_LIBS@
--LIBS		= -L../lib -larlalib \
--		  -L../../rxdef -lrxdefclient \
--		  -L../../lib/cmd -lcmd \
--		  -L../../rx -lrx \
--		  -L../../lwp -llwp @PLWP_LIB_FLAGS@ \
--		  -L../../lib/ko -lko -L../../util -lutil \
--		  @LIB_roken@ \
-+LIBS		= ../lib/libarlalib.a \
-+		  ../../rxdef/librxdefclient.a \
-+		  ../../lib/cmd/libcmd.a \
-+		  ../../rx/librx.a \
-+		  ../../lwp/liblwp.a @PLWP_LIB_FLAGS@ \
-+		  ../../lib/ko/libko.a \
-+		  ../../util/libutil.a \
-+		  ../../lib/roken/libroken.a \
- 		  $(RXKAD_LIBS) \
- 		  $(KAFS_LIBS) \
- 		  $(RXKAD_LIBS) @LIBS@
diff --git a/net/arla/patches/patch-ax b/net/arla/patches/patch-ax
deleted file mode 100644
index ad02baad262..00000000000
--- a/net/arla/patches/patch-ax
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ax,v 1.1 2001/08/09 13:49:01 wennmach Exp $
-
-Don't use a search path for libroken.
-
---- appl/amon/Makefile.in.orig	Sat Aug  4 18:18:55 2001
-+++ appl/amon/Makefile.in	Sat Aug  4 18:19:42 2001
-@@ -60,7 +60,8 @@
- 		  $(RXKAD_LIBS) \
- 		  $(KAFS_LIBS) \
- 		  $(RXKAD_LIBS) \
--		  @LIB_roken@ @LIBS@
-+		  ../../lib/roken/libroken.a \
-+		  @LIBS@
- 
- AMON_LIBS	= @X_LIBS@  \
- 		  -lXaw -lXt -lXmu -lXext @X_PRE_LIBS@ -lX11 @X_EXTRA_LIBS@
diff --git a/net/arla/patches/patch-ay b/net/arla/patches/patch-ay
deleted file mode 100644
index 8536b8d140b..00000000000
--- a/net/arla/patches/patch-ay
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ay,v 1.1 2001/08/09 13:49:01 wennmach Exp $
-
-Don't use search path for libroken.
-
---- appl/kalog/Makefile.in.orig	Sat Aug  4 18:30:31 2001
-+++ appl/kalog/Makefile.in	Sat Aug  4 18:31:21 2001
-@@ -59,7 +59,7 @@
- 		  -L../../rx -lrx \
- 		  -L../../lwp -llwp @PLWP_LIB_FLAGS@ \
- 		  -L../../lib/ko -lko -L../../util -lutil \
--		  @LIB_roken@ \
-+		  ../../lib/roken/libroken.a \
- 		  $(RXKAD_LIBS) \
- 		  $(KAFS_LIBS) \
- 		  $(RXKAD_LIBS) @LIBS@
diff --git a/net/arla/patches/patch-az b/net/arla/patches/patch-az
deleted file mode 100644
index e69bd405a16..00000000000
--- a/net/arla/patches/patch-az
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-az,v 1.1 2001/08/09 13:49:01 wennmach Exp $
-
-Don't use library search path for libroken.
-
---- appl/pts/Makefile.in.orig	Sat Aug  4 18:47:05 2001
-+++ appl/pts/Makefile.in	Sat Aug  4 18:47:45 2001
-@@ -61,7 +61,7 @@
- 		  -L../../lib/ko -lko -L../../util -lutil \
- 		  -L../../lib/sl -lsl \
- 		  $(READLINE_lib) \
--		  @LIB_roken@ \
-+		  ../../lib/roken/libroken.a \
- 		  $(RXKAD_LIBS) \
- 		  $(KAFS_LIBS) \
- 		  $(RXKAD_LIBS) @LIBS@
diff --git a/net/arla/patches/patch-ba b/net/arla/patches/patch-ba
deleted file mode 100644
index 10ea8f87e40..00000000000
--- a/net/arla/patches/patch-ba
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Don't use a library search path for libroken.
-
---- appl/vos/Makefile.in.orig	Sat Aug  4 19:01:10 2001
-+++ appl/vos/Makefile.in	Sat Aug  4 19:01:43 2001
-@@ -62,7 +62,7 @@
- 		  ../../util/libutil.a \
- 		  ../../lib/sl/libsl.a \
- 		  $(READLINE_lib) \
--		  @LIB_roken@ \
-+		  ../../lib/roken/libroken.a \
- 		  $(RXKAD_LIBS) \
- 		  $(KAFS_LIBS) \
- 		  $(RXKAD_LIBS) @LIBS@
diff --git a/net/arla/patches/patch-bb b/net/arla/patches/patch-bb
deleted file mode 100644
index 253652f2021..00000000000
--- a/net/arla/patches/patch-bb
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-bb,v 1.1 2001/08/09 13:49:02 wennmach Exp $
-
-Don't use search path for libroken.
-
---- tests/Makefile.in.orig	Sat Aug  4 23:26:21 2001
-+++ tests/Makefile.in	Sat Aug  4 23:27:50 2001
-@@ -14,7 +14,7 @@
- CPPFLAGS	= @CPPFLAGS@
- DEFS		= @DEFS@
- LDFLAGS		= @LDFLAGS@
--LIBS		= @LIB_roken@ @LIBS@
-+LIBS		= ../lib/roken/libroken.a @LIBS@
- KAFS_LIBS	= @AFS_EXTRA_LIBS@ @KAFS_LIBS@
- KRB_LIBS	= @KRB4_LIB_FLAGS@
- APPL_LIB	= -L../appl/lib -larlalib -L../lib/ko -lko
diff --git a/net/arla/patches/patch-bc b/net/arla/patches/patch-bc
deleted file mode 100644
index 23f066e5431..00000000000
--- a/net/arla/patches/patch-bc
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-bc,v 1.1 2001/08/09 13:49:02 wennmach Exp $
-
-Do not install libroken and its header files.
-
---- lib/roken/Makefile.in.orig	Sun Aug  5 12:48:51 2001
-+++ lib/roken/Makefile.in	Sun Aug  5 12:50:40 2001
-@@ -175,17 +175,8 @@
- 	$(CC) -c $(CPPFLAGS) $(DEFS) -I../../include -I$(srcdir) $(CFLAGS) $(PICFLAGS) $<
- 
- install: all
--	$(MKINSTALLDIRS) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)
--	$(INSTALL_DATA) $(LIB) $(DESTDIR)$(libdir)/$(LIB)
--	for x in $(include_HEADERS); do \
--		$(INSTALL_DATA) $(srcdir)/$$x $(DESTDIR)$(includedir)/$$x; \
--	done
- 
- uninstall:
--	rm -f $(DESTDIR)$(libdir)/$(LIB)
--	for x in $(include_HEADERS); do \
--		rm -f $(DESTDIR)$(includedir)/$$x; \
--	done
- 
- TAGS: $(SOURCES)
- 	etags $(SOURCES)