From owner-svn-ports-head@FreeBSD.ORG Wed Dec 18 18:27:06 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 098F5930; Wed, 18 Dec 2013 18:27:06 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E95FE16B5; Wed, 18 Dec 2013 18:27:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBIIR5B7014772; Wed, 18 Dec 2013 18:27:05 GMT (envelope-from tijl@svn.freebsd.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBIIR5dK014768; Wed, 18 Dec 2013 18:27:05 GMT (envelope-from tijl@svn.freebsd.org) Message-Id: <201312181827.rBIIR5dK014768@svn.freebsd.org> From: Tijl Coosemans Date: Wed, 18 Dec 2013 18:27:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336854 - in head: biology/tinker biology/tinker/files textproc/hunspell X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Dec 2013 18:27:06 -0000 Author: tijl Date: Wed Dec 18 18:27:04 2013 New Revision: 336854 URL: http://svnweb.freebsd.org/changeset/ports/336854 Log: - biology/tinker: USES=fortran, staging. - Add CONFLICTS_INSTALL between hunspell and tinker. Both install bin/analyze. Modified: head/biology/tinker/Makefile head/biology/tinker/files/patch-make__Makefile head/textproc/hunspell/Makefile Modified: head/biology/tinker/Makefile ============================================================================== --- head/biology/tinker/Makefile Wed Dec 18 18:15:58 2013 (r336853) +++ head/biology/tinker/Makefile Wed Dec 18 18:27:04 2013 (r336854) @@ -3,7 +3,7 @@ PORTNAME= tinker PORTVERSION= 6.2.06 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= biology MASTER_SITES= http://dasher.wustl.edu/tinker/downloads/ @@ -12,6 +12,8 @@ COMMENT= General purpose molecular model RESTRICTED= author requests no distribution except from his FTP site +CONFLICTS_INSTALL= hunspell-[0-9]* + OPTIONS_DEFINE= OPTIMIZED_FFLAGS DOCS EXAMPLES OPTIMIZED_FFLAGS_DESC= compilation optimizations @@ -19,7 +21,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME} BUILD_WRKSRC= ${WRKSRC}/source INSTALL_WRKSRC= ${WRKSRC}/source -USE_FORTRAN= yes +USES= fortran MAKE_ENV= HAVE_G2C=yes MAKEFILE= ${WRKSRC}/make/Makefile ALL_TARGET= all listing @@ -27,8 +29,7 @@ INSTALL_TARGET= rename SUB_FILES= pkg-message -NO_STAGE= yes -.include +.include .if ${PORT_OPTIONS:MOPTIMIZED_FFLAGS} FFLAGS+= -O3 -ffast-math -finline-functions -fomit-frame-pointer -funroll-loops -fexpensive-optimizations @@ -41,31 +42,28 @@ post-extract: @${CHMOD} -R u+w ${WRKSRC} pre-build: - @${RM} -f ${BUILD_WRKSRC}/*.c + @${RM} -f ${BUILD_WRKSRC}/*.c post-install: - @${MKDIR} ${DATADIR} - (cd ${INSTALL_WRKSRC} && ${INSTALL_DATA} tinker.txt ${DATADIR}) - @${MKDIR} ${DATADIR}/bench + ${MKDIR} ${STAGEDIR}${DATADIR} + (cd ${INSTALL_WRKSRC} && ${INSTALL_DATA} tinker.txt ${STAGEDIR}${DATADIR}) + ${MKDIR} ${STAGEDIR}${DATADIR}/bench (cd ${WRKSRC}/bench && ${INSTALL_DATA} \ 0README *.dyn0 *.log *.key *.run *.xyz results* \ - ${DATADIR}/bench) - @${MKDIR} ${DATADIR}/params - (cd ${WRKSRC}/params && ${INSTALL_DATA} * ${DATADIR}/params) - @${MKDIR} ${DATADIR}/test - (cd ${WRKSRC}/test && ${INSTALL_DATA} * ${DATADIR}/test) + ${STAGEDIR}${DATADIR}/bench) + ${MKDIR} ${STAGEDIR}${DATADIR}/params + (cd ${WRKSRC}/params && ${INSTALL_DATA} * ${STAGEDIR}${DATADIR}/params) + ${MKDIR} ${STAGEDIR}${DATADIR}/test + (cd ${WRKSRC}/test && ${INSTALL_DATA} * ${STAGEDIR}${DATADIR}/test) .if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - (cd ${WRKSRC}/doc && ${INSTALL_DATA} 0README *.pdf *.txt ${DOCSDIR}) + ${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC}/doc && ${INSTALL_DATA} 0README *.pdf *.txt ${STAGEDIR}${DOCSDIR}) .endif .if ${PORT_OPTIONS:MEXAMPLES} - @${MKDIR} ${EXAMPLESDIR} + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} (cd ${WRKSRC}/example && ${INSTALL_DATA} \ 0README *.make *.dyn *.int *.frac *.key *.seq *.pdb *.xyz \ - ${EXAMPLESDIR}) + ${STAGEDIR}${EXAMPLESDIR}) .endif - @${ECHO_CMD} - @${CAT} ${PKGMESSAGE} - @${ECHO_CMD} -.include +.include Modified: head/biology/tinker/files/patch-make__Makefile ============================================================================== --- head/biology/tinker/files/patch-make__Makefile Wed Dec 18 18:15:58 2013 (r336853) +++ head/biology/tinker/files/patch-make__Makefile Wed Dec 18 18:27:04 2013 (r336854) @@ -8,7 +8,7 @@ -BINDIR = $(TINKERDIR)/bin -LINKDIR = /usr/local/bin +TINKERDIR = ${WRKDIR} -+BINDIR = ${PREFIX}/bin ++BINDIR = ${DESTDIR}${PREFIX}/bin +#LINKDIR = /usr/local/bin #################################################################### Modified: head/textproc/hunspell/Makefile ============================================================================== --- head/textproc/hunspell/Makefile Wed Dec 18 18:15:58 2013 (r336853) +++ head/textproc/hunspell/Makefile Wed Dec 18 18:27:04 2013 (r336854) @@ -3,7 +3,7 @@ PORTNAME= hunspell PORTVERSION= 1.3.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= textproc MASTER_SITES= SF/${PORTNAME}/Hunspell/${PORTVERSION} DIST_SUBDIR= ${PORTNAME} @@ -14,6 +14,7 @@ COMMENT= Improved spell-checker for Hung LICENSE= GPLv2 LGPL21 MPL LICENSE_COMB= dual +CONFLICTS_INSTALL= tinker-[0-9]* CONFIGURE_ARGS= --disable-nls ${ICONV_CONFIGURE_ARG} --with-readline --with-ui GNU_CONFIGURE= yes USES= pathfix iconv ncurses readline shebangfix perl5