From sgk@outpost.globcon.net  Sun Oct 13 15:12:58 2002
Return-Path: <sgk@outpost.globcon.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 8C4E637B401
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 13 Oct 2002 15:12:58 -0700 (PDT)
Received: from outpost.lukarcos.com (outpost.globcon.net [62.141.88.161])
	by mx1.FreeBSD.org (Postfix) with SMTP id 487C343EA3
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 13 Oct 2002 15:12:57 -0700 (PDT)
	(envelope-from sgk@outpost.globcon.net)
Received: (qmail 20018 invoked by uid 911); 13 Oct 2002 22:12:59 -0000
Message-Id: <20021013221259.20017.qmail@outpost.globcon.net>
Date: 13 Oct 2002 22:12:59 -0000
From: Sergei Kolobov <sergei@kolobov.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [MAINTAINER] Update mail/queue-repair: work with qmail port
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         44022
>Category:       ports
>Synopsis:       [MAINTAINER] Update mail/queue-repair: work with qmail port
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Oct 13 15:20:02 PDT 2002
>Closed-Date:    Mon Oct 14 06:32:48 PDT 2002
>Last-Modified:  Mon Oct 14 06:32:48 PDT 2002
>Originator:     Sergei Kolobov
>Release:        FreeBSD 4.6-STABLE i386
>Organization:
>Environment:
System: FreeBSD outpost.globcon.net 4.6-STABLE FreeBSD 4.6-STABLE #0: Thu Aug 1 02:44:26 MSD 2002 sgk@outpost.globcon.net:/data/FreeBSD/obj/data/FreeBSD/src/sys/OUTPOST i386
>Description:
- Default to RUN_DEPEND on mail/qmail port (can be turned off - 
  define WITHOUT_QMAIL_PORT); patch source for nofiles->qnofiles group used by
  the qmail port (suggested by Kevin M. Dulzo <kdulzo@sockpuppet.org>)
- Bump PORTREVISION
- Do not install yet another copy of GPL (COPYING)
>How-To-Repeat:
>Fix:

--- queue-repair-0.8.6_1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/queue-repair/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- Makefile	8 Oct 2002 14:19:44 -0000	1.1
+++ Makefile	13 Oct 2002 22:06:18 -0000
@@ -7,24 +7,33 @@
 
 PORTNAME=	queue-repair
 PORTVERSION=	0.8.6
+PORTREVISION=	1
 CATEGORIES=	mail python
 MASTER_SITES=	http://www.qcc.ca/~charlesc/software/queue_repair/
 
 MAINTAINER=	sergei@kolobov.com
 
+.if !defined(WITHOUT_QMAIL_PORT)
+RUN_DEPENDS=	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail
+QMAIL_DIR?=	/var/qmail
+.endif
+
 USE_PYTHON=	yes
 USE_REINPLACE=	yes
 
-DOCS=		BLURB CHANGELOG COPYING TODO docs.txt
+DOCS=		BLURB CHANGELOG TODO docs.txt
 
 do-build:
 	${REINPLACE_CMD} -e 's,^#!/usr/bin/python,#!${PYTHON_CMD},' \
 		${WRKSRC}/queue_repair.py
+.if !defined(WITHOUT_QMAIL_PORT)
+	${REINPLACE_CMD} -e 's,nofiles,qnofiles,' ${WRKSRC}/queue_repair.py
+.endif
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/queue_repair.py ${PREFIX}/bin/queue-repair
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR}
 .for file in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
--- queue-repair-0.8.6_1.patch ends here ---

>Release-Note:
>Audit-Trail:

From: Sergei Kolobov <sergei@kolobov.com>
To: FreeBSD-gnats-submit@FreeBSD.org
Cc:  
Subject: Re: ports/44022: [MAINTAINER] Update mail/queue-repair: work with qmail port
Date: Mon, 14 Oct 2002 03:01:29 +0400

 On 2002-10-13 at 22:12 -0000, Sergei Kolobov wrote:
 > - Do not install yet another copy of GPL (COPYING)
 
 I forgot to make a corresponding change in pkg-plist:
 
 --- /usr/ports/mail/queue-repair/pkg-plist	Tue Oct  8 18:19:44 2002
 +++ /home/sgk/ports/mail/queue-repair/pkg-plist	Mon Oct 14 02:56:35 2002
 @@ -1,7 +1,6 @@
  bin/queue-repair
  %%PORTDOCS%%share/doc/queue-repair/BLURB
  %%PORTDOCS%%share/doc/queue-repair/CHANGELOG
 -%%PORTDOCS%%share/doc/queue-repair/COPYING
  %%PORTDOCS%%share/doc/queue-repair/TODO
  %%PORTDOCS%%share/doc/queue-repair/docs.txt
  %%PORTDOCS%%@dirrm share/doc/queue-repair
State-Changed-From-To: open->closed 
State-Changed-By: ijliao 
State-Changed-When: Mon Oct 14 06:32:21 PDT 2002 
State-Changed-Why:  
committed, thanks 

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