From lioux-FreeBSD-gnats-submit=freebsd.org@uol.com.br  Sun May 21 19:12:12 2000
Return-Path: <lioux-FreeBSD-gnats-submit=freebsd.org@uol.com.br>
Received: from 200-191-155-46-as.acessonet.com.br (200-191-155-46-as.acessonet.com.br [200.191.155.46])
	by hub.freebsd.org (Postfix) with SMTP id 7E60037BA9D
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 21 May 2000 19:12:05 -0700 (PDT)
	(envelope-from lioux-FreeBSD-gnats-submit=freebsd.org@uol.com.br)
Received: (qmail 59278 invoked by uid 1001); 22 May 2000 01:45:43 -0000
Message-Id: <20000522014543.59277.qmail@Fedaykin.here>
Date: 22 May 2000 01:45:43 -0000
From: lioux@uol.com.br
Sender: lioux-FreeBSD-gnats-submit=freebsd.org@uol.com.br
Reply-To: lioux@uol.com.br
To: FreeBSD-gnats-submit@freebsd.org
Subject: Update port mail/qmail
X-Send-Pr-Version: 3.2

>Number:         18733
>Category:       ports
>Synopsis:       Update port mail/qmail
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun May 21 19:20:01 PDT 2000
>Closed-Date:    Sun May 28 20:35:47 PDT 2000
>Last-Modified:  Sun May 28 20:37:27 PDT 2000
>Originator:     Mario Sergio Fujikawa Ferreira
>Release:        FreeBSD 4.0-STABLE i386
>Organization:
>Environment:

FreeBSD Here.here 4.0-STABLE FreeBSD 4.0-STABLE #16: Fri May 12 22:39:32 EST 2000     lioux@Here.here:/usr/src/sys/compile/LIOUX  i386

>Description:

This update both corrects PLIST and allows this port to be
used as a skeleton for qmail-${ANYTHING} ports.
I am submitting this one to support qmail-ldap which I'll be
sending
right away.
ps: I am the maintainer.

>How-To-Repeat:

n/a

>Fix:

diff -ruN ./Makefile /home/lioux/bin/ports/qmail/Makefile
--- ./Makefile	Fri Apr 14 08:03:11 2000
+++ /home/lioux/bin/ports/qmail/Makefile	Sun May 21 22:30:24 2000
@@ -21,8 +21,8 @@
 # Patch necessary to cope with non-RFC >512 dns entries
 # Since AOL has been using those, the problem has skyrocketed from minor to
 # groundzero. qmail being RFC compliant need to be "fixed" to work with those
-PATCH_SITES=	http://www.ckdhr.com/ckd/
-PATCHFILES=	qmail-103.patch
+PATCH_SITES?=	http://www.ckdhr.com/ckd/
+PATCHFILES?=	qmail-103.patch
 PATCH_DIST_STRIP+=	-p1
 
 MAINTAINER=	lioux@linf.unb.br
@@ -51,7 +51,7 @@
 
 PLIST_SUB=	DOCDIR=${DOCDIR}
 
-DOCFILES=	${WRKSRC}/BLURB ${WRKSRC}/BLURB2 ${WRKSRC}/BLURB3 \
+DOCFILES+=	${WRKSRC}/BLURB ${WRKSRC}/BLURB2 ${WRKSRC}/BLURB3 \
 		${WRKSRC}/BLURB4 ${WRKSRC}/INTERNALS ${WRKSRC}/SECURITY \
 		${WRKSRC}/THOUGHTS ${FILESDIR}/PORT_NOTES \
 		${FILESDIR}/PORT_NOTES_FreeBSD_40-RELEASE
@@ -82,7 +82,7 @@
 		${WRKSRC}/dnsip ${WRKSRC}/ipmeprint ${WRKSRC}/dnsptr
 CONFIGUREFILES=	${WRKSRC}/config ${WRKSRC}/config-fast
 
-.if (${PREFIX} == "/usr/local")
+.if (${PREFIX} == ${LOCALBASE})
 DOCDIR=	share/doc/qmail
 .else
 DOCDIR=	doc
@@ -90,6 +90,10 @@
 
 NO_MTREE=	yes
 
+.if !defined(_PREMKINCLUDED)
+.include <bsd.port.pre.mk>
+.endif
+
 # If you want to change the qmail users, they must be changed in both
 # work/*/conf-users and pkg/INSTALL.
 
@@ -136,7 +140,12 @@
 	@${ECHO}
 	@${SED} s!/usr/local/!${PREFIX}/!g ${PKGDIR}/MESSAGE | /usr/bin/fmt
 
+# hack to allow slave ports to include bsd.port.pre.mk and then this file
+.if defined(_PREMKINCLUDED)
+.include <bsd.port.post.mk>
+.else
 .include <bsd.port.mk>
+.endif
 
 # Ugh...  ;-)
 thereal-post-patch:
diff -ruN ./files/md5 /home/lioux/bin/ports/qmail/files/md5
--- ./files/md5	Mon Nov  1 20:29:20 1999
+++ /home/lioux/bin/ports/qmail/files/md5	Sun May 21 21:49:41 2000
@@ -1,2 +1,3 @@
 MD5 (qmail-1.03.tar.gz) = 622f65f982e380dbe86e6574f3abcb7c
 MD5 (qmail-103.patch) = 9140ad2b03017145cd7963c84bb24f16
+MD5 (qmail-ldap-1.03-20000501.patch.gz) = 3bac26caf4fbbf9a9af1919c60dd9f94
diff -ruN ./pkg/PLIST /home/lioux/bin/ports/qmail/pkg/PLIST
--- ./pkg/PLIST	Thu Aug 20 02:38:19 1998
+++ /home/lioux/bin/ports/qmail/pkg/PLIST	Sun May 21 22:28:19 2000
@@ -132,6 +132,7 @@
 @comment This port installs the following manually (ie. not through qmail-hier)
 configure/install
 configure/config
+configure/config-fast
 configure/dnsfq
 configure/hostname
 configure/dnsip
@@ -145,6 +146,7 @@
 %%DOCDIR%%/SECURITY
 %%DOCDIR%%/THOUGHTS
 %%DOCDIR%%/PORT_NOTES
+%%DOCDIR%%/PORT_NOTES_FreeBSD_40-RELEASE
 %%DOCDIR%%/SYSDEPS
 %%DOCDIR%%/mkaliasdir
 boot/maildir

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: steve 
State-Changed-When: Sun May 28 20:35:47 PDT 2000 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=18733 
>Unformatted:
