Massive cleanup and add the PASSFILE feature controlled by a new local USE flag.

5 files changed, 139 insertions, 2 deletions

diff --git a/net-mail/pine/ChangeLog b/net-mail/pine/ChangeLog
index d6fbbc379edd..4dcdba6621b9 100644
--- a/net-mail/pine/ChangeLog
+++ b/net-mail/pine/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-mail/pine
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/pine/ChangeLog,v 1.36 2003/09/16 06:11:46 rajiv Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/pine/ChangeLog,v 1.37 2003/09/20 04:40:51 max Exp $
+
+*pine-4.58-r2 (19 Sep 2003)
+
+  19 Sep 2003; Max Kalika <max@gentoo.org> pine-4.58-r2.ebuild,
+  files/pine-4.56-passfile.patch:
+  Massive cleanup and add the PASSFILE feature controlled by a new local USE
+  flag.
 
 *pine-4.58-r1 (16 Sep 2003)
 
diff --git a/net-mail/pine/Manifest b/net-mail/pine/Manifest
index 45aae1187fc6..a3304c5da2e8 100644
--- a/net-mail/pine/Manifest
+++ b/net-mail/pine/Manifest
@@ -1,10 +1,12 @@
+MD5 895ad95b014a18e06db793585bea170e pine-4.58-r2.ebuild 3352
 MD5 d1e5490be0d14f85b3ad82911fff3640 pine-4.58.ebuild 3312
 MD5 4c37407d8c7106315e06cc267b1806dc pine-4.50-r4.ebuild 3509
 MD5 a33d9cf73ee99c67dd5f075639c47a23 pine-4.58-r1.ebuild 3430
-MD5 6d2dca80f82de51229d1f1281d6648c3 ChangeLog 7105
+MD5 57922902874dba79c52deebc9dc729cf ChangeLog 7316
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 MD5 c47b08cab6132957eef9c0d61862f951 files/digest-pine-4.50-r4 131
 MD5 da5a30f5086db88f8dd801212f512e77 files/digest-pine-4.58-r1 145
+MD5 da5a30f5086db88f8dd801212f512e77 files/digest-pine-4.58-r2 145
 MD5 921f1e2837b3d3aaaff0ff9b78432e92 files/pine-4.30-ldap.patch 420
 MD5 36fbad9153bc6b61adb00767d199d284 files/imap-4.7c2-flock+maildir.patch 551
 MD5 3803bda87f35ee20456ab2b363460db9 files/pine-4.31-segfix.patch 460
@@ -15,6 +17,7 @@ MD5 5eb69ed43326ebdca20e77b988d0b19b files/pine-4.21-fixhome.patch 830
 MD5 e11e8fb4fba9fc54b7c0f302d79458bf files/pine-4.40-boguswarning.patch 512
 MD5 e2791bad5a20d4429dcd4a928714558f files/flock.c 1182
 MD5 6fca405df4fd22a5708ddf83e8081716 files/pine-4.40-lockfile-perm.patch 932
+MD5 dadc9e153e023ad3b24d8cefd4bf5a2b files/pine-4.56-passfile.patch 504
 MD5 b0aee0d39a268c8f0c85e774f7408509 files/pine-4.21-passwd.patch 448
 MD5 0493455a84ab45910a606f0f4f9f4dfd files/digest-pine-4.58 62
 MD5 3eb735b51e3192ee78b7b556e83256b3 files/transparency.patch 447
diff --git a/net-mail/pine/files/digest-pine-4.58-r2 b/net-mail/pine/files/digest-pine-4.58-r2
new file mode 100644
index 000000000000..c14d43b95bde
--- /dev/null
+++ b/net-mail/pine/files/digest-pine-4.58-r2
@@ -0,0 +1,2 @@
+MD5 6135222a12f06b2dfceea5c1b736891e pine4.58.tar.bz2 2837321
+MD5 f52ba0a0bd3ad18d09d0df287be397ba pine-4.58-chappa-all-20030915.patch.gz 106988
diff --git a/net-mail/pine/files/pine-4.56-passfile.patch b/net-mail/pine/files/pine-4.56-passfile.patch
new file mode 100644
index 000000000000..2b218e3fb9c5
--- /dev/null
+++ b/net-mail/pine/files/pine-4.56-passfile.patch
@@ -0,0 +1,12 @@
+--- pine/osdep/os-lnx.h.orig	2003-07-23 07:23:26.000000000 -0700
++++ pine/osdep/os-lnx.h	2003-07-23 07:23:30.000000000 -0700
+@@ -295,5 +295,9 @@
+ #define MAX_ADDR_EXPN   (1000)  /* Longest expanded addr                    */
+ #define MAX_ADDR_FIELD (10000)  /* Longest fully-expanded addr field        */
+ 
++/*----------------------------------------------------------------------
++    Allow for caching of passwords between connections.
++ ----*/
++#define PASSFILE ".pinepw"
+ 
+ #endif /* _OS_INCLUDED */
diff --git a/net-mail/pine/pine-4.58-r2.ebuild b/net-mail/pine/pine-4.58-r2.ebuild
new file mode 100644
index 000000000000..466f0a73b3e1
--- /dev/null
+++ b/net-mail/pine/pine-4.58-r2.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/pine/pine-4.58-r2.ebuild,v 1.1 2003/09/20 04:40:51 max Exp $
+
+inherit eutils
+
+DESCRIPTION="A tool for reading, sending and managing electronic messages."
+SRC_URI="ftp://ftp.cac.washington.edu/pine/${PN}${PV}.tar.bz2
+	mirror://gentoo/${P}-chappa-all-20030915.patch.gz"
+HOMEPAGE="http://www.washington.edu/pine/
+	http://www.math.washington.edu/~chappa/pine/patches/"
+
+LICENSE="PICO"
+SLOT="0"
+KEYWORDS="x86 ~ppc sparc ~alpha"
+IUSE="ssl ldap passfile"
+
+DEPEND="virtual/glibc
+	>=sys-apps/sed-4
+	>=sys-libs/ncurses-5.1
+	>=sys-libs/pam-0.72
+	ssl? ( dev-libs/openssl )
+	ldap? ( net-nds/openldap )
+	!net-mail/pine-maildir"
+
+S="${WORKDIR}/${PN}${PV}"
+
+src_unpack() {
+	unpack ${A} && cd "${S}"
+
+	epatch "${WORKDIR}/${P}-chappa-all-20030915.patch"
+	epatch "${FILESDIR}/pine-4.21-fixhome.patch"
+	epatch "${FILESDIR}/imap-4.7c2-flock.patch"
+	cp "${FILESDIR}/flock.c" "${S}/imap/src/osdep/unix"
+
+	if [ "`use ldap`" ] ; then
+		# link to shared ldap libs instead of static
+		epatch "${FILESDIR}/pine-4.30-ldap.patch"
+		mkdir "${S}/ldap"
+		ln -s /usr/lib "${S}/ldap/libraries"
+		ln -s /usr/include "${S}/ldap/include"
+	fi
+
+	if [ "`use passfile`" ] ; then
+		epatch "${FILESDIR}/pine-4.56-passfile.patch"
+	fi
+
+	epatch "${FILESDIR}/pine-4.31-segfix.patch"
+	epatch "${FILESDIR}/pine-4.40-lockfile-perm.patch"
+	epatch "${FILESDIR}/imap-2000-time.patch"
+	epatch "${FILESDIR}/pine-4.33-whitespace.patch"
+	# bug #23336 - makes pine transparent in terms that support it
+	epatch "${FILESDIR}/transparency.patch"
+
+	if [ "`use debug`" ] ; then
+		sed -e "s:-g -DDEBUG -DDEBUGJOURNAL:${CFLAGS} -g -DDEBUG -DDEBUGJOURNAL:" \
+			-i "${S}/pine/makefile.lnx" || die "sed pine/makefile.lnx failed"
+		sed -e "s:-g -DDEBUG:${CFLAGS} -g -DDEBUG:" \
+			-i "${S}/pico/makefile.lnx" || die "sed pico/makefile.lnx failed"
+	else
+		sed -e "s:-g -DDEBUG -DDEBUGJOURNAL:${CFLAGS}:" \
+			-i "${S}/pine/makefile.lnx" || die "sed pine/makefile.lnx failed"
+		sed -e "s:-g -DDEBUG:${CFLAGS}:" \
+			-i "${S}/pico/makefile.lnx" || die "sed pico/makefile.lnx failed"
+	fi
+
+	sed -e "s:/usr/local/lib/pine.conf:/etc/pine.conf:" \
+		-i "${S}/pine/osdep/os-lnx.h" || die "sed os-lnx.h failed"
+}
+
+src_compile() {
+	local BUILDOPTS
+
+	if [ "`use ssl`" ] ; then
+		BUILDOPTS="${BUILDOPTS} SSLDIR=/usr SSLTYPE=unix SSLCERTS=/etc/ssl/certs"
+		sed -e "s:\$(SSLDIR)/certs:/etc/ssl/certs:" \
+			-e "s:\$(SSLCERTS):/etc/ssl/certs:" \
+			-e "s:-I\$(SSLINCLUDE) ::" \
+			-i "${S}/imap/src/osdep/unix/Makefile" || die "sed Makefile failed"
+	else
+		BUILDOPTS="${BUILDOPTS} NOSSL"
+	fi
+
+	if [ "`use ldap`" ] ; then
+		./contrib/ldap-setup lnp lnp
+		BUILDOPTS="${BUILDOPTS} LDAPCFLAGS=-DENABLE_LDAP"
+	else
+		BUILDOPTS="${BUILDOPTS} NOLDAP"
+	fi
+
+	./build ${BUILDOPTS} lnp || die "compile problem"
+}
+
+src_install() {
+	exeinto /usr/bin
+	doexe bin/pine bin/pico bin/pilot bin/mtest bin/rpdump bin/rpload
+
+	insinto /etc
+	doins doc/mime.types
+	donewins doc/mailcap.unx mailcap
+
+	doman doc/pine.1 doc/pico.1 doc/pilot.1 doc/rpdump.1 doc/rpload.1
+	dodoc CPYRIGHT README doc/brochure.txt doc/tech-notes.txt
+
+	docinto imap
+	dodoc imap/docs/*.txt imap/docs/CONFIG imap/docs/RELNOTES
+
+	docinto imap/rfc
+	dodoc imap/docs/rfc/*.txt
+
+	docinto html/tech-notes
+	dohtml -r doc/tech-notes/
+}