diff -urN /usr/ports/biology/molden/Makefile biology/molden/Makefile
--- /usr/ports/biology/molden/Makefile	2013-12-30 02:46:15.000000000 +0900
+++ biology/molden/Makefile	2014-01-21 00:00:00.000000000 +0900
@@ -2,8 +2,7 @@
 # $FreeBSD: head/biology/molden/Makefile 337992 2013-12-29 14:30:20Z tijl $
 
 PORTNAME=	molden
-PORTVERSION=	5.0.6
-PORTREVISION=	1
+PORTVERSION=	5.0.7
 PORTEPOCH=	1
 CATEGORIES=	biology
 MASTER_SITES=	ftp://ftp.cmbi.ru.nl/pub/molgraph/molden/
@@ -20,13 +19,13 @@
 WRKSRC=		${WRKDIR}/${PORTNAME}${PORTVERSION:R}
 
 USES=		fortran gmake
-USE_XORG=	x11 xproto
+USE_XORG=	x11
 USE_GL=		glu
 MAKEFILE=	makefile
 MAKE_JOBS_UNSAFE=yes
 
 CFLAGS+=	-D${OPSYS:U} -DDOBACK -DHASTIMER -DCOLOR_OFFSET=0.0 \
-		-I/usr/local/include -Wno-return-type
+		-I${LOCALBASE}/include -Wno-return-type
 
 PORTDOCS=	*
 PORTDATA=	*
@@ -50,19 +49,17 @@
 	@${ECHO_MSG} "********************"
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/molden ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/gmolden ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/ambfor/ambfor ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/surf/surf ${STAGEDIR}${PREFIX}/bin
-.if ${PORT_OPTIONS:MDATA}
-	${MKDIR} ${STAGEDIR}${DATADIR}/test
-	${INSTALL_DATA} ${WRKSRC}/test/* ${STAGEDIR}${DATADIR}/test
-	${MKDIR} ${STAGEDIR}${DATADIR}/utils
-	${INSTALL_DATA} ${WRKSRC}/utils/* ${STAGEDIR}${DATADIR}/utils
-.endif
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/* ${STAGEDIR}${DOCSDIR}
-.endif
+.for i in molden gmolden
+	(cd ${WRKSRC} && ${INSTALL_PROGRAM} ${i} ${STAGEDIR}${PREFIX}/bin)
+.endfor
+.for i in ambfor surf
+	(cd ${WRKSRC}/${i} && ${INSTALL_PROGRAM} ${i} ${STAGEDIR}/${PREFIX}/bin)
+.endfor
+	@${MKDIR} ${STAGEDIR}${DATADIR}/test
+	(cd ${WRKSRC}/test && ${INSTALL_DATA} * ${STAGEDIR}${DATADIR}/test)
+	@${MKDIR} ${STAGEDIR}${DATADIR}/utils
+	(cd ${WRKSRC}/utils &&  ${INSTALL_DATA} * ${STAGEDIR}${DATADIR}/utils)
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC}/doc && ${INSTALL_DATA} * ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff -urN /usr/ports/biology/molden/distinfo biology/molden/distinfo
--- /usr/ports/biology/molden/distinfo	2013-11-06 22:05:43.000000000 +0900
+++ biology/molden/distinfo	2014-01-21 00:00:00.000000000 +0900
@@ -1,2 +1,2 @@
-SHA256 (molden5.0.6.tar.gz) = b22339129140095fdb3f2a5b9b11518e1bb81cc0fd02a627aa44575294b064cf
-SIZE (molden5.0.6.tar.gz) = 3084150
+SHA256 (molden5.0.7.tar.gz) = f1228cdba1aee210138f5f99efce9892d7a64e721f98d6a1e2133981bc62ac3b
+SIZE (molden5.0.7.tar.gz) = 3076021
diff -urN /usr/ports/biology/molden/pkg-descr biology/molden/pkg-descr
--- /usr/ports/biology/molden/pkg-descr	2013-12-30 02:46:15.000000000 +0900
+++ biology/molden/pkg-descr	2014-01-21 00:00:00.000000000 +0900
@@ -11,4 +11,4 @@
  * Using a not-so-latest version is prohibited, because 
    the author may only respond about the latest version.
 
-WWW: http://www.cmbi.ru.nl/molden/
+WWW: http://www.cmbi.kun.nl/~schaft/molden/molden.html