Version bump

5 files changed, 176 insertions, 2 deletions

diff --git a/mail-client/pine/ChangeLog b/mail-client/pine/ChangeLog
index 37d7dcd0ee81..8f0a2d258ebc 100644
--- a/mail-client/pine/ChangeLog
+++ b/mail-client/pine/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/pine
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/ChangeLog,v 1.2 2004/06/07 03:55:14 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/ChangeLog,v 1.3 2004/06/08 23:29:53 g2boojum Exp $
+
+*pine-4.60 (08 Jun 2004)
+
+  08 Jun 2004; Grant Goodyear <g2boojum@gentoo.org>
+  +files/imap-4.7c2-flock_4.60.patch, +pine-4.60.ebuild:
+  Version bump that supposedly fixes Bugs 50696, 23232, 28877, and 48273.
 
   06 Jun 2004; Aron Griffis <agriffis@gentoo.org> pine-4.50-r4.ebuild,
   pine-4.58-r1.ebuild, pine-4.58-r2.ebuild, pine-4.58-r3.ebuild,
diff --git a/mail-client/pine/Manifest b/mail-client/pine/Manifest
index ffd52d00fe19..5ded1b4356b3 100644
--- a/mail-client/pine/Manifest
+++ b/mail-client/pine/Manifest
@@ -3,8 +3,10 @@ MD5 cebcdf0798f508121fc30942fa5c2790 pine-4.58.ebuild 3296
 MD5 0c43cc360d13611c57e1d87e817e7062 pine-4.50-r4.ebuild 3473
 MD5 ac38b7a948630d92106109b938d53a56 pine-4.58-r1.ebuild 3408
 MD5 09a324a2109a4f3a1d84656d03ca9bb2 pine-4.58-r3.ebuild 4300
-MD5 5e3e249b9c0aa1ea33649244b35a60c1 ChangeLog 8644
+MD5 6ea50ff901b31946cf2b92ed0031089f ChangeLog 8854
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
+MD5 5fc33eeda6d77cc12cff50ca429b3bd3 pine-4.60.ebuild 4711
+MD5 de52689ee75160c695bf4659ee956845 files/imap-4.7c2-flock_4.60.patch 537
 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
@@ -22,4 +24,5 @@ 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 74f43c70f061a3fb9378d7800b64ccaa files/digest-pine-4.60 136
 MD5 3eb735b51e3192ee78b7b556e83256b3 files/transparency.patch 447
diff --git a/mail-client/pine/files/digest-pine-4.60 b/mail-client/pine/files/digest-pine-4.60
new file mode 100644
index 000000000000..c307c12f63be
--- /dev/null
+++ b/mail-client/pine/files/digest-pine-4.60
@@ -0,0 +1,2 @@
+MD5 aece91c8a857605994829ffa91d98c9f pine4.60.tar.bz2 2996963
+MD5 0d321869aec8a6dc86e484a648c6e9ce pine-4.60-chappa-all.patch.gz 143602
diff --git a/mail-client/pine/files/imap-4.7c2-flock_4.60.patch b/mail-client/pine/files/imap-4.7c2-flock_4.60.patch
new file mode 100644
index 000000000000..3bb14250d01d
--- /dev/null
+++ b/mail-client/pine/files/imap-4.7c2-flock_4.60.patch
@@ -0,0 +1,14 @@
+--- imap/src/osdep/unix/Makefile.flock	Wed Aug 23 05:51:40 2000
++++ imap/src/osdep/unix/Makefile	Wed Aug 23 05:51:44 2000
+@@ -116,7 +116,7 @@
+ BINARIES=osdep.o mail.o misc.o newsrc.o smanager.o utf8.o siglocal.o \
+  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 maildir.o
+-CFLAGS=-g
++ unix.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o maildir.o flock.o
++CFLAGS=$(BASECFLAGS) $(EXTRACFLAGS)
+ 
+ CAT=cat
+ MAKE=make
+ MV=mv
diff --git a/mail-client/pine/pine-4.60.ebuild b/mail-client/pine/pine-4.60.ebuild
new file mode 100644
index 000000000000..c98d4b59f4a3
--- /dev/null
+++ b/mail-client/pine/pine-4.60.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/pine-4.60.ebuild,v 1.1 2004/06/08 23:29:53 g2boojum Exp $
+
+inherit eutils
+
+DESCRIPTION="A tool for reading, sending and managing electronic messages."
+HOMEPAGE="http://www.washington.edu/pine/
+	http://www.math.washington.edu/~chappa/pine/patches/"
+SRC_URI="ftp://ftp.cac.washington.edu/pine/${PN}${PV}.tar.bz2
+	mirror://gentoo/${P}-chappa-all.patch.gz"
+#	ipv6? (
+#		http://www.ngn.euro6ix.org/IPv6/${PN}/${P}-v6-20031001.diff
+#		http://www.ngn.euro6ix.org/IPv6/${PN}/readme.${P}-v6-20031001
+#	)"
+
+LICENSE="PICO"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+#IUSE="ipv6 maildir ssl ldap kerberos passfile"
+IUSE="ssl ldap kerberos passfile debug"
+
+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 )
+	kerberos? ( app-crypt/mit-krb5 )"
+
+S="${WORKDIR}/${PN}${PV}"
+
+src_unpack() {
+	unpack ${A} && cd "${S}"
+
+	# Various fixes and features.
+	epatch "${WORKDIR}/${P}-chappa-all.patch"
+	# Fix Home and End keys. Seems to work anyway?
+	#epatch "${FILESDIR}/pine-4.21-fixhome.patch"
+	# UTF8 support. Not ported. 4.60 has utf8 some conversion.
+	#epatch "${DISTDIR}/${PN}${PV}-utf8-to-singlebyte.patch"
+	# Fix flock() emulation.
+	cp "${FILESDIR}/flock.c" "${S}/imap/src/osdep/unix"
+	# Build the flock() emulation.
+	epatch "${FILESDIR}/imap-4.7c2-flock_4.60.patch"
+	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 ipv6`" ] ; then
+#		epatch "${DISTDIR}/${P}-v6-20031001.diff"
+#	fi
+	if [ "`use passfile`" ] ; then
+		#Is this really the correct place to define it?
+		epatch "${FILESDIR}/pine-4.56-passfile.patch"
+	fi
+
+	# Something from RedHat.
+	epatch "${FILESDIR}/pine-4.31-segfix.patch"
+	# Create lockfiles with a mode of 0600 instead of 0666.
+	epatch "${FILESDIR}/pine-4.40-lockfile-perm.patch"
+	# Add missing time.h includes.
+	epatch "${FILESDIR}/imap-2000-time.patch"
+	# Get rid of stripwhitespace() calls.
+	# Fixed with changed default behaviour and options.
+	# Patch does not apply anymore.
+	#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 myconf
+	if [ "`use ssl`" ] ; then
+		myconf="${myconf} 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
+		myconf="${myconf} NOSSL"
+	fi
+	if [ "`use ldap`" ] ; then
+		./contrib/ldap-setup lnp lnp
+		myconf="${myconf} LDAPCFLAGS=-DENABLE_LDAP"
+	else
+		myconf="${myconf} NOLDAP"
+	fi
+	if [ "`use kerberos`" ] ; then
+		myconf="${myconf} EXTRAAUTHENTICATORS=gss"
+	fi
+
+	./build ${myconf} lnp || die "compile problem"
+}
+
+src_install() {
+	dobin 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
+#	if [ "`use ipv6`" ] ; then
+#		dodoc "${DISTDIR}/readme.${P}-v6-20031001"
+#	fi
+
+	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/
+}
+
+pkg_postinst() {
+	einfo
+	einfo "This build of Pine has Maildir support built in as"
+	einfo "part of the chappa-all patch."
+	einfo
+	einfo "If you have a maildir at ~/Maildir it will be your"
+	einfo "default INBOX. The path may be changed with the"
+	einfo "maildir-location setting in Pine."
+	einfo
+	einfo "If you don't have any maildirs Pine works as before"
+	einfo "with the INBOX at /var/spool/mail/."
+	einfo
+}