From owner-svn-ports-all@FreeBSD.ORG Sun Mar 8 23:13:23 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DE92984D; Sun, 8 Mar 2015 23:13:23 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C87A5666; Sun, 8 Mar 2015 23:13:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t28NDNti014357; Sun, 8 Mar 2015 23:13:23 GMT (envelope-from mi@FreeBSD.org) Received: (from mi@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t28NDMZY014346; Sun, 8 Mar 2015 23:13:22 GMT (envelope-from mi@FreeBSD.org) Message-Id: <201503082313.t28NDMZY014346@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mi set sender to mi@FreeBSD.org using -f From: Mikhail Teterin Date: Sun, 8 Mar 2015 23:13:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r380806 - in head/biology/platon: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Mar 2015 23:13:24 -0000 Author: mi Date: Sun Mar 8 23:13:21 2015 New Revision: 380806 URL: https://svnweb.freebsd.org/changeset/ports/380806 QAT: https://qat.redports.org/buildarchive/r380806/ Log: Unbreak by upgrading to March 5, 2015 "release" from upstream. Reduce restrictions from RESTRICTED to NO_CDROM -- the licensing allows use by academic community as long as it is not redistributed. Upstream still do not version their "releases", so next time they reroll the tarball, the download will start breaking again. But this time, it will be possible to fetch it from FreeBSD mirrors. Hide most of the optional data files under the DOCS-option and streamline various build-related scriptlets. Added: head/biology/platon/files/patch-warnings (contents, props changed) Modified: head/biology/platon/Makefile head/biology/platon/distinfo head/biology/platon/files/Makefile head/biology/platon/pkg-plist Modified: head/biology/platon/Makefile ============================================================================== --- head/biology/platon/Makefile Sun Mar 8 22:05:32 2015 (r380805) +++ head/biology/platon/Makefile Sun Mar 8 23:13:21 2015 (r380806) @@ -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_EXA OPTIONS_DEFINE= DOCS +MAKEFILE= ${FILESDIR}/Makefile + .include 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 Modified: head/biology/platon/distinfo ============================================================================== --- head/biology/platon/distinfo Sun Mar 8 22:05:32 2015 (r380805) +++ head/biology/platon/distinfo Sun Mar 8 23:13:21 2015 (r380806) @@ -1,2 +1,2 @@ -SHA256 (platon.tar.gz) = f94c63180a9059a4a3fbca248fdee11cd62996cfacc1bb1b0cd54f2944fd0ac3 -SIZE (platon.tar.gz) = 10950174 +SHA256 (platon.tar.gz) = 607d568ccec11a83558aa8afe2299d6ac66afdb2e56efdcfe2b913b5639a5cfb +SIZE (platon.tar.gz) = 12091579 Modified: head/biology/platon/files/Makefile ============================================================================== --- head/biology/platon/files/Makefile Sun Mar 8 22:05:32 2015 (r380805) +++ head/biology/platon/files/Makefile Sun Mar 8 23:13:21 2015 (r380806) @@ -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 Added: head/biology/platon/files/patch-warnings ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/biology/platon/files/patch-warnings Sun Mar 8 23:13:21 2015 (r380806) @@ -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 */ Modified: head/biology/platon/pkg-plist ============================================================================== --- head/biology/platon/pkg-plist Sun Mar 8 22:05:32 2015 (r380805) +++ head/biology/platon/pkg-plist Sun Mar 8 23:13:21 2015 (r380806) @@ -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