2 files changed, 167 insertions, 164 deletions

diff --git a/net/openafs/Makefile b/net/openafs/Makefile
index 78e2eefc8ec2..2930674b9d14 100644
--- a/net/openafs/Makefile
+++ b/net/openafs/Makefile
@@ -1,6 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	openafs
+PORTREVISION=	1
 DISTVERSION=	${AFS_DISTVERSION}.${DBVERSION:S/-//g}
 CATEGORIES=	net
 MASTER_SITES=	http://dl.central.org/dl/openafs/${AFS_DISTVERSION}/:openafs \
@@ -29,7 +30,7 @@ USE_LDCONFIG=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ENV=	_XCFLAGS="${CFLAGS} -fPIC" \
 		_PAM_CFLAGS="${CFLAGS} -fPIC" \
-		_MT_LIBS="${PTHREAD_LIBS}"
+		_MT_LIBS="-lpthread"
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--localstatedir=/var \
 		--mandir=${MANPREFIX}/man \
diff --git a/net/openafs/pkg-plist b/net/openafs/pkg-plist
index 296bd1c3b12d..9ca09b31d219 100644
--- a/net/openafs/pkg-plist
+++ b/net/openafs/pkg-plist
@@ -1,112 +1,74 @@
-bin/rxgen
-bin/sys
-bin/pagsh.krb
-bin/udebug
+bin/afs_compile_et
+bin/afsio
+bin/afsmonitor
+bin/aklog
+bin/asetkey
+bin/bos
+bin/cmdebug
+bin/fs
+bin/klog.krb5
+bin/livesys
 bin/pagsh
+bin/pagsh.krb
 bin/pts
-bin/tokens.krb
+bin/restorevol
+bin/rxgen
 bin/scout
-bin/xstat_cm_test
-bin/bos
-bin/unlog
+bin/sys
 bin/tokens
-bin/livesys
+bin/tokens.krb
+bin/translate_et
+bin/udebug
+bin/unlog
 bin/up
-bin/fs
+bin/xstat_cm_test
 bin/xstat_fs_test
-bin/afsmonitor
-bin/cmdebug
-bin/translate_et
-bin/afs_compile_et
-bin/restorevol
-bin/klog.krb5
-bin/asetkey
-bin/aklog
-bin/afsio
-include/openafs/afs/param.h
-include/openafs/afs/stds.h
-include/openafs/afs/afs_sysnames.h
+@sample etc/openafs/CellServDB.sample
+@sample etc/openafs/ThisCell.sample
+@sample etc/openafs/cacheinfo.sample
+include/openafs/afs/acl.h
+include/openafs/afs/afs.h
 include/openafs/afs/afs_args.h
-include/openafs/afs/icl.h
-include/openafs/afs/venus.h
-include/openafs/afs/pthread_nosigs.h
-include/openafs/afs/procmgmt.h
-include/openafs/afs/dirpath.h
-include/openafs/afs/fileutil.h
-include/openafs/afs/netutils.h
-include/openafs/afs/errors.h
-include/openafs/afs/vice.h
-include/openafs/afs/remote.h
-include/openafs/afs/ktime.h
-include/openafs/afs/afsutil_prototypes.h
-include/openafs/afs/packages.h
-include/openafs/afs/afsutil.h
-include/openafs/afs/pthread_glock.h
-include/openafs/afs/cmd.h
+include/openafs/afs/afs_assert.h
 include/openafs/afs/afs_atomlist.h
+include/openafs/afs/afs_consts.h
 include/openafs/afs/afs_lhash.h
-include/openafs/afs/softsig.h
-include/openafs/afs/com_err.h
-include/openafs/afs/error_table.h
-include/openafs/afs/mit-sipb-cr.h
-include/openafs/afs/afs.h
-include/openafs/afs/afscp.h
-include/openafs/afs/osi_inode.h
 include/openafs/afs/afs_stats.h
-include/openafs/afs/exporter.h
-include/openafs/afs/nfsclient.h
-include/openafs/afs/unified_afs.h
-include/openafs/afs/sysctl.h
-include/openafs/afs/rxgen_consts.h
-include/openafs/afs/afsint.h
+include/openafs/afs/afs_sysnames.h
+include/openafs/afs/afs_trace.h
 include/openafs/afs/afscbint.h
+include/openafs/afs/afscp.h
+include/openafs/afs/afsint.h
 include/openafs/afs/afssyscalls.h
-include/openafs/afs/xfsattrs.h
+include/openafs/afs/afsutil.h
+include/openafs/afs/afsutil_prototypes.h
 include/openafs/afs/audit.h
-include/openafs/afs/keys.h
-include/openafs/afs/cellconfig.h
 include/openafs/afs/auth.h
-include/openafs/afs/ktc.h
-include/openafs/afs/prclient.h
-include/openafs/afs/prerror.h
-include/openafs/afs/print.h
-include/openafs/afs/prserver.h
-include/openafs/afs/ptclient.h
-include/openafs/afs/ptuser.h
-include/openafs/afs/pterror.h
-include/openafs/afs/ptint.h
-include/openafs/afs/ptserver.h
-include/openafs/afs/acl.h
-include/openafs/afs/prs_fs.h
+include/openafs/afs/bnode.h
+include/openafs/afs/bosint.h
+include/openafs/afs/bubasics.h
+include/openafs/afs/budb.h
+include/openafs/afs/budb_client.h
+include/openafs/afs/budb_errs.h
 include/openafs/afs/bumon.h
 include/openafs/afs/butc.h
-include/openafs/afs/bubasics.h
-include/openafs/afs/tcdata.h
 include/openafs/afs/butm.h
 include/openafs/afs/butx.h
-include/openafs/afs/usd.h
-include/openafs/afs/dir.h
-include/openafs/afs/nfs.h
-include/openafs/afs/vnode.h
-include/openafs/afs/viceinode.h
-include/openafs/afs/volume.h
-include/openafs/afs/voldefs.h
-include/openafs/afs/partition.h
-include/openafs/afs/fssync.h
-include/openafs/afs/ihandle.h
-include/openafs/afs/namei_ops.h
-include/openafs/afs/vl_opcodes.h
-include/openafs/afs/vlserver.h
-include/openafs/afs/vldbint.h
+include/openafs/afs/cellconfig.h
+include/openafs/afs/cmd.h
 include/openafs/afs/cnvldb.h
+include/openafs/afs/com_err.h
+include/openafs/afs/daemon_com.h
+include/openafs/afs/dir.h
+include/openafs/afs/dirpath.h
+include/openafs/afs/error_table.h
+include/openafs/afs/errors.h
+include/openafs/afs/exporter.h
+include/openafs/afs/fileutil.h
 include/openafs/afs/fs_stats.h
-include/openafs/afs/volser.h
-include/openafs/afs/volint.h
-include/openafs/afs/budb.h
-include/openafs/afs/budb_errs.h
-include/openafs/afs/budb_client.h
-include/openafs/afs/bosint.h
-include/openafs/afs/bnode.h
+include/openafs/afs/fsprobe.h
+include/openafs/afs/fssync.h
+include/openafs/afs/gtxX11win.h
 include/openafs/afs/gtxcurseswin.h
 include/openafs/afs/gtxdumbwin.h
 include/openafs/afs/gtxframe.h
@@ -118,19 +80,61 @@ include/openafs/afs/gtxobjects.h
 include/openafs/afs/gtxtextcb.h
 include/openafs/afs/gtxtextobj.h
 include/openafs/afs/gtxwindows.h
-include/openafs/afs/gtxX11win.h
-include/openafs/afs/fsprobe.h
-include/openafs/afs/xstat_fs.h
-include/openafs/afs/xstat_cm.h
-include/openafs/afs/vioc.h
-include/openafs/afs/afs_consts.h
+include/openafs/afs/icl.h
+include/openafs/afs/ihandle.h
+include/openafs/afs/keys.h
+include/openafs/afs/ktc.h
+include/openafs/afs/ktime.h
+include/openafs/afs/mit-sipb-cr.h
+include/openafs/afs/namei_ops.h
+include/openafs/afs/netutils.h
+include/openafs/afs/nfs.h
+include/openafs/afs/nfsclient.h
+include/openafs/afs/osi_inode.h
+include/openafs/afs/packages.h
 include/openafs/afs/pagcb.h
+include/openafs/afs/param.h
+include/openafs/afs/partition.h
+include/openafs/afs/prclient.h
+include/openafs/afs/prerror.h
+include/openafs/afs/print.h
+include/openafs/afs/procmgmt.h
+include/openafs/afs/prs_fs.h
+include/openafs/afs/prserver.h
+include/openafs/afs/ptclient.h
+include/openafs/afs/pterror.h
+include/openafs/afs/pthread_glock.h
+include/openafs/afs/pthread_nosigs.h
+include/openafs/afs/ptint.h
+include/openafs/afs/ptserver.h
+include/openafs/afs/ptuser.h
+include/openafs/afs/remote.h
+include/openafs/afs/rxgen_consts.h
+include/openafs/afs/salvsync.h
+include/openafs/afs/softsig.h
+include/openafs/afs/stds.h
+include/openafs/afs/sysctl.h
+include/openafs/afs/tcdata.h
+include/openafs/afs/unified_afs.h
+include/openafs/afs/usd.h
+include/openafs/afs/venus.h
+include/openafs/afs/vice.h
+include/openafs/afs/viceinode.h
+include/openafs/afs/vioc.h
+include/openafs/afs/vl_opcodes.h
+include/openafs/afs/vldbint.h
+include/openafs/afs/vlserver.h
+include/openafs/afs/vnode.h
 include/openafs/afs/vnode_inline.h
+include/openafs/afs/voldefs.h
+include/openafs/afs/volint.h
+include/openafs/afs/volser.h
+include/openafs/afs/volume.h
 include/openafs/afs/volume_inline.h
-include/openafs/afs/salvsync.h
-include/openafs/afs/daemon_com.h
 include/openafs/afs/vsutils_prototypes.h
-include/openafs/afs/afs_assert.h
+include/openafs/afs/xfsattrs.h
+include/openafs/afs/xstat_cm.h
+include/openafs/afs/xstat_fs.h
 include/openafs/des.h
 include/openafs/des_conf.h
 include/openafs/des_odd.h
@@ -138,31 +142,32 @@ include/openafs/des_prototypes.h
 include/openafs/kopenafs.h
 include/openafs/lock.h
 include/openafs/lwp.h
-include/openafs/preempt.h
 include/openafs/mit-cpyright.h
-include/openafs/rx/rx_prototypes.h
+include/openafs/preempt.h
+include/openafs/rx/fcrypt.h
 include/openafs/rx/rx.h
-include/openafs/rx/rx_packet.h
-include/openafs/rx/xdr_prototypes.h
-include/openafs/rx/rxstat.h
-include/openafs/rx/rx_user.h
+include/openafs/rx/rx_clock.h
 include/openafs/rx/rx_event.h
-include/openafs/rx/rx_queue.h
 include/openafs/rx/rx_globals.h
-include/openafs/rx/rx_clock.h
-include/openafs/rx/rx_multi.h
-include/openafs/rx/rx_pthread.h
 include/openafs/rx/rx_lwp.h
 include/openafs/rx/rx_misc.h
+include/openafs/rx/rx_multi.h
 include/openafs/rx/rx_null.h
-include/openafs/rx/xdr.h
-include/openafs/rx/rxkad_prototypes.h
-include/openafs/rx/fcrypt.h
+include/openafs/rx/rx_packet.h
+include/openafs/rx/rx_prototypes.h
+include/openafs/rx/rx_pthread.h
+include/openafs/rx/rx_queue.h
+include/openafs/rx/rx_user.h
 include/openafs/rx/rxkad.h
+include/openafs/rx/rxkad_prototypes.h
+include/openafs/rx/rxstat.h
+include/openafs/rx/xdr.h
+include/openafs/rx/xdr_prototypes.h
 include/openafs/timer.h
 include/openafs/ubik.h
 include/openafs/ubik_int.h
 lib/afs/libacl.a
+lib/afs/libafscom_err.a
 lib/afs/libafsint.a
 lib/afs/libafsutil.a
 lib/afs/libaudit.a
@@ -174,7 +179,6 @@ lib/afs/libbudb.a
 lib/afs/libbutm.a
 lib/afs/libbxdb.a
 lib/afs/libcmd.a
-lib/afs/libafscom_err.a
 lib/afs/libdir.a
 lib/afs/libfsprobe.a
 lib/afs/libgtx.a
@@ -189,68 +193,43 @@ lib/afs/libxstat_cm.a
 lib/afs/libxstat_fs.a
 lib/afs/util.a
 lib/afs/vlib.a
-lib/librxstat.a
+lib/libafsauthent.a
+lib/libafsauthent.so
+lib/libafsauthent.so.1
+lib/libafsauthent.so.1.1
+lib/libafsauthent_pic.a
+lib/libafscp.a
+lib/libafsrpc.a
+lib/libafsrpc.so
+lib/libafsrpc.so.1
+lib/libafsrpc.so.1.5
+lib/libafsrpc_pic.a
 lib/libdes.a
+lib/libjuafs.a
+lib/libkopenafs.a
+lib/libkopenafs.so
+lib/libkopenafs.so.1
+lib/libkopenafs.so.1.1
 lib/liblwp.a
 lib/librx.a
 lib/librxkad.a
-lib/libafsauthent.a
+lib/librxstat.a
 lib/libuafs.a
 lib/libubik.a
-lib/libafsrpc.a
-lib/libafscp.a
 lib/pam_afs.krb.so.1
-lib/libjuafs.a
 lib/pam_afs.so.1
-lib/libafsrpc_pic.a
-lib/libafsrpc.so.1.5
-lib/libafsrpc.so.1
-lib/libafsrpc.so
-lib/libafsauthent_pic.a
-lib/libafsauthent.so.1
-lib/libafsauthent.so.1.1
-lib/libafsauthent.so
-lib/libkopenafs.so.1.1
-lib/libkopenafs.so.1
-lib/libkopenafs.so
-lib/libkopenafs.a
 libexec/openafs/buserver
-libexec/openafs/fileserver
 libexec/openafs/dafileserver
+libexec/openafs/dasalvager
+libexec/openafs/davolserver
+libexec/openafs/fileserver
 libexec/openafs/ptserver
 libexec/openafs/salvager
+libexec/openafs/salvageserver
 libexec/openafs/upclient
 libexec/openafs/upserver
 libexec/openafs/vlserver
 libexec/openafs/volserver
-libexec/openafs/davolserver
-libexec/openafs/salvageserver
-libexec/openafs/dasalvager
-%%DATADIR%%/C/afszcm.cat
-%%FUSE%%sbin/afsd.fuse
-sbin/dafssync-debug
-sbin/prdb_check
-sbin/rmtsysd
-sbin/pt_util
-sbin/volinfo
-sbin/afsd
-sbin/vsys
-sbin/vldb_convert
-sbin/vldb_check
-sbin/read_tape
-sbin/bosserver
-sbin/voldump
-sbin/vos
-sbin/uss
-sbin/backup
-sbin/butc
-sbin/rxdebug
-sbin/bos_util
-sbin/fms
-sbin/fstrace
-sbin/state_analyzer
-sbin/salvsync-debug
-sbin/fssync-debug
 man/man1/afs.1.gz
 man/man1/afs_compile_et.1.gz
 man/man1/afsmonitor.1.gz
@@ -436,7 +415,6 @@ man/man5/uss.5.gz
 man/man5/uss_bulk.5.gz
 man/man5/vldb.DB0.5.gz
 man/man8/afsd.8.gz
-%%FUSE%%man/man8/afsd.fuse.8.gz
 man/man8/aklog_dynamic_auth.8.gz
 man/man8/asetkey.8.gz
 man/man8/backup.8.gz
@@ -569,10 +547,34 @@ man/man8/volinfo.8.gz
 man/man8/volserver.8.gz
 man/man8/vsys.8.gz
 man/man8/xfs_size_check.8.gz
-@sample etc/openafs/CellServDB.sample
-@sample etc/openafs/ThisCell.sample
-@sample etc/openafs/cacheinfo.sample
+sbin/afsd
+sbin/backup
+sbin/bos_util
+sbin/bosserver
+sbin/butc
+sbin/dafssync-debug
+sbin/fms
+sbin/fssync-debug
+sbin/fstrace
+sbin/prdb_check
+sbin/pt_util
+sbin/read_tape
+sbin/rmtsysd
+sbin/rxdebug
+sbin/salvsync-debug
+sbin/state_analyzer
+sbin/uss
+sbin/vldb_check
+sbin/vldb_convert
+sbin/voldump
+sbin/volinfo
+sbin/volscan
+sbin/vos
+sbin/vsys
+%%DATADIR%%/C/afszcm.cat
+%%FUSE%%man/man8/afsd.fuse.8.gz
+%%FUSE%%sbin/afsd.fuse
 /%%KMODDIR%%/libafs.ko
-@dir /%%AFSMNTDIR%%
 @dir /%%AFSCACHEDIR%%
+@dir /%%AFSMNTDIR%%
 @dir /%%AFSSTATEDIR%%