From 44a62daff3c95290f4b47f32a273ea7b9129393c Mon Sep 17 00:00:00 2001
From: Ying-Chieh Liao <ijliao@FreeBSD.org>
Date: Wed, 7 May 2003 17:21:07 +0000
Subject: [PATCH] - 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

PR:		50921
Submitted by:	Sergei Kolobov <sergei@kolobov.com>
---
 mail/librfc822/Makefile             |  7 +++++--
 mail/librfc822/files/patch-lexer.cc | 11 +++++++++++
 mail/librfc822/pkg-plist            | 17 +++++------------
 3 files changed, 21 insertions(+), 14 deletions(-)
 create mode 100644 mail/librfc822/files/patch-lexer.cc

diff --git a/mail/librfc822/Makefile b/mail/librfc822/Makefile
index 1193bb772113..56e856f74877 100644
--- a/mail/librfc822/Makefile
+++ b/mail/librfc822/Makefile
@@ -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>
diff --git a/mail/librfc822/files/patch-lexer.cc b/mail/librfc822/files/patch-lexer.cc
new file mode 100644
index 000000000000..e2f50d64f8c9
--- /dev/null
+++ b/mail/librfc822/files/patch-lexer.cc
@@ -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)
+ 	{
diff --git a/mail/librfc822/pkg-plist b/mail/librfc822/pkg-plist
index 60d7cce6c752..6ab9ec7d998e 100644
--- a/mail/librfc822/pkg-plist
+++ b/mail/librfc822/pkg-plist
@@ -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
+%%PORTDOCS%%%%DOCSDIR%%/readme.html
+%%PORTDOCS%%%%DOCSDIR%%/readme.txt
+%%PORTDOCS%%%%DOCSDIR%%/user-manual.html
+%%PORTDOCS%%%%DOCSDIR%%/user-manual.pdf
+%%PORTDOCS%%@dirrm %%DOCSDIR%%