diff --git a/graphics/libboard/Makefile b/graphics/libboard/Makefile
index 6a8a5e72ee52..5b2617e9e813 100644
--- a/graphics/libboard/Makefile
+++ b/graphics/libboard/Makefile
@@ -1,55 +1,60 @@
 # New ports collection makefile for:	libboard
 # Date created:		Fri 24 aug 2007
 # Whom:			thierry@pompo.net
 #
 # $FreeBSD$
 #
 
 PORTNAME=		libboard
-PORTVERSION=		0.8.2
+DISTVERSION=		0.8.6b-2
 CATEGORIES=		graphics
 MASTER_SITES=		SF
 
 MAINTAINER=		thierry@FreeBSD.org
 COMMENT=		A vector graphics C++ library
 
+BUILD_DEPENDS=		doxygen:${PORTSDIR}/devel/doxygen
+
 HAS_CONFIGURE=		yes
 CONFIGURE_ARGS=		--prefix=${PREFIX}
 CONFIGURE_ENV=		CXX=${CXX}
 
 USE_GMAKE=		yes
 USE_LDCONFIG=		yes
 
+WRKSRC=		${WRKDIR}/${DISTNAME:C/-.$//}
+
 PORTDOCS=	*
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} != i386
-CFLAGS+=	-fPIC
+CXXFLAGS+=	-fPIC
 .endif
 
 pre-configure:
 	${REINPLACE_CMD} -e 's|-O3|${CXXFLAGS}|' ${WRKSRC}/${CONFIGURE_SCRIPT}
 
 post-install:
 	${MV} ${PREFIX}/lib/libboard.so ${PREFIX}/lib/libboard.so.0
 	${LN} -sf ${PREFIX}/lib/libboard.so.0 ${PREFIX}/lib/libboard.so
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC}/doc/html/ && ${COPYTREE_SHARE} . ${DOCSDIR}/
 	${RM} -rf ${DOCSDIR}/.svn
 .endif
 .if !defined(NOPORTEXAMPLES)
 	${MKDIR} ${EXAMPLESDIR}
 	cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${EXAMPLESDIR}/
+	cd ${WRKSRC}/bin/ && ${COPYTREE_BIN} . ${EXAMPLESDIR}/
 	${RM} -rf ${EXAMPLESDIR}/.svn
 .endif
 
 regression-test:
 	(cd ${WRKDIR} && ${WRKSRC}/bin/arithmetic bec)
 .for ex in 1 2 3
 	(cd ${WRKDIR} && ${WRKSRC}/bin/example${ex})
 .endfor
 	${LS} -l ${WRKDIR}/arithm* ${WRKDIR}/draw*
 
 .include <bsd.port.post.mk>
diff --git a/graphics/libboard/distinfo b/graphics/libboard/distinfo
index da215a3cba72..3109e4660d84 100644
--- a/graphics/libboard/distinfo
+++ b/graphics/libboard/distinfo
@@ -1,3 +1,3 @@
-MD5 (libboard-0.8.2.tar.gz) = 2360017013695c27759221d9537279a6
-SHA256 (libboard-0.8.2.tar.gz) = 7762775653f7ec2963b639faf9e894bb9f3b969173d2261291841015b8f1fe92
-SIZE (libboard-0.8.2.tar.gz) = 202025
+MD5 (libboard-0.8.6b-2.tar.gz) = d462ca619221090f72649f40aa4e0fa7
+SHA256 (libboard-0.8.6b-2.tar.gz) = b21cd08fe437d216e4a1eda54a9073785f60120e8aea734c1a9a97e0d32de7b5
+SIZE (libboard-0.8.6b-2.tar.gz) = 299488
diff --git a/graphics/libboard/files/patch-configure b/graphics/libboard/files/patch-configure
index 143d63ba7cca..3cd709dea6e7 100644
--- a/graphics/libboard/files/patch-configure
+++ b/graphics/libboard/files/patch-configure
@@ -1,52 +1,43 @@
---- configure.orig	2007-12-17 11:15:52.000000000 +0100
-+++ configure	2008-11-19 19:05:16.000000000 +0100
-@@ -60,7 +60,7 @@
- ##
- ## Are we on a powerpc (Mac ?)
- ##
--if [ `arch` = "ppc" ]; then
-+if [ `uname -m` = "ppc" ]; then
-     LDFLAGSLIB=-dynamiclib
-     DYNLIB_EXTENSION=dynlib
- fi
-@@ -68,23 +68,23 @@
+--- configure.orig	2009-02-02 12:12:55.000000000 +0100
++++ configure	2009-02-06 10:28:55.000000000 +0100
+@@ -109,23 +109,23 @@
  ##
  ## Are we on a 64 bits arch
  ##
 -${ECHO} -n "Checking for 64 bits architecture..."
 -cat > is64.c <<EOF
 -int main() {
 - unsigned long n = 0;
 - n = ~n;
 - return n == 0xFFFFFFFF;
 -}
 -EOF
 -gcc -o is64 is64.c
 -if is64; then
 -CXX64FLAGS="-fPIC"
 -echo yes
 -else
 -CXX64FLAGS=""
 -echo no
 -fi
 -rm -f is64 is64.c
 +#${ECHO} -n "Checking for 64 bits architecture..."
 +#cat > is64.c <<EOF
 +#int main() {
 +# unsigned long n = 0;
 +# n = ~n;
 +# return n == 0xFFFFFFFF;
 +#}
 +#EOF
-+#gcc -o is64 is64.c
++#$(CXX) -o is64 is64.c
 +#if is64; then
 +#CXX64FLAGS="-fPIC"
 +#echo yes
 +#else
 +#CXX64FLAGS=""
 +#echo no
 +#fi
 +#rm -f is64 is64.c
  
- 
  cat > Makefile <<EOF
+ 
diff --git a/graphics/libboard/pkg-plist b/graphics/libboard/pkg-plist
index 9d2597f59c92..6a8b7466d8ea 100644
--- a/graphics/libboard/pkg-plist
+++ b/graphics/libboard/pkg-plist
@@ -1,20 +1,38 @@
 include/Board.h
-include/board/Board.h
 include/board/Color.h
+include/board/PSFonts.h
 include/board/Point.h
 include/board/Rect.h
 include/board/ShapeList.h
 include/board/Shapes.h
+include/board/Tools.h
 include/board/Transforms.h
 lib/libboard.a
 lib/libboard.so
 lib/libboard.so.0
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/arithmetic
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/arithmetic.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/arrows
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/arrows.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ellipse
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ellipse.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example1
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example1.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example2
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example2.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example3
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example3.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example4
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example4.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graph
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/graph.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/koch
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/koch.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/logo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/logo.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ruler
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ruler.cpp
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 @dirrm include/board