2 files changed, 5 insertions, 43 deletions

diff --git a/mail/qmail-mysql/Makefile b/mail/qmail-mysql/Makefile
index 981ce9cc1702..550c00a3bdce 100644
--- a/mail/qmail-mysql/Makefile
+++ b/mail/qmail-mysql/Makefile
@@ -7,45 +7,21 @@
 
 PORTNAME=	qmail
 PORTVERSION=	${QMAIL_VERSION}.${MYSQL_PATCH_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 PKGNAMESUFFIX=	-mysql
 
-PATCH_SITES+=	http://iain.cx/unix/qmail/download/:mysql
-PATCHFILES+=	qmail-mysql-${MYSQL_PATCH_VERSION}.patch:mysql
-
 MAINTAINER=	freebsd@galle.com.br
 COMMENT=	A SECURE, reliable, and FAST MTA for UNIX systems WITH MySQL support
 
-USE_MYSQL=	yes
-USE_REINPLACE=	yes
-
-# patches from the master port that brake this one are now allowed
-MAIN_QMAIL_PORT_WITH_QMAILQUEUE_PATCH_BARRIER=	yes
-
 MYSQL_PATCH_VERSION=	1.1.8
 
-# Using default from master port, i.e., /var/qmail
-PREFIX?=	${QMAIL_PORT_PREFIX}
+SLAVE_MYSQL=	yes
 
-.if !defined(_PREMKINCLUDED)
-.include <bsd.port.pre.mk>
-.endif
+USE_MYSQL=	yes
 
-# Local overrides
 MASTERDIR=	${.CURDIR}/../qmail
-PKGDIR_LOCAL=	${.CURDIR}
-DESCR=		${PKGDIR_LOCAL}/pkg-descr
-PKGMESSAGE=	${PKGDIR_LOCAL}/pkg-message
-
-QMAIL_PORT_PREFIX!=	cd ${MASTERDIR} && ${MAKE} -V PREFIX
-
-# Yet anther ugly hack (works due to code inside the main qmail port)
-slaveport-post-patch: qmail-mysql-post-patch
-
-qmail-mysql-post-patch:
-	@${REINPLACE_CMD} \
-		 's|/opt/mysql|${LOCALBASE}|' \
-			${WRKSRC}/Makefile
+DESCR=		${.CURDIR}/pkg-descr
+LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
 
 .include "${MASTERDIR}/Makefile"
diff --git a/mail/qmail-mysql/pkg-message b/mail/qmail-mysql/pkg-message
deleted file mode 100644
index 51ce1aa835ac..000000000000
--- a/mail/qmail-mysql/pkg-message
+++ /dev/null
@@ -1,14 +0,0 @@
-	ATTENTIONATTENTION:
-
-Please make sure that you read /var/qmail/doc/PORT_NOTES.
-It contains important information about testing and configuring
-qmail, and finally replacing sendmail with qmail.
-
-You should also add /var/qmail/man to your MANPATH (see manpath(1)
-or login.conf(5)).
-
-Do not forget to read http://iain.cx/unix/qmail/mysql.php. After all,
-this is NOT our old stock qmail.
-
-You can enable qmail as your default mailer executing:
-> /var/qmail/scripts/enable-qmail