pkg/33399: Allow arla and openafs packages to co-exist

[kula%tproa.net@localhost]

>Number:         33399
>Category:       pkg
>Synopsis:       Allow arla and openafs packages to co-exist
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Mon May 01 03:10:00 +0000 2006
>Originator:     kula%tproa.net@localhost
>Release:        NetBSD 3.0
>Organization:
The People's Republic of Ames
>Environment:
System: NetBSD gozer.tproa.net 3.0 NetBSD 3.0 (GENERIC) #0: Mon Dec 19 01:04:02 
UTC 2005 
builds%works.netbsd.org@localhost:/home/builds/ab/netbsd-3-0-RELEASE/i386/200512182024Z-obj/home/builds/ab/netbsd-3-0-RELEASE/src/sys/arch/i386/compile/GENERIC
 i386
Architecture: i386
Machine: i386
>Description:

Included is a patch that moves files in the arla package that 
conflict with files in the openafs package, allowing both
packages to coexist. Libraries and includes are placed in
'arla/' subdirectories, and executables are prefixed with
'arla-'. Note, mount_nnpfs and umount_nnpfs are left in their
conventional location, so that the mount and umount commands
find them when dealing with nnpfs filesystems.

As a side-effect, the conflicts with heimdal, lwp and rx are 
fixed.

This patch includes work done by David L. Goodrich <dlg%dorkzilla.org@localhost>
and Thomas L. Kula <kula%tproa.net@localhost>

>How-To-Repeat:
Use both arla and openafs packages on the same machine
>Fix:


Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/net/arla/distinfo,v
retrieving revision 1.21
diff -u -r1.21 distinfo
--- distinfo
+++ distinfo
@@ -17,3 +17,4 @@
 SHA1 (patch-bp) = c38f93427694ec57dc0557518efe984b14334ef1
 SHA1 (patch-bq) = c7bac5059b39ee4edfdf5215c0d4e5f1bf987c56
 SHA1 (patch-libslmakefilein) = a31f5f110e59e132a4637268682b6abe61609bdd
+SHA1 (patch-br) = 144e616ee9ce0da63cda50d54ec6ff9a3236b130
Index: files/arlad.sh
===================================================================
RCS file: /cvsroot/pkgsrc/net/arla/files/arlad.sh,v
retrieving revision 1.5
diff -u -r1.5 files/arlad.sh
--- files/arlad.sh
+++ files/arlad.sh
@@ -10,7 +10,7 @@
 
 name="arlad"
 rcvar=$name
-command="/usr/pkg/libexec/${name}"
+command="/usr/pkg/libexec/arla-${name}"
 command_args="-z /dev/nnpfs0"
 required_files="/dev/nnpfs0"
 
Index: files/lkm.conf
===================================================================
RCS file: /cvsroot/pkgsrc/net/arla/files/lkm.conf,v
retrieving revision 1.3
diff -u -r1.3 files/lkm.conf
--- files/lkm.conf
+++ files/lkm.conf
@@ -1,2 +1,2 @@
 # $NetBSD: lkm.conf,v 1.3 2005/03/15 15:58:52 wennmach Exp $
-@PREFIX@/lkm/nnpfs_mod.o       -       nnpfs_mod               
@PREFIX@/sbin/nnpfs_makedev     /var/db/nnpfs_sym       BEFOREMOUNT
+@PREFIX@/lkm/nnpfs_mod.o       -       nnpfs_mod               
@PREFIX@/sbin/arla-nnpfs_makedev        /var/db/nnpfs_sym       BEFOREMOUNT
Index: patches/patch-br
--- /dev/null
+++ patches/patch-br
@@ -0,0 +1,10 @@
+--- nnpfs/bsd/bin/startarla.in 2006-04-26 19:42:38.000000000 -0500
++++ nnpfs/bsd/bin/startarla.in 2006-04-26 19:42:45.000000000 -0500
+@@ -57,6 +57,6 @@
+   echo "Couldn't figure out how to load your kernel module"
+   exit 1
+ fi
+-${LIBEXECDIR}/arlad -z /dev/nnpfs0
++${LIBEXECDIR}/arla-arlad -z /dev/nnpfs0
+ test -d /afs || mkdir /afs
+ ${SBINDIR}/mount_nnpfs /dev/nnpfs0 /afs
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/net/arla/PLIST,v
retrieving revision 1.20
diff -u -r1.20 PLIST
--- PLIST       6 Apr 2006 03:20:54 -0000       1.20
+++ PLIST       1 May 2006 02:38:14 -0000
@@ -1,110 +1,109 @@
 @comment $NetBSD: PLIST,v 1.20 2006/04/06 03:20:54 jlam Exp $
-bin/afsfsperf
-bin/afstool
-bin/amon
+bin/arla-afsfsperf
+bin/arla-afstool
+bin/arla-amon
 bin/arla-send-pr
-bin/bos
-bin/fs
-bin/kalog
-bin/mk_cmds
-bin/pts
-bin/rxdebug
-bin/rxperf
-bin/tokens
-bin/udebug
-bin/unlog
-bin/vos
-bin/ydr
-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/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/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/xdbm.h
+bin/arla-bos
+bin/arla-fs
+bin/arla-kalog
+bin/arla-mk_cmds
+bin/arla-pts
+bin/arla-rxdebug
+bin/arla-rxperf
+bin/arla-tokens
+bin/arla-udebug
+bin/arla-unlog
+bin/arla-vos
+bin/arla-ydr
+include/arla/arla/afs_uuid.h
+include/arla/arla/agetarg.h
+include/arla/arla/cellconfig.h
+include/arla/arla/ko.h
+include/arla/arla/part.h
+include/arla/arla/ports.h
+include/arla/arla/uae.h
+include/arla/arlamath.h
+include/arla/atypes.h
+include/arla/base64.h
+include/arla/bool.h
+include/arla/fs_errors.h
+include/arla/getarg.h
+include/arla/hash.h
+include/arla/heap.h
+include/arla/list.h
+include/arla/lock.h
+include/arla/log.h
+include/arla/lwp.h
+include/arla/parse_bytes.h
+include/arla/parse_time.h
+include/arla/parse_units.h
+include/arla/preempt.h
+include/arla/resolve.h
+include/arla/roken-common.h
+include/arla/roken.h
+include/arla/rtbl.h
+include/arla/rx/rx-new.h
+include/arla/rx/rx.h
+include/arla/rx/rx_clock.h
+include/arla/rx/rx_event.h
+include/arla/rx/rx_globs.h
+include/arla/rx/rx_kern.h
+include/arla/rx/rx_kmutex.h
+include/arla/rx/rx_locl.h
+include/arla/rx/rx_mach.h
+include/arla/rx/rx_misc.h
+include/arla/rx/rx_multi.h
+include/arla/rx/rx_null.h
+include/arla/rx/rx_pkt.h
+include/arla/rx/rx_queue.h
+include/arla/rx/rx_strm.h
+include/arla/rx/rx_trace.h
+include/arla/rx/rx_user.h
+include/arla/rx/rxgencon.h
+include/arla/rxkad/rxkad.h
+include/arla/sl.h
+include/arla/ss/ss.h
+include/arla/timer.h
+include/arla/xdbm.h
 info/arla.info
 info/send-pr.info
-lib/emacs/site-lisp/send-pr.el
-lib/libarlalib.la
-lib/libarlautil.la
-lib/libbosclient.la
-lib/libbosserver.la
-lib/libbufdir.la
-lib/libkaclient.la
-lib/libkaserver.la
-lib/liblwp.a
-lib/libptclient.la
-lib/libptserver.la
-lib/libroken.la
-lib/librx.la
-lib/librxcbclient.la
-lib/librxcbserver.la
-lib/librxdefclient.la
-lib/librxfsserver.la
-lib/librxvlserver.la
-lib/librxvolserver.la
-lib/libsl.la
-lib/libss.la
-libexec/arlad
+lib/arla/libarlalib.la
+lib/arla/libarlautil.la
+lib/arla/libbosclient.la
+lib/arla/libbosserver.la
+lib/arla/libbufdir.la
+lib/arla/libkaclient.la
+lib/arla/libkaserver.la
+lib/arla/liblwp.a
+lib/arla/libptclient.la
+lib/arla/libptserver.la
+lib/arla/libroken.la
+lib/arla/librx.la
+lib/arla/librxcbclient.la
+lib/arla/librxcbserver.la
+lib/arla/librxdefclient.la
+lib/arla/librxfsserver.la
+lib/arla/librxvlserver.la
+lib/arla/librxvolserver.la
+lib/arla/libsl.la
+lib/arla/libss.la
+libexec/arla-arlad
 lkm/nnpfs_mod.o
 man/cat3/arg_printusage.0
 man/cat3/getarg.0
-man/man1/afstool.1
+man/man1/arla-afstool.1
 man/man1/arla-send-pr.1
-man/man1/kalog.1
-man/man1/pts.1
-man/man1/rxdebug.1
-man/man1/tokens.1
-man/man1/udebug.1
-man/man1/unlog.1
+man/man1/arla-kalog.1
+man/man1/arla-pts.1
+man/man1/arla-rxdebug.1
+man/man1/arla-tokens.1
+man/man1/arla-udebug.1
+man/man1/arla-unlog.1
 man/man3/arg_printusage.3
-man/man3/getarg.3
+man/man3/arla-getarg.3
 man/man3/log_close.3
 man/man3/log_get_mask.3
-man/man3/log_log.3
+man/man3/arla-log_log.3
 man/man3/log_mask2str.3
 man/man3/log_open.3
 man/man3/log_set_mask.3
@@ -112,22 +111,22 @@
 man/man3/log_unit_free.3
 man/man3/log_unit_init.3
 man/man3/log_vlog.3
-man/man4/nnpfs.4
-man/man5/AliasDB.5
-man/man5/CellServDB.5
-man/man5/DynRootDB.5
-man/man5/SuidCells.5
-man/man5/ThisCell.5
-man/man5/arla.conf.5
-man/man8/arla-cli.8
-man/man8/arlad.8
+man/man4/arla-nnpfs.4
+man/man5/arla-AliasDB.5
+man/man5/arla-CellServDB.5
+man/man5/arla-DynRootDB.5
+man/man5/arla-SuidCells.5
+man/man5/arla-ThisCell.5
+man/man5/arla-arla.conf.5
+man/man8/arla-arla-cli.8
+man/man8/arla-arlad.8
 man/man8/mount_nnpfs.8
 man/man8/umount_nnpfs.8
-man/man8/vos.8
-sbin/arla-cli
+man/man8/arla-vos.8
+sbin/arla-arla-cli
 sbin/mount_nnpfs
-sbin/nnpfs_makedev
-sbin/startarla
+sbin/arla-nnpfs_makedev
+sbin/arla-startarla
 sbin/umount_nnpfs
 share/examples/arla/CellServDB
 share/examples/arla/DynRootDB
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/arla/Makefile,v
retrieving revision 1.58
diff -u -r1.58 Makefile
--- Makefile    6 Apr 2006 03:20:54 -0000       1.58
+++ Makefile    1 May 2006 02:40:46 -0000
@@ -9,10 +9,6 @@
 HOMEPAGE=              http://www.stacken.kth.se/project/arla/
 COMMENT=               Free AFS implementation from KTH
 
-CONFLICTS+=            heimdal-[0-9]*
-CONFLICTS+=            lwp-[0-9]*
-CONFLICTS+=            openafs-[0-9]*
-CONFLICTS+=            rx-[0-9]*
 CONFLICTS+=            kth-krb4-[0-9]*
 
 OSVERSION_SPECIFIC=    yes
@@ -20,6 +16,8 @@
 
 USE_LIBTOOL=           yes
 GNU_CONFIGURE=         yes
+PREFIX+=               arla
+
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -31,6 +29,9 @@
 .  endif
 .endif
 
+CONFIGURE_ARGS+=       --program-prefix=arla-
+CONFIGURE_ARGS+=       --libdir=${PREFIX}/lib/arla
+CONFIGURE_ARGS+=       --includedir=${PREFIX}/include/arla
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ARGS+=       --with-arlacachedir=${ARLA_CACHE:Q}
 CONFIGURE_ARGS+=       --enable-shared=no
@@ -71,5 +72,9 @@
        ${RM} -f ${EGDIR}/*.default
        ${INSTALL_DATA} ${WRKDIR}/lkm.conf ${EGDIR}
        ${INSTALL_DATA} ${FILESDIR}/fstab ${EGDIR}
+       ${MV} ${PREFIX}/sbin/arla-mount_nnpfs ${PREFIX}/sbin/mount_nnpfs
+       ${MV} ${PREFIX}/sbin/arla-umount_nnpfs ${PREFIX}/sbin/umount_nnpfs
+       ${MV} ${PREFIX}/man/man8/arla-mount_nnpfs.8 
${PREFIX}/man/man8/mount_nnpfs.8
+       ${MV} ${PREFIX}/man/man8/arla-umount_nnpfs.8 
${PREFIX}/man/man8/umount_nnpfs.8
 
 .include "../../mk/bsd.pkg.mk"