From e867f12dac1bd94ec533fa13427b74883d225e82 Mon Sep 17 00:00:00 2001
From: alek <alek@openbsd.org>
Date: Sun, 28 Nov 2004 21:41:31 +0000
Subject: [PATCH] - Kill DEINSTALL - Add @extra - Add WANTLIB marker - Don't
 hardcode /etc - Bump PKGNAME

ok jakob@
---
 mail/pine/Makefile      |  5 +++--
 mail/pine/pkg/DEINSTALL | 24 ------------------------
 mail/pine/pkg/MESSAGE   |  4 +++-
 mail/pine/pkg/PLIST     |  4 +++-
 4 files changed, 9 insertions(+), 28 deletions(-)
 delete mode 100644 mail/pine/pkg/DEINSTALL

diff --git a/mail/pine/Makefile b/mail/pine/Makefile
index 313ab127815..54118508bcb 100644
--- a/mail/pine/Makefile
+++ b/mail/pine/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.58 2004/07/18 16:57:55 jakob Exp $
+# $OpenBSD: Makefile,v 1.59 2004/11/28 21:41:31 alek Exp $
 
 COMMENT=	"program for Internet E-mail and News"
 COMMENT-pico=	"small text editor"
@@ -11,7 +11,7 @@ PICO_VERSION=	4.8
 PILOT_VERSION=	2.0
 
 DISTNAME=	pine${VERSION}
-PKGNAME=	pine-${VERSION}
+PKGNAME=	pine-${VERSION}p0
 PKGNAME-pico=	pico-${PICO_VERSION}
 PKGNAME-pilot=	pilot-${PILOT_VERSION}
 
@@ -26,6 +26,7 @@ PERMIT_PACKAGE_CDROM=	No
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	No
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		c crypto ssl termcap termlib
 
 NO_REGRESS=	Yes
 VMEM_WARNING=	Yes
diff --git a/mail/pine/pkg/DEINSTALL b/mail/pine/pkg/DEINSTALL
deleted file mode 100644
index c4a442ccb4d..00000000000
--- a/mail/pine/pkg/DEINSTALL
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-# $OpenBSD: DEINSTALL,v 1.3 2002/12/01 20:57:10 jakob Exp $
-#
-# pine de-installation
-
-set -e
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-PREFIX=${PKG_PREFIX:-/usr/local}
-
-if [ -f /etc/pine.conf -o -f /etc/pine.conf.fixed ]; then
-    echo
-    echo "+---------------"
-    echo "| To completely deinstall the $1 package you need to perform"
-    echo "| this step as root:"
-    echo "|"
-    echo "|           rm -rf /etc/pine.*"
-    echo "|"
-    echo "| Do not do this if you plan on re-installing $1"
-    echo "| at some future time."
-    echo "+---------------"
-    echo
-fi
-
-exit 0
diff --git a/mail/pine/pkg/MESSAGE b/mail/pine/pkg/MESSAGE
index 1ebc124357f..5915ca8f234 100644
--- a/mail/pine/pkg/MESSAGE
+++ b/mail/pine/pkg/MESSAGE
@@ -2,4 +2,6 @@ Some documentation for pine can be found in
 ${PREFIX}/share/doc/pine as well as pine(1).
 
 Please read the documentation for instruction on how to make/update
-the configuration files /etc/pine.conf and /etc/pine.conf.fixed
+the configuration files:
+        ${SYSCONFDIR}/pine.conf
+        ${SYSCONFDIR}/pine.conf.fixed
diff --git a/mail/pine/pkg/PLIST b/mail/pine/pkg/PLIST
index 69823f3db31..a328a986804 100644
--- a/mail/pine/pkg/PLIST
+++ b/mail/pine/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.13 2004/09/15 09:09:44 espie Exp $
+@comment $OpenBSD: PLIST,v 1.14 2004/11/28 21:41:31 alek Exp $
 bin/pine
 bin/rpdump
 bin/rpload
@@ -7,3 +7,5 @@ bin/rpload
 @man man/man1/rpload.1
 share/doc/pine/
 share/doc/pine/tech-notes.txt
+@extra ${SYSCONFDIR}/pine.conf
+@extra ${SYSCONFDIR}/pine.conf.fixed