- Fix 'all-depends-list' target in cases if dependencies list is

  very long and if some dependencies can't be added into the list.
  [1]

- Fix FAM support.  Make gamin the default FAM system. [2]

- Introduce new 'quicksearch' target to show only port, path and
  info section of the matching ports. [3]

- Introduce new category - rubygems. [4]

- Fix stale dependencies while installing qmail slaveport and
  another port that depends on qmail. [5]

- Add commentary for describes target in bsd.port.mk. [6]

- Fix warning issued during make index on archs !368. [7]

- Add USE_DOS2UNIX variable.  If set to "YES", remove the ^M from
  all files under ${WRKSRC}. If set to a string, remove in all files
  under ${WRKSRC} with one of these names the ^Ms. [8]

- Add new variables PERL_RUN_DEPENDS and PERL_BUILD_DEPENDS by
  checking the existance of the Perl modules with the "perl -e 'use
  module;'" command. [9]

- Fix bsd.port.mk variable quoting issues.  No quoting is necessary
  anymore either in the Makefile or on the command line.  Affected
  variables include:

  BROKEN
  FORBIDDEN
  IGNORE
  MANUAL_PACKAGE_BUILD
  NO_CDROM
  NO_PACKAGE
  RESTRICTED

  [10]

- Add NOFETCHFILES variable.  If set, don't download these files
  from the ${MASTER_SITES} or ${MASTER_SITE_BACKUP} (but do from
  ${MASTER_SITE_OVERRIDE}). [11]

- Improve 'search' target output. [12]

- Add a new virtual category for Amateur Radio - hamradio. [13]

- Cleanup some old/unused pathes in bsd.port.mk. [14]

- Add @dirrmtry for plists which does the same as:
  "@unexec rmdir %D/foo 2>/dev/null || true" [15]

- Remove virtual category - offix. [16]

- Use portsnap instead of cvsup or cvs on "make update" in
  /usr/ports. [17]

- Move location of bsd.autotools.mk within bsd.port.mk [18]

- Add bsd.linux-rpm.mk, fix INSTALLS_SHLIB for Linux ports [19]

- Use new USE_RC_SUBR format for FreeBSD version >= 700007 [20]

- Replace the string "FreeBSD" by "The FreeBSD Project" in the
  security warning [21]

- Add bsd.local.mk for local modification to ports framework. [22]

- Replace rcNG spelling by rc.d [23]

- Remove superfluous USE_REINPLACE. [24]

Special thanks to:      linimon for spending hours with all these patches
                        clement for fixes
                        kris for help with pointyhat
PR:     ports/86310 [1], ports/89498 [2], ports/83530 [3],
        ports/83789 [4], ports/84053 [5], ports/86281 [6],
        ports/87214 [7], ports/87234 [8], ports/87318 [9],
        ports/87396 [10], ports/87605 [11], ports/87840 [12],
        ports/88230 [13], ports/88493 [14], ports/88711 [15],
        ports/88751 [16], ports/89281 [17], ports/89999 [18],
        ports/90031 [19], ports/90150 [20], ports/90668 [21],
        ports/91433 [23], ports/88754 [24]
Submitted by:   mi [1], marcus [2], Lars Engels <lars.engels@0x20.net> [3],
                pav [4, 16, 20, 24], garga [5], cperciva [6], vd [7],
                edwin [8, 9, 11, 15, 21],
                fenner [10], Arseny Nasokin <tarc.po.cs.msu.su@tarc.po.cs.msu.su> [12],
                Carl Makin <carl@stagecraft.cx> [13], arved [14],
                NIIMI Satoshi <sa2c@sa2c.net> [17], thierry [18],
                jylefort [19], linimon [22], dougb [23]

1 files changed, 47 insertions, 12 deletions

diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile
index 55ac1bd239e9..0fa4474078d3 100644
--- a/mail/qmail/Makefile
+++ b/mail/qmail/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	qmail
 PORTVERSION?=	${QMAIL_VERSION}
-PORTREVISION?=	4
+PORTREVISION?=	5
 CATEGORIES=	mail
 MASTER_SITES+=	${MASTER_SITE_QMAIL}
 DISTNAME=	${PORTNAME}-${QMAIL_VERSION}
@@ -98,10 +98,7 @@ PATCH_SITE_SUBDIR+=	garga/qmail/:dns,sendmail_flagf,rfc2821,ldap,mysql,tls,quota
 NO_PACKAGE=	"djb\'s packaging license does not allow non-standard \
 		qmail binary distributions"
 
-# A normal qmail installation puts everything into /var/qmail/.
-# If you want to install to /usr/local/, then "/usr/local/qmail" is
-# suggested instead of "/usr/local", but both will work.
-PREFIX?=		/var/qmail
+PREFIX?=		${QMAIL_PREFIX}
 QMAIL_VERSION?=		1.03
 
 .if !defined(BARRIER_SMTP_AUTH_PATCH)
@@ -198,6 +195,10 @@ MAN8+=	qmail-local.8 qmail-lspawn.8 qmail-getpw.8 qmail-remote.8 \
 	qmail-tcpto.8 qmail-pop3d.8 qmail-popup.8 qmail-qmqpc.8 qmail-qmqpd.8 \
 	qmail-qmtpd.8 qmail-smtpd.8 qmail-command.8
 
+.if defined(SLAVE_MYSQL)
+PKGMESSAGE_SUFFIX=	mysql
+.endif
+
 .if defined(SLAVE_SPAMCONTROL)
 EXTRA_MAN8=	qmail-badloadertypes.8 qmail-badmimetypes.8 qmail-recipients.8
 ALL_TARGET+=	${EXTRA_MAN8}
@@ -211,7 +212,7 @@ PLIST_SUB+=	README_AUTH="@comment "
 .endif
 
 .if defined(SLAVE_LDAP)
-PKGMESSAGE_SUFFIX=	-ldap
+PKGMESSAGE_SUFFIX=	ldap
 PLIST_SUB+=	LDAP="" NOT_LDAP="@comment "
 .else
 PLIST_SUB+=	LDAP="@comment " NOT_LDAP=""
@@ -224,16 +225,27 @@ PLIST_SUB+=	SPAMCONTROL="@comment "
 .endif
 
 .if defined(SLAVE_TLS)
-PKGMESSAGE_SUFFIX=	-tls
+PKGMESSAGE_SUFFIX=	tls
 PLIST_SUB+=	TLS=""
 .else
 PLIST_SUB+=	TLS="@comment "
 .endif
 
-SUB_FILES+=	pkg-message${PKGMESSAGE_SUFFIX} mailer.conf.sample \
-		bootfiles.sed enable-qmail
+.if defined(PKGMESSAGE_SUFFIX)
+SLAVEPORT_LINE=	${PKGMESSAGE_SUFFIX}
+.elif defined(SLAVE_SPAMCONTROL)
+SLAVEPORT_LINE=	spamcontrol
+.endif
+
+SUB_FILES+=	mailer.conf.sample bootfiles.sed enable-qmail
 PKGINSTALL?=	${WRKDIR}/pkg-install
-PKGMESSAGE?=	${WRKDIR}/pkg-message${PKGMESSAGE_SUFFIX}
+
+.if defined(PKGMESSAGE_SUFFIX)
+SUB_FILES+=	pkg-message-${PKGMESSAGE_SUFFIX}
+PKGMESSAGE?=	${WRKDIR}/pkg-message-${PKGMESSAGE_SUFFIX}
+.else
+SUB_FILES+=	pkg-message
+.endif
 
 CSH?=	/bin/csh
 
@@ -291,6 +303,8 @@ CONFIGUREPROGS=	${WRKSRC}/install ${WRKSRC}/dnsfq ${WRKSRC}/hostname \
 		${WRKSRC}/dnsip ${WRKSRC}/ipmeprint ${WRKSRC}/dnsptr
 CONFIGUREFILES=	${WRKSRC}/config ${WRKSRC}/config-fast
 
+.include "${.CURDIR}/../../Mk/bsd.mail.mk"
+
 .if (${PREFIX} != ${LOCALBASE})
 DOCSDIR=	${PREFIX}/doc
 .endif
@@ -308,10 +322,8 @@ CFLAGS+=	-DDEBUG
 .endif
 
 .if defined(SLAVE_LDAP)
-PKGNAMESUFFIX:=	${PKGNAMESUFFIX}2
 
 .if !defined(WITHOUT_TLS)
-PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-with_tls
 # we can't use USE_OPENSSL=yes after including bsd.port.pre.mk
 .include "${PORTSDIR}/Mk/bsd.openssl.mk"
 .endif
@@ -469,6 +481,18 @@ pre-everything::
 	@${ECHO_MSG} ""
 .endif
 
+.if !defined(QMAIL_PREFIX)
+	@${ECHO_MSG} "QMAIL_PREFIX=PREFIX_PATH"
+	@${ECHO_MSG} "		(default PREFIX_PATH=${PREFIX})"
+	@${ECHO_MSG} "		A normal qmail installation puts"
+	@${ECHO_MSG} "		everything into /var/qmail/."
+	@${ECHO_MSG} "		If you want to install to ${LOCALBASE},"
+	@${ECHO_MSG} "		then \"${LOCALBASE}/qmail\" is suggested"
+	@${ECHO_MSG} "		instead of \"${LOCALBASE}\", but both will"
+	@${ECHO_MSG} "		work."
+ 	@${ECHO_MSG} ""
+.endif
+ 
 post-extract:
 .if defined(SLAVE_SPAMCONTROL)
 	@cd ${WRKSRC} && ${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${SPAMCONTROL_DIST}
@@ -596,6 +620,17 @@ do-install:
 	@${ECHO_CMD}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD}
+.if defined(SLAVEPORT_LINE)
+	@${ECHO_CMD} "============================================="
+	@${ECHO_CMD}
+	@${ECHO_CMD} "ATTENTION"
+	@${ECHO_CMD}
+	@${ECHO_CMD} "Add the following line to your /etc/make.conf"
+	@${ECHO_CMD} "QMAIL_SLAVEPORT=${SLAVEPORT_LINE}"
+	@${ECHO_CMD}
+	@${ECHO_CMD} "============================================="
+	@${ECHO_CMD}
+.endif
 
 certificate:
 .if defined(SLAVE_TLS) || defined(SLAVE_LDAP)