From 4d9fda57f7b6c741eada9bfcce8d4d92401b437e Mon Sep 17 00:00:00 2001
From: dougb <dougb@FreeBSD.org>
Date: Sun, 13 Mar 2005 23:09:32 +0000
Subject: Add maildir support, prompted by the PR but with a different
 solution. This requires twiddling patch-af because it and the maildir patch
 were trying to adjust the same hunk.

While I'm here:
1. Remove a painfully obvious comment
2. s/pkg-message/${PKG_MESSAGE}/ to help people that have weird things
set in their environment.
---
 mail/pine4/Makefile       | 15 ++++++++++++---
 mail/pine4/distinfo       |  2 ++
 mail/pine4/files/patch-af |  9 ---------
 3 files changed, 14 insertions(+), 12 deletions(-)

(limited to 'mail/pine4')

diff --git a/mail/pine4/Makefile b/mail/pine4/Makefile
index 54471569d93b..916c06b99686 100644
--- a/mail/pine4/Makefile
+++ b/mail/pine4/Makefile
@@ -22,8 +22,6 @@ COMMENT=	PINE(tm) -- a Program for Internet News & Email
 
 RUN_DEPENDS=	ispell:${PORTSDIR}/textproc/ispell
 
-# Define "WITH_LDAP" to include ldap support.
-#
 .if defined(WITH_LDAP)
 USE_OPENLDAP=	yes
 LDAP_PREFIX?=	${LOCALBASE}
@@ -51,8 +49,19 @@ pre-fetch:
 .if !defined(BATCH) && !defined(PACKAGE_BUILDING)
 	${SH} pkg-install
 .endif
+.if defined(WITH_MAILDIR)
+PATCH_SITES=	http://www.math.washington.edu/~chappa/pine/patches/pine4.62/
+PATCHFILES=	maildir.patch.gz
+PATCH_DIST_ARGS+=	-E --quiet -d ${PATCH_WRKSRC} -p1
+.endif
 
 post-patch:
+# Do this here because the maildir patch also modifies this file
+	@${CP} ${WRKSRC}/imap/src/osdep/unix/Makefile \
+		${WRKSRC}/imap/src/osdep/unix/Makefile.presed
+	@${SED} -e 's:^CFLAGS=.*:CFLAGS=$$(BASECFLAGS) $$(EXTRACFLAGS):' \
+		${WRKSRC}/imap/src/osdep/unix/Makefile.presed > \
+		${WRKSRC}/imap/src/osdep/unix/Makefile
 .for f in build buildcyg
 	@${CP} ${WRKSRC}/${f} ${WRKSRC}/${f}.presed
 	@${SED} -e 's:CC=cc:CC=${CC}:g' ${WRKSRC}/${f}.presed > ${WRKSRC}/${f}
@@ -99,6 +108,6 @@ post-install:
 	${PREFIX}/bin/pine -P ${PREFIX}/etc/pine.conf -conf >${WRKSRC}/pine.conf
 	${INSTALL_DATA} ${WRKSRC}/pine.conf ${PREFIX}/etc/pine.conf
 
-	@${CAT} pkg-message
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/mail/pine4/distinfo b/mail/pine4/distinfo
index f3100a39625b..55f85d1930a5 100644
--- a/mail/pine4/distinfo
+++ b/mail/pine4/distinfo
@@ -1,2 +1,4 @@
 MD5 (pine4.62.tar.gz) = 97880cde506534d6d0cfb44aed366fa1
 SIZE (pine4.62.tar.gz) = 4108969
+MD5 (maildir.patch.gz) = 4efeb83dc94e9e5ed654e10e0b9337e3
+SIZE (maildir.patch.gz) = 23472
diff --git a/mail/pine4/files/patch-af b/mail/pine4/files/patch-af
index 851050817f8f..35b7ad38cb51 100644
--- a/mail/pine4/files/patch-af
+++ b/mail/pine4/files/patch-af
@@ -9,15 +9,6 @@
  LN=ln -s
  RANLIB=ranlib
  
-@@ -117,7 +117,7 @@
-  dummy.o pseudo.o netmsg.o flstring.o fdstring.o \
-  rfc822.o nntp.o smtp.o imap4r1.o pop3.o \
-  unix.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o
--CFLAGS=-g
-+CFLAGS=$(BASECFLAGS) $(EXTRACFLAGS)
- 
- CAT=cat
- MAKE=make
 @@ -219,8 +219,9 @@
  	 SPOOLDIR=/var \
  	 ACTIVEFILE=/usr/local/news/lib/active \
-- 
cgit