5 files changed, 103 insertions, 106 deletions

diff --git a/biology/platon/Makefile b/biology/platon/Makefile
index e8f27f0f76ed..f5b8e3b967f3 100644
--- a/biology/platon/Makefile
+++ b/biology/platon/Makefile
@@ -2,25 +2,19 @@
 # $FreeBSD$
 
 PORTNAME=	platon
-PORTVERSION=	2014.07.13
-PORTREVISION=	1
+PORTVERSION=	2015.03.05
 CATEGORIES=	biology
-# Please note that the upstream vendor does not perform any discernible
-# versioning. Therefore, the distfile has to be hosted elsewhere in order
-# to prevent breakage due to distinfo becoming outdated unexpectedly. For the
-# latest upstream version, please see
-# http://www.cryst.chem.uu.nl/spek/xraysoft/unix/
-MASTER_SITES=	http://www.skysmurf.nl/comp/FreeBSD/distfiles/
+MASTER_SITES=	http://www.cryst.chem.uu.nl/spek/xraysoft/unix/	\
+		http://www.platonsoft.nl/spek/xraysoft/
 DISTNAME=	platon
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tool for viewing molecular/crystallographic structures
 
-BROKEN=		Unfetchable
 # PLATON may be used free of charge by the academic community under
 # the condition that it is not redistributed for a current & fresh copy.
 # There is a charge of US$ 5000 for commercial users.
-RESTRICTED=	free for academic, US$ 5000 for commercial users
+NO_CDROM=	free for academic, US$ 5000 for commercial users
 
 USES=		fortran
 USE_XORG=	x11
@@ -32,31 +26,26 @@ TESTDATADIR=	ABSORB_EXAMPLE ABSTOMPA_EXAMPLE ABSTOMPA_TEST ADDSYM_EXAMPLE \
 
 OPTIONS_DEFINE=	DOCS
 
+MAKEFILE=	${FILESDIR}/Makefile
+
 .include <bsd.port.pre.mk>
 
 pre-patch:
-	(cd ${WRKDIR}/${DISTNAME} ; ${GUNZIP_CMD} platon.f.gz xdrvr.c.gz)
-
-post-patch:
-	${CP} ${FILESDIR}/Makefile ${WRKSRC}/Makefile
-	${REINPLACE_CMD} -e "s+%%LOCALBASE%%+${LOCALBASE}+"  ${WRKSRC}/Makefile
+	${GUNZIP_CMD} ${WRKSRC}/platon.f.gz ${WRKSRC}/xdrvr.c.gz
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKDIR}/${DISTNAME}/platon \
 		${STAGEDIR}${PREFIX}/bin
-	${LN} -s platon ${STAGEDIR}${PREFIX}/bin/pluton
+	${LN} -fs platon ${STAGEDIR}${PREFIX}/bin/pluton
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/README* ${STAGEDIR}${DOCSDIR}
-.for f in ${SAMPLES}
-	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/$f ${STAGEDIR}${DOCSDIR}
-.endfor
-	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/platon_html.tar.gz \
+	${MV} ${WRKDIR}/${DISTNAME}/README* ${STAGEDIR}${DOCSDIR}/
+	${MV} ${SAMPLES:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}/
+	${MV} ${WRKSRC}/platon_html.tar.gz \
 		${STAGEDIR}${DOCSDIR}
-	${MKDIR} ${STAGEDIR}${DOCSDIR}/TEST
-.for d in ${TESTDATADIR}
-	${MKDIR} ${STAGEDIR}${DOCSDIR}/TEST/$d
-	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/TEST/$d/* \
-		${STAGEDIR}${DOCSDIR}/TEST/$d
-.endfor
+	${MV} ${WRKSRC}/TEST ${STAGEDIR}${DOCSDIR}/
+	${FIND} ${STAGEDIR}${DOCSDIR} -type f -print0 |	\
+		${XARGS} -0 ${CHMOD} ${_SHAREMODE}
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/biology/platon/distinfo b/biology/platon/distinfo
index 131616df66f9..f8556d2ced0e 100644
--- a/biology/platon/distinfo
+++ b/biology/platon/distinfo
@@ -1,2 +1,2 @@
-SHA256 (platon.tar.gz) = f94c63180a9059a4a3fbca248fdee11cd62996cfacc1bb1b0cd54f2944fd0ac3
-SIZE (platon.tar.gz) = 10950174
+SHA256 (platon.tar.gz) = 607d568ccec11a83558aa8afe2299d6ac66afdb2e56efdcfe2b913b5639a5cfb
+SIZE (platon.tar.gz) = 12091579
diff --git a/biology/platon/files/Makefile b/biology/platon/files/Makefile
index 366e8b7ab49f..cce2ab467d5f 100644
--- a/biology/platon/files/Makefile
+++ b/biology/platon/files/Makefile
@@ -4,17 +4,10 @@
 
 TARGET=	platon
 OBJS=	platon.o xdrvr.o
-FOPT=	${FFLAGS}
-COPT=	${CFLAGS} -I%%LOCALBASE%%/include
-LOPT=	-L%%LOCALBASE%%/lib -lX11
+CFLAGS+=-I${LOCALBASE}/include
+LDADD=	-L${LOCALBASE}/lib -lX11
 
 all:	${OBJS}
-	${FC} -o ${TARGET} ${OBJS} ${LOPT}
-
-platon.o:	platon.f
-	${FC} ${FOPT} -c $<
-
-xdrvr.o:	xdrvr.c
-	${CC} ${COPT} -c $<
+	${FC} -o ${TARGET} ${OBJS} ${LDADD}
 
 #f77 -o platon platon.f xdrvr.c -lX11
diff --git a/biology/platon/files/patch-warnings b/biology/platon/files/patch-warnings
new file mode 100644
index 000000000000..f0f234af2103
--- /dev/null
+++ b/biology/platon/files/patch-warnings
@@ -0,0 +1,15 @@
+--- xdrvr.c	2015-03-05 06:26:17.000000000 -0500
++++ xdrvr.c	2015-03-08 18:19:13.000000000 -0400
+@@ -86,4 +86,6 @@
+    (StructureNotifyMask | ButtonPressMask | ExposureMask | KeyPressMask )
+ 
++static int def_colors(void);
++
+ static int            version   = 70607;
+ static int            lastevent = -1;
+@@ -104,4 +106,5 @@
+ Bool                  predproc(Display *display, XEvent *event, char *arg);
+ /***************************************************************************/
++int
+ xwin_(int *x, int *y, int * z, int *ind, char *buf) {
+   static Window        theWindow;		/* X stuff - some	*/
diff --git a/biology/platon/pkg-plist b/biology/platon/pkg-plist
index fee35f633923..22e403c1309e 100644
--- a/biology/platon/pkg-plist
+++ b/biology/platon/pkg-plist
@@ -4,71 +4,71 @@ bin/pluton
 %%PORTDOCS%%%%DOCSDIR%%/README.ADDSYM
 %%PORTDOCS%%%%DOCSDIR%%/README.LEPAGE
 %%PORTDOCS%%%%DOCSDIR%%/README.PLUTON
-%%DOCSDIR%%/TEST/ABSORB_EXAMPLE/s588a.hkl.gz
-%%DOCSDIR%%/TEST/ABSORB_EXAMPLE/s588a.hkp.gz
-%%DOCSDIR%%/TEST/ABSORB_EXAMPLE/s588a.ins
-%%DOCSDIR%%/TEST/ABSORB_EXAMPLE/s588a.lis
-%%DOCSDIR%%/TEST/ABSTOMPA_EXAMPLE/s555b.hkl.gz
-%%DOCSDIR%%/TEST/ABSTOMPA_EXAMPLE/s555b.hkp.gz
-%%DOCSDIR%%/TEST/ABSTOMPA_EXAMPLE/s555b.ins
-%%DOCSDIR%%/TEST/ABSTOMPA_EXAMPLE/s555b.lis.gz
-%%DOCSDIR%%/TEST/ABSTOMPA_EXAMPLE/s588a.hkl.gz
-%%DOCSDIR%%/TEST/ABSTOMPA_EXAMPLE/s588a.hkp.gz
-%%DOCSDIR%%/TEST/ABSTOMPA_EXAMPLE/s588a.ins
-%%DOCSDIR%%/TEST/ABSTOMPA_EXAMPLE/s588a.lis.gz
-%%DOCSDIR%%/TEST/ABSTOMPA_TEST/README
-%%DOCSDIR%%/TEST/ABSTOMPA_TEST/abstest.hkl
-%%DOCSDIR%%/TEST/ABSTOMPA_TEST/abstest.hkp
-%%DOCSDIR%%/TEST/ABSTOMPA_TEST/abstest.ins
-%%DOCSDIR%%/TEST/ABSTOMPA_TEST/abstest.lis
-%%DOCSDIR%%/TEST/ABSTOMPA_TEST/stand.hkl
-%%DOCSDIR%%/TEST/ABSTOMPA_TEST/stand.hkp
-%%DOCSDIR%%/TEST/ABSTOMPA_TEST/stand.ins
-%%DOCSDIR%%/TEST/ABSTOMPA_TEST/stand.lis
-%%DOCSDIR%%/TEST/ABSTOMPA_TEST/test1.hkl
-%%DOCSDIR%%/TEST/ABSTOMPA_TEST/test1.hkp
-%%DOCSDIR%%/TEST/ABSTOMPA_TEST/test1.ins
-%%DOCSDIR%%/TEST/ABSTOMPA_TEST/test1.lis
-%%DOCSDIR%%/TEST/ABSTOMPA_TEST/test2.hkl
-%%DOCSDIR%%/TEST/ABSTOMPA_TEST/test2.hkp
-%%DOCSDIR%%/TEST/ABSTOMPA_TEST/test2.ins
-%%DOCSDIR%%/TEST/ABSTOMPA_TEST/test2.lis
-%%DOCSDIR%%/TEST/ADDSYM_EXAMPLE/README
-%%DOCSDIR%%/TEST/ADDSYM_EXAMPLE/ex1.spf
-%%DOCSDIR%%/TEST/ADDSYM_EXAMPLE/ex2.ins
-%%DOCSDIR%%/TEST/ADDSYM_EXAMPLE/ex3.spf
-%%DOCSDIR%%/TEST/ASYM_EXAMPLE/README
-%%DOCSDIR%%/TEST/ASYM_EXAMPLE/asym.hkl.gz
-%%DOCSDIR%%/TEST/ASYM_EXAMPLE/asym.hkp.gz
-%%DOCSDIR%%/TEST/ASYM_EXAMPLE/asym.ins
-%%DOCSDIR%%/TEST/ASYM_EXAMPLE/asym.lis.gz
-%%DOCSDIR%%/TEST/MULABS_EXAMPLE/shelx.hkl.gz
-%%DOCSDIR%%/TEST/MULABS_EXAMPLE/shelx.hkp.gz
-%%DOCSDIR%%/TEST/MULABS_EXAMPLE/shelx.ins.gz
-%%DOCSDIR%%/TEST/MULABS_EXAMPLE/shelx.lis
-%%DOCSDIR%%/TEST/PSICOR_EXAMPLE/old_s588a.ps
-%%DOCSDIR%%/TEST/PSICOR_EXAMPLE/s588a.hkl
-%%DOCSDIR%%/TEST/PSICOR_EXAMPLE/s588a.hkp
-%%DOCSDIR%%/TEST/PSICOR_EXAMPLE/s588a.ins
-%%DOCSDIR%%/TEST/PSICOR_EXAMPLE/s588a.lis
-%%DOCSDIR%%/TEST/SQUEEZE_EXAMPLE/README.gz
-%%DOCSDIR%%/TEST/SQUEEZE_EXAMPLE/shelxl.hkl.gz
-%%DOCSDIR%%/TEST/SQUEEZE_EXAMPLE/shelxl.hkp.gz
-%%DOCSDIR%%/TEST/SQUEEZE_EXAMPLE/shelxl.lis.gz
-%%DOCSDIR%%/TEST/SQUEEZE_EXAMPLE/shelxl.res.gz
-%%DOCSDIR%%/TEST/SQUEEZE_EXAMPLE/shelxl.sqz.gz
-%%DOCSDIR%%/TEST/SQUEEZE_EXAMPLE/sqz.hkl.gz
-%%DOCSDIR%%/TEST/SQUEEZE_EXAMPLE/sqz.lis.gz
-%%DOCSDIR%%/TEST/SQUEEZE_EXAMPLE/sqz.res.gz
-%%DOCSDIR%%/azt.dat
-%%DOCSDIR%%/bucky.spf
-%%DOCSDIR%%/c476.spf
-%%DOCSDIR%%/c540.cart3d
-%%DOCSDIR%%/check.def
-%%DOCSDIR%%/cubane.spf
-%%DOCSDIR%%/cyto.spf
-%%DOCSDIR%%/ml.pdb
-%%DOCSDIR%%/s810c.cif
-%%DOCSDIR%%/s913a.res
-%%DOCSDIR%%/sucrose.spf
+%%PORTDOCS%%%%DOCSDIR%%/TEST/ABSORB_EXAMPLE/s588a.hkl.gz
+%%PORTDOCS%%%%DOCSDIR%%/TEST/ABSORB_EXAMPLE/s588a.hkp.gz
+%%PORTDOCS%%%%DOCSDIR%%/TEST/ABSORB_EXAMPLE/s588a.ins
+%%PORTDOCS%%%%DOCSDIR%%/TEST/ABSORB_EXAMPLE/s588a.lis
+%%PORTDOCS%%%%DOCSDIR%%/TEST/ABSTOMPA_EXAMPLE/s555b.hkl.gz
+%%PORTDOCS%%%%DOCSDIR%%/TEST/ABSTOMPA_EXAMPLE/s555b.hkp.gz
+%%PORTDOCS%%%%DOCSDIR%%/TEST/ABSTOMPA_EXAMPLE/s555b.ins
+%%PORTDOCS%%%%DOCSDIR%%/TEST/ABSTOMPA_EXAMPLE/s555b.lis.gz
+%%PORTDOCS%%%%DOCSDIR%%/TEST/ABSTOMPA_EXAMPLE/s588a.hkl.gz
+%%PORTDOCS%%%%DOCSDIR%%/TEST/ABSTOMPA_EXAMPLE/s588a.hkp.gz
+%%PORTDOCS%%%%DOCSDIR%%/TEST/ABSTOMPA_EXAMPLE/s588a.ins
+%%PORTDOCS%%%%DOCSDIR%%/TEST/ABSTOMPA_EXAMPLE/s588a.lis.gz
+%%PORTDOCS%%%%DOCSDIR%%/TEST/ABSTOMPA_TEST/README
+%%PORTDOCS%%%%DOCSDIR%%/TEST/ABSTOMPA_TEST/abstest.hkl
+%%PORTDOCS%%%%DOCSDIR%%/TEST/ABSTOMPA_TEST/abstest.hkp
+%%PORTDOCS%%%%DOCSDIR%%/TEST/ABSTOMPA_TEST/abstest.ins
+%%PORTDOCS%%%%DOCSDIR%%/TEST/ABSTOMPA_TEST/abstest.lis
+%%PORTDOCS%%%%DOCSDIR%%/TEST/ABSTOMPA_TEST/stand.hkl
+%%PORTDOCS%%%%DOCSDIR%%/TEST/ABSTOMPA_TEST/stand.hkp
+%%PORTDOCS%%%%DOCSDIR%%/TEST/ABSTOMPA_TEST/stand.ins
+%%PORTDOCS%%%%DOCSDIR%%/TEST/ABSTOMPA_TEST/stand.lis
+%%PORTDOCS%%%%DOCSDIR%%/TEST/ABSTOMPA_TEST/test1.hkl
+%%PORTDOCS%%%%DOCSDIR%%/TEST/ABSTOMPA_TEST/test1.hkp
+%%PORTDOCS%%%%DOCSDIR%%/TEST/ABSTOMPA_TEST/test1.ins
+%%PORTDOCS%%%%DOCSDIR%%/TEST/ABSTOMPA_TEST/test1.lis
+%%PORTDOCS%%%%DOCSDIR%%/TEST/ABSTOMPA_TEST/test2.hkl
+%%PORTDOCS%%%%DOCSDIR%%/TEST/ABSTOMPA_TEST/test2.hkp
+%%PORTDOCS%%%%DOCSDIR%%/TEST/ABSTOMPA_TEST/test2.ins
+%%PORTDOCS%%%%DOCSDIR%%/TEST/ABSTOMPA_TEST/test2.lis
+%%PORTDOCS%%%%DOCSDIR%%/TEST/ADDSYM_EXAMPLE/README
+%%PORTDOCS%%%%DOCSDIR%%/TEST/ADDSYM_EXAMPLE/ex1.spf
+%%PORTDOCS%%%%DOCSDIR%%/TEST/ADDSYM_EXAMPLE/ex2.ins
+%%PORTDOCS%%%%DOCSDIR%%/TEST/ADDSYM_EXAMPLE/ex3.spf
+%%PORTDOCS%%%%DOCSDIR%%/TEST/ASYM_EXAMPLE/README
+%%PORTDOCS%%%%DOCSDIR%%/TEST/ASYM_EXAMPLE/asym.hkl.gz
+%%PORTDOCS%%%%DOCSDIR%%/TEST/ASYM_EXAMPLE/asym.hkp.gz
+%%PORTDOCS%%%%DOCSDIR%%/TEST/ASYM_EXAMPLE/asym.ins
+%%PORTDOCS%%%%DOCSDIR%%/TEST/ASYM_EXAMPLE/asym.lis.gz
+%%PORTDOCS%%%%DOCSDIR%%/TEST/MULABS_EXAMPLE/shelx.hkl.gz
+%%PORTDOCS%%%%DOCSDIR%%/TEST/MULABS_EXAMPLE/shelx.hkp.gz
+%%PORTDOCS%%%%DOCSDIR%%/TEST/MULABS_EXAMPLE/shelx.ins.gz
+%%PORTDOCS%%%%DOCSDIR%%/TEST/MULABS_EXAMPLE/shelx.lis
+%%PORTDOCS%%%%DOCSDIR%%/TEST/PSICOR_EXAMPLE/old_s588a.ps
+%%PORTDOCS%%%%DOCSDIR%%/TEST/PSICOR_EXAMPLE/s588a.hkl
+%%PORTDOCS%%%%DOCSDIR%%/TEST/PSICOR_EXAMPLE/s588a.hkp
+%%PORTDOCS%%%%DOCSDIR%%/TEST/PSICOR_EXAMPLE/s588a.ins
+%%PORTDOCS%%%%DOCSDIR%%/TEST/PSICOR_EXAMPLE/s588a.lis
+%%PORTDOCS%%%%DOCSDIR%%/TEST/SQUEEZE_EXAMPLE/README.gz
+%%PORTDOCS%%%%DOCSDIR%%/TEST/SQUEEZE_EXAMPLE/shelxl.hkl.gz
+%%PORTDOCS%%%%DOCSDIR%%/TEST/SQUEEZE_EXAMPLE/shelxl.hkp.gz
+%%PORTDOCS%%%%DOCSDIR%%/TEST/SQUEEZE_EXAMPLE/shelxl.lis.gz
+%%PORTDOCS%%%%DOCSDIR%%/TEST/SQUEEZE_EXAMPLE/shelxl.res.gz
+%%PORTDOCS%%%%DOCSDIR%%/TEST/SQUEEZE_EXAMPLE/shelxl.sqz.gz
+%%PORTDOCS%%%%DOCSDIR%%/TEST/SQUEEZE_EXAMPLE/sqz.hkl.gz
+%%PORTDOCS%%%%DOCSDIR%%/TEST/SQUEEZE_EXAMPLE/sqz.lis.gz
+%%PORTDOCS%%%%DOCSDIR%%/TEST/SQUEEZE_EXAMPLE/sqz.res.gz
+%%PORTDOCS%%%%DOCSDIR%%/azt.dat
+%%PORTDOCS%%%%DOCSDIR%%/bucky.spf
+%%PORTDOCS%%%%DOCSDIR%%/c476.spf
+%%PORTDOCS%%%%DOCSDIR%%/c540.cart3d
+%%PORTDOCS%%%%DOCSDIR%%/check.def
+%%PORTDOCS%%%%DOCSDIR%%/cubane.spf
+%%PORTDOCS%%%%DOCSDIR%%/cyto.spf
+%%PORTDOCS%%%%DOCSDIR%%/ml.pdb
+%%PORTDOCS%%%%DOCSDIR%%/s810c.cif
+%%PORTDOCS%%%%DOCSDIR%%/s913a.res
+%%PORTDOCS%%%%DOCSDIR%%/sucrose.spf
 %%PORTDOCS%%%%DOCSDIR%%/platon_html.tar.gz