- Update to 4.1.3

PR:		ports/71248
Submitted by:	Linh Pham <question+freebsdpr@closedsrc.org>

4 files changed, 41 insertions, 25 deletions

diff --git a/mail/getmail/Makefile b/mail/getmail/Makefile
index fffd55efa466..f6f5987aa9bb 100644
--- a/mail/getmail/Makefile
+++ b/mail/getmail/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:   getmail
 # Date created:        06 May 2001
-# Whom:                Yukihiro Nakai <nakai@FreeBSD.org>
+# # Whom:                Yukihiro Nakai <nakai@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	getmail
-PORTVERSION=	3.2.4
+PORTVERSION=	4.1.3
 CATEGORIES=	mail python
 MASTER_SITES=	http://www.qcc.ca/~charlesc/software/getmail-4/%SUBDIR%/
 MASTER_SITE_SUBDIR=	old-versions
@@ -19,8 +19,9 @@ USE_REINPLACE=	yes
 
 SCRIPTS=	getmail getmail_maildir getmail_mbox
 MAN1=		getmail.1
-DOCS=		CHANGELOG THANKS TODO docs.txt faq.txt getmail.txt \
-		docs.html faq.html
+DOCS=		CHANGELOG THANKS TODO configuration.txt documentation.txt \
+		faq.txt configuration.html documentation.html \
+		faq.html troubleshooting.txt troubleshooting.html
 
 do-build:
 	cd ${WRKSRC} && \
@@ -29,15 +30,19 @@ do-build:
 		-e 's!/usr/bin/python!${PYTHON_CMD}!' ${SCRIPTS} *.py
 
 do-install:
-	cd ${WRKSRC} && ${INSTALL_SCRIPT} ${SCRIPTS} ${PREFIX}/bin
-	cd ${WRKSRC} && ${INSTALL_MAN} ${MAN1} ${MANPREFIX}/man/man1
-	@${MKDIR} ${DATADIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/*.py ${DATADIR}
+	@${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/
 	@${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/getmailrc-example ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/docs/getmailrc-examples ${EXAMPLESDIR}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
+	cd ${WRKSRC}/docs && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/mail/getmail/distinfo b/mail/getmail/distinfo
index b57eafeed143..c4e078b72632 100644
--- a/mail/getmail/distinfo
+++ b/mail/getmail/distinfo
@@ -1,2 +1,2 @@
-MD5 (getmail-3.2.4.tar.gz) = 10f0d7df28503ab32e52e6f97ce11d48
-SIZE (getmail-3.2.4.tar.gz) = 69266
+MD5 (getmail-4.1.3.tar.gz) = 303ba0b8c7faf5090a825e5b5591fbf3
+SIZE (getmail-4.1.3.tar.gz) = 108085
diff --git a/mail/getmail/pkg-descr b/mail/getmail/pkg-descr
index a79ac8ae2b40..47ba68972c2b 100644
--- a/mail/getmail/pkg-descr
+++ b/mail/getmail/pkg-descr
@@ -15,4 +15,4 @@ Summary of features:
 - Simple to install, configure, and use. 
 
 Author:	Charles Cazabon <getmail@discworld.dyndns.org>
-WWW:	http://www.qcc.sk.ca/~charlesc/software/getmail-3.0/
+WWW:	http://www.qcc.sk.ca/~charlesc/software/getmail-4/
diff --git a/mail/getmail/pkg-plist b/mail/getmail/pkg-plist
index 8eb968be40b7..aa059bfa109e 100644
--- a/mail/getmail/pkg-plist
+++ b/mail/getmail/pkg-plist
@@ -5,20 +5,31 @@ bin/getmail_mbox
 %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
 %%PORTDOCS%%%%DOCSDIR%%/THANKS
 %%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/docs.html
-%%PORTDOCS%%%%DOCSDIR%%/docs.txt
+%%PORTDOCS%%%%DOCSDIR%%/documentation.html
+%%PORTDOCS%%%%DOCSDIR%%/documentation.txt
 %%PORTDOCS%%%%DOCSDIR%%/faq.html
 %%PORTDOCS%%%%DOCSDIR%%/faq.txt
-%%PORTDOCS%%%%DOCSDIR%%/getmail.txt
+%%PORTDOCS%%%%DOCSDIR%%/configuration.html
+%%PORTDOCS%%%%DOCSDIR%%/configuration.txt
+%%PORTDOCS%%%%DOCSDIR%%/troubleshooting.html
+%%PORTDOCS%%%%DOCSDIR%%/troubleshooting.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%EXAMPLESDIR%%/getmailrc-example
+%%EXAMPLESDIR%%/getmailrc-examples
 @dirrm %%EXAMPLESDIR%%
-%%DATADIR%%/ConfParser.py
-%%DATADIR%%/getmail.py
-%%DATADIR%%/getmail_classes.py
-%%DATADIR%%/getmail_constants.py
-%%DATADIR%%/getmail_defaults.py
-%%DATADIR%%/getmail_mbox.py
-%%DATADIR%%/getmail_utilities.py
-%%DATADIR%%/timeoutsocket.py
+%%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%%