diff options
| author | mph <mph@FreeBSD.org> | 1998-06-14 03:26:55 +0800 |
|---|---|---|
| committer | mph <mph@FreeBSD.org> | 1998-06-14 03:26:55 +0800 |
| commit | 1d69d0acc2f3d2521786ec3c7f25949a7588402b (patch) | |
| tree | 11395a05af2f03824064bea1b3385fd95a3f4e69 /mail | |
| parent | 275ad0dd38c52470cad8a8b12b7e07317f468052 (diff) | |
| download | freebsd-ports-gnome-1d69d0acc2f3d2521786ec3c7f25949a7588402b.tar.gz freebsd-ports-gnome-1d69d0acc2f3d2521786ec3c7f25949a7588402b.tar.zst freebsd-ports-gnome-1d69d0acc2f3d2521786ec3c7f25949a7588402b.zip | |
Upgrade to 4.4.9. Add a wrapper around fetchmailconf that checks
whether Python is installed, and emits a helpful message if it isn't.
PR: 6866
Submitted by: Ville Eerola <ve@sci.fi> (wrapper by mph)
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/fetchmail/Makefile | 15 | ||||
| -rw-r--r-- | mail/fetchmail/distinfo | 2 | ||||
| -rw-r--r-- | mail/fetchmail/files/fetchmailconf | 19 | ||||
| -rw-r--r-- | mail/fetchmail/pkg-plist | 1 |
4 files changed, 33 insertions, 4 deletions
diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile index 4f323241c49a..82c6e3b944fd 100644 --- a/mail/fetchmail/Makefile +++ b/mail/fetchmail/Makefile @@ -1,12 +1,17 @@ # New ports collection makefile for: fetchmail -# Version required: 4.4.8 +# Version required: 4.4.9 # Date created: 26 Oct 1996 # Whom: Ville Eerola <ve@sci.fi> # -# $Id: Makefile,v 1.61 1998/05/24 03:15:11 steve Exp $ +# $Id: Makefile,v 1.62 1998/05/27 04:04:59 mph Exp $ # +# NOTE: The fetchmailconf program (an interactive program for +# writing .fetchmailrc files) requires Python, found in the Ports +# Collection under lang/python. The fetchmail program itself +# does not need Python, so there is no RUN_DEPENDS for Python in +# this Makefile. -DISTNAME= fetchmail-4.4.8 +DISTNAME= fetchmail-4.4.9 CATEGORIES= mail MASTER_SITES= ftp://ftp.ccil.org/pub/esr/fetchmail/ @@ -25,6 +30,8 @@ FDOC= ${PREFIX}/share/doc/fetchmail post-patch: @${CP} -f /usr/include/md5.h ${WRKSRC} + @perl -pi.bak -e 's|^#!/.*/python|#!${PREFIX}/bin/python|;' ${WRKSRC}/fetchmailconf + @${SED} -e "s|@PREFIX@|${PREFIX}|" ${FILESDIR}/fetchmailconf > ${WRKDIR}/fetchmailconf post-install: ${INSTALL} -d -m 555 -o ${DOCOWN} -g ${DOCGRP} ${FDOC} @@ -33,5 +40,7 @@ post-install: sample.rcfile FAQ NOTES FEATURES README COPYING \ fetchmail-FAQ.html fetchmail-features.html \ design-notes.html ${FDOC} + ${MV} ${PREFIX}/bin/fetchmailconf ${PREFIX}/libexec/fetchmailconf.bin + ${INSTALL_SCRIPT} ${WRKDIR}/fetchmailconf ${PREFIX}/bin .include <bsd.port.mk> diff --git a/mail/fetchmail/distinfo b/mail/fetchmail/distinfo index 0b2f72fc1f49..c0f0154b6cd6 100644 --- a/mail/fetchmail/distinfo +++ b/mail/fetchmail/distinfo @@ -1 +1 @@ -MD5 (fetchmail-4.4.8.tar.gz) = a733bcf6191e5e1ebd5cc530a7a3f9d4 +MD5 (fetchmail-4.4.9.tar.gz) = 0382bffb6815182fdfa969da5f71c75a diff --git a/mail/fetchmail/files/fetchmailconf b/mail/fetchmail/files/fetchmailconf new file mode 100644 index 000000000000..98a3d0f42adb --- /dev/null +++ b/mail/fetchmail/files/fetchmailconf @@ -0,0 +1,19 @@ +#!/bin/sh +# +# Wrapper for the real fetchmailconf. Checks whether Python is installed, +# and runs the real fetchmailconf or alerts the user, as appropriate. +# +# $Id$ + +PREFIX=@PREFIX@ + +if [ -e $PREFIX/bin/python ]; then + exec $PREFIX/libexec/fetchmailconf.bin +else + cat <<EOF +The fetchmailconf program requires Python, which does not appear to be +installed on this system. Python can be found in the FreeBSD Ports +Collection under lang/python. +EOF + exit 1 +fi diff --git a/mail/fetchmail/pkg-plist b/mail/fetchmail/pkg-plist index 5bcf58a853d4..c1c9643211d5 100644 --- a/mail/fetchmail/pkg-plist +++ b/mail/fetchmail/pkg-plist @@ -1,5 +1,6 @@ bin/fetchmail bin/fetchmailconf +libexec/fetchmailconf.bin man/man1/fetchmail.1.gz man/man1/fetchmailconf.1.gz share/doc/fetchmail/README |