* Create the link /usr/lib/sasl -> ${PREFIX}/lib/sasl as it's where SASL-

  aware applications look for authentication mechanisms by default.
* Warn package admin if ${PREFIX}/lib/sasl is non-empty after
  deinstallation, as it may contain service config files.
* Purge use of PKGDIR.

4 files changed, 22 insertions, 8 deletions

diff --git a/security/cyrus-sasl/DEINSTALL b/security/cyrus-sasl/DEINSTALL
index 1743439f402..499d1ba5e9d 100644
--- a/security/cyrus-sasl/DEINSTALL
+++ b/security/cyrus-sasl/DEINSTALL
@@ -1,12 +1,13 @@
 #!/bin/sh
 #
-# $NetBSD: DEINSTALL,v 1.3 2001/11/26 06:54:14 jlam Exp $
+# $NetBSD: DEINSTALL,v 1.4 2002/01/31 20:42:08 jlam Exp $
 
 SASLDB=@PKG_SYSCONFDIR@/sasldb.db
 PWCHECKDIR=@PWCHECKDIR@
 
 case ${STAGE} in
 POST-DEINSTALL)
+	${RM} -f /usr/lib/sasl
 	${RM} -rf ${PWCHECKDIR}
 	if [ -e ${SASLDB} ]
 	then
diff --git a/security/cyrus-sasl/INSTALL b/security/cyrus-sasl/INSTALL
new file mode 100644
index 00000000000..21144c2cd01
--- /dev/null
+++ b/security/cyrus-sasl/INSTALL
@@ -0,0 +1,12 @@
+# $NetBSD: INSTALL,v 1.3 2002/01/31 20:42:08 jlam Exp $
+
+case ${STAGE} in
+POST-INSTALL)
+	#
+	# Create the default search location for SASL authentication
+	# mechanism libraries.
+	#
+	${RM} -f /usr/lib/sasl
+	${LN} -s ${PKG_PREFIX}/lib/sasl /usr/lib/sasl
+	;;
+esac
diff --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile
index 2c1529f0666..3252441a305 100644
--- a/security/cyrus-sasl/Makefile
+++ b/security/cyrus-sasl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2002/01/31 19:52:02 jlam Exp $
+# $NetBSD: Makefile,v 1.28 2002/01/31 20:42:09 jlam Exp $
 
 DISTNAME=		cyrus-sasl-1.5.27
 SVR4_PKGNAME=		csasl
@@ -33,7 +33,7 @@ FILES_SUBST+=		PWCHECKDIR=${PWCHECKDIR}
 
 BUILD_DEFS+=		CYRUS_USER CYRUS_GROUP
 
-PLIST_SRC=		${PKGDIR}/PLIST.common
+PLIST_SRC=		${.CURDIR}/PLIST.common
 
 CONFIGURE_ARGS+=	--with-pwcheck=${PWCHECKDIR}
 CONFIGURE_ARGS+=	--with-dblib=ndbm
@@ -55,12 +55,12 @@ CONFIGURE_ARGS+=	--disable-krb4		# --- no KERBEROS_V4
 
 .if defined(SASL_USE_GSSAPI) && ${SASL_USE_GSSAPI} == "YES"
 CONFIGURE_ARGS+=	--enable-gssapi=/usr	# GSSAPI
-PLIST_SRC+=		${PKGDIR}/PLIST.krb5
+PLIST_SRC+=		${.CURDIR}/PLIST.krb5
 .else
 CONFIGURE_ARGS+=	--disable-gssapi	# --- no GSSAPI
 .endif
 
-PLIST_SRC+=		${PKGDIR}/PLIST.plugins
+PLIST_SRC+=		${.CURDIR}/PLIST.plugins
 
 .if defined(USE_PAM)
 .include "../../security/PAM/buildlink.mk"
@@ -71,9 +71,11 @@ CONFIGURE_ARGS+=	--with-pam=${PREFIX}
 PKG_GROUPS=		${CYRUS_GROUP}
 PKG_USERS=		${CYRUS_USER}:${CYRUS_GROUP}::::${SH}
 RCD_SCRIPTS=		sasl_pwcheck
+OWN_DIRS=		${PREFIX}/lib/sasl
 OWN_DIRS_PERMS=		${PWCHECKDIR} ${CYRUS_USER} ${ROOT_GROUP} 0700
 
-DEINSTALL_EXTRA_TMPL=	${PKGDIR}/DEINSTALL
+DEINSTALL_EXTRA_TMPL=	${.CURDIR}/DEINSTALL
+INSTALL_EXTRA_TMPL=	${.CURDIR}/INSTALL
 
 post-extract:
 	cd ${WRKSRC}; ${RM} -f include/md5.h
diff --git a/security/cyrus-sasl/PLIST.plugins b/security/cyrus-sasl/PLIST.plugins
index fd330f69896..44faf5cf8dc 100644
--- a/security/cyrus-sasl/PLIST.plugins
+++ b/security/cyrus-sasl/PLIST.plugins
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.plugins,v 1.3 2002/01/13 14:23:38 skrll Exp $
+@comment $NetBSD: PLIST.plugins,v 1.4 2002/01/31 20:42:09 jlam Exp $
 lib/sasl/libanonymous.a
 lib/sasl/libanonymous.la
 lib/sasl/libanonymous.so
@@ -19,4 +19,3 @@ lib/sasl/libplain.la
 lib/sasl/libplain.so
 lib/sasl/libplain.so.1
 lib/sasl/libplain.so.1.15
-@unexec ${RMDIR} -p %D/lib/sasl 2>/dev/null || ${TRUE}