aboutsummaryrefslogtreecommitdiff
path: root/biology
diff options
context:
space:
mode:
authorTijl Coosemans <tijl@FreeBSD.org>2013-12-18 18:27:04 +0000
committerTijl Coosemans <tijl@FreeBSD.org>2013-12-18 18:27:04 +0000
commit1555ae4f314511fd596fa29d01b010d17ffdce00 (patch)
treed74b642176a85226ad068a0ee960a37eef96566c /biology
parenta7481c3ea5a1e6427c5de53c19a9a24c1ba8bbe6 (diff)
downloadports-1555ae4f314511fd596fa29d01b010d17ffdce00.tar.gz
ports-1555ae4f314511fd596fa29d01b010d17ffdce00.zip
Notes
Diffstat (limited to 'biology')
-rw-r--r--biology/tinker/Makefile40
-rw-r--r--biology/tinker/files/patch-make__Makefile2
2 files changed, 20 insertions, 22 deletions
diff --git a/biology/tinker/Makefile b/biology/tinker/Makefile
index 5e4a0ae187a0..75274ef7bcc5 100644
--- a/biology/tinker/Makefile
+++ b/biology/tinker/Makefile
@@ -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 modelling package
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 <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
.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 <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/biology/tinker/files/patch-make__Makefile b/biology/tinker/files/patch-make__Makefile
index 0fa8c9e795c2..8417bb2c8ce7 100644
--- a/biology/tinker/files/patch-make__Makefile
+++ b/biology/tinker/files/patch-make__Makefile
@@ -8,7 +8,7 @@
-BINDIR = $(TINKERDIR)/bin
-LINKDIR = /usr/local/bin
+TINKERDIR = ${WRKDIR}
-+BINDIR = ${PREFIX}/bin
++BINDIR = ${DESTDIR}${PREFIX}/bin
+#LINKDIR = /usr/local/bin
####################################################################