Version bump, resolve bug #58205. Thanks to: Anders Hellgren <andh@gentoo.se>.

4 files changed, 166 insertions, 2 deletions

diff --git a/mail-client/pine/ChangeLog b/mail-client/pine/ChangeLog
index e9f96a627fde..6778cd409282 100644
--- a/mail-client/pine/ChangeLog
+++ b/mail-client/pine/ChangeLog
@@ -1,7 +1,14 @@
 # ChangeLog for mail-client/pine
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/ChangeLog,v 1.11 2004/07/24 13:59:16 alexander Exp $
-  
+# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/ChangeLog,v 1.12 2004/07/28 02:14:33 langthang Exp $
+
+*pine-4.61 (27 Jul 2004)
+
+  27 Jul 2004; Tuan Van <langthang@gentoo.org> +pine-4.61.ebuild:
+  Version bump, resolve bug #58205.
+  Thanks to: Anders Hellgren <andh@gentoo.se>
+  This ebuild also installs mailutil tool, resolve bug #53489.
+
   24 Jun 2004; Alexander Plank <alexander@gentoo.org> pine-4.58-r3.ebuild:
   add -macos; doesn't compile correctly
 
diff --git a/mail-client/pine/Manifest b/mail-client/pine/Manifest
index dcd30f331b21..d3c192246dd3 100644
--- a/mail-client/pine/Manifest
+++ b/mail-client/pine/Manifest
@@ -1,5 +1,6 @@
 MD5 d8cde185d59fc9edbd42b8aac32a134f pine-4.58.ebuild 3336
 MD5 389917fa953f4231b68b745faffbfcbd pine-4.50-r4.ebuild 3516
+MD5 ccb1667e716fcb4bd449ca7ca1b9b564 pine-4.61.ebuild 4671
 MD5 30cc9ba9af4fe0125a599e79f0d0bab7 pine-4.58-r3.ebuild 4347
 MD5 211c47f17e249e93cae1645c02079e4d ChangeLog 9700
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
@@ -21,4 +22,5 @@ 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 842103af69000cf5e815dfd79972d99f files/digest-pine-4.61 136
 MD5 3eb735b51e3192ee78b7b556e83256b3 files/transparency.patch 447
diff --git a/mail-client/pine/files/digest-pine-4.61 b/mail-client/pine/files/digest-pine-4.61
new file mode 100644
index 000000000000..922d51aa5926
--- /dev/null
+++ b/mail-client/pine/files/digest-pine-4.61
@@ -0,0 +1,2 @@
+MD5 885c6aa4f4f16fcb83a49ef6c025307e pine4.61.tar.bz2 3032253
+MD5 8988efbfd1f33693230c83babfa0b5f8 pine-4.61-chappa-all.patch.gz 148297
diff --git a/mail-client/pine/pine-4.61.ebuild b/mail-client/pine/pine-4.61.ebuild
new file mode 100644
index 000000000000..a43bc2c1ca88
--- /dev/null
+++ b/mail-client/pine/pine-4.61.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/pine/pine-4.61.ebuild,v 1.1 2004/07/28 02:14:33 langthang 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 ~amd64 -macos"
+#IUSE="ipv6 maildir ssl ldap kerberos passfile"
+IUSE="ssl ldap kerberos passfile debug"
+
+DEPEND="virtual/libc
+	>=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 \
+	      mailutil/mailutil
+
+	insinto /etc
+	doins doc/mime.types
+
+	# Only mailbase should install /etc/mailcap
+#	donewins doc/mailcap.unx mailcap
+
+	doman doc/pine.1 doc/pico.1 doc/pilot.1 doc/rpdump.1 doc/rpload.1 \
+	      imap/src/mailutil/mailutil.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
+}