- add USE_GCC=2.95 and unbreak this port

- replace pkg-plist with PORTDOCS and PLIST_FILES

PR:		72105
Submitted by:	leeym
Approved by:	portmgr (marcus)

2 files changed, 8 insertions, 14 deletions

diff --git a/mail/librfc822/Makefile b/mail/librfc822/Makefile
index bbdda1fdd308..a5158f553da8 100644
--- a/mail/librfc822/Makefile
+++ b/mail/librfc822/Makefile
@@ -15,20 +15,21 @@ 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
+USE_GCC=	2.95
+USE_REINPLACE=	yes
 
-.include <bsd.port.pre.mk>
+PORTDOCS=	readme.html readme.txt user-manual.html user-manual.pdf
+PLIST_FILES=	include/rfc822.hh lib/librfc822.a
 
-.if ${OSVERSION} >= 502126
-BROKEN=		"Does not compile with gcc 3.4.2"
-.endif
+post-patch:
+	@${REINPLACE_CMD} -E -e 's/^(CXX.*)=(.*)/\1\?=\2/' ${WRKSRC}/Makefile
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/rfc822.hh ${PREFIX}/include
 	${INSTALL_DATA} ${WRKSRC}/librfc822.a ${PREFIX}/lib
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	@cd ${WRKSRC}/documentation && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
+	@cd ${WRKSRC}/documentation && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/librfc822/pkg-plist b/mail/librfc822/pkg-plist
deleted file mode 100644
index 6ab9ec7d998e..000000000000
--- a/mail/librfc822/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-include/rfc822.hh
-lib/librfc822.a
-%%PORTDOCS%%%%DOCSDIR%%/readme.html
-%%PORTDOCS%%%%DOCSDIR%%/readme.txt
-%%PORTDOCS%%%%DOCSDIR%%/user-manual.html
-%%PORTDOCS%%%%DOCSDIR%%/user-manual.pdf
-%%PORTDOCS%%@dirrm %%DOCSDIR%%