- Replace INSTALL with @sample

- Better @extraunexec
- Replace DEINSTALL with UNMESSAGE
- Bump PKGNAME
- Add WANTLIB marker

ok naddy@

security/cfs/Makefile

@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.24 2004/06/15 18:32:22 sturm Exp $
+# $OpenBSD: Makefile,v 1.25 2004/12/03 16:08:47 alek Exp $
 
 NOT_FOR_ARCHS=	${LP64_ARCHS}
 
 COMMENT=	"cryptographic file system (user-space NFS server)"
 
 DISTNAME=	cfs-1.4.1
+PKGNAME=	${DISTNAME}p0
 CATEGORIES=	security
 
 HOMEPAGE=	http://www.crypto.com/software/
@@ -14,6 +15,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		c
 
 MASTER_SITES=	${HOMEPAGE} \
 		ftp://utopia.hacktic.nl/pub/crypto/disk/cfs/

security/cfs/pkg/DEINSTALL

@@ -1,26 +0,0 @@
-#!/bin/sh
-# $OpenBSD: DEINSTALL,v 1.1 2004/06/15 18:32:22 sturm Exp $
-
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-PREFIX=${PKG_PREFIX:-/usr/local}
-CRYPT=/crypt
-NULL=/null
-
-echo
-echo "+---------------"
-echo "| To completely deinstall the $1 package you need to perform"
-echo "| these steps as root:"
-echo "|"
-echo "|           revert changes to /etc/exports and /etc/rc.conf"
-if [ "$PKG_DELETE_EXTRA" != Yes ]; then
-    echo "|           umount $CRYPT"
-    echo "|           rm -r $CRYPT"
-    echo "|           rm -r $NULL"
-fi
-echo "|"
-echo "| Do not do this if you plan on re-installing $1"
-echo "| at some future time."
-echo "+---------------"
-echo
-
-exit 0

security/cfs/pkg/INSTALL

@@ -1,52 +0,0 @@
-#!/bin/sh
-# $OpenBSD: INSTALL,v 1.1 2004/06/15 18:32:22 sturm Exp $
-
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-PREFIX=${PKG_PREFIX:-/usr/local}
-CRYPT=/crypt
-NULL=/null
-
-do_notice()
-{
-	echo
-	echo "+---------------"
-	echo "| The existing directories $CRYPT and $NULL have"
-	echo "| not been changed."
-	echo "+---------------"
-}
-
-do_install()
-{
-	if [ ! -d $CRYPT ]; then
-		install -d -o root -g wheel -m 755 $CRYPT
-		echo "==> Directory $CRYPT created."
-	fi
-	if [ ! -d $NULL ]; then
-		install -d -o root -g wheel -m 0 $NULL
-		echo "==> Directory $NULL created."
-	fi
-}
-
-if [ $# -ne 2 ]; then
-    echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
-    exit 1
-fi
-
-case $2 in
-    PRE-INSTALL)
-	: nothing to pre-install for this port
-	;;
-    POST-INSTALL)
-	if [ -d /crypt -a -d /null ]; then
-	    do_notice $1
-	else
-	    do_install $1
-	fi
-	;;
-    *)
-	echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
-	exit 1
-	;;
-esac
-
-exit 0

security/cfs/pkg/PLIST

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.6 2004/09/15 18:35:59 espie Exp $
+@comment $OpenBSD: PLIST,v 1.7 2004/12/03 16:08:48 alek Exp $
 bin/cattach
 bin/cdetach
 bin/cmkdir
@@ -14,6 +14,9 @@ sbin/cfsd
 share/doc/cfs/
 share/doc/cfs/README.install
 share/doc/cfs/notes.ms
-@extraunexec umount /crypt > /dev/null 2>&1
+@sample /crypt/
+@mode 0
+@sample /null/
+@extraunexec umount /crypt > /dev/null 2>&1 || true
 @extraunexec rm -r /crypt
 @extraunexec rm -r /null

security/cfs/pkg/UNMESSAGE

@@ -0,0 +1 @@
+Do not forget to revert changes made to /etc/exports and /etc/rc.conf.