From cc9fc325b5715e4a8a88925556d3b151b008ba1d Mon Sep 17 00:00:00 2001
From: jakob <jakob@openbsd.org>
Date: Mon, 9 May 2005 14:28:22 +0000
Subject: [PATCH] fix plugin location instead of creating soft line from
 /usr/lib/sasl2 bump pkgname

---
 security/cyrus-sasl2/Makefile      |  5 +++--
 security/cyrus-sasl2/pkg/DEINSTALL | 11 ----------
 security/cyrus-sasl2/pkg/INSTALL   | 35 ------------------------------
 3 files changed, 3 insertions(+), 48 deletions(-)
 delete mode 100644 security/cyrus-sasl2/pkg/DEINSTALL
 delete mode 100644 security/cyrus-sasl2/pkg/INSTALL

diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile
index 32aa1d9b46c..4f59b38dfad 100644
--- a/security/cyrus-sasl2/Makefile
+++ b/security/cyrus-sasl2/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.25 2005/01/12 21:31:06 sturm Exp $
+# $OpenBSD: Makefile,v 1.26 2005/05/09 14:28:22 jakob Exp $
 
 COMMENT=	"RFC 2222 SASL (Simple Authentication and Security Layer)"
 
 DISTNAME=	cyrus-sasl-2.1.20
-PKGNAME=	${DISTNAME}p3
+PKGNAME=	${DISTNAME}p4
 CATEGORIES=	security
 
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
@@ -26,6 +26,7 @@ CONFIGURE_ARGS+=	${CONFIGURE_SHARED}
 CONFIGURE_ARGS+=	--with-saslauthd="/var/sasl2" \
 			--enable-gssapi="/usr" \
 			--with-gss_impl="heimdal" \
+		 	--with-plugindir=${PREFIX}/lib/sasl2 \
 			--enable-login \
 			--enable-static \
 			--disable-sample
diff --git a/security/cyrus-sasl2/pkg/DEINSTALL b/security/cyrus-sasl2/pkg/DEINSTALL
deleted file mode 100644
index d69b124e0c4..00000000000
--- a/security/cyrus-sasl2/pkg/DEINSTALL
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-#
-# $OpenBSD: DEINSTALL,v 1.2 2003/02/04 22:59:48 naddy Exp $
-
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-
-if [ -L /usr/lib/sasl2 ]; then
-	rm /usr/lib/sasl2
-fi
-
-exit 0
diff --git a/security/cyrus-sasl2/pkg/INSTALL b/security/cyrus-sasl2/pkg/INSTALL
deleted file mode 100644
index 8d203b05af2..00000000000
--- a/security/cyrus-sasl2/pkg/INSTALL
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-#
-# $OpenBSD: INSTALL,v 1.3 2003/06/17 23:09:00 naddy Exp $
-
-# exit on errors, use a sane path and install prefix
-#
-set -e
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-PREFIX=${PKG_PREFIX:-/usr/local}
-
-# verify proper execution
-#
-if [ $# -ne 2 ]; then
-    echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
-    exit 1
-fi
-
-# Verify/process the command
-#
-case $2 in
-    PRE-INSTALL)
-	: nothing to pre-install for this port
-	;;
-    POST-INSTALL)
-	if [ ! -e /usr/lib/sasl2 ]; then
-		ln -s ${PREFIX}/lib/sasl2 /usr/lib/sasl2
-	fi
-	;;
-    *)
-	echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
-	exit 1
-	;;
-esac
-
-exit 0