Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 30 Jun 2005 00:10:22 GMT
From:      Renato Botelho <freebsd@galle.com.br>
To:        freebsd-ports-bugs@FreeBSD.org
Subject:   Re: ports/82791: [MAINTAINER] mail/qmail: Add scheme to fix stale dependencies when use slaveports
Message-ID:  <200506300010.j5U0AMKB032149@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/82791; it has been noted by GNATS.

From: Renato Botelho <freebsd@galle.com.br>
To: bug-followup@FreeBSD.org, freebsd@galle.com.br
Cc:  
Subject: Re: ports/82791: [MAINTAINER] mail/qmail: Add scheme to fix stale dependencies when use slaveports
Date: Wed, 29 Jun 2005 21:09:58 -0300

 I forgot to remove PKGNAMESUFFIX change to qmail-ldap, IMHO, it's not
 needed.
 
 Here is a new patch:
 
 --- qmail.patch begins here ---
 diff -ruN --exclude=CVS ../ports.orig/UPDATING ./UPDATING
 --- ../ports.orig/UPDATING	Wed Jun 29 15:54:01 2005
 +++ ./UPDATING	Wed Jun 29 16:00:05 2005
 @@ -6,6 +6,24 @@
  time you update your ports collection, before attempting any port
  upgrades.
  
 +20050629:
 +  AFFECTS: users of mail/qmail all slaveports
 +  AUTHOR: freebsd@galle.com.br
 +
 +  People that uses one of all mail/qmail slave ports have problems with
 +  stale dependencies, because all ports that depends of qmail, points
 +  to mail/qmail port.
 +
 +  If you use a mail/qmail slaveport, set QMAIL_SLAVEPORT var on 
 +  /etc/make.conf, (ex. QMAIL_SLAVEPORT=ldap).
 +
 +  The actual choices are:
 +  * ldap
 +  * mysql
 +  * smtp_auth+tls
 +  * spamcontrol
 +  * tls
 +
  20050624:
    AFFECTS: users of lang/perl5.8
    AUTHOR: tobez@FreeBSD.org
 diff -ruN --exclude=CVS ../ports.orig/mail/ezmlm/Makefile ./mail/ezmlm/Makefile
 --- ../ports.orig/mail/ezmlm/Makefile	Fri Oct 24 12:56:39 2003
 +++ ./mail/ezmlm/Makefile	Wed Jun 29 16:08:27 2005
 @@ -7,6 +7,7 @@
  
  PORTNAME=	ezmlm
  PORTVERSION=	0.53
 +PORTREVISION=	1
  CATEGORIES=	mail
  MASTER_SITES=	http://cr.yp.to/software/ \
  		ftp://ftp.fu-berlin.de/unix/mail/qmail/ \
 @@ -19,15 +20,12 @@
  MAINTAINER=	sergei@FreeBSD.org
  COMMENT=	An easy-to-use, high-speed mailing list manager for qmail
  
 -RUN_DEPENDS=	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail
 +DEPEND_QMAIL_RUN=	yes
  
  CONFLICTS=	ezmlm-idx-*
  
  NO_PACKAGE=	Unsure of DJB license
  
 -# QMAIL_DIR is the directory where qmail is installed
 -QMAIL_DIR?=	/var/qmail
 -
  ALL_TARGET=	it
  
  PROGRAMS=	ezmlm-make ezmlm-manage ezmlm-send ezmlm-reject ezmlm-return \
 @@ -37,6 +35,8 @@
  		ezmlm-warn.1 ezmlm-weed.1
  MAN5=		ezmlm.5
  DOCS=		BLURB INSTALL README THANKS TODO
 +
 +.include "${PORTSDIR}/mail/qmail/Makefile.include"
  
  post-patch:
  	@${ECHO_CMD} ${PREFIX}/bin > ${WRKSRC}/conf-bin
 diff -ruN --exclude=CVS ../ports.orig/mail/ezmlm-idx/Makefile ./mail/ezmlm-idx/Makefile
 --- ../ports.orig/mail/ezmlm-idx/Makefile	Sun Jan 30 22:35:49 2005
 +++ ./mail/ezmlm-idx/Makefile	Wed Jun 29 16:08:16 2005
 @@ -7,7 +7,7 @@
  
  PORTNAME=	ezmlm-idx
  PORTVERSION=	0.40
 -PORTREVISION=	3
 +PORTREVISION=	4
  CATEGORIES=	mail
  MASTER_SITES=	ftp://ftp.ezmlm.org/pub/patches/ \
  		ftp://gd.tuwien.ac.at/infosys/mail/qmail/ezmlm-patches/ \
 @@ -22,13 +22,10 @@
  MAINTAINER=	sergei@FreeBSD.org
  COMMENT=	Improved version of the ezmlm mailing list manager
  
 -RUN_DEPENDS=	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail
 +DEPEND_QMAIL_RUN=	yes
  
  CONFLICTS=	ezmlm-0.*
  
 -# QMAIL_DIR is the directory where qmail is installed
 -QMAIL_DIR?=	/var/qmail
 -
  # LANGUAGE is the ISO code for the language to use in ezmlmrc
  LANGUAGE?=	en_US
  
 @@ -74,6 +71,8 @@
  	ezmlm-warn.1 ezmlm-weed.1
  MAN5=	ezmlm.5 ezmlmglrc.5 ezmlmrc.5 ezmlmsubrc.5
  DOCS=	CHANGES.idx DOWNGRADE.idx FAQ.idx INSTALL.idx README.idx UPGRADE.idx
 +
 +.include "${PORTSDIR}/mail/qmail/Makefile.include"
  
  pre-patch:
  	@${MV} -f ${WRKDIR}/ezmlm-idx-${PORTVERSION}/* ${WRKSRC}
 diff -ruN --exclude=CVS ../ports.orig/mail/mailfront/Makefile ./mail/mailfront/Makefile
 --- ../ports.orig/mail/mailfront/Makefile	Thu Nov 18 15:33:42 2004
 +++ ./mail/mailfront/Makefile	Wed Jun 29 16:08:36 2005
 @@ -7,6 +7,7 @@
  
  PORTNAME=	mailfront
  PORTVERSION=	0.92
 +PORTREVISION=	1
  CATEGORIES=	mail
  MASTER_SITES=	http://untroubled.org/${PORTNAME}/
  
 @@ -16,19 +17,20 @@
  BUILD_DEPENDS=	${LOCALBASE}/lib/libbg.a:${PORTSDIR}/devel/bglibs \
  		${LOCALBASE}/lib/libcvm-client.a:${PORTSDIR}/security/cvm
  
 -QMAIL_ROOT?=	/var/qmail
  CFLAGS+=	-I${LOCALBASE}/include
  LDFLAGS?=	-s
  
  DOCS=		NEWS README TODO *.html
  
 +.include "${PORTSDIR}/mail/qmail/Makefile.include"
 +
  do-configure:
  	${ECHO_CMD} "${PREFIX}/bin"	> ${WRKSRC}/conf-bin
  	${ECHO_CMD} "${CC} ${CFLAGS}"	> ${WRKSRC}/conf-cc
  	${ECHO_CMD} "${CC} ${LDFLAGS}"	> ${WRKSRC}/conf-ld
  	${ECHO_CMD} "${LOCALBASE}/include/bglibs" > ${WRKSRC}/conf-bgincs
  	${ECHO_CMD} "${LOCALBASE}/lib"	> ${WRKSRC}/conf-bglibs
 -	${ECHO_CMD} "${QMAIL_ROOT}"	> ${WRKSRC}/conf-qmail
 +	${ECHO_CMD} "${QMAIL_DIR}"	> ${WRKSRC}/conf-qmail
  
  do-install:
  	cd ${WRKSRC} && ./installer
 diff -ruN --exclude=CVS ../ports.orig/mail/mess822/Makefile ./mail/mess822/Makefile
 --- ../ports.orig/mail/mess822/Makefile	Sat Apr 17 19:08:11 2004
 +++ ./mail/mess822/Makefile	Wed Jun 29 16:08:41 2005
 @@ -7,6 +7,7 @@
  
  PORTNAME=	mess822
  PORTVERSION=	0.58
 +PORTREVISION=	1
  CATEGORIES=	mail
  MASTER_SITES=	http://cr.yp.to/software/ \
  		ftp://ftp.jp.qmail.org/qmail/ \
 @@ -16,7 +17,7 @@
  MAINTAINER=	drs@rucus.ru.ac.za
  COMMENT=	RFC 822 mail message parsing library and rewriting utilities
  
 -RUN_DEPENDS=	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail
 +DEPEND_QMAIL_RUN=	yes
  
  NO_PACKAGE=	Violates djb\'s license
  USE_REINPLACE=	yes
 @@ -31,13 +32,9 @@
  MAN5=		rewriting.5
  MAN8=		ofmipd.8 ofmipname.8
  
 -.if exists(${PREFIX}/qmail/bin/qmail-send)
 -QMAIL_DIR?=	${PREFIX}/qmail
 -.else
 -QMAIL_DIR?=	/var/qmail
 -.endif
 -
  NO_MTREE=	yes
 +
 +.include "${PORTSDIR}/mail/qmail/Makefile.include"
  
  post-patch:
  	@${REINPLACE_CMD} -e "s|-O2|${CFLAGS}|" ${WRKSRC}/conf-cc
 diff -ruN --exclude=CVS ../ports.orig/mail/qmHandle/Makefile ./mail/qmHandle/Makefile
 --- ../ports.orig/mail/qmHandle/Makefile	Wed Jan 14 02:35:54 2004
 +++ ./mail/qmHandle/Makefile	Wed Jun 29 16:08:47 2005
 @@ -7,7 +7,7 @@
  
  PORTNAME=	qmHandle
  PORTVERSION=	1.2.0
 -PORTREVISION=	1
 +PORTREVISION=	2
  CATEGORIES=	mail
  MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
  MASTER_SITE_SUBDIR=	qmhandle
 @@ -16,17 +16,13 @@
  MAINTAINER=	petef@FreeBSD.org
  COMMENT=	Tool to view and manage a qmail queue
  
 -RUN_DEPENDS=	${QMAIL_DIR}/bin/qmail-qstat:${PORTSDIR}/mail/qmail
 +DEPEND_QMAIL_RUN=	yes
  
  NO_WRKSUBDIR=	yes
  NO_BUILD=	yes
  USE_PERL5=	yes
  
 -.if exists(${LOCALBASE}/qmail/bin/qmail-qstat)
 -QMAIL_DIR?=	${LOCALBASE}/qmail
 -.else
 -QMAIL_DIR?=	/var/qmail
 -.endif
 +.include "${PORTSDIR}/mail/qmail/Makefile.include"
  
  .include <bsd.port.pre.mk>
  
 diff -ruN --exclude=CVS ../ports.orig/mail/qmail/Makefile ./mail/qmail/Makefile
 --- ../ports.orig/mail/qmail/Makefile	Tue Jun 28 12:40:25 2005
 +++ ./mail/qmail/Makefile	Wed Jun 29 21:03:34 2005
 @@ -202,6 +202,10 @@
  	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}
 @@ -215,14 +219,14 @@
  .endif
  
  .if defined(SLAVE_LDAP)
 -PKGMESSAGE_SUFFIX=	-ldap
 +PKGMESSAGE_SUFFIX=	ldap
  PLIST_SUB+=	LDAP="" NOT_LDAP="@comment "
  .else
  PLIST_SUB+=	LDAP="@comment " NOT_LDAP=""
  .endif
  
  .if defined(SLAVE_SMTP_AUTH_TLS)
 -PKGMESSAGE_SUFFIX=	-smtp_auth+tls
 +PKGMESSAGE_SUFFIX=	smtp_auth+tls
  PLIST_SUB+=	SMTP_AUTH_TLS=""
  .else
  PLIST_SUB+=	SMTP_AUTH_TLS="@comment "
 @@ -235,16 +239,27 @@
  .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
  
 @@ -315,10 +330,8 @@
  .include <bsd.port.pre.mk>
  
  .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
 @@ -591,6 +604,17 @@
  	@${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_SMTP_AUTH_TLS) || defined(SLAVE_LDAP)
 diff -ruN --exclude=CVS ../ports.orig/mail/qmail/Makefile.include ./mail/qmail/Makefile.include
 --- ../ports.orig/mail/qmail/Makefile.include	Wed Dec 31 21:00:00 1969
 +++ ./mail/qmail/Makefile.include	Wed Jun 29 13:57:59 2005
 @@ -0,0 +1,23 @@
 +.if exists(${PREFIX}/qmail/bin/qmail-send)
 +QMAIL_DIR?=	${PREFIX}/qmail
 +.else
 +QMAIL_DIR?=	/var/qmail
 +.endif
 +
 +.if defined(DEPEND_QMAIL) || defined(DEPEND_QMAIL_RUN) || defined (DEPEND_QMAIL_BUILD)
 +
 +.if defined(QMAIL_SLAVEPORT)
 +QMAIL_DEPENDS=	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail-${QMAIL_SLAVEPORT}
 +.else
 +QMAIL_DEPENDS=	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail
 +.endif
 +
 +.if defined(DEPEND_QMAIL) || defined(DEPEND_QMAIL_RUN)
 +RUN_DEPENDS+=	${QMAIL_DEPENDS}
 +.endif
 +
 +.if defined(DEPEND_QMAIL) || defined(DEPEND_QMAIL_BUILD)
 +BUILD_DEPENDS+=	${QMAIL_DEPENDS}
 +.endif
 +
 +.endif
 diff -ruN --exclude=CVS ../ports.orig/mail/qmail-autoresponder/Makefile ./mail/qmail-autoresponder/Makefile
 --- ../ports.orig/mail/qmail-autoresponder/Makefile	Wed Dec 24 12:01:43 2003
 +++ ./mail/qmail-autoresponder/Makefile	Wed Jun 29 16:08:55 2005
 @@ -10,14 +10,14 @@
  
  PORTNAME=	qmail-autoresponder
  PORTVERSION=	0.96.1
 -PORTREVISION=	1
 +PORTREVISION=	2
  CATEGORIES=	mail
  MASTER_SITES=	http://untroubled.org/${PORTNAME}/
  
  MAINTAINER=	sergei@FreeBSD.org
  COMMENT=	Rate-limited autoresponder for qmail
  
 -BUILD_DEPENDS=	${LOCALBASE}/lib/libbg-iobuf.a:${PORTSDIR}/devel/bglibs
 +DEPEND_QMAIL_BUILD=	yes
  
  LDFLAGS?=	-s
  
 @@ -37,6 +37,8 @@
  .endif
  
  ALL_TARGET=	${PROGS}
 +
 +.include "${PORTSDIR}/mail/qmail/Makefile.include"
  
  do-configure:
  	${ECHO_CMD} "${PREFIX}/bin"		> ${WRKSRC}/conf-bin
 diff -ruN --exclude=CVS ../ports.orig/mail/qmail-conf/Makefile ./mail/qmail-conf/Makefile
 --- ../ports.orig/mail/qmail-conf/Makefile	Fri Sep  5 04:33:48 2003
 +++ ./mail/qmail-conf/Makefile	Wed Jun 29 16:09:01 2005
 @@ -7,7 +7,7 @@
  
  PORTNAME=	qmail-conf
  PORTVERSION=	0.60
 -PORTREVISION=	1
 +PORTREVISION=	2
  CATEGORIES=	mail
  MASTER_SITES=	http://www.din.or.jp/~ushijima/qmail-conf/ \
  		http://cr.yp.to/djbdns/
 @@ -23,8 +23,6 @@
  
  NO_PACKAGE=	"borrows code from djbdns, thus falls under the same restrictions as dns/djbdns"
  
 -# Note: this MUST be the same as the directory qmail is installed in!
 -QMAIL_DIR?=	/var/qmail
  PREFIX?=	${QMAIL_DIR}
  
  NO_MTREE=	yes
 @@ -32,6 +30,8 @@
  DJBDNS_VER=	1.05
  DJBDNS_NAME=	djbdns-${DJBDNS_VER}
  DJBDNS_DIST=	${DJBDNS_NAME}${EXTRACT_SUFX}
 +
 +.include "${PORTSDIR}/mail/qmail/Makefile.include"
  
  post-extract:
  		@(cd ${WRKSRC} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${DJBDNS_DIST} ${EXTRACT_AFTER_ARGS})
 diff -ruN --exclude=CVS ../ports.orig/mail/qmail-contrib/Makefile ./mail/qmail-contrib/Makefile
 --- ../ports.orig/mail/qmail-contrib/Makefile	Thu Mar 25 15:33:22 2004
 +++ ./mail/qmail-contrib/Makefile	Wed Jun 29 16:09:15 2005
 @@ -7,6 +7,7 @@
  
  PORTNAME=	qmail-contrib
  PORTVERSION=	0.1
 +PORTREVISION=	1
  CATEGORIES=	mail
  MASTER_SITES=	ftp://ftp.qmail.org/pub/software/ \
  		ftp://rucus.ru.ac.za/pub/mail/qmail/src/
 @@ -16,7 +17,7 @@
  MAINTAINER=	ports@FreeBSD.org
  COMMENT=	Contributed programs for qmail
  
 -RUN_DEPENDS=	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail
 +DEPEND_QMAIL_RUN=	yes
  
  NO_PACKAGE=	Unsure of djb\'s license
  
 @@ -28,13 +29,7 @@
  
  PLIST_SUB=	DOCDIR=${DOCDIR}
  
 -.if exists(${PREFIX}/qmail/bin/qmail-send)
 -QMAIL_DIR?=	${PREFIX}/qmail
 -PREFIX?=	${PREFIX}/qmail
 -.else
 -QMAIL_DIR?=	/var/qmail
 -PREFIX?=	/var/qmail
 -.endif
 +PREFIX?=	${QMAIL_DIR}
  
  .if (${PREFIX} == "/usr/local")
  DOCDIR=		share/doc/qmail
 @@ -51,6 +46,8 @@
  
  NO_MTREE=	yes
  USE_PERL5_BUILD=yes
 +
 +.include "${PORTSDIR}/mail/qmail/Makefile.include"
  
  pre-patch:
  	@cd ${WRKFF} \
 diff -ruN --exclude=CVS ../ports.orig/mail/qmail-scanner/Makefile ./mail/qmail-scanner/Makefile
 --- ../ports.orig/mail/qmail-scanner/Makefile	Wed Jun  1 16:23:58 2005
 +++ ./mail/qmail-scanner/Makefile	Wed Jun 29 16:09:20 2005
 @@ -7,7 +7,7 @@
  
  PORTNAME=	qmail-scanner
  PORTVERSION=	1.25
 -PORTREVISION=	1
 +PORTREVISION=	2
  CATEGORIES=	mail security
  MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
  MASTER_SITE_SUBDIR=	${PORTNAME}
 @@ -17,13 +17,9 @@
  MAINTAINER=	freebsd@simplerezo.com
  COMMENT=	Content/Anti-virus Scanner for qmail
  
 -BUILD_DEPENDS=	${QMAIL_QUEUE}:${PORTSDIR}/mail/qmail \
 -		reformime:${PORTSDIR}/mail/maildrop \
 +BUILD_DEPENDS=	reformime:${PORTSDIR}/mail/maildrop \
  		${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes
  
 -# A normal qmail installation puts everything into /var/qmail/.
 -# Must match your qmail installation
 -QMAIL_DIR?=	/var/qmail
  QMAIL_QUEUE=	${QMAIL_DIR}/bin/qmail-queue
  
  USE_PERL5=	yes
 @@ -79,6 +75,8 @@
  
  RUN_DEPENDS=	${BUILD_DEPENDS}
  
 +DEPEND_QMAIL=	yes
 +
  SPOOLDIR=	${PREFIX}/qmailscan
  PLIST_SUB=	SPOOLDIR="${SPOOLDIR:S,${PREFIX}/,,}"
  
 @@ -92,6 +90,8 @@
  		--add-dscr-hdrs yes \
  		--log-details syslog --debug no \
  		--batch
 +
 +.include "${PORTSDIR}/mail/qmail/Makefile.include"
  
  pre-configure:
  	@${ECHO_MSG} ""
 diff -ruN --exclude=CVS ../ports.orig/mail/qmailadmin/Makefile ./mail/qmailadmin/Makefile
 --- ../ports.orig/mail/qmailadmin/Makefile	Tue Jun 14 09:48:33 2005
 +++ ./mail/qmailadmin/Makefile	Wed Jun 29 16:09:46 2005
 @@ -7,6 +7,7 @@
  
  PORTNAME=	qmailadmin
  PORTVERSION=	1.2.7
 +PORTREVISION=	1
  PORTEPOCH=	1
  CATEGORIES=	mail www
  MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 @@ -70,17 +71,9 @@
  PLIST_SUB+=	CGIBINDIR="${CGIBINDIR}" CGIBINSUBDIR="${CGIBINSUBDIR}" \
  		WEBDATADIR="${WEBDATADIR}" WEBDATASUBDIR="${WEBDATASUBDIR}"
  
 -.include <bsd.port.pre.mk>
 -
 -#
 -# QMAIL_DIR     - location of qmail directory
 -#
 +.include "${PORTSDIR}/mail/qmail/Makefile.include"
  
 -.if exists(${LOCALBASE}/qmail/bin/qmail-send)
 -QMAIL_DIR?=	${LOCALBASE}/qmail
 -.else
 -QMAIL_DIR?=	/var/qmail
 -.endif
 +.include <bsd.port.pre.mk>
  
  # End of user-configurable variables
  
 diff -ruN --exclude=CVS ../ports.orig/mail/qmailadmin-devel/Makefile ./mail/qmailadmin-devel/Makefile
 --- ../ports.orig/mail/qmailadmin-devel/Makefile	Mon Mar 14 06:26:52 2005
 +++ ./mail/qmailadmin-devel/Makefile	Wed Jun 29 16:09:37 2005
 @@ -7,6 +7,7 @@
  
  PORTNAME=	qmailadmin
  PORTVERSION=	1.2.7
 +PORTREVISION=	1
  CATEGORIES=	mail www
  MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
  MASTER_SITE_SUBDIR=	${PORTNAME}
 @@ -16,11 +17,9 @@
  COMMENT=	CGI program for administering Qmail with vchkpw/vpopmail
  
  BUILD_DEPENDS=	\
 -	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail \
  	autorespond:${PORTSDIR}/mail/autorespond \
  	${LOCALBASE}/vpopmail/lib/libvpopmail.a:${PORTSDIR}/mail/vpopmail-devel
  RUN_DEPENDS=	\
 -	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail \
  	autorespond:${PORTSDIR}/mail/autorespond \
  	${LOCALBASE}/vpopmail/lib/libvpopmail.a:${PORTSDIR}/mail/vpopmail-devel
  
 @@ -71,17 +70,9 @@
  PLIST_SUB+=	CGIBINDIR="${CGIBINDIR}" CGIBINSUBDIR="${CGIBINSUBDIR}" \
  		WEBDATADIR="${WEBDATADIR}" WEBDATASUBDIR="${WEBDATASUBDIR}"
  
 -.include <bsd.port.pre.mk>
 -
 -#
 -# QMAIL_DIR     - location of qmail directory
 -#
 +.include "${PORTSDIR}/mail/qmail/Makefile.include"
  
 -.if exists(${LOCALBASE}/qmail/bin/qmail-send)
 -QMAIL_DIR?=	${LOCALBASE}/qmail
 -.else
 -QMAIL_DIR?=	/var/qmail
 -.endif
 +.include <bsd.port.pre.mk>
  
  # End of user-configurable variables
  
 diff -ruN --exclude=CVS ../ports.orig/mail/qmailanalog/Makefile ./mail/qmailanalog/Makefile
 --- ../ports.orig/mail/qmailanalog/Makefile	Mon May 30 17:46:07 2005
 +++ ./mail/qmailanalog/Makefile	Wed Jun 29 16:09:52 2005
 @@ -7,14 +7,14 @@
  
  PORTNAME=	qmailanalog
  PORTVERSION=	0.70
 -PORTREVISION=	1
 +PORTREVISION=	2
  CATEGORIES=	mail
  MASTER_SITES=	ftp://cr.yp.to/software/
  
  MAINTAINER=	freebsd@galle.com.br
  COMMENT=	A collection of tools to analyze qmail-send's activity
  
 -RUN_DEPENDS=	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail
 +DEPEND_QMAIL_RUN=	yes
  
  ALL_TARGET=	it
  INSTALL_TARGET=	setup
 @@ -24,12 +24,6 @@
  
  PLIST_SUB+=	MYSUBDIR=${MYSUBDIR}
  
 -.if exists(${PREFIX}/qmail/bin/qmail-send)
 -QMAIL_DIR?=	${PREFIX}/qmail
 -.else
 -QMAIL_DIR?=	/var/qmail
 -.endif
 -
  .if !defined(NOSUBDIR)
  MYSUBDIR?=	qmailanalog/
  .else
 @@ -41,6 +35,8 @@
  
  NO_MTREE=	yes
  USE_REINPLACE=	yes
 +
 +.include "${PORTSDIR}/mail/qmail/Makefile.include"
  
  .include <bsd.port.pre.mk>
  
 diff -ruN --exclude=CVS ../ports.orig/mail/qmailmrtg7/Makefile ./mail/qmailmrtg7/Makefile
 --- ../ports.orig/mail/qmailmrtg7/Makefile	Tue Jun 14 11:51:42 2005
 +++ ./mail/qmailmrtg7/Makefile	Wed Jun 29 16:10:01 2005
 @@ -7,25 +7,21 @@
  
  PORTNAME=	qmailmrtg7
  PORTVERSION=	4.2
 +PORTREVISION=	1
  CATEGORIES=	mail net-mgmt
  MASTER_SITES=	http://www.inter7.com/qmailmrtg7/
  
  MAINTAINER=	ale@FreeBSD.org
  COMMENT=	A program to create mrtg graphs for qmail activity
  
 -BUILD_DEPENDS=	${QMAIL_DIR}/bin/qmail-queue:${PORTSDIR}/mail/qmail
 -RUN_DEPENDS=	${QMAIL_DIR}/bin/qmail-queue:${PORTSDIR}/mail/qmail \
 -		mrtg:${PORTSDIR}/net-mgmt/mrtg
 +RUN_DEPENDS=	mrtg:${PORTSDIR}/net-mgmt/mrtg
 +DEPEND_QMAIL=	yes
  
  USE_REINPLACE=	yes
  
 -.include <bsd.port.pre.mk>
 +.include "${PORTSDIR}/mail/qmail/Makefile.include"
  
 -.if exists(${LOCALBASE}/qmail/bin/qmail-queue)
 -QMAIL_DIR?=	${LOCALBASE}/qmail
 -.else
 -QMAIL_DIR?=	/var/qmail
 -.endif
 +.include <bsd.port.pre.mk>
  
  post-patch:
  	@${REINPLACE_CMD} "s|cc|${CC}|g;s|-s -O|${CFLAGS}|g" ${WRKSRC}/Makefile
 diff -ruN --exclude=CVS ../ports.orig/mail/qscan/Makefile ./mail/qscan/Makefile
 --- ../ports.orig/mail/qscan/Makefile	Thu Apr  8 12:13:39 2004
 +++ ./mail/qscan/Makefile	Wed Jun 29 16:10:09 2005
 @@ -7,26 +7,24 @@
  
  PORTNAME=	qscan
  PORTVERSION=	1.5
 +PORTREVISION=	1
  CATEGORIES=	mail security
  MASTER_SITES=	ftp://ftp.c9x.org/qscan/
  
  MAINTAINER=	ale@FreeBSD.org
  COMMENT=	A mail filter for Qmail that scans messages with ClamAV
  
 -RUN_DEPENDS=	${QMAIL_QUEUE}:${PORTSDIR}/mail/qmail \
 -		clamdscan:${PORTSDIR}/security/clamav \
 +RUN_DEPENDS=	clamdscan:${PORTSDIR}/security/clamav \
  		ripmime:${PORTSDIR}/mail/ripmime
 +DEPEND_QMAIL_RUN=	yes
  
  GNU_CONFIGURE=	yes
  USE_REINPLACE=	yes
  
 +.include "${PORTSDIR}/mail/qmail/Makefile.include"
 +
  .include <bsd.port.pre.mk>
  
 -.if exists(${LOCALBASE}/qmail/bin/qmail-queue)
 -QMAIL_DIR?=	${LOCALBASE}/qmail
 -.else
 -QMAIL_DIR?=	/var/qmail
 -.endif
  QMAIL_QUEUE=	${QMAIL_DIR}/bin/qmail-queue
  QSCAN_VAR?=	${QMAIL_DIR}/${PORTNAME}
  PLIST_SUB+=	QSCAN_VAR="${QSCAN_VAR}" \
 diff -ruN --exclude=CVS ../ports.orig/mail/qtools/Makefile ./mail/qtools/Makefile
 --- ../ports.orig/mail/qtools/Makefile	Thu Oct 23 03:42:46 2003
 +++ ./mail/qtools/Makefile	Wed Jun 29 16:10:15 2005
 @@ -7,21 +7,21 @@
  
  PORTNAME=	qtools
  PORTVERSION=	0.56
 -PORTREVISION=	1
 +PORTREVISION=	2
  CATEGORIES=	mail
  MASTER_SITES=	http://www.superscript.com/qtools/
  
  MAINTAINER=	sergei@FreeBSD.org
  COMMENT=	Tools to use in .qmail files
  
 -RUN_DEPENDS=	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail \
 -		${EZMLM_DIR}/bin/ezmlm-weed:${PORTSDIR}/mail/ezmlm
 +RUN_DEPENDS=	${EZMLM_DIR}/bin/ezmlm-weed:${PORTSDIR}/mail/ezmlm
  
  ALL_TARGET=	it
  INSTALL_TARGET=	setup check
  
 -QMAIL_DIR?=	/var/qmail
  EZMLM_DIR?=	${LOCALBASE}
 +
 +.include "${PORTSDIR}/mail/qmail/Makefile.include"
  
  do-configure:
  	@${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc
 diff -ruN --exclude=CVS ../ports.orig/mail/queue-fix/Makefile ./mail/queue-fix/Makefile
 --- ../ports.orig/mail/queue-fix/Makefile	Tue Apr 19 18:34:08 2005
 +++ ./mail/queue-fix/Makefile	Wed Jun 29 16:10:27 2005
 @@ -7,15 +7,15 @@
  
  PORTNAME=	queue-fix
  PORTVERSION=	1.4
 +PORTREVISION=	1
  CATEGORIES=	mail
  MASTER_SITES=	http://www.netmeridian.com/e-huss/
  
  MAINTAINER=	freebsd@galle.com.br
  COMMENT=	Repairs or generates a qmail queue structure
  
 -RUN_DEPENDS=	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail
 +DEPEND_QMAIL_RUN=	yes
  
 -QMAIL_DIR?=	/var/qmail
  PREFIX?=	${QMAIL_DIR}
  
  OPTIONS=	BIG_TODO "Use big_todo patch" off
 @@ -25,6 +25,8 @@
  
  PLIST_SUB=	DOCDIR=${DOCDIR}
  PLIST_FILES=	bin/queue-fix
 +
 +.include "${PORTSDIR}/mail/qmail/Makefile.include"
  
  .if !defined(NOPORTDOCS)
  PLIST_FILES+=	%%DOCDIR%%/README
 diff -ruN --exclude=CVS ../ports.orig/mail/queue-repair/Makefile ./mail/queue-repair/Makefile
 --- ../ports.orig/mail/queue-repair/Makefile	Mon Dec  8 15:09:23 2003
 +++ ./mail/queue-repair/Makefile	Wed Jun 29 16:10:31 2005
 @@ -7,6 +7,7 @@
  
  PORTNAME=	queue-repair
  PORTVERSION=	0.9.0
 +PORTREVISION=	1
  CATEGORIES=	mail python
  MASTER_SITES=	http://www.qcc.ca/~charlesc/software/queue_repair/
  
 @@ -14,8 +15,8 @@
  COMMENT=	A qmail queue diagnostic and repair tool
  
  .if !defined(WITHOUT_QMAIL_PORT)
 -RUN_DEPENDS=	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail
 -QMAIL_DIR?=	/var/qmail
 +DEPEND_QMAIL_RUN=	yes
 +.include "${PORTSDIR}/mail/qmail/Makefile.include"
  .endif
  
  USE_PYTHON=	yes
 diff -ruN --exclude=CVS ../ports.orig/mail/serialmail/Makefile ./mail/serialmail/Makefile
 --- ../ports.orig/mail/serialmail/Makefile	Tue Oct 12 04:35:40 2004
 +++ ./mail/serialmail/Makefile	Wed Jun 29 16:10:38 2005
 @@ -7,7 +7,7 @@
  
  PORTNAME=	serialmail
  PORTVERSION=	0.75
 -PORTREVISION=	1
 +PORTREVISION=	2
  CATEGORIES=	mail
  MASTER_SITES=	http://cr.yp.to/software/ \
  		ftp://ftp.gbnet.net/pub/qmail/ \
 @@ -17,11 +17,8 @@
  MAINTAINER=	sergei@FreeBSD.org
  COMMENT=	Tools for passing mail across serial links
  
 -RUN_DEPENDS=	tcpserver:${PORTSDIR}/sysutils/ucspi-tcp \
 -		${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail
 -
 -# QMAIL_DIR is the directory where qmail is installed
 -QMAIL_DIR?=	/var/qmail
 +RUN_DEPENDS=	tcpserver:${PORTSDIR}/sysutils/ucspi-tcp
 +DEPEND_QMAIL_RUN=	yes
  
  NO_PACKAGE=	Unsure of DJB license
  
 @@ -34,6 +31,8 @@
  MAN1=		maildirqmtp.1 maildirserial.1 maildirsmtp.1 serialqmtp.1 \
  		serialsmtp.1 setlock.1
  DOCS=		AUTOTURN BLURB CHANGES FROMISP README TODO TOISP THANKS
 +
 +.include "${PORTSDIR}/mail/qmail/Makefile.include"
  
  .include <bsd.port.pre.mk>
  
 diff -ruN --exclude=CVS ../ports.orig/mail/simscan/Makefile ./mail/simscan/Makefile
 --- ../ports.orig/mail/simscan/Makefile	Sun Apr  3 13:04:21 2005
 +++ ./mail/simscan/Makefile	Wed Jun 29 16:10:44 2005
 @@ -7,6 +7,7 @@
  
  PORTNAME=	simscan
  PORTVERSION=	1.1
 +PORTREVISION=	1
  CATEGORIES=	mail security
  MASTER_SITES=	http://www.inter7.com/simscan/
  MASTER_SITE_SUBDIR=	${PORTNAME}
 @@ -15,13 +16,10 @@
  MAINTAINER=	toxa@toxahost.ru
  COMMENT=	Fast Content/Anti-virus Scanner for qmail Written in C
  
 -BUILD_DEPENDS=	${QMAIL_QUEUE}:${PORTSDIR}/mail/qmail
 +DEPEND_QMAIL_BUILD=	yes
  
  GNU_CONFIGURE=	yes
  
 -# A normal qmail installation puts everything into /var/qmail/.
 -# Must match your qmail installation
 -QMAIL_DIR?=	/var/qmail
  WORKDIR?=	${QMAIL_DIR}/${PORTNAME}
  QMAIL_QUEUE=	${QMAIL_DIR}/bin/qmail-queue
  PLIST_SUB=	QMAIL_DIR=${QMAIL_DIR} \
 @@ -36,6 +34,8 @@
  		DROPMSG "Drop Message in Case of Virus Found" off \
  		PASSTHRU "Pass Spam Thru, Do Not Reject (required SPAMD)" off \
  		HEADERS "Add a Received Line With Versions of Scanners" off
 +
 +.include "${PORTSDIR}/mail/qmail/Makefile.include"
  
  .include <bsd.port.pre.mk>
  
 diff -ruN --exclude=CVS ../ports.orig/mail/usendmail/Makefile ./mail/usendmail/Makefile
 --- ../ports.orig/mail/usendmail/Makefile	Fri Mar 12 12:34:38 2004
 +++ ./mail/usendmail/Makefile	Wed Jun 29 16:10:52 2005
 @@ -8,16 +8,14 @@
  
  PORTNAME=	usendmail
  PORTVERSION=	0.1.6
 +PORTREVISION=	1
  CATEGORIES=	mail
  MASTER_SITES=	http://www.ohse.de/uwe/usendmail/
  
  MAINTAINER=	tmseck@netcologne.de
  COMMENT=	A replacement for qmail's sendmail drop-in
  
 -BUILD_DEPENDS=	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail
 -RUN_DEPENDS=	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail
 -
 -QMAIL_DIR?=	/var/qmail
 +DEPEND_QMAIL=	yes
  
  NO_SIZE=	yes
  USE_REINPLACE=	yes
 @@ -26,6 +24,8 @@
  
  PLIST_FILES=	sbin/usendmail
  PORTDOCS=	NEWS README
 +
 +.include "${PORTSDIR}/mail/qmail/Makefile.include"
  
  do-patch:
  	@${REINPLACE_CMD} -e 's,/var/qmail,${QMAIL_DIR},' \
 diff -ruN --exclude=CVS ../ports.orig/mail/vmailmgr/Makefile ./mail/vmailmgr/Makefile
 --- ../ports.orig/mail/vmailmgr/Makefile	Sun Jan 30 09:28:50 2005
 +++ ./mail/vmailmgr/Makefile	Wed Jun 29 16:10:58 2005
 @@ -7,25 +7,26 @@
  
  PORTNAME=	vmailmgr
  PORTVERSION=	0.96.9
 -PORTREVISION=	1
 +PORTREVISION=	2
  CATEGORIES=	mail
  MASTER_SITES=	http://www.vmailmgr.org/current/
  
  MAINTAINER=	patrick@rinke-bochum.de
  COMMENT=	Virtual MAIL ManaGeR for virtual mailboxes and domains
  
 -RUN_DEPENDS=	/var/qmail/bin/qmail-start:${PORTSDIR}/mail/qmail \
 -		unixserver:${PORTSDIR}/sysutils/ucspi-unix
 +DEPEND_QMAIL_RUN=	yes
  
  HAS_CONFIGURE=yes
  
 -SVC_DIR=	"/var/qmail/service/vmailmgrd"
 +SVC_DIR=	"${QMAIL_DIR}/service/vmailmgrd"
  
  MAN1=		checkvpw.1 vauthenticate.1 vpasswd2cdb.1 vrehash.1 \
  		listvdomain.1 vadduser.1 vchattr.1 vchforwards.1 \
  		vcheckquota.1 vdeliver.1 vdeluser.1 vpasswd.1
  MAN7=		vmailmgr.7
  MAN8=		vmailmgrd.8
 +
 +.include "${PORTSDIR}/mail/qmail/Makefile.include"
  
  post-install:
  	${MKDIR} ${PREFIX}/etc/vmailmgr
 diff -ruN --exclude=CVS ../ports.orig/mail/vpopmail/Makefile ./mail/vpopmail/Makefile
 --- ../ports.orig/mail/vpopmail/Makefile	Tue Jun  7 05:51:34 2005
 +++ ./mail/vpopmail/Makefile	Wed Jun 29 16:11:43 2005
 @@ -7,7 +7,7 @@
  
  PORTNAME=	vpopmail
  PORTVERSION=	5.4.10
 -PORTREVISION=	2
 +PORTREVISION=	3
  CATEGORIES=	mail
  MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
  MASTER_SITE_SUBDIR=	${PORTNAME}
 @@ -15,10 +15,9 @@
  MAINTAINER=	roam@FreeBSD.org
  COMMENT=	Easy virtual domain and authentication package for use with qmail
  
 -BUILD_DEPENDS=	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail \
 -		${LOCALBASE}/bin/tcprules:${PORTSDIR}/sysutils/ucspi-tcp
 -RUN_DEPENDS=	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail \
 -		${LOCALBASE}/bin/tcprules:${PORTSDIR}/sysutils/ucspi-tcp
 +BUILD_DEPENDS=	${LOCALBASE}/bin/tcprules:${PORTSDIR}/sysutils/ucspi-tcp
 +RUN_DEPENDS=	${LOCALBASE}/bin/tcprules:${PORTSDIR}/sysutils/ucspi-tcp
 +DEPEND_QMAIL=	yes
  
  CONFLICTS=	vpopmail-devel-5.*
  
 @@ -189,13 +188,9 @@
  CONFIGURE_ARGS+=	--enable-sql-logging
  .endif
  
 -.include <bsd.port.pre.mk>
 +.include "${PORTSDIR}/mail/qmail/Makefile.include"
  
 -.if exists(${LOCALBASE}/qmail/bin/qmail-send)
 -QMAIL_DIR?=	${LOCALBASE}/qmail
 -.else
 -QMAIL_DIR?=	/var/qmail
 -.endif
 +.include <bsd.port.pre.mk>
  
  # Uncomment this, or set PREFIX to /home if you have an existing
  # vpopmail install with the vpopmail users' home directory set to
 diff -ruN --exclude=CVS ../ports.orig/mail/vpopmail-devel/Makefile ./mail/vpopmail-devel/Makefile
 --- ../ports.orig/mail/vpopmail-devel/Makefile	Sun Jan 30 22:35:50 2005
 +++ ./mail/vpopmail-devel/Makefile	Wed Jun 29 16:11:05 2005
 @@ -7,7 +7,7 @@
  
  PORTNAME=	vpopmail
  PORTVERSION=	5.5.0
 -PORTREVISION=	1
 +PORTREVISION=	2
  CATEGORIES=	mail
  MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
  MASTER_SITE_SUBDIR=	${PORTNAME}
 @@ -16,10 +16,9 @@
  MAINTAINER=	ale@FreeBSD.org
  COMMENT=	Easy virtual domain and authentication package for use with qmail
  
 -BUILD_DEPENDS=	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail \
 -		${LOCALBASE}/bin/tcprules:${PORTSDIR}/sysutils/ucspi-tcp
 -RUN_DEPENDS=	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail \
 -		${LOCALBASE}/bin/tcprules:${PORTSDIR}/sysutils/ucspi-tcp
 +BUILD_DEPENDS=	${LOCALBASE}/bin/tcprules:${PORTSDIR}/sysutils/ucspi-tcp
 +RUN_DEPENDS=	${LOCALBASE}/bin/tcprules:${PORTSDIR}/sysutils/ucspi-tcp
 +DEPEND_QMAIL=	yes
  
  CONFLICTS=	vpopmail-5.*
  
 @@ -168,13 +167,9 @@
  .endif
  .endif
  
 -.include <bsd.port.pre.mk>
 +.include "${PORTSDIR}/mail/qmail/Makefile.include"
  
 -.if exists(${LOCALBASE}/qmail/bin/qmail-send)
 -QMAIL_DIR?=	${LOCALBASE}/qmail
 -.else
 -QMAIL_DIR?=	/var/qmail
 -.endif
 +.include <bsd.port.pre.mk>
  
  # Uncomment this, or set PREFIX to /home if you have an existing
  # vpopmail install with the vpopmail users' home directory set to
 diff -ruN --exclude=CVS ../ports.orig/mail/vqadmin/Makefile ./mail/vqadmin/Makefile
 --- ../ports.orig/mail/vqadmin/Makefile	Thu May 19 13:28:42 2005
 +++ ./mail/vqadmin/Makefile	Wed Jun 29 16:11:50 2005
 @@ -7,6 +7,7 @@
  
  PORTNAME=	vqadmin
  PORTVERSION=	2.3.6
 +PORTREVISION=	1
  CATEGORIES=	mail
  MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
  MASTER_SITE_SUBDIR=	vqadmin
 @@ -24,11 +25,12 @@
  
  CGIBINDIR?=	www/cgi-bin-dist
  WEBDATADIR?=	www/data-dist
 -QMAIL_DIR?=	/var/qmail
  
  CONFIGURE_ARGS=	--enable-cgibindir=${PREFIX}/${CGIBINDIR} \
  		--enable-htmldir=${PREFIX}/${WEBDATADIR} \
  		--enable-qmaildir=${QMAIL_DIR}
 +
 +.include "${PORTSDIR}/mail/qmail/Makefile.include"
  
  .include <bsd.port.pre.mk>
  
 diff -ruN --exclude=CVS ../ports.orig/mail/zabit/Makefile ./mail/zabit/Makefile
 --- ../ports.orig/mail/zabit/Makefile	Fri May 20 17:23:47 2005
 +++ ./mail/zabit/Makefile	Wed Jun 29 16:12:01 2005
 @@ -7,23 +7,21 @@
  
  PORTNAME=	zabit
  PORTVERSION=	0.7.1
 +PORTREVISION=	1
  CATEGORIES=	mail
  MASTER_SITES=	http://www.enderunix.org/zabit/
  
  MAINTAINER=	ozkan@enderunix.org
  COMMENT=	Zabit is a content/attachment filter for qmail
  
 -RUN_DEPENDS=	${QMAIL_QUEUE}:${PORTSDIR}/mail/qmail
 +DEPEND_QMAIL_RUN=	yes
  
  HAS_CONFIGURE=	yes
  
 +.include "${PORTSDIR}/mail/qmail/Makefile.include"
 +
  .include <bsd.port.pre.mk>
  
 -.if exists(${LOCALBASE}/qmail/bin/qmail-queue)
 -QMAIL_DIR?=     ${LOCALBASE}/qmail
 -.else
 -QMAIL_DIR?=     /var/qmail
 -.endif
  QMAIL_QUEUE=    ${QMAIL_DIR}/bin/qmail-queue
  
  pre-build:
 diff -ruN --exclude=CVS ../ports.orig/security/amavis-perl/Makefile ./security/amavis-perl/Makefile
 --- ../ports.orig/security/amavis-perl/Makefile	Mon May 24 21:04:30 2004
 +++ ./security/amavis-perl/Makefile	Wed Jun 29 16:12:07 2005
 @@ -7,6 +7,7 @@
  
  PORTNAME=	amavis-perl
  PORTVERSION=	11
 +PORTREVISION=	1
  CATEGORIES=	security
  MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
  MASTER_SITE_SUBDIR=	amavis
 @@ -57,13 +58,8 @@
  MTA?=	qmail
  DIROWNER?=	qmailq:qmail
  CONFIGURE_ARGS+=	--enable-qmail
 -.if exists(${LOCALBASE}/qmail/bin/qmail-send)
 -QMAIL_DIR?=	${LOCALBASE}/qmail
 -.else
 -QMAIL_DIR?=	/var/qmail
 -.endif
 -BUILD_DEPENDS+=	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail
 -RUN_DEPENDS=	${BUILD_DEPENDS}
 +DEPEND_QMAIL=	yes
 +.include "${PORTSDIR}/mail/qmail/Makefile.include"
  .endif
  
  .if defined(MTA)
 diff -ruN --exclude=CVS ../ports.orig/sysutils/dtc/Makefile ./sysutils/dtc/Makefile
 --- ../ports.orig/sysutils/dtc/Makefile	Tue Feb  8 11:47:14 2005
 +++ ./sysutils/dtc/Makefile	Wed Jun 29 16:12:12 2005
 @@ -7,7 +7,7 @@
  
  PORTNAME=	dtc
  PORTVERSION=	0.12.0.6
 -PORTREVISION=	1
 +PORTREVISION=	2
  CATEGORIES=	sysutils
  MASTER_SITES=	ftp://ftp.gplhost.com/pub/dtc/bsd/
  
 @@ -18,10 +18,8 @@
  		${LOCALBASE}/libexec/proftpd:${PORTSDIR}/ftp/proftpd-mysql \
  		${LOCALBASE}/libexec/apache2/mod_log_sql.so:${PORTSDIR}/www/mod_log_sql2 \
  		${LOCALBASE}/bin/webalizer:${PORTSDIR}/www/webalizer \
 -		${QMAIL_DIR}/bin/qmail-start:${PORTSDIR}/mail/qmail
  
  USE_PHP=	session mysql sockets gd
 -QMAIL_DIR?=	/var/qmail
  
  DTCROOT?=	www/dtc
  DTCDIR=		${PREFIX}/${DTCROOT}
 @@ -33,6 +31,9 @@
  
  NO_BUILD=	yes
  USE_MYSQL=	yes
 +
 +DEPEND_QMAIL_RUN=	yes
 +.include "${PORTSDIR}/mail/qmail/Makefile.include"
  
  do-configure:
  	@${SED} -e 's,%%PREFIX%%,${PREFIX},;\
 --- qmail.patch ends here ---
 -- 
 Renato Botelho <freebsd at galle dot com dot br>
 AIM: RBGargaBR | ICQ: 54596223
 GnuPG Key: http://www.galle.com.br/~renato/pubkey.asc
 
 It is easier to change the specification to fit the program than vice
 versa.



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200506300010.j5U0AMKB032149>