Subject: CVS commit: pkgsrc/mail
To: None <>
From: Amitai Schlair <>
List: pkgsrc-changes
Date: 08/02/2004 03:57:17
Module Name:	pkgsrc
Committed By:	schmonz
Date:		Mon Aug  2 03:57:17 UTC 2004

Modified Files:
	pkgsrc/mail/netqmail: Makefile distinfo
	pkgsrc/mail/qmail: INSTALL MESSAGE Makefile Makefile.common PLIST
Removed Files:
	pkgsrc/mail/qmail: distinfo
	pkgsrc/mail/qmail/files: mailer.conf

Log Message:
Remove add-on scripts and config files from the qmail and netqmail
packages. They now simply compile and install qmail and its
prerequisites. (The add-on scripts and config files will be revivified
as a separate qmail-run package. Thus, QMAIL_AUTOCONFIG is no longer

The user is notified at install time that one popular, well-regarded
way to enable qmail is to follow the directions in "Life with
qmail", and that another way is to install the qmail-run package.

These changes, based on discussion with Charles Cazabon, are intended
to make life easier for the helpful people on the qmail mailing
list by clearly marking custom add-ons as such.

Other changes:

Since netqmail is a tarball containing the qmail tarball plus the
netqmail bits, we can use it for both packages and share more logic
between the two packages: MASTER_SITES, DISTINFO_FILE, WRKSRC, and
the post-extract target.

Now that there's one place to put the distinfo, add Eben Pratt's
simple patch to build and install on Mac OS X 10.3 (the patch is
not applied on other OSes).

Bump PKGREVISION of both packages.

To generate a diff of this commit:
cvs rdiff -r1.1.1.1 -r1.2 pkgsrc/mail/netqmail/Makefile \
cvs rdiff -r1.1 -r1.2 pkgsrc/mail/qmail/INSTALL \
cvs rdiff -r1.8 -r1.9 pkgsrc/mail/qmail/MESSAGE
cvs rdiff -r1.24 -r1.25 pkgsrc/mail/qmail/Makefile
cvs rdiff -r1.7 -r1.8 pkgsrc/mail/qmail/PLIST
cvs rdiff -r1.6 -r0 pkgsrc/mail/qmail/distinfo
cvs rdiff -r1.3 -r0 pkgsrc/mail/qmail/files/mailer.conf \
cvs rdiff -r1.1 -r0 pkgsrc/mail/qmail/files/ \
    pkgsrc/mail/qmail/files/ \
cvs rdiff -r1.5 -r0 pkgsrc/mail/qmail/files/
cvs rdiff -r1.4 -r0 pkgsrc/mail/qmail/files/

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.