Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/mail/librfc822/Makefile,v
retrieving revision 1.6
diff -u -u -r1.6 Makefile
--- Makefile	16 Aug 2004 02:47:08 -0000	1.6
+++ Makefile	26 Sep 2004 16:41:52 -0000
@@ -15,20 +15,21 @@
 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>
Index: pkg-plist
===================================================================
RCS file: pkg-plist
diff -N pkg-plist
--- pkg-plist	7 May 2003 17:21:07 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -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%%