5 files changed, 106 insertions, 44 deletions
diff --git a/mail/getmail/Makefile b/mail/getmail/Makefile
index 8793ec32daa5..2309ecf15814 100644
--- a/mail/getmail/Makefile
+++ b/mail/getmail/Makefile
@@ -7,42 +7,27 @@
 
 PORTNAME=	getmail
 PORTVERSION=	4.2.2
+PORTREVISION=	1
 CATEGORIES=	mail python
 MASTER_SITES=	http://www.qcc.ca/~charlesc/software/getmail-4/%SUBDIR%/
 MASTER_SITE_SUBDIR=	old-versions
 
 MAINTAINER=	question+fbsdports@closedsrc.org
-COMMENT=	POP3/IMAP mail retriever with Maildir and command delivery
+COMMENT=	POP3/IMAP4 mail retriever with Maildir and command delivery
 
-USE_PYTHON=	yes
-USE_REINPLACE=	yes
+USE_PYTHON=		yes
+USE_PYDISTUTILS=	yes
 
-SCRIPTS=	getmail getmail_maildir getmail_mbox
-MAN1=		getmail.1
-DOCS=		CHANGELOG THANKS TODO configuration.txt documentation.txt \
-		faq.txt configuration.html documentation.html \
-		faq.html troubleshooting.txt troubleshooting.html
+MAN1=		getmail.1 getmail_maildir.1 getmail_mbox.1
+DOCS=		../README BUGS CHANGELOG THANKS TODO *.txt *.html *.css
 
-do-build:
-	cd ${WRKSRC} && \
-		${REINPLACE_CMD} -e 's!/usr/lib/getmail!${DATADIR}!' \
-		-e 's!`which python`!${PYTHON_CMD}!' \
-		-e 's!/usr/bin/python!${PYTHON_CMD}!' ${SCRIPTS} *.py
-
-do-install:
-	@${MKDIR} ${DATADIR} ${DATADIR}/getmailcore
-	cd ${WRKSRC} && ${INSTALL_SCRIPT} ${SCRIPTS} ${DATADIR}
-	@${LN} -s ${DATADIR}/getmail ${PREFIX}/bin/getmail
-	@${LN} -s ${DATADIR}/getmail_maildir ${PREFIX}/bin/getmail_maildir
-	@${LN} -s ${DATADIR}/getmail_mbox ${PREFIX}/bin/getmail_mbox
-	cd ${WRKSRC}/docs && ${INSTALL_MAN} ${MAN1} ${MANPREFIX}/man/man1
-	@${MKDIR} ${DATADIR} ${DATADIR}/getmailcore
-	${INSTALL_SCRIPT} ${WRKSRC}/getmailcore/*.py ${DATADIR}/getmailcore/
+post-install:
 	@${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/getmailrc-examples ${EXAMPLESDIR}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC}/docs && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
 .endif
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/mail/getmail/files/patch-setup.py b/mail/getmail/files/patch-setup.py
new file mode 100644
index 000000000000..e25b9f14cd9f
--- /dev/null
+++ b/mail/getmail/files/patch-setup.py
@@ -0,0 +1,41 @@
+--- setup.py.orig
++++ setup.py
+@@ -39,12 +39,11 @@
+     datadir or prefix,
+     'share',
+     'doc',
+-    'getmail-%s' % __version__
++    'getmail'
+ )
+ 
+ GETMAILMANDIR = os.path.join(
+     datadir or prefix,
+-    'share',
+     'man',
+     'man1'
+ )
+@@ -97,24 +96,6 @@
+     'getmail_mbox'
+     ],
+     data_files=[
+-        (GETMAILDOCDIR, [
+-            './README',
+-            'docs/BUGS',
+-            'docs/COPYING',
+-            'docs/CHANGELOG',
+-            'docs/TODO',
+-            'docs/THANKS',
+-            'docs/configuration.html',
+-            'docs/configuration.txt',
+-            'docs/documentation.html',
+-            'docs/documentation.txt',
+-            'docs/faq.html',
+-            'docs/faq.txt',
+-            'docs/getmaildocs.css',
+-            'docs/getmailrc-examples',
+-            'docs/troubleshooting.html',
+-            'docs/troubleshooting.txt',
+-        ]),
+         (GETMAILMANDIR, [
+             'docs/getmail.1',
+             'docs/getmail_maildir.1',
diff --git a/mail/getmail/pkg-descr b/mail/getmail/pkg-descr
index 47ba68972c2b..1dcff522305c 100644
--- a/mail/getmail/pkg-descr
+++ b/mail/getmail/pkg-descr
@@ -1,7 +1,8 @@
-A POP3 mail retriever with reliable Maildir and command delivery.
+A POP3 and IMAP4 mail retriever with reliable Maildir and command delivery.
 
 Summary of features:
-- Retrieve mail from an unlimited number of POP3 mailboxes and servers. 
+- Retrieve mail from an unlimited number of POP3/IMAP4 mailboxes and servers. 
+- Support for POP3-over-SSL and IMAP-over-SSL, as well as SDPS
 - Support for multidrop or domain mailboxes. 
 - Safe and reliable delivery to qmail-style Maildirs, as well as program
   (pipe) delivery for use with arbitrary external MDAs. Includes an MDA
diff --git a/mail/getmail/pkg-message b/mail/getmail/pkg-message
new file mode 100644
index 000000000000..375173b1b926
--- /dev/null
+++ b/mail/getmail/pkg-message
@@ -0,0 +1,12 @@
+=======================================================================
+
+The getmail rc file (configuration file) format has changed since 
+version 3.x.  If you are upgrading from version 3, you will need 
+to write a new configuration file based on the contents of your old one. 
+The new file format resembles the old in many ways. 
+
+Each account you retrieve mail from will require a separate rc file, 
+but getmail can operate with multiple rc files simultaneously 
+if you wish to retrieve mail from multiple accounts.
+
+=======================================================================
diff --git a/mail/getmail/pkg-plist b/mail/getmail/pkg-plist
index aa059bfa109e..f5f5852f6e5d 100644
--- a/mail/getmail/pkg-plist
+++ b/mail/getmail/pkg-plist
@@ -2,34 +2,57 @@
 bin/getmail
 bin/getmail_maildir
 bin/getmail_mbox
+%%PYTHON_SITELIBDIR%%/getmailcore/__init__.py
+%%PYTHON_SITELIBDIR%%/getmailcore/__init__.pyc
+%%PYTHON_SITELIBDIR%%/getmailcore/__init__.pyo
+%%PYTHON_SITELIBDIR%%/getmailcore/_pop3ssl.py
+%%PYTHON_SITELIBDIR%%/getmailcore/_pop3ssl.pyc
+%%PYTHON_SITELIBDIR%%/getmailcore/_pop3ssl.pyo
+%%PYTHON_SITELIBDIR%%/getmailcore/_retrieverbases.py
+%%PYTHON_SITELIBDIR%%/getmailcore/_retrieverbases.pyc
+%%PYTHON_SITELIBDIR%%/getmailcore/_retrieverbases.pyo
+%%PYTHON_SITELIBDIR%%/getmailcore/baseclasses.py
+%%PYTHON_SITELIBDIR%%/getmailcore/baseclasses.pyc
+%%PYTHON_SITELIBDIR%%/getmailcore/baseclasses.pyo
+%%PYTHON_SITELIBDIR%%/getmailcore/constants.py
+%%PYTHON_SITELIBDIR%%/getmailcore/constants.pyc
+%%PYTHON_SITELIBDIR%%/getmailcore/constants.pyo
+%%PYTHON_SITELIBDIR%%/getmailcore/destinations.py
+%%PYTHON_SITELIBDIR%%/getmailcore/destinations.pyc
+%%PYTHON_SITELIBDIR%%/getmailcore/destinations.pyo
+%%PYTHON_SITELIBDIR%%/getmailcore/exceptions.py
+%%PYTHON_SITELIBDIR%%/getmailcore/exceptions.pyc
+%%PYTHON_SITELIBDIR%%/getmailcore/exceptions.pyo
+%%PYTHON_SITELIBDIR%%/getmailcore/filters.py
+%%PYTHON_SITELIBDIR%%/getmailcore/filters.pyc
+%%PYTHON_SITELIBDIR%%/getmailcore/filters.pyo
+%%PYTHON_SITELIBDIR%%/getmailcore/logging.py
+%%PYTHON_SITELIBDIR%%/getmailcore/logging.pyc
+%%PYTHON_SITELIBDIR%%/getmailcore/logging.pyo
+%%PYTHON_SITELIBDIR%%/getmailcore/message.py
+%%PYTHON_SITELIBDIR%%/getmailcore/message.pyc
+%%PYTHON_SITELIBDIR%%/getmailcore/message.pyo
+%%PYTHON_SITELIBDIR%%/getmailcore/retrievers.py
+%%PYTHON_SITELIBDIR%%/getmailcore/retrievers.pyc
+%%PYTHON_SITELIBDIR%%/getmailcore/retrievers.pyo
+%%PYTHON_SITELIBDIR%%/getmailcore/utilities.py
+%%PYTHON_SITELIBDIR%%/getmailcore/utilities.pyc
+%%PYTHON_SITELIBDIR%%/getmailcore/utilities.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/getmailcore
+%%PORTDOCS%%%%DOCSDIR%%/BUGS
 %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
+%%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/THANKS
 %%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/configuration.html
+%%PORTDOCS%%%%DOCSDIR%%/configuration.txt
 %%PORTDOCS%%%%DOCSDIR%%/documentation.html
 %%PORTDOCS%%%%DOCSDIR%%/documentation.txt
 %%PORTDOCS%%%%DOCSDIR%%/faq.html
 %%PORTDOCS%%%%DOCSDIR%%/faq.txt
-%%PORTDOCS%%%%DOCSDIR%%/configuration.html
-%%PORTDOCS%%%%DOCSDIR%%/configuration.txt
+%%PORTDOCS%%%%DOCSDIR%%/getmaildocs.css
 %%PORTDOCS%%%%DOCSDIR%%/troubleshooting.html
 %%PORTDOCS%%%%DOCSDIR%%/troubleshooting.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%EXAMPLESDIR%%/getmailrc-examples
 @dirrm %%EXAMPLESDIR%%
-%%DATADIR%%/getmailcore/__init__.py
-%%DATADIR%%/getmailcore/_pop3ssl.py
-%%DATADIR%%/getmailcore/_retrieverbases.py
-%%DATADIR%%/getmailcore/baseclasses.py
-%%DATADIR%%/getmailcore/constants.py
-%%DATADIR%%/getmailcore/destinations.py
-%%DATADIR%%/getmailcore/exceptions.py
-%%DATADIR%%/getmailcore/filters.py
-%%DATADIR%%/getmailcore/logging.py
-%%DATADIR%%/getmailcore/message.py
-%%DATADIR%%/getmailcore/retrievers.py
-%%DATADIR%%/getmailcore/utilities.py
-%%DATADIR%%/getmail
-%%DATADIR%%/getmail_maildir
-%%DATADIR%%/getmail_mbox
-@dirrm %%DATADIR%%/getmailcore
-@dirrm %%DATADIR%%