From sgk@kolobov.com  Sun Apr 13 15:47:36 2003
Return-Path: <sgk@kolobov.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 6CB8837B401
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 13 Apr 2003 15:47:36 -0700 (PDT)
Received: from outpost.lukarcos.com (outpost.globcon.net [62.141.88.161])
	by mx1.FreeBSD.org (Postfix) with SMTP id B7B0A43FA3
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 13 Apr 2003 15:47:34 -0700 (PDT)
	(envelope-from sgk@kolobov.com)
Received: (qmail 75769 invoked from network); 13 Apr 2003 22:47:36 -0000
Received: from h166.lukarcos.com (HELO kolobov.com) (62.141.88.166)
  by outpost.globcon.net with SMTP; 13 Apr 2003 22:47:36 -0000
Received: (qmail 70400 invoked by uid 911); 13 Apr 2003 22:46:12 -0000
Message-Id: <20030413224612.70399.qmail@kolobov.com>
Date: 13 Apr 2003 22:46:12 -0000
From: Sergei Kolobov <sergei@kolobov.com>
To: FreeBSD-gnats-submit@freebsd.org
Subject: [PATCH] mail/librfc822: unbreak on -CURRENT
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         50921
>Category:       ports
>Synopsis:       [PATCH] mail/librfc822: unbreak on -CURRENT
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Apr 13 15:50:14 PDT 2003
>Closed-Date:    Wed May 07 10:21:14 PDT 2003
>Last-Modified:  Wed May 07 10:21:14 PDT 2003
>Originator:     Sergei Kolobov
>Release:        FreeBSD 5.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD elf.chetwood.ru 5.0-CURRENT FreeBSD 5.0-CURRENT #0: Sun Apr 13 01:13:44 MSD 2003
>Description:
- Unbreak on -CURRENT (patch added)
- Add devel as a secondary category
- Use INSTALL_DATA instead of CP to install documentation
- Only install the .txt/.html/.pdf files, skip supporting files
- Bump PORTREVISION due to changed package

Added files:
- files/patch-lexer.cc
>How-To-Repeat:
>Fix:

--- librfc822-1.0.patch begins here ---
? files
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/librfc822/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- Makefile	2003/02/20 18:40:33	1.4
+++ Makefile	2003/04/13 22:43:42
@@ -8,18 +8,21 @@
 
 PORTNAME=	librfc822
 PORTVERSION=	1.0
-CATEGORIES=	mail
+PORTREVISION=	1
+CATEGORIES=	mail devel
 MASTER_SITES=	http://cryp.to/librfc822/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A complete parser for RFC822 addresses
 
+DOCS=		readme.html readme.txt user-manual.html user-manual.pdf
+
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/rfc822.hh ${PREFIX}/include
 	${INSTALL_DATA} ${WRKSRC}/librfc822.a ${PREFIX}/lib
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	${CP} ${WRKSRC}/documentation/* ${DOCSDIR}
+	@cd ${WRKSRC}/documentation && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/mail/librfc822/pkg-plist,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist
--- pkg-plist	2002/04/18 18:42:32	1.1
+++ pkg-plist	2003/04/13 22:43:42
@@ -1,14 +1,7 @@
 include/rfc822.hh
 lib/librfc822.a
-%%PORTDOCS%%share/doc/librfc822/Makefile
-%%PORTDOCS%%share/doc/librfc822/index.sgml
-%%PORTDOCS%%share/doc/librfc822/peti.css
-%%PORTDOCS%%share/doc/librfc822/peti.dsl
-%%PORTDOCS%%share/doc/librfc822/purpose.inc
 %%PORTDOCS%%share/doc/librfc822/readme.html
-%%PORTDOCS%%share/doc/librfc822/readme.sgml
 %%PORTDOCS%%share/doc/librfc822/readme.txt
 %%PORTDOCS%%share/doc/librfc822/user-manual.html
 %%PORTDOCS%%share/doc/librfc822/user-manual.pdf
-%%PORTDOCS%%share/doc/librfc822/user-manual.sgml
 %%PORTDOCS%%@dirrm share/doc/librfc822
--- librfc822-1.0.patch ends here ---

>Release-Note:
>Audit-Trail:

From: Sergei Kolobov <sergei@kolobov.com>
To: FreeBSD-gnats-submit@FreeBSD.org
Cc:  
Subject: Re: ports/50921: [PATCH] mail/librfc822: unbreak on -CURRENT
Date: Mon, 14 Apr 2003 17:26:30 +0400

 The following patch was unintentionally omitted from the PR:
 
 Added files:
 - files/patch-lexer.cc
 
 --- librfc822/files/patch-lexer.cc	Thu Jan  1 03:00:00 1970
 +++ librfc822-1.0_1/files/patch-lexer.cc	Mon Apr 14 02:35:24 2003
 @@ -0,0 +1,11 @@
 +--- lexer.cc.orig	Mon Apr 14 02:34:51 2003
 ++++ lexer.cc	Mon Apr 14 02:34:55 2003
 +@@ -6,7 +6,7 @@
 + #include "rfc822.hh"
 + using namespace std;
 + 
 +-ostream & operator<< (ostream & os, const token & t)
 ++std::ostream & operator<< (std::ostream& os, const token & t)
 +     {
 +     switch(t.type)
 + 	{
State-Changed-From-To: open->closed 
State-Changed-By: ijliao 
State-Changed-When: Wed May 7 10:20:29 PDT 2003 
State-Changed-Why:  
committed, thanks 

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