diff -ruN qmail.orig/Makefile qmail/Makefile
--- qmail.orig/Makefile	Wed Feb 15 10:14:12 2006
+++ qmail/Makefile	Wed Feb 15 10:48:33 2006
@@ -97,9 +97,7 @@
 QMAIL_VERSION?=		1.03
 
 .if !defined(BARRIER_SMTP_AUTH_PATCH)
-SMTP_AUTH_VERSION=	0.31
-SMTP_AUTH_DIR=		${WRKDIR}/${PORTNAME}-smtpd-auth-${SMTP_AUTH_VERSION}
-
+SMTP_AUTH_VERSION=	0.57
 OPTIONS+=	SMTP_AUTH_PATCH "Provide SMTP Authentication" off
 .endif
 .if !defined(BARRIER_QMAILQUEUE_PATCH)
@@ -135,6 +133,10 @@
 .if !defined(BARRIER_TARPIT_PATCH)
 OPTIONS+=	TARPIT_PATCH "Implement TARPIT functions" off
 .endif
+.if !defined(BARRIER_QHPSI_PATCH)
+QHPSI_VERSION=	0.17
+OPTIONS+=	QHPSI_PATCH "enable antivirus qhpsi patch" off
+.endif
 .if defined(SLAVE_TLS)
 OPTIONS+=	TLS_DEBUG "enable additional debug information" off
 .elif defined(SLAVE_LDAP)
@@ -265,6 +267,12 @@
 		${WRKSRC}/PIC.nullclient ${WRKSRC}/PIC.relaybad \
 		${WRKSRC}/PIC.relaygood ${WRKSRC}/PIC.rem2local
 
+.if defined(WITH_SMTP_AUTH_PATCH)
+DOCFILES+=	${WRKSRC}/README.auth
+.endif
+.if defined(WITH_QHPSI_PATCH)
+DOCFILES+=	${WRKSRC}/README.qhpsi ${WRKSRC}/README.clamav
+.endif
 .if defined(SLAVE_LDAP)
 DOCFILES+=	${WRKSRC}/QLDAPINSTALL ${WRKSRC}/QLDAPNEWS \
 		${WRKSRC}/POPBEFORESMTP ${WRKSRC}/QLDAPTODO \
@@ -302,7 +310,7 @@
 		${WRKSRC}/dnsip ${WRKSRC}/ipmeprint ${WRKSRC}/dnsptr
 CONFIGUREFILES=	${WRKSRC}/config ${WRKSRC}/config-fast
 
-.include "${.CURDIR}/../../Mk/bsd.mail.mk"
+.include "${.CURDIR}/../../../ports/Mk/bsd.mail.mk"
 
 .if (${PREFIX} != ${LOCALBASE})
 DOCSDIR=	${PREFIX}/doc
@@ -341,13 +349,8 @@
 .endif
 
 .if defined(WITH_SMTP_AUTH_PATCH) && !defined(BARRIER_SMTP_AUTH_PATCH)
-MASTER_SITES+=	http://members.elysium.pl/brush/qmail-smtpd-auth/dist/:smtp_auth \
-		${MASTER_SITE_LOCAL:S/$/:smtp_auth/}
-MASTER_SITE_SUBDIR+=	garga/qmail/:smtp_auth
-DISTFILES+=	qmail-smtpd-auth-${SMTP_AUTH_VERSION}.tar.gz:smtp_auth
-EXTRACT_ONLY+=	qmail-smtpd-auth-${SMTP_AUTH_VERSION}.tar.gz
-MASTER_SITES+=	http://tomclegg.net/qmail/:close3
-DISTFILES+=	qmail-smtpd-auth-close3.patch:close3
+PATCH_SITES+=	http://www.alexdupre.com/qmail/:smtp_auth
+PATCHFILES+=	qmail-smtp-auth-${SMTP_AUTH_VERSION}.patch:smtp_auth
 .endif
 
 .if defined(WITH_MAILDIRQUOTA_PATCH) && !defined(BARRIER_MAILDIRQUOTA_PATCH)
@@ -365,6 +368,11 @@
 PATCHFILES+=	qmail-discard-double-bounces.patch:doublebounce
 .endif
 
+.if defined(WITH_QHPSI_PATCH) && !defined(BARRIER_QHPSI_PATCH)
+PATCH_SITES+=	http://www.alexdupre.com/qmail/:qhpsi
+PATCHFILES+=	qmail-qhpsi-${QHPSI_VERSION}.patch:qhpsi
+.endif
+
 .if defined(WITH_SPF_PATCH) && !defined(BARRIER_SPF_PATCH)
 . if defined(SLAVE_TLS)
 MASTER_SITES+=	http://manuel.mausz.at/patches/qmail/:spf_tls
@@ -518,19 +526,7 @@
 .endif
 
 post-patch:
-.if defined(WITH_SMTP_AUTH_PATCH)
-	@${CP} ${SMTP_AUTH_DIR}/base64.[ch] ${WRKSRC}
-. if defined(SLAVE_TLS)
-	@${PATCH} -d ${SMTP_AUTH_DIR} < ${FILESDIR}/auth.patch.patch-tls
-. elif defined(WITH_SPF_PATCH)
-	@${PATCH} -d ${SMTP_AUTH_DIR} < ${FILESDIR}/auth.patch.patch
-. endif
-	@${PATCH} -d ${WRKSRC} < ${SMTP_AUTH_DIR}/auth.patch
-. if defined(WITH_SPF_PATCH) && defined(SLAVE_TLS)
-	@${PATCH} -d ${WRKSRC} < ${DISTDIR}/${DIST_SUBDIR}/${SPF_TLS_PATCH}
-. endif
-	@${PATCH} -d ${WRKSRC} < ${DISTDIR}/${DIST_SUBDIR}/qmail-smtpd-auth-close3.patch
-.elif defined(SLAVE_TLS) && defined(WITH_SPF_PATCH)
+.if defined(SLAVE_TLS) && defined(WITH_SPF_PATCH)
 	@${PATCH} -d ${WRKSRC} < ${DISTDIR}/${DIST_SUBDIR}/${SPF_TLS_PATCH}
 .endif
 .if defined(SLAVE_MYSQL)
diff -ruN qmail.orig/distinfo qmail/distinfo
--- qmail.orig/distinfo	Wed Feb 15 10:14:12 2006
+++ qmail/distinfo	Wed Feb 15 11:16:26 2006
@@ -61,12 +61,12 @@
 MD5 (qmail/qmail-1.03-tls-20021228-renato.patch) = be15cd5eaff7aa3cd88aee962febadc6
 SHA256 (qmail/qmail-1.03-tls-20021228-renato.patch) = ab0de8f744241dcb7f5ee207fc7eab4f067bf42812deb85f9eb0050ac49e6e23
 SIZE (qmail/qmail-1.03-tls-20021228-renato.patch) = 42095
-MD5 (qmail/qmail-smtpd-auth-0.31.tar.gz) = 6b202f71a99fb41e9e32906017270ba0
-SHA256 (qmail/qmail-smtpd-auth-0.31.tar.gz) = 1b439fa7e128de13fa80b86883f61a39d17b87b7e8916b6a0eab065bbe49b938
-SIZE (qmail/qmail-smtpd-auth-0.31.tar.gz) = 8798
-MD5 (qmail/qmail-smtpd-auth-close3.patch) = 0ba66d73dcba1c68ed714b07e47abd3e
-SHA256 (qmail/qmail-smtpd-auth-close3.patch) = d933e871261d6740cebe5c21cad81146525cfe06a464e277979f61c1242b5ad4
-SIZE (qmail/qmail-smtpd-auth-close3.patch) = 520
+MD5 (qmail/qmail-qhpsi-0.17.patch) = 74c4f9afed702e11496ff0f694c69398
+SHA256 (qmail/qmail-qhpsi-0.17.patch) = 74cb36c49691a4b89b8f3a52af281039170f9869f467489cfeb011d198acab6e
+SIZE (qmail/qmail-qhpsi-0.17.patch) = 12294
+MD5 (qmail/qmail-smtp-auth-0.57.patch) = 496525d72b8f53a41fa859011361d547
+SHA256 (qmail/qmail-smtp-auth-0.57.patch) = cf6db310156db2a54adf4f9103fb968d72c42e93c5135b11153fb86daa68ae03
+SIZE (qmail/qmail-smtp-auth-0.57.patch) = 22779
 MD5 (qmail/tarpit.patch) = 49a2c0a445981deb09f3af73041d75f5
 SHA256 (qmail/tarpit.patch) = de94abbb71ef5d25e168725e435edd96ce3b14b7347440e0805dcb919b9d9604
 SIZE (qmail/tarpit.patch) = 3089