From 56b0b62df2ed3dc08b052ae4792b1ca9ededdf9d Mon Sep 17 00:00:00 2001
From: Matthias Andree <mandree@FreeBSD.org>
Date: Fri, 18 Mar 2011 02:45:59 +0000
Subject: Make previous mail/getmail commit optional, default off, to render
 authentic binary packages.

While at it, add LICENSE=GPLv2.
---
 mail/getmail/Makefile                                    | 12 +++++++++++-
 mail/getmail/files/diff-getmailcore___retrieverbases.py  | 16 ++++++++++++++++
 mail/getmail/files/patch-getmailcore___retrieverbases.py | 16 ----------------
 3 files changed, 27 insertions(+), 17 deletions(-)
 create mode 100644 mail/getmail/files/diff-getmailcore___retrieverbases.py
 delete mode 100644 mail/getmail/files/patch-getmailcore___retrieverbases.py

(limited to 'mail')

diff --git a/mail/getmail/Makefile b/mail/getmail/Makefile
index 68280148df6e..941b354ecc5b 100644
--- a/mail/getmail/Makefile
+++ b/mail/getmail/Makefile
@@ -16,12 +16,22 @@ MASTER_SITE_SUBDIR=	old-versions
 MAINTAINER=	question+fbsdports@closedsrc.org
 COMMENT=	POP3/IMAP4 mail retriever with Maildir and command delivery
 
+LICENSE=	GPLv2
+
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	yes
 
 MAN1=		getmail.1 getmail_fetch.1 getmail_maildir.1 getmail_mbox.1
 PORTDOCS=	README BUGS CHANGELOG THANKS TODO *.txt *.html *.css
 
+OPTIONS=	NOTSEEN "Do not mark IMAP-retrieved mail \\Seen" OFF
+
+.include <bsd.port.pre.mk>
+
+.ifdef WITH_NOTSEEN
+EXTRA_PATCHES+=	${FILESDIR}/diff-getmailcore___retrieverbases.py
+.endif
+
 post-install:
 	@${CHMOD} -R 644 ${PYTHON_SITELIBDIR}/getmailcore/*
 	@${CP} ${WRKSRC}/README ${WRKSRC}/docs/
@@ -35,4 +45,4 @@ post-install:
 .endif
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/mail/getmail/files/diff-getmailcore___retrieverbases.py b/mail/getmail/files/diff-getmailcore___retrieverbases.py
new file mode 100644
index 000000000000..3423c356a7db
--- /dev/null
+++ b/mail/getmail/files/diff-getmailcore___retrieverbases.py
@@ -0,0 +1,16 @@
+--- ./getmailcore/_retrieverbases.py.orig	2010-06-29 18:03:42.000000000 +0200
++++ ./getmailcore/_retrieverbases.py	2011-03-18 00:25:54.000000000 +0100
+@@ -898,11 +898,11 @@
+ 
+     def _getmsgbyid(self, msgid):
+         self.log.trace()
+-        return self._getmsgpartbyid(msgid, '(RFC822)')
++        return self._getmsgpartbyid(msgid, '(BODY.PEEK[])')
+ 
+     def _getheaderbyid(self, msgid):
+         self.log.trace()
+-        return self._getmsgpartbyid(msgid, '(RFC822[header])')
++        return self._getmsgpartbyid(msgid, '(BODY.PEEK[header])')
+ 
+     def initialize(self):
+         self.log.trace()
diff --git a/mail/getmail/files/patch-getmailcore___retrieverbases.py b/mail/getmail/files/patch-getmailcore___retrieverbases.py
deleted file mode 100644
index 3423c356a7db..000000000000
--- a/mail/getmail/files/patch-getmailcore___retrieverbases.py
+++ /dev/null
@@ -1,16 +0,0 @@
---- ./getmailcore/_retrieverbases.py.orig	2010-06-29 18:03:42.000000000 +0200
-+++ ./getmailcore/_retrieverbases.py	2011-03-18 00:25:54.000000000 +0100
-@@ -898,11 +898,11 @@
- 
-     def _getmsgbyid(self, msgid):
-         self.log.trace()
--        return self._getmsgpartbyid(msgid, '(RFC822)')
-+        return self._getmsgpartbyid(msgid, '(BODY.PEEK[])')
- 
-     def _getheaderbyid(self, msgid):
-         self.log.trace()
--        return self._getmsgpartbyid(msgid, '(RFC822[header])')
-+        return self._getmsgpartbyid(msgid, '(BODY.PEEK[header])')
- 
-     def initialize(self):
-         self.log.trace()
-- 
cgit v1.2.3