diff --git a/devel/sourcenav/Makefile b/devel/sourcenav/Makefile
index 54f63df06052..53b7c2940e12 100644
--- a/devel/sourcenav/Makefile
+++ b/devel/sourcenav/Makefile
@@ -1,39 +1,39 @@
 # Created by: Donald Burr <dburr@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	sourcenav
 PORTVERSION=	4.5
-PORTREVISION=	8
+PORTREVISION=	9
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}/NG${PORTVERSION}
 DISTNAME=	sourcenavigator-NG${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Source code analysis tool
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_aarch64=		fails to build: undefined reference to fpsetround
 
 USES=		shebangfix tar:bzip2
 SHEBANG_FILES=	${WRKSRC}/snavigator/demo/c++/contrib/perl/sample_client
-USE_GCC=	yes
 USE_XORG=	x11
 
 HAS_CONFIGURE=	yes
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=--prefix=${PREFIX}/sourcenav
 
 post-patch:
 	${REINPLACE_CMD} -e 's|@XINCLUDES@|-I${LOCALBASE}/include|; \
 	    s|@XLIBSW@|-L${LOCALBASE}/lib -lX11|' ${WRKSRC}/tk/unix/Makefile.in
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sourcenav/bin/wish8.3
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sourcenav/bin/tclsh8.3
-	${LN} -s ${PREFIX}/sourcenav/bin/snavigator ${STAGEDIR}${PREFIX}/bin/snavigator
+	${RLN} ${STAGEDIR}${PREFIX}/sourcenav/bin/snavigator \
+		${STAGEDIR}${PREFIX}/bin/snavigator
 
 .include <bsd.port.mk>
diff --git a/devel/sourcenav/files/patch-db4_dbinc_atomic.h b/devel/sourcenav/files/patch-db4_dbinc_atomic.h
new file mode 100644
index 000000000000..a46116fe18f5
--- /dev/null
+++ b/devel/sourcenav/files/patch-db4_dbinc_atomic.h
@@ -0,0 +1,20 @@
+--- db4/dbinc/atomic.h.orig	2010-10-28 20:58:58 UTC
++++ db4/dbinc/atomic.h
+@@ -144,7 +144,7 @@ typedef LONG volatile *interlocked_val;
+ #define	atomic_inc(env, p)	__atomic_inc(p)
+ #define	atomic_dec(env, p)	__atomic_dec(p)
+ #define	atomic_compare_exchange(env, p, o, n)	\
+-	__atomic_compare_exchange((p), (o), (n))
++	__atomic_compare_exchange_db((p), (o), (n))
+ static inline int __atomic_inc(db_atomic_t *p)
+ {
+ 	int	temp;
+@@ -176,7 +176,7 @@ static inline int __atomic_dec(db_atomic_t *p)
+  * http://gcc.gnu.org/onlinedocs/gcc-4.1.0/gcc/Atomic-Builtins.html
+  * which configure could be changed to use.
+  */
+-static inline int __atomic_compare_exchange(
++static inline int __atomic_compare_exchange_db(
+ 	db_atomic_t *p, atomic_value_t oldval, atomic_value_t newval)
+ {
+ 	atomic_value_t was;
diff --git a/devel/sourcenav/files/patch-db4_dbinc_mutex__int.h b/devel/sourcenav/files/patch-db4_dbinc_mutex__int.h
new file mode 100644
index 000000000000..65ec48df493d
--- /dev/null
+++ b/devel/sourcenav/files/patch-db4_dbinc_mutex__int.h
@@ -0,0 +1,11 @@
+--- db4/dbinc/mutex_int.h.orig	2010-10-28 20:58:58 UTC
++++ db4/dbinc/mutex_int.h
+@@ -596,7 +596,7 @@ MUTEX_SET(int *tsl)  {
+ 	 : "=&r" (__r), "+r" (tsl)
+ 	 :
+ 	 : "cr0", "memory");
+-	 return (int)tsl;
++	 return (tsl != 0);
+ }
+ 
+ static inline int
diff --git a/devel/sourcenav/files/patch-snavigator_parsers_php_phpbrowser.c b/devel/sourcenav/files/patch-snavigator_parsers_php_phpbrowser.c
new file mode 100644
index 000000000000..8894260f90f7
--- /dev/null
+++ b/devel/sourcenav/files/patch-snavigator_parsers_php_phpbrowser.c
@@ -0,0 +1,11 @@
+--- snavigator/parsers/php/phpbrowser.c.orig	2010-02-02 12:29:53 UTC
++++ snavigator/parsers/php/phpbrowser.c
+@@ -5878,7 +5878,7 @@ YY_RULE_SETUP
+     free_head_token(); /* const keyword */
+ 
+     if ( !current_class )
+-        return;
++        return 0;
+ 
+     result = sn_insert_symbol(SN_ENUM_CONST_DEF,
+         current_class,
diff --git a/devel/sourcenav/pkg-descr b/devel/sourcenav/pkg-descr
index 98b907afb437..99d27f492735 100644
--- a/devel/sourcenav/pkg-descr
+++ b/devel/sourcenav/pkg-descr
@@ -1,13 +1,13 @@
 Source Navigator NG is a source code analysis tool.
 With it, you can edit your source code, display relationships
 between classes and functions and members, and display call trees.
 
 You can navigate your source code and easily get to declarations
 or implementations of functions, variables and macros (commonly
 called "symbols") which helps you discovering and mapping unknown
 source code for enhancement or maintenance tasks.
 
 It is based upon the old source navigator and strives to
 improve usability and performance.
 
-WWW: http://sourcenav.berlios.de/
+WWW: http://sourcenav.sourceforge.net/