diff -urN /usr/ports/devel/dia2code/Makefile devel/dia2code/Makefile
--- /usr/ports/devel/dia2code/Makefile	Fri May  5 11:07:09 2006
+++ devel/dia2code/Makefile	Thu Jan  4 22:41:49 2007
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	dia2code
-PORTVERSION=	0.8.1
+PORTVERSION=	0.8.2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,22 +15,22 @@
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A small utility used to generate code from a Dia diagram
 
-LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2
-
-XML_CONFIG=	${LOCALBASE}/bin/xml2-config
-
+USE_GNOME=	gnometarget libxml2
+USE_GCC=	3.4+
+USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		XML_CONFIG="${XML_CONFIG}"
+		LDFLAGS="-L${LOCALBASE}/lib"
+MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOHEADER="${TRUE}" \
+		AUTOMAKE="${TRUE}"
 
 MAN1=		dia2code.1
 PLIST_FILES=	bin/dia2code
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|#include <malloc.h>||' ${WRKSRC}/dia2code/dia2code.h
+	@${REINPLACE_CMD} -e '/<malloc.h>/d' ${WRKSRC}/dia2code/dia2code.h
 
 post-install:
-	@${INSTALL_MAN} ${WRKSRC}/dia2code.1 ${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/dia2code.1 ${MANPREFIX}/man/man1
 
 .include <bsd.port.mk>
diff -urN /usr/ports/devel/dia2code/distinfo devel/dia2code/distinfo
--- /usr/ports/devel/dia2code/distinfo	Fri Nov 25 13:31:53 2005
+++ devel/dia2code/distinfo	Thu Jan  4 22:35:53 2007
@@ -1,3 +1,3 @@
-MD5 (dia2code-0.8.1.tar.gz) = 549eb4da412d92d779bcd3e65175064f
-SHA256 (dia2code-0.8.1.tar.gz) = af4a086753558ff5af436c3c1e870703cf455831517cd43ac3dacb7d6c0205a3
-SIZE (dia2code-0.8.1.tar.gz) = 71453
+MD5 (dia2code-0.8.2.tar.gz) = 59672747f1dfa05eea5813346891e935
+SHA256 (dia2code-0.8.2.tar.gz) = 687164ac248772458350dbd75fd6d9b336cbd946724843453104a130521e477b
+SIZE (dia2code-0.8.2.tar.gz) = 127307
diff -urN /usr/ports/devel/dia2code/files/patch-aa devel/dia2code/files/patch-aa
--- /usr/ports/devel/dia2code/files/patch-aa	Sun Mar 31 14:33:56 2002
+++ devel/dia2code/files/patch-aa	Thu Jan  1 09:00:00 1970
@@ -1,13 +0,0 @@
---- ./dia2code/dia2code.h.orig	Sat Mar 30 21:36:07 2002
-+++ ./dia2code/dia2code.h	Sat Mar 30 21:36:30 2002
-@@ -25,8 +25,8 @@
- #include <stdlib.h>
- 
- /* libxml[2] headers */
--#include <parser.h>
--#include <tree.h>
-+#include <libxml2/libxml/parser.h>
-+#include <libxml2/libxml/tree.h>
- 
- #define VERSION "0.8.1"
-