pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/net/arla Update arla to 0.38. The update is necessary ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/9f384fc7ef0f
branches:  trunk
changeset: 490581:9f384fc7ef0f
user:      wennmach <wennmach%pkgsrc.org@localhost>
date:      Tue Mar 15 15:58:52 2005 +0000

description:
Update arla to 0.38. The update is necessary to support NetBSD-2.0.
The update during the pkgsrc freeze has been approved by <wiz>.

Two patches have been provided by <christos>.

Tested on NetBSD-1.6.1/i386 and NetBSD-2.0/i386.

Closes PR pkg/20906.

diffstat:

 net/arla/DEINSTALL        |    6 +-
 net/arla/INSTALL          |    8 +-
 net/arla/MESSAGE          |   15 +-
 net/arla/Makefile         |   30 +-
 net/arla/PLIST            |  171 +++++++-----
 net/arla/distinfo         |   52 ++-
 net/arla/files/arlad.sh   |   25 +-
 net/arla/files/fstab      |    4 +-
 net/arla/files/lkm.conf   |    4 +-
 net/arla/files/services   |   14 -
 net/arla/patches/patch-aa |   15 +
 net/arla/patches/patch-ab |   18 +
 net/arla/patches/patch-ac |   36 +-
 net/arla/patches/patch-ae |   49 +--
 net/arla/patches/patch-af |   13 +-
 net/arla/patches/patch-ag |   51 +++
 net/arla/patches/patch-ah |   33 +-
 net/arla/patches/patch-ai |   14 +
 net/arla/patches/patch-aj |   10 +
 net/arla/patches/patch-ak |   40 +++
 net/arla/patches/patch-al |   20 +
 net/arla/patches/patch-am |   37 ++
 net/arla/patches/patch-an |   14 +
 net/arla/patches/patch-ao |   14 +
 net/arla/patches/patch-ap |   14 +
 net/arla/patches/patch-aq |   30 ++
 net/arla/patches/patch-ar |   30 ++
 net/arla/patches/patch-as |   15 +-
 net/arla/patches/patch-at |   25 +-
 net/arla/patches/patch-au |   30 ++
 net/arla/patches/patch-av |   29 ++
 net/arla/patches/patch-aw |  287 +++++++++++++++++++++
 net/arla/patches/patch-ax |   14 +
 net/arla/patches/patch-bd |   23 -
 net/arla/patches/patch-be |   23 -
 net/arla/patches/patch-bf |   23 -
 net/arla/patches/patch-bg |   28 --
 net/arla/patches/patch-bh |   23 -
 net/arla/patches/patch-bi |   23 -
 net/arla/patches/patch-bj |   23 -
 net/arla/patches/patch-bk |   23 -
 net/arla/patches/patch-bl |   31 --
 net/arla/patches/patch-bm |   27 --
 net/arla/patches/patch-bn |   39 --
 net/arla/patches/patch-bo |   27 --
 net/arla/patches/patch-bp |   30 --
 net/arla/patches/patch-br |   30 --
 net/arla/patches/patch-bs |  610 ----------------------------------------------
 48 files changed, 886 insertions(+), 1264 deletions(-)

diffs (truncated from 2505 to 300 lines):

diff -r 0c74b8770cb9 -r 9f384fc7ef0f net/arla/DEINSTALL
--- a/net/arla/DEINSTALL        Tue Mar 15 15:57:31 2005 +0000
+++ b/net/arla/DEINSTALL        Tue Mar 15 15:58:52 2005 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: DEINSTALL,v 1.1 2002/09/25 00:06:33 jlam Exp $
+# $NetBSD: DEINSTALL,v 1.2 2005/03/15 15:58:52 wennmach Exp $
 
 ARLA_CACHE="@ARLA_CACHE@"
 
 case ${STAGE} in
 DEINSTALL)
        ${RM} -rf ${ARLA_CACHE}
-       ${RM} -f ${PKG_PREFIX}/lkm/xfs_mod
-       ${RM} -f /sbin/mount_xfs
+       ${RM} -f ${PKG_PREFIX}/lkm/nnpfs_mod
+       ${RM} -f /sbin/mount_nnpfs
        ;;
 esac
diff -r 0c74b8770cb9 -r 9f384fc7ef0f net/arla/INSTALL
--- a/net/arla/INSTALL  Tue Mar 15 15:57:31 2005 +0000
+++ b/net/arla/INSTALL  Tue Mar 15 15:58:52 2005 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: INSTALL,v 1.1 2002/09/25 00:06:33 jlam Exp $
+# $NetBSD: INSTALL,v 1.2 2005/03/15 15:58:52 wennmach Exp $
 
 case ${STAGE} in
 POST-INSTALL)
-       if [ ! -f /sbin/mount_xfs ]; then
-               ${ECHO} "Creating /sbin/mount_xfs"
-               ${LN} -s ${PKG_PREFIX}/sbin/mount_xfs /sbin/mount_xfs
+       if [ ! -f /sbin/mount_nnpfs ]; then
+               ${ECHO} "Creating /sbin/mount_nnpfs"
+               ${LN} -s ${PKG_PREFIX}/sbin/mount_nnpfs /sbin/mount_nnpfs
        fi
        if [ "${PKG_SYSCONFDIR}" != "${PKG_PREFIX}/etc" ]; then
                if [ -f ${PREFIX}/etc/arla.conf ]; then
diff -r 0c74b8770cb9 -r 9f384fc7ef0f net/arla/MESSAGE
--- a/net/arla/MESSAGE  Tue Mar 15 15:57:31 2005 +0000
+++ b/net/arla/MESSAGE  Tue Mar 15 15:58:52 2005 +0000
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.4 2003/01/14 12:00:08 wennmach Exp $
+$NetBSD: MESSAGE,v 1.5 2005/03/15 15:58:52 wennmach Exp $
 
 Arla now has been installed on your system.
 
@@ -24,16 +24,15 @@
        ${PREFIX}/share/examples/ThisCell
        ${PREFIX}/share/examples/arla.conf
 
-to ${PKG_SYSCONFDIR} and customize them, include an entry for xfs in your
-/etc/fstab (see ${PREFIX}/share/examples/arla/fstab), append (only on
-NetBSD releases prior to 1.6):
-
-       ${PREFIX}/share/examples/arla/services
-
-to /etc/services and append:
+to ${PKG_SYSCONFDIR} and customize them, include an entry for nnpfs in your
+/etc/fstab (see ${PREFIX}/share/examples/arla/fstab), and append
 
        ${PREFIX}/share/examples/arla/lkm.conf
 
 to /etc/lkm.conf.  You also have to enable loading of lkms in /etc/rc.conf
 (set lkm to YES).
+
+NOTE: Please note that the name of the arla device changed from "xfs"
+      to "nnpfs". If you're upgrading arla from an older version, you
+      need to adjust /etc/fstab, /etc/lkm.conf, and /etc/rc.d/arlad. 
 ===========================================================================
diff -r 0c74b8770cb9 -r 9f384fc7ef0f net/arla/Makefile
--- a/net/arla/Makefile Tue Mar 15 15:57:31 2005 +0000
+++ b/net/arla/Makefile Tue Mar 15 15:58:52 2005 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.40 2004/12/28 02:47:46 reed Exp $
+# $NetBSD: Makefile,v 1.41 2005/03/15 15:58:52 wennmach Exp $
 
-DISTNAME=              arla-0.35.12
-PKGREVISION=   2
+DISTNAME=              arla-0.38
+#PKGREVISION=
 CATEGORIES=            net security
 MASTER_SITES=          ftp://ftp.stacken.kth.se/pub/arla/
 
@@ -13,41 +13,30 @@
 CONFLICTS+=            rx-[0-9]*
 
 OSVERSION_SPECIFIC=    yes
-INFO_FILES=            arla.info
+INFO_FILES=            arla.info send-pr.info
 
 USE_BUILDLINK3=                yes
 USE_X11=               yes
+USE_LIBTOOL=           yes
 GNU_CONFIGURE=         yes
+USE_PKGINSTALL=                yes
 
-USE_PKGINSTALL=                yes
 DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
 INSTALL_EXTRA_TMPL+=   ${.CURDIR}/INSTALL
 
-.if exists(/usr/lib/libroken.a)
-CONFIGURE_ARGS+=       --with-krb4-lib=/usr/lib
-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/buildlink3.mk"
-CONFIGURE_ARGS+=       --with-krb4-lib=${BUILDLINK_PREFIX.kth-krb4}
-CONFIGURE_ARGS+=       --with-krb4-include=${BUILDLINK_PREFIX.kth-krb4}/include
-CONFIGURE_ARGS+=       --with-roken=${BUILDLINK_PREFIX.kth-krb4}
-CONFIGURE_ARGS+=       --with-roken-include=${BUILDLINK_PREFIX.kth-krb4}/include/kerberosIV
-.endif
-
 .include "../../mk/bsd.prefs.mk"
 
-.if !exists(/sys/lib/libkern/libkern.h)
+.if !exists(/usr/src/sys/lib/libkern/libkern.h)
 .  if exists(${BSDSRCDIR}/sys/lib/libkern/libkern.h)
 CONFIGURE_ARGS+=       --with-sys=${BSDSRCDIR}/sys
 .  else
-PKG_FAIL_REASON= "${PKGNAME} requires kernel sources available under \$$BSDSRCDIR/sys (or /sys)"
+PKG_FAIL_REASON= "${PKGNAME} requires kernel sources available under \$$BSDSRCDIR/sys (or //usr/src/sys)"
 .  endif
 .endif
 
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=       --with-arlacachedir=${ARLA_CACHE}
+CONFIGURE_ARGS+=       --enable-shared=no
 MESSAGE_SUBST+=                ARLA_CACHE=${ARLA_CACHE}
 PLIST_SUBST+=          ARLA_CACHE=${ARLA_CACHE}
 FILES_SUBST+=          ARLA_CACHE=${ARLA_CACHE}
@@ -69,7 +58,6 @@
        ${SED}  ${FILES_SUBST_SED}                                      \
                < ${FILESDIR}/lkm.conf > ${WRKDIR}/lkm.conf
        ${INSTALL_DATA} ${WRKDIR}/lkm.conf ${EGDIR}
-       ${INSTALL_DATA} ${FILESDIR}/services ${EGDIR}
        ${INSTALL_DATA} ${FILESDIR}/fstab ${EGDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff -r 0c74b8770cb9 -r 9f384fc7ef0f net/arla/PLIST
--- a/net/arla/PLIST    Tue Mar 15 15:57:31 2005 +0000
+++ b/net/arla/PLIST    Tue Mar 15 15:58:52 2005 +0000
@@ -1,108 +1,125 @@
-@comment $NetBSD: PLIST,v 1.15 2004/04/23 22:07:55 reed Exp $
-bin/aklog
+@comment $NetBSD: PLIST,v 1.16 2005/03/15 15:58:52 wennmach Exp $
+bin/ydr
+bin/rxdebug
+bin/rxperf
 bin/amon
-bin/bos
 bin/fs
-bin/kalog
+bin/tokens
+bin/afstool
 bin/pts
-bin/rxdebug
-bin/tokens
 bin/udebug
-bin/unlog
-bin/up
+bin/afsfsperf
 bin/vos
-bin/ydr
-include/afs/cmd.h
-include/arlalib.h
+bin/bos
+bin/kalog
+bin/arla-send-pr
+bin/mk_cmds
 include/atypes.h
-include/auth.h
-include/bos.cs.h
-include/cb.cs.h
+include/fs_errors.h
+include/base64.h
+include/getarg.h
+include/parse_bytes.h
+include/parse_time.h
+include/parse_units.h
+include/resolve.h
+include/roken-common.h
+include/rtbl.h
+include/xdbm.h
+include/roken.h
+include/lock.h
+include/preempt.h
+include/timer.h
+include/lwp.h
+include/vldb.h
 include/cb.h
-include/cb.ss.h
-include/cellconfig.h
-include/fs.cs.h
 include/fs.h
+include/pts.h
+include/vldb.cs.h
+include/vldb.ss.h
+include/cb.cs.h
+include/cb.ss.h
+include/fs.cs.h
 include/fs.ss.h
-include/fs_errors.h
-include/ka-procs.h
-include/lock.h
-include/lwp.h
-include/preempt.h
 include/pts.cs.h
-include/pts.h
 include/pts.ss.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/timer.h
 include/ubik.cs.h
 include/ubik.ss.h
-include/vldb.cs.h
-include/vldb.h
-include/vldb.ss.h
-lib/libarlalib.a
+include/bos.cs.h
+include/sl.h
+include/ss/ss.h
+include/bool.h
+include/hash.h
+include/heap.h
+include/list.h
+include/log.h
+include/arlamath.h
+lib/libroken.la
+lib/liblwp.a
+lib/librxdefclient.a
+lib/librxfsserver.a
+lib/librxvlserver.a
+lib/librxvolserver.a
+lib/libptserver.a
+lib/libptclient.a
+lib/libbosserver.a
 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/librx.a
-lib/librxdefclient.a
-lib/librxfsserver.a
-lib/librxkad.a
-lib/librxvlserver.a
-lib/librxvolserver.a
+lib/librxcbclient.a
+lib/librxcbserver.a
+lib/librx.la
+lib/libbufdir.a
+lib/libarlalib.la
+lib/libsl.la
+lib/libss.la
+lib/libarlautil.la
+lib/emacs/site-lisp/send-pr.el
 libexec/arlad
-lkm/xfs_mod.o
-man/man1/aklog.1
-man/man1/fs.1
-man/man1/kalog.1
-man/man1/pts.1
+man/cat3/getarg.0
+man/cat3/arg_printusage.0
 man/man1/rxdebug.1
 man/man1/tokens.1
+man/man1/afstool.1
+man/man1/pts.1
 man/man1/udebug.1
-man/man1/unlog.1
-man/man3/cmd.3
+man/man1/kalog.1
+man/man1/arla-send-pr.1
+man/man3/getarg.3
+man/man3/arg_printusage.3
+man/man3/log_log.3
+man/man3/log_vlog.3
+man/man3/log_open.3
+man/man3/log_close.3
+man/man3/log_unit_init.3
+man/man3/log_unit_free.3
+man/man3/log_set_mask.3



Home | Main Index | Thread Index | Old Index