From owner-svn-ports-all@freebsd.org Tue Nov 13 07:03:17 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A7F1F110665E; Tue, 13 Nov 2018 07:03:17 +0000 (UTC) (envelope-from jmd@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A19AE75F3A; Tue, 13 Nov 2018 07:03:16 +0000 (UTC) (envelope-from jmd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8235D4EB0; Tue, 13 Nov 2018 07:03:16 +0000 (UTC) (envelope-from jmd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wAD73G61076630; Tue, 13 Nov 2018 07:03:16 GMT (envelope-from jmd@FreeBSD.org) Received: (from jmd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAD73GWF076628; Tue, 13 Nov 2018 07:03:16 GMT (envelope-from jmd@FreeBSD.org) Message-Id: <201811130703.wAD73GWF076628@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jmd set sender to jmd@FreeBSD.org using -f From: Johannes M Dieterich Date: Tue, 13 Nov 2018 07:03:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r484858 - in head/biology/molden: . files X-SVN-Group: ports-head X-SVN-Commit-Author: jmd X-SVN-Commit-Paths: in head/biology/molden: . files X-SVN-Commit-Revision: 484858 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: A19AE75F3A X-Spamd-Result: default: False [-106.88 / 200.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; ALLOW_DOMAIN_WHITELIST(-100.00)[FreeBSD.org]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; TO_DN_NONE(0.00)[]; HAS_XAW(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; DMARC_NA(0.00)[FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; MX_GOOD(-0.01)[cached: mx1.FreeBSD.org]; NEURAL_HAM_SHORT(-1.00)[-1.000,0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; IP_SCORE(-3.77)[ip: (-9.91), ipnet: 2610:1c1:1::/48(-4.93), asn: 11403(-3.91), country: US(-0.09)] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 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: Tue, 13 Nov 2018 07:03:18 -0000 Author: jmd Date: Tue Nov 13 07:03:15 2018 New Revision: 484858 URL: https://svnweb.freebsd.org/changeset/ports/484858 Log: biology/molden: update to 5.8.2 Also add do-install-{option}-on targets and shadow ${MKDIR} commands. PR: 233060 Submitted by: yuri Added: head/biology/molden/files/patch-xwin.c (contents, props changed) Modified: head/biology/molden/Makefile head/biology/molden/distinfo Modified: head/biology/molden/Makefile ============================================================================== --- head/biology/molden/Makefile Tue Nov 13 05:36:53 2018 (r484857) +++ head/biology/molden/Makefile Tue Nov 13 07:03:15 2018 (r484858) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= molden -PORTVERSION= 5.7 -PORTREVISION= 16 +DISTVERSION= 5.8.2 PORTEPOCH= 1 CATEGORIES= biology MASTER_SITES= ftp://ftp.cmbi.umcn.nl/pub/molgraph/molden/ @@ -19,7 +18,7 @@ LICENSE_PERMS= auto-accept RESTRICTED= free for academic, non profit usage; do not re-distribute source and executable. -WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION} +WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION:R} USES= fortran gl gmake USE_XORG= x11 @@ -62,11 +61,15 @@ do-install: .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) + +do-install-DATA-on: + @${MKDIR} ${STAGEDIR}${DATADIR}/test + (cd ${WRKSRC}/test && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/test) ${MKDIR} ${STAGEDIR}${DATADIR}/utils - (cd ${WRKSRC}/utils && ${INSTALL_DATA} * ${STAGEDIR}${DATADIR}/utils) + (cd ${WRKSRC}/utils && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/utils) + +do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} - (cd ${WRKSRC}/doc && ${INSTALL_DATA} * ${STAGEDIR}${DOCSDIR}) + (cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) .include Modified: head/biology/molden/distinfo ============================================================================== --- head/biology/molden/distinfo Tue Nov 13 05:36:53 2018 (r484857) +++ head/biology/molden/distinfo Tue Nov 13 07:03:15 2018 (r484858) @@ -1,3 +1,3 @@ -TIMESTAMP = 1526851227 -SHA256 (molden5.7.tar.gz) = 10e3c02b63e6aa277922488f48be1bbd231e5bb111fb86fa162293a6fbc9718a -SIZE (molden5.7.tar.gz) = 5346379 +TIMESTAMP = 1541594934 +SHA256 (molden5.8.2.tar.gz) = 65a24db9e80b4fb6038cc1e57c7d6e2457414812c9389bc651af7cb33f01dbe9 +SIZE (molden5.8.2.tar.gz) = 5770998 Added: head/biology/molden/files/patch-xwin.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/biology/molden/files/patch-xwin.c Tue Nov 13 07:03:15 2018 (r484858) @@ -0,0 +1,32 @@ +--- xwin.c.orig 2018-11-07 12:54:20 UTC ++++ xwin.c +@@ -4218,8 +4218,12 @@ void makeRasterFont(Display *dpy); + #include + + #include +-#if defined(__APPLE__) || defined(__FreeBSD__) ++#if defined(__APPLE__) + #include ++#elif defined(__FreeBSD__) ++#include ++#include ++#include + #else + #include + #endif +@@ -4238,9 +4242,14 @@ int OSCopyFile(const char* source, const + } + + //Here we use kernel-space copying for performance reasons +-#if defined(__APPLE__) || defined(__FreeBSD__) ++#if defined(__APPLE__) + //fcopyfile works on FreeBSD and OS X 10.5+ + int result = fcopyfile(input, output, 0, COPYFILE_ALL); ++#elif defined(__FreeBSD__) ++ off_t bytesCopied = 0; ++ struct stat fileinfo = {0}; ++ fstat(input, &fileinfo); ++ int result = sendfile(output, input, 0/*ofset*/, fileinfo.st_size, 0/*hdtr*/, &bytesCopied, 0/*flags*/); + #else + //sendfile will work with non-socket output (i.e. regular file) on Linux 2.6.33+ + off_t bytesCopied = 0;