ports/54373: [PATCH] mail/qmHandle: update to 1.1.1

[Sergei Kolobov]

>Number:         54373
>Category:       ports
>Synopsis:       [PATCH] mail/qmHandle: update to 1.1.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jul 11 07:20:01 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Sergei Kolobov
>Release:        FreeBSD 5.1-CURRENT i386
>Organization:
>Environment:
System: FreeBSD elf.chetwood.ru 5.1-CURRENT FreeBSD 5.1-CURRENT #0: Thu Jun  5 02:19:41 MSD
>Description:
- Update to 1.1.1
- Change awk(1) instead of cut(1) in pidof replacement pipe
- Use DOCSDIR macro in pkg-plist

Include fixes from ports/52939:
- Update to 1.1.0:                                                                                  
  * Development resume at SourceForge                                                               
    * Added new -a option (send ALRM signal to qmail-send to flush its queue)                         
    - Minor Makefile tweaks while I'm here                                                              
                                                                                                        
Obsoletes:	ports/52939

Port maintainer (petef at FreeBSD.org) is cc'd.
>How-To-Repeat:
>Fix:

--- qmHandle-1.1.1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /FreeBSD/cvs/ports/mail/qmHandle/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- Makefile	6 Apr 2003 19:51:37 -0000	1.5
+++ Makefile	11 Jul 2003 12:43:33 -0000
@@ -6,26 +6,22 @@
 #
 
 PORTNAME=	qmHandle
-PORTVERSION=	1.0.0
-PORTREVISION=	1
+PORTVERSION=	1.1.1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	qmhandle
+MASTER_SITE_SUBDIR=	${PORTNAME:L}
+DISTNAME=	${PORTNAME:L}-${PORTVERSION}
 
 MAINTAINER=	petef at FreeBSD.org
 COMMENT=	Tool to view and manage a qmail queue
 
-RUN_DEPENDS=	${QMAIL_DIR}/bin/qmail-qstat:${PORTSDIR}/mail/qmail
+RUN_DEPENDS=	qmail-qstat:${PORTSDIR}/mail/qmail
 
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 USE_PERL5=	yes
 
-.if exists(${LOCALBASE}/qmail/bin/qmail-qstat)
-QMAIL_DIR?=	${LOCALBASE}/qmail
-.else
-QMAIL_DIR?=	/var/qmail
-.endif
+DOCS=		HISTORY README
 
 post-patch:
 	@${PERL} -pi -e 's,^#!/usr/bin/perl,#!${PERL},; \
@@ -35,9 +31,7 @@
 	${INSTALL_SCRIPT} ${WRKSRC}/qmHandle ${PREFIX}/bin
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for file in HISTORY README
-	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
-.endfor
+	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /FreeBSD/cvs/ports/mail/qmHandle/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo	6 Apr 2003 19:51:37 -0000	1.3
+++ distinfo	11 Jul 2003 12:43:44 -0000
@@ -1 +1 @@
-MD5 (qmHandle-1.0.0.tar.gz) = 4522172ffaba5830757b2f1730ecb534
+MD5 (qmhandle-1.1.1.tar.gz) = ed3d31647c386a5c33f1695e1444b558
Index: pkg-plist
===================================================================
RCS file: /FreeBSD/cvs/ports/mail/qmHandle/pkg-plist,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist
--- pkg-plist	24 Aug 2001 18:29:56 -0000	1.1
+++ pkg-plist	11 Jul 2003 12:52:04 -0000
@@ -1,4 +1,4 @@
 bin/qmHandle
-%%PORTDOCS%%share/doc/qmHandle/HISTORY
-%%PORTDOCS%%share/doc/qmHandle/README
-%%PORTDOCS%%@dirrm share/doc/qmHandle
+%%PORTDOCS%%%%DOCSDIR%%/HISTORY
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
Index: files/patch-qmHandle
===================================================================
RCS file: /FreeBSD/cvs/ports/mail/qmHandle/files/patch-qmHandle,v
retrieving revision 1.1
diff -u -r1.1 patch-qmHandle
--- files/patch-qmHandle	23 Jan 2003 13:32:09 -0000	1.1
+++ files/patch-qmHandle	11 Jul 2003 14:03:58 -0000
@@ -24,7 +24,7 @@
 -my ($pidcmd) = 'pidof qmail-send';
 +#my ($pidcmd) = 'pidof qmail-send';
 +# This is for FreeBSD with a standard qmail installation:
-+my ($pidcmd) = 'ps -U qmails | grep qmail-send | cut -s -d " " -f 3';
++my ($pidcmd) = 'ps -U qmails | grep qmail-send | awk "{print \$1;}"';
 +
  
  ####################  USER CONFIGURATION END  ####################
--- qmHandle-1.1.1.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: