diff --git a/biology/platon/Makefile b/biology/platon/Makefile
index 4471ee8f1129..85f68a4022e3 100644
--- a/biology/platon/Makefile
+++ b/biology/platon/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	platon
-PORTVERSION=	2000.04.26
+PORTVERSION=	2000.06.05
 CATEGORIES=	biology
 MASTER_SITES=	ftp://xraysoft.chem.ruu.nl/pub/unix/
 DISTNAME=	platon
@@ -35,7 +35,7 @@ MAKE_ENV+=	HAVE_G2C=yes
 
 pre-patch:
 	(cd ${WRKDIR}/${DISTNAME} && ${GUNZIP_CMD} platon.f.Z)
-	${CP} ${FILESDIR}/Makefile ${WRKDIR}/${DISTNAME}
+	${SED} 's,%%X11BASE%%,${X11BASE},g' ${FILESDIR}/Makefile > ${WRKDIR}/${DISTNAME}/Makefile
 
 pre-install:
 	strip ${WRKDIR}/${DISTNAME}/platon
diff --git a/biology/platon/distinfo b/biology/platon/distinfo
index ea898cd6a74e..1c355f21869b 100644
--- a/biology/platon/distinfo
+++ b/biology/platon/distinfo
@@ -1 +1 @@
-MD5 (platon.tar.gz) = 249d5846d1c89b8429d3bdb5dcda716b
+MD5 (platon.tar.gz) = f5653fb5d8b05a69abaf6a36d129071d
diff --git a/biology/platon/files/Makefile b/biology/platon/files/Makefile
index 39f793adb059..d37f5658360c 100644
--- a/biology/platon/files/Makefile
+++ b/biology/platon/files/Makefile
@@ -1,10 +1,21 @@
 # Makefile for platon
+#
+# $FreeBSD$
 
 TARGET=	platon
 OBJS=	platon.o xdrvr.o
+.if ${OSVERSION} >= 400018
+FOPT=
+.else
 FOPT=	-Nx800 -NL400 -Nn802
-COPT=	-I/usr/X11R6/include
-LOPT=	-L/usr/X11R6/lib -lX11 -lf2c
+.endif
+COPT=	-I%%X11BASE%%/include
+LOPT=	-L%%X11BASE%%/lib -lX11
+.if defined(HAVE_G2C)
+LOPT+=	-lg2c
+.else
+LOPT+=	-lf2c
+.endif
 
 all:	${OBJS}
 	${FC} -o ${TARGET} ${OBJS} ${LOPT}
diff --git a/biology/platon/pkg-plist b/biology/platon/pkg-plist
index ad0ca1f0bb5d..41cab0a8c004 100644
--- a/biology/platon/pkg-plist
+++ b/biology/platon/pkg-plist
@@ -4,7 +4,6 @@ share/doc/platon/TEST/ABSORB_EXAMPLE/s588a.hkl.gz
 share/doc/platon/TEST/ABSORB_EXAMPLE/s588a.hkp.gz
 share/doc/platon/TEST/ABSORB_EXAMPLE/s588a.ins
 share/doc/platon/TEST/ABSORB_EXAMPLE/s588a.lis
-@dirrm share/doc/platon/TEST/ABSORB_EXAMPLE
 share/doc/platon/TEST/ABSTOMPA_EXAMPLE/s555b.hkl.gz
 share/doc/platon/TEST/ABSTOMPA_EXAMPLE/s555b.hkp.gz
 share/doc/platon/TEST/ABSTOMPA_EXAMPLE/s555b.ins
@@ -13,7 +12,6 @@ share/doc/platon/TEST/ABSTOMPA_EXAMPLE/s588a.hkl.gz
 share/doc/platon/TEST/ABSTOMPA_EXAMPLE/s588a.hkp.gz
 share/doc/platon/TEST/ABSTOMPA_EXAMPLE/s588a.ins
 share/doc/platon/TEST/ABSTOMPA_EXAMPLE/s588a.lis.gz
-@dirrm share/doc/platon/TEST/ABSTOMPA_EXAMPLE
 share/doc/platon/TEST/ABSTOMPA_TEST/README
 share/doc/platon/TEST/ABSTOMPA_TEST/abstest.hkl
 share/doc/platon/TEST/ABSTOMPA_TEST/abstest.hkp
@@ -31,34 +29,28 @@ share/doc/platon/TEST/ABSTOMPA_TEST/test2.hkl
 share/doc/platon/TEST/ABSTOMPA_TEST/test2.hkp
 share/doc/platon/TEST/ABSTOMPA_TEST/test2.ins
 share/doc/platon/TEST/ABSTOMPA_TEST/test2.lis
-@dirrm share/doc/platon/TEST/ABSTOMPA_TEST
 share/doc/platon/TEST/ADDSYM_EXAMPLE/README
 share/doc/platon/TEST/ADDSYM_EXAMPLE/ex1.spf
 share/doc/platon/TEST/ADDSYM_EXAMPLE/ex2.ins
 share/doc/platon/TEST/ADDSYM_EXAMPLE/ex3.spf
-@dirrm share/doc/platon/TEST/ADDSYM_EXAMPLE
 share/doc/platon/TEST/ASYM_EXAMPLE/README
 share/doc/platon/TEST/ASYM_EXAMPLE/asym.hkl.gz
 share/doc/platon/TEST/ASYM_EXAMPLE/asym.hkp.gz
 share/doc/platon/TEST/ASYM_EXAMPLE/asym.ins
 share/doc/platon/TEST/ASYM_EXAMPLE/asym.lis.gz
-@dirrm share/doc/platon/TEST/ASYM_EXAMPLE
 share/doc/platon/TEST/DELABS_EXAMPLE/s588a.hkl.gz
 share/doc/platon/TEST/DELABS_EXAMPLE/s588a.hkp.gz
 share/doc/platon/TEST/DELABS_EXAMPLE/s588a.lis
 share/doc/platon/TEST/DELABS_EXAMPLE/s588a.res
-@dirrm share/doc/platon/TEST/DELABS_EXAMPLE
 share/doc/platon/TEST/MULABS_EXAMPLE/shelx.hkl.gz
 share/doc/platon/TEST/MULABS_EXAMPLE/shelx.hkp.gz
 share/doc/platon/TEST/MULABS_EXAMPLE/shelx.ins.gz
 share/doc/platon/TEST/MULABS_EXAMPLE/shelx.lis.gz
-@dirrm share/doc/platon/TEST/MULABS_EXAMPLE
 share/doc/platon/TEST/PSICOR_EXAMPLE/old_s588a.ps
 share/doc/platon/TEST/PSICOR_EXAMPLE/s588a.hkl
 share/doc/platon/TEST/PSICOR_EXAMPLE/s588a.hkp
 share/doc/platon/TEST/PSICOR_EXAMPLE/s588a.ins
 share/doc/platon/TEST/PSICOR_EXAMPLE/s588a.lis
-@dirrm share/doc/platon/TEST/PSICOR_EXAMPLE
 share/doc/platon/TEST/SQUEEZE_EXAMPLE/README.gz
 share/doc/platon/TEST/SQUEEZE_EXAMPLE/shelxl.hkl.gz
 share/doc/platon/TEST/SQUEEZE_EXAMPLE/shelxl.hkp.gz
@@ -68,8 +60,6 @@ share/doc/platon/TEST/SQUEEZE_EXAMPLE/shelxl.sqz.gz
 share/doc/platon/TEST/SQUEEZE_EXAMPLE/sqz.hkl.gz
 share/doc/platon/TEST/SQUEEZE_EXAMPLE/sqz.lis.gz
 share/doc/platon/TEST/SQUEEZE_EXAMPLE/sqz.res.gz
-@dirrm share/doc/platon/TEST/SQUEEZE_EXAMPLE
-@dirrm share/doc/platon/TEST
 share/doc/platon/README
 share/doc/platon/README.ADDSYM
 share/doc/platon/README.LEPAGE
@@ -87,4 +77,14 @@ share/doc/platon/s810c.cif
 share/doc/platon/s913a.res
 share/doc/platon/sucrose.spf
 share/doc/platon/platon_html.tar.gz
+@dirrm share/doc/platon/TEST/ABSORB_EXAMPLE
+@dirrm share/doc/platon/TEST/ABSTOMPA_EXAMPLE
+@dirrm share/doc/platon/TEST/ABSTOMPA_TEST
+@dirrm share/doc/platon/TEST/ADDSYM_EXAMPLE
+@dirrm share/doc/platon/TEST/ASYM_EXAMPLE
+@dirrm share/doc/platon/TEST/DELABS_EXAMPLE
+@dirrm share/doc/platon/TEST/MULABS_EXAMPLE
+@dirrm share/doc/platon/TEST/PSICOR_EXAMPLE
+@dirrm share/doc/platon/TEST/SQUEEZE_EXAMPLE
+@dirrm share/doc/platon/TEST
 @dirrm share/doc/platon