Have slave ports correctly inherit PREFIX from master port qmail

Also, replace hard references to the master port with relative
ones.

Spotted by:	Radovan Gibala <gigi@agraf.sk>

5 files changed, 50 insertions, 26 deletions

diff --git a/mail/qmail-ldap/Makefile b/mail/qmail-ldap/Makefile
index e6fba0b02bf7..c3c1eef2f7f6 100644
--- a/mail/qmail-ldap/Makefile
+++ b/mail/qmail-ldap/Makefile
@@ -14,7 +14,7 @@ PATCH_SITES=	http://www.nrg4u.com/qmail/
 PATCHFILES=	qmail-ldap-1.03-${LDAP_PATCH_DATE}.patch.gz
 PATCH_DIST_STRIP+=	-p1
 
-EXTRA_PATCHES+=	${QMAILPORT_PATCHDIR}/patch-ab ${QMAILPORT_PATCHDIR}/patch-ac
+EXTRA_PATCHES+=	${QMAIL_PORT_PATCHDIR}/patch-ab ${QMAIL_PORT_PATCHDIR}/patch-ac
 
 MAINTAINER=	lioux@FreeBSD.org
 
@@ -25,14 +25,18 @@ MAIN_QMAIL_PORT_PATCH_BARRIER=	yes
 
 LDAP_PATCH_DATE=	20010201
 
+# Using default from master port, i.e., /var/qmail
+PREFIX?=	${QMAIL_PORT_PREFIX}
+#PREFIX=		/var/qmail-ldap
+
 .if !defined(PRE_MK_INCLUDED)
 .include <bsd.port.pre.mk>
 .endif
 
-#PREFIX=		/var/qmail-ldap
-
-QMAILPORT=	${PORTSDIR}/mail/qmail
-QMAILPORT_PATCHDIR!=	cd ${QMAILPORT} && ${MAKE} -V PATCHDIR
+#QMAIL_PORT=	${PORTSDIR}/mail/qmail
+QMAIL_PORT=	${.CURDIR}/../qmail
+QMAIL_PORT_PREFIX!=	cd ${QMAIL_PORT} && ${MAKE} -V PREFIX
+QMAIL_PORT_PATCHDIR!=	cd ${QMAIL_PORT} && ${MAKE} -V PATCHDIR
 
 DOCFILES+=	${WRKSRC}/QLDAPINSTALL ${WRKSRC}/QLDAPNEWS \
 		${WRKSRC}/QLDAPTODO ${WRKSRC}/QLDAPPICTURE \
@@ -47,7 +51,8 @@ ldap-pre-fetch:
 	@${ECHO_MSG} "WITH_LDAP_CLUSTER=yes	enable cluster support"
 	@${ECHO_MSG} "WITH_AUTOMAILDIRMAKE=yes	enable the auto-maildir-make feature"
 	@${ECHO_MSG} "WITH_AUTOHOMEDIRMAKE=yes	enable the auto-homedir-make feature"
-	@${ECHO_MSG} "WITH_LDAP_DEBUG=yes	enable the possibility to log and debug imap and pop"
+	@${ECHO_MSG} "WITH_LDAP_DEBUG=yes	enable the possibility to log and"
+	@${ECHO_MSG} "				debug imap and pop"
 	@${ECHO_MSG} "WITH_CLEARTEXTPASSWD=yes	use cleartext passwords"
 	@${ECHO_MSG} ""
 
@@ -72,8 +77,7 @@ ldap-post-patch:
 .endif # WITH_CLEARTEXTPASSWD
 
 # Local overrides
-MASTERDIR=	${QMAILPORT}
-#MASTERDIR=	${.CURDIR}/../qmail
+MASTERDIR=	${QMAIL_PORT}
 PATCHDIR=	${.CURDIR}/files
 PKGDIR_LOCAL=	${.CURDIR}
 COMMENT=	${PKGDIR_LOCAL}/pkg-comment
diff --git a/mail/qmail-mysql/Makefile b/mail/qmail-mysql/Makefile
index 7b4cee0094d3..c1244083360b 100644
--- a/mail/qmail-mysql/Makefile
+++ b/mail/qmail-mysql/Makefile
@@ -19,11 +19,17 @@ LIB_DEPENDS+=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 
 MYSQL_PATCH_VERSION=	1.1.1
 
+# Using default from master port, i.e., /var/qmail
+PREFIX?=	${QMAIL_PORT_PREFIX}
+#PREFIX=		/var/qmail-mysql
+
 .if !defined(PRE_MK_INCLUDED)
 .include <bsd.port.pre.mk>
 .endif
 
-#PREFIX=		/var/qmail-mysql
+#QMAIL_PORT=	${PORTSDIR}/mail/qmail
+QMAIL_PORT=	${.CURDIR}/../qmail
+QMAIL_PORT_PREFIX!=	cd ${QMAIL_PORT} && ${MAKE} -V PREFIX
 
 # Yet anther ugly hack (works due to code inside the main qmail port)
 yetanotherone-post-patch: qmail-mysql-post-patch
@@ -34,8 +40,7 @@ qmail-mysql-post-patch:
 			${WRKSRC}/Makefile
 
 # Local overrides
-MASTERDIR=	${PORTSDIR}/mail/qmail
-#MASTERDIR=	${.CURDIR}/../qmail
+MASTERDIR=	${QMAIL_PORT}
 PKGDIR_LOCAL=	${.CURDIR}
 COMMENT=	${PKGDIR_LOCAL}/pkg-comment
 DESCR=		${PKGDIR_LOCAL}/pkg-descr
diff --git a/mail/qmail-smtp_auth+tls/Makefile b/mail/qmail-smtp_auth+tls/Makefile
index 56d71a279c62..af454106c0ca 100644
--- a/mail/qmail-smtp_auth+tls/Makefile
+++ b/mail/qmail-smtp_auth+tls/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	qmail
-PORTVERSION= 	${QMAIL_VERSION}.${TLS_PATCH_DATE}
+PORTVERSION=	${QMAIL_VERSION}.${TLS_PATCH_DATE}
 CATEGORIES=	mail
 PKGNAMESUFFIX=	-tls
 
@@ -20,17 +20,23 @@ USE_OPENSSL=	YES
 
 TLS_PATCH_DATE=	20000823
 
+# Using default from master port, i.e., /var/qmail
+PREFIX?=	${QMAIL_PORT_PREFIX}
+#PREFIX=		/var/qmail-tls
+
 .if !defined(PRE_MK_INCLUDED)
 .include <bsd.port.pre.mk>
 .endif
 
-MAKE_ARGS+=     TLS=yes
+MAKE_ARGS+=	TLS=yes
 
 .if defined(WITH_TLS_DEBUG)
 MAKE_ARGS+=	DEBUG=yes
 .endif # WITH_TLS_DEBUG
 
-#PREFIX=		/var/qmail-tls
+#QMAIL_PORT=	${PORTSDIR}/mail/qmail
+QMAIL_PORT=	${.CURDIR}/../qmail
+QMAIL_PORT_PREFIX!=	cd ${QMAIL_PORT} && ${MAKE} -V PREFIX
 
 DOCFILES+=	${WRKDIR}/TLS.readme
 
@@ -89,8 +95,7 @@ certificate-req:
 	fi
 
 # Local overrides
-MASTERDIR=	${PORTSDIR}/mail/qmail
-#MASTERDIR=	${.CURDIR}/../qmail
+MASTERDIR=	${QMAIL_PORT}
 PKGDIR_LOCAL=	${.CURDIR}
 COMMENT=	${PKGDIR_LOCAL}/pkg-comment
 DESCR=		${PKGDIR_LOCAL}/pkg-descr
diff --git a/mail/qmail-smtp_auth/Makefile b/mail/qmail-smtp_auth/Makefile
index 56d71a279c62..af454106c0ca 100644
--- a/mail/qmail-smtp_auth/Makefile
+++ b/mail/qmail-smtp_auth/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	qmail
-PORTVERSION= 	${QMAIL_VERSION}.${TLS_PATCH_DATE}
+PORTVERSION=	${QMAIL_VERSION}.${TLS_PATCH_DATE}
 CATEGORIES=	mail
 PKGNAMESUFFIX=	-tls
 
@@ -20,17 +20,23 @@ USE_OPENSSL=	YES
 
 TLS_PATCH_DATE=	20000823
 
+# Using default from master port, i.e., /var/qmail
+PREFIX?=	${QMAIL_PORT_PREFIX}
+#PREFIX=		/var/qmail-tls
+
 .if !defined(PRE_MK_INCLUDED)
 .include <bsd.port.pre.mk>
 .endif
 
-MAKE_ARGS+=     TLS=yes
+MAKE_ARGS+=	TLS=yes
 
 .if defined(WITH_TLS_DEBUG)
 MAKE_ARGS+=	DEBUG=yes
 .endif # WITH_TLS_DEBUG
 
-#PREFIX=		/var/qmail-tls
+#QMAIL_PORT=	${PORTSDIR}/mail/qmail
+QMAIL_PORT=	${.CURDIR}/../qmail
+QMAIL_PORT_PREFIX!=	cd ${QMAIL_PORT} && ${MAKE} -V PREFIX
 
 DOCFILES+=	${WRKDIR}/TLS.readme
 
@@ -89,8 +95,7 @@ certificate-req:
 	fi
 
 # Local overrides
-MASTERDIR=	${PORTSDIR}/mail/qmail
-#MASTERDIR=	${.CURDIR}/../qmail
+MASTERDIR=	${QMAIL_PORT}
 PKGDIR_LOCAL=	${.CURDIR}
 COMMENT=	${PKGDIR_LOCAL}/pkg-comment
 DESCR=		${PKGDIR_LOCAL}/pkg-descr
diff --git a/mail/qmail-tls/Makefile b/mail/qmail-tls/Makefile
index 56d71a279c62..af454106c0ca 100644
--- a/mail/qmail-tls/Makefile
+++ b/mail/qmail-tls/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	qmail
-PORTVERSION= 	${QMAIL_VERSION}.${TLS_PATCH_DATE}
+PORTVERSION=	${QMAIL_VERSION}.${TLS_PATCH_DATE}
 CATEGORIES=	mail
 PKGNAMESUFFIX=	-tls
 
@@ -20,17 +20,23 @@ USE_OPENSSL=	YES
 
 TLS_PATCH_DATE=	20000823
 
+# Using default from master port, i.e., /var/qmail
+PREFIX?=	${QMAIL_PORT_PREFIX}
+#PREFIX=		/var/qmail-tls
+
 .if !defined(PRE_MK_INCLUDED)
 .include <bsd.port.pre.mk>
 .endif
 
-MAKE_ARGS+=     TLS=yes
+MAKE_ARGS+=	TLS=yes
 
 .if defined(WITH_TLS_DEBUG)
 MAKE_ARGS+=	DEBUG=yes
 .endif # WITH_TLS_DEBUG
 
-#PREFIX=		/var/qmail-tls
+#QMAIL_PORT=	${PORTSDIR}/mail/qmail
+QMAIL_PORT=	${.CURDIR}/../qmail
+QMAIL_PORT_PREFIX!=	cd ${QMAIL_PORT} && ${MAKE} -V PREFIX
 
 DOCFILES+=	${WRKDIR}/TLS.readme
 
@@ -89,8 +95,7 @@ certificate-req:
 	fi
 
 # Local overrides
-MASTERDIR=	${PORTSDIR}/mail/qmail
-#MASTERDIR=	${.CURDIR}/../qmail
+MASTERDIR=	${QMAIL_PORT}
 PKGDIR_LOCAL=	${.CURDIR}
 COMMENT=	${PKGDIR_LOCAL}/pkg-comment
 DESCR=		${PKGDIR_LOCAL}/pkg-descr