Date: Thu, 14 Oct 2004 18:13:58 -0700 (PDT) From: Linh Pham <question+fbsdports@closedsrc.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: sergie@FreeBSD.org Subject: ports/72720: mail/getmail - Clean up Makefile Message-ID: <20041015011358.7240A45037@q.closedsrc.org> Resent-Message-ID: <200410150120.i9F1KKKF097621@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 72720
>Category: ports
>Synopsis: mail/getmail - Clean up Makefile
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Fri Oct 15 01:20:20 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Linh Pham
>Release: FreeBSD 5.2.1-RELEASE-p8 i386
>Organization:
>Environment:
System: FreeBSD q.internal.closedsrc.org 5.2.1-RELEASE-p8 FreeBSD 5.2.1-RELEASE-p8 #2: Sat Jun 5 19:22:58 PDT 2004 question@q.internal.closedsrc.org:/usr/obj/usr/src/sys/Q i386
>Description:
Nuno Teixeira <nunotex@freeshell.org> sent me a cleaned up Makefile along with
a patch and a pkg-message warning the user about the configuration file syntax
change from 3.x to 4.x. The new Makefile uses PYDISTUTILS to handle the
installation and de-installation of the port.
Attached is a diff against the current version of the port.
Thanks Nuno for the port update!
>How-To-Repeat:
>Fix:
--- getmail-4.2.2_nunotex.diff begins here ---
diff -ruN /usr/ports/mail/getmail/Makefile getmail/Makefile
--- /usr/ports/mail/getmail/Makefile Thu Oct 14 17:49:02 2004
+++ getmail/Makefile Thu Oct 14 17:56:00 2004
@@ -2,7 +2,7 @@
# Date created: 06 May 2001
# Whom: Yukihiro Nakai <nakai@FreeBSD.org>
#
-# $FreeBSD: ports/mail/getmail/Makefile,v 1.30 2004/10/13 16:08:50 sergei Exp $
+# $FreeBSD: ports/mail/getmail/Makefile,v 1.28 2004/07/11 19:15:39 krion Exp $
#
PORTNAME= getmail
@@ -14,35 +14,10 @@
MAINTAINER= question+fbsdports@closedsrc.org
COMMENT= POP3/IMAP 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
-
-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/
- @${MKDIR} ${EXAMPLESDIR}
- ${INSTALL_DATA} ${WRKSRC}/docs/getmailrc-examples ${EXAMPLESDIR}
-.if !defined(NOPORTDOCS)
- @${MKDIR} ${DOCSDIR}
- cd ${WRKSRC}/docs && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
-.endif
+post-install:
+ @${CAT} ${PKGMESSAGE}
.include <bsd.port.mk>
diff -ruN /usr/ports/mail/getmail/files/patch-aa getmail/files/patch-aa
--- /usr/ports/mail/getmail/files/patch-aa Wed Dec 31 16:00:00 1969
+++ getmail/files/patch-aa Wed Oct 13 16:16:22 2004
@@ -0,0 +1,16 @@
+--- setup.py.orig Thu Oct 14 00:11:21 2004
++++ setup.py Thu Oct 14 00:12:14 2004
+@@ -39,12 +39,11 @@
+ datadir or prefix,
+ 'share',
+ 'doc',
+- 'getmail-%s' % __version__
++ 'getmail'
+ )
+
+ GETMAILMANDIR = os.path.join(
+ datadir or prefix,
+- 'share',
+ 'man',
+ 'man1'
+ )
diff -ruN /usr/ports/mail/getmail/pkg-descr getmail/pkg-descr
--- /usr/ports/mail/getmail/pkg-descr Tue Oct 12 08:10:56 2004
+++ getmail/pkg-descr Thu Oct 14 17:53:37 2004
@@ -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 -ruN /usr/ports/mail/getmail/pkg-message getmail/pkg-message
--- /usr/ports/mail/getmail/pkg-message Wed Dec 31 16:00:00 1969
+++ getmail/pkg-message Wed Oct 13 16:31:13 2004
@@ -0,0 +1,11 @@
+
+==================================================================
+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 -ruN /usr/ports/mail/getmail/pkg-plist getmail/pkg-plist
--- /usr/ports/mail/getmail/pkg-plist Tue Oct 12 08:10:56 2004
+++ getmail/pkg-plist Wed Oct 13 16:59:49 2004
@@ -1,35 +1,60 @@
-@comment $FreeBSD: ports/mail/getmail/pkg-plist,v 1.8 2004/10/12 07:21:05 sergei Exp $
bin/getmail
bin/getmail_maildir
bin/getmail_mbox
-%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
-%%PORTDOCS%%%%DOCSDIR%%/THANKS
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%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%%/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%%
+%%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
+man/man1/getmail.1
+man/man1/getmail_maildir.1
+man/man1/getmail_mbox.1
+share/doc/getmail/BUGS
+share/doc/getmail/CHANGELOG
+share/doc/getmail/COPYING
+share/doc/getmail/README
+share/doc/getmail/THANKS
+share/doc/getmail/TODO
+share/doc/getmail/configuration.html
+share/doc/getmail/configuration.txt
+share/doc/getmail/documentation.html
+share/doc/getmail/documentation.txt
+share/doc/getmail/faq.html
+share/doc/getmail/faq.txt
+share/doc/getmail/getmaildocs.css
+share/doc/getmail/getmailrc-examples
+share/doc/getmail/troubleshooting.html
+share/doc/getmail/troubleshooting.txt
+@dirrm share/doc/getmail
+@dirrm %%PYTHON_SITELIBDIR%%/getmailcore
--- getmail-4.2.2_nunotex.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20041015011358.7240A45037>