diff --git a/math/snns/Makefile b/math/snns/Makefile
index 39859f2f245d..9acd7b7469f6 100644
--- a/math/snns/Makefile
+++ b/math/snns/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	SNNSv${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Fully featured neural network simulator
 
-LIB_DEPENDS=	Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d
+LIB_DEPENDS=	libXaw3d.so:${PORTSDIR}/x11-toolkits/Xaw3d
 
 USE_XORG=	x11 xext xt
 HAS_CONFIGURE=	yes
@@ -19,8 +19,6 @@ CONFIGURE_ARGS=	--prefix=${PREFIX}/lib/snns --enable-global \
 		--build=${CONFIGURE_TARGET}
 MAKE_JOBS_UNSAFE=	yes
 
-NO_STAGE=	yes
-
 OPTIONS_DEFINE=	EXAMPLES
 
 .include <bsd.port.options.mk>
@@ -46,15 +44,14 @@ post-patch:
 	@${ECHO_CMD} '${PREFIX}/lib/snns/bin/xgui' >> ${WRKDIR}/snns
 
 post-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/snns ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/Readme ${PREFIX}/lib/snns
-	${INSTALL_DATA} ${WRKSRC}/Readme.license ${PREFIX}/lib/snns
-	${INSTALL_DATA} ${WRKSRC}/default.cfg ${PREFIX}/lib/snns
-	${INSTALL_DATA} ${WRKSRC}/help.hdoc ${PREFIX}/lib/snns
+	${INSTALL_SCRIPT} ${WRKDIR}/snns ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/Readme ${STAGEDIR}${PREFIX}/lib/snns
+	${INSTALL_DATA} ${WRKSRC}/Readme.license ${STAGEDIR}${PREFIX}/lib/snns
+	${INSTALL_DATA} ${WRKSRC}/default.cfg ${STAGEDIR}${PREFIX}/lib/snns
+	${INSTALL_DATA} ${WRKSRC}/help.hdoc ${STAGEDIR}${PREFIX}/lib/snns
 .if ${PORT_OPTIONS:MEXAMPLES}
-	@${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/examples/* ${EXAMPLESDIR}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR}
 .endif
-	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/math/snns/files/patch-tools__sources__Makefile b/math/snns/files/patch-tools__sources__Makefile
new file mode 100644
index 000000000000..c7aee34bcc43
--- /dev/null
+++ b/math/snns/files/patch-tools__sources__Makefile
@@ -0,0 +1,19 @@
+--- tools/sources/Makefile.orig	2008-04-21 15:56:06.000000000 +0800
++++ tools/sources/Makefile	2014-06-08 23:09:09.194124344 +0800
+@@ -109,12 +109,12 @@ kerneltools: $(KRTOOLS_PRG)
+ batchtools:  $(BATCH_PRG)
+ tools:       $(TOOLS_PRG) $(KRTOOLS_PRG) $(BATCH_PRG)
+ 
+-$(TOOLSBINDIR):
+-	-mkdir $(TOOLSBINDIR)
++$(DESTDIR)$(TOOLSBINDIR):
++	-mkdir $(DESTDIR)$(TOOLSBINDIR)
+ 
+-install: tools $(TOOLSBINDIR)
++install: tools $(DESTDIR)$(TOOLSBINDIR)
+ 	for tooltarget in $(TOOLS_PRG) $(KRTOOLS_PRG) $(BATCH_PRG) ; do \
+-            $(INSTALL_PROGRAM) $$tooltarget $(TOOLSBINDIR) ; \
++            $(INSTALL_PROGRAM) $$tooltarget $(DESTDIR)$(TOOLSBINDIR) ; \
+         done
+ 
+ install-strip:
diff --git a/math/snns/files/patch-xgui__sources__Makefile b/math/snns/files/patch-xgui__sources__Makefile
new file mode 100644
index 000000000000..f6b26159ae2a
--- /dev/null
+++ b/math/snns/files/patch-xgui__sources__Makefile
@@ -0,0 +1,15 @@
+--- xgui/sources/Makefile.orig	2014-06-08 23:06:43.903120060 +0800
++++ xgui/sources/Makefile	2014-06-08 23:06:57.485121237 +0800
+@@ -147,10 +147,10 @@ PROGRAM            = xgui
+ all: $(PROGRAM)
+ 
+ $(XGUIBINDIR):
+-	-mkdir $(XGUIBINDIR)
++	-mkdir $(DESTDIR)$(XGUIBINDIR)
+ 
+ install: all $(XGUIBINDIR)
+-	$(INSTALL_PROGRAM) $(PROGRAM) $(XGUIBINDIR)
++	$(INSTALL_PROGRAM) $(PROGRAM) $(DESTDIR)$(XGUIBINDIR)
+ 
+ install-strip:
+ 	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install