use PKG_SYSCONFSUBDIR=sfs

use /var/sfs instead of /usr/pkg/var/sfs
use OWN_DIRS_PERMS
bump PKGREVISION

4 files changed, 19 insertions, 31 deletions

diff --git a/security/sfs/DEINSTALL b/security/sfs/DEINSTALL
deleted file mode 100644
index 4874ae17b5f..00000000000
--- a/security/sfs/DEINSTALL
+++ /dev/null
@@ -1,12 +0,0 @@
-# $NetBSD: DEINSTALL,v 1.1.1.1 2003/03/17 21:01:47 agc Exp $
-
-case "${STAGE}" in
-POST-DEINSTALL)
-	${ECHO} ===========================================================================
-	${ECHO}
-	${ECHO} If you will not be reinstalling SFS, manually remove ${SFSDIR}
-	${ECHO} and ${PREFIX}/etc/sfs.
-	${ECHO}
-	${ECHO} ===========================================================================
-	;;
-esac
diff --git a/security/sfs/MESSAGE b/security/sfs/MESSAGE
index 443c7cf3395..a152abb9efd 100644
--- a/security/sfs/MESSAGE
+++ b/security/sfs/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2003/03/17 21:01:47 agc Exp $
+$NetBSD: MESSAGE,v 1.2 2003/03/23 14:28:32 lukem Exp $
 
 Quick Client Setup:
 
@@ -20,7 +20,7 @@ nfs_server=YES
 sfssd=YES
 
 2. Run: /etc/rc.d/nfsd start
-3. Copy  ${PREFIX}/etc/sfs/sfsrwsd_config.sample to 
+3. Copy  ${SFSEXAMPLEDIR}/sfsrwsd_config.sample to 
    ${PREFIX}/etc/sfs/sfsrwsd_config and modify.
 4. Modify /etc/exports to match your sfsrwsd_config.
 5. Create the root directories in ${SFSDIR}/root.
diff --git a/security/sfs/Makefile b/security/sfs/Makefile
index bed43d7b196..452963fa72d 100644
--- a/security/sfs/Makefile
+++ b/security/sfs/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/03/17 21:01:47 agc Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/23 14:28:32 lukem Exp $
 #
 
 DISTNAME=		sfs-0.7.2
+PKGREVISION=		1
 CATEGORIES=		net security
 MASTER_SITES=		http://www.fs.net/sfs/@new-york.lcs.mit.edu,u83s4uk49nt8rmp4uwmt2exvz6d3cavh/pub/sfswww/dist/
 
@@ -13,7 +14,8 @@ GNU_CONFIGURE=		yes
 
 CONFIGURE_ARGS+=	--with-sfsuser=sfs
 CONFIGURE_ARGS+=	--with-sfsgroup=sfs
-CONFIGURE_ARGS+=	--with-etcdir=${PREFIX}/etc/sfs
+CONFIGURE_ARGS+=	--with-etcdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--with-sfsdir=${SFS_ROOT}
 CONFIGURE_ARGS+=	--disable-uvfs
 
 USE_PKGINSTALL=		yes
@@ -22,23 +24,22 @@ USE_PERL5=		yes
 
 DIST_GCC=		2.95.3
 
-PKG_USERS=              sfs:sfs::Self-certifying\\ file\\ system:/
-PKG_GROUPS=             sfs
+PKG_USERS=		sfs:sfs::Self-certifying\\ file\\ system:/
+PKG_GROUPS=		sfs
+PKG_SYSCONFSUBDIR=	sfs
 
 .include "../../mk/bsd.prefs.mk"
 
-SFSDIR?=		${PREFIX}/var/sfs
+SFSDIR?=		/var/sfs
 SFS_ROOT=		${SFSDIR}
 
-CONFIGURE_ARGS+=	--with-sfsdir=${SFS_ROOT}
+OWN_DIRS_PERMS=		${SFS_ROOT} sfs sfs 555
 
-MESSAGE_SUBST+=         SFSDIR=${SFS_ROOT}
+SFSEXAMPLEDIR=		${PREFIX}/share/examples/sfs
 
-INFO_FILES=		sfs.info
+MESSAGE_SUBST+=		SFSDIR=${SFS_ROOT} SFSEXAMPLEDIR=${SFSEXAMPLEDIR}
 
-pre-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/etc/sfs
-	${INSTALL_DATA_DIR} ${SFS_ROOT}
+INFO_FILES=		sfs.info
 
 post-install:
 	@${SED} -e 's|@PREFIX@|${PREFIX}|g' ${FILESDIR}/sfscd \
@@ -47,8 +48,9 @@ post-install:
 	@${SED} -e 's|@PREFIX@|${PREFIX}|g' ${FILESDIR}/sfssd \
 		> ${PREFIX}/etc/rc.d/sfssd
 	@${CHMOD} +x ${PREFIX}/etc/rc.d/sfssd
+	${INSTALL_DATA_DIR} ${SFSEXAMPLEDIR}
 	@${SED} -e 's|@SFSDIR@|${SFS_ROOT}|g' ${FILESDIR}/sfsrwsd_config.sample \
-		> ${PREFIX}/etc/sfs/sfsrwsd_config.sample
+		> ${SFSEXAMPLEDIR}/sfsrwsd_config.sample
 
 .include "../../devel/gmp/buildlink2.mk"
 .include "../../lang/gcc/buildlink2.mk"
diff --git a/security/sfs/PLIST b/security/sfs/PLIST
index 0f30c4b25f0..c0c9bc331d2 100644
--- a/security/sfs/PLIST
+++ b/security/sfs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2003/03/22 22:07:22 lukem Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/03/23 14:28:32 lukem Exp $
 bin/dirsearch
 bin/newaid
 bin/rex
@@ -10,7 +10,6 @@ bin/sfsproac
 bin/ssu
 etc/rc.d/sfscd
 etc/rc.d/sfssd
-etc/sfs/sfsrwsd_config.sample
 include/sfs
 include/${PKGNAME}/aclnt.h
 include/${PKGNAME}/aes.h
@@ -194,10 +193,9 @@ share/sfs/sfs_srp_parms
 share/sfs/sfsauthd_config
 share/sfs/sfscd_config
 share/sfs/sfssd_config
+share/examples/sfs/sfsrwsd_config.sample
 @exec ${MKDIR} %D/var/sfs
-@dirrm var/sfs
-@dirrm var
+@dirrm share/examples/sfs
 @dirrm share/sfs
 @dirrm lib/${PKGNAME}
 @dirrm include/${PKGNAME}
-@dirrm etc/sfs