From 14cf43194526c7e6fc02bade9f835107ddf72195 Mon Sep 17 00:00:00 2001
From: Doug Barton <dougb@FreeBSD.org>
Date: Sat, 9 Jun 2001 10:29:24 +0000
Subject: portlint fixes, unbreak (optional) ldap support.

---
 mail/pine4/Makefile    | 25 +++++++++++++------------
 mail/pine4/pkg-descr   |  4 ++--
 mail/pine4/pkg-install |  2 --
 3 files changed, 15 insertions(+), 16 deletions(-)

(limited to 'mail')

diff --git a/mail/pine4/Makefile b/mail/pine4/Makefile
index 1a35226b842e..3177aff6df71 100644
--- a/mail/pine4/Makefile
+++ b/mail/pine4/Makefile
@@ -12,9 +12,13 @@ CATEGORIES=	mail news
 MASTER_SITES=	ftp://ftp.cac.washington.edu/pine/
 DISTNAME=	${PORTNAME}${PORTVERSION}
 
-MAINTAINER=	DougB@FreeBSD.org
+.if defined(WITH_MAILDIR)
+PATCH_SITES+=	http://www.qmail.org/
+PATCHFILES+=	pine-maildir-4.33
+PATCH_DIST_STRIP=-p1
+.endif
 
-MAN1=		pine.1 pico.1 pilot.1
+MAINTAINER=	DougB@FreeBSD.org
 
 LIB_DEPENDS=	c-client4.8:${PORTSDIR}/mail/cclient
 
@@ -24,7 +28,7 @@ LIB_DEPENDS=	c-client4.8:${PORTSDIR}/mail/cclient
 #
 .if defined(WITH_LDAP)
 LDAP_PREFIX?=	${LOCALBASE}
-BUILD_DEPENDS+=	${LDAP_PREFIX}/lib/libldap.a:${PORTSDIR}/net/ldap
+BUILD_DEPENDS+=	${LDAP_PREFIX}/lib/libldap.a:${PORTSDIR}/net/openldap
 .endif
 
 .if defined(WITH_SSL)
@@ -32,11 +36,7 @@ USE_OPENSSL=	yes
 EXTRA_OPTS=	SSL_LINK="-L${OPENSSLLIB} -lssl -lcrypto"
 .endif
 
-.if defined(WITH_MAILDIR)
-PATCH_SITES+=	http://www.qmail.org/
-PATCHFILES+=	pine-maildir-4.33
-PATCH_DIST_STRIP=-p1
-.endif
+MAN1=		pine.1 pico.1 pilot.1
 
 pre-fetch:
 .if !defined(WITH_MAILDIR)
@@ -44,6 +44,7 @@ pre-fetch:
 	@${ECHO_MSG} "WITH_MAILDIR=yes enables support of Maildir"
 	@${ECHO_MSG} ""
 .endif
+
 .if !defined(BATCH) && !defined(PACKAGE_BUILDING)
 	${SH} pkg-install
 .endif
@@ -67,13 +68,13 @@ post-patch:
 		${RM} $$i.sed ; \
 	done
 .if defined(WITH_LDAP)
-	-mkdir ${WRKSRC}/ldap
-	ln -sf ${LDAP_PREFIX}/include ${WRKSRC}/ldap/include
-	ln -sf  ${LDAP_PREFIX}/lib ${WRKSRC}/ldap/libraries
+	${MKDIR} ${WRKSRC}/ldap
+	${LN} -sf ${LDAP_PREFIX}/include ${WRKSRC}/ldap/include
+	${LN} -sf ${LDAP_PREFIX}/lib ${WRKSRC}/ldap/libraries
 .endif
 
 do-build:
-	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ./build bsf $(EXTRA_OPTS))
+	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ./build bsf ${EXTRA_OPTS})
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/pico ${PREFIX}/bin/pico
diff --git a/mail/pine4/pkg-descr b/mail/pine4/pkg-descr
index 2dc657e76cd4..b9710407194d 100644
--- a/mail/pine4/pkg-descr
+++ b/mail/pine4/pkg-descr
@@ -18,5 +18,5 @@ pgpencode, and pgpsign.
 
 WWW: http://www.washington.edu/pine/
 
-Adrian Penisoara (Ady)
-pine@freebsd.ady.ro
+- Doug Barton
+DougB@FreeBSD.org
diff --git a/mail/pine4/pkg-install b/mail/pine4/pkg-install
index b8e5db1ea6ee..7441a8e5e140 100644
--- a/mail/pine4/pkg-install
+++ b/mail/pine4/pkg-install
@@ -5,5 +5,3 @@ if [ "$2" = "POST-INSTALL" -o -n "${PACKAGE_BUILDING}" ]; then
 fi
 
 /usr/bin/dialog --yesno "SECURITY NOTE: The pine software has had several remote vulnerabilities discovered in the past, which allowed remote attackers to execute arbitrary code as you on your local system, by the action of sending a specially-prepared email. All such KNOWN problems have been fixed, but the pine code is written in a very insecure style and the FreeBSD Security Officer believes there are likely to be other undiscovered vulnerabilities. Do you wish to proceed with the installation of pine anyway?" 12 70 || /usr/bin/false
-
-
-- 
cgit