diff options
| author | Steve Price <steve@FreeBSD.org> | 1999-05-24 02:01:41 +0000 |
|---|---|---|
| committer | Steve Price <steve@FreeBSD.org> | 1999-05-24 02:01:41 +0000 |
| commit | e13591e2ec6b5e41da75edd3b5e3102107fbe76c (patch) | |
| tree | e48c16232292a9e2f69ad64b6026b1e6738f143e /biology/tinker | |
| parent | Remove '-p' since ${MKDIR} == 'mkdir -p'. (diff) | |
Fix build on -current (Alpha) machines.
Notes
Notes:
svn path=/head/; revision=18958
Diffstat (limited to 'biology/tinker')
| -rw-r--r-- | biology/tinker/Makefile | 30 | ||||
| -rw-r--r-- | biology/tinker/files/patch-aa | 17 |
2 files changed, 29 insertions, 18 deletions
diff --git a/biology/tinker/Makefile b/biology/tinker/Makefile index 2c9cf9926b24..b4161f6fcbda 100644 --- a/biology/tinker/Makefile +++ b/biology/tinker/Makefile @@ -3,32 +3,36 @@ # Date Created: 26 August 1998 # Whom: Glenn Johnson # -# $Id: Makefile,v 1.1.1.1 1998/11/17 04:53:17 jkoshy Exp $ +# $Id: Makefile,v 1.2 1998/11/18 02:10:54 jkoshy Exp $ # -DISTNAME= tinker -PKGNAME= tinker-3.6 -CATEGORIES= biology -MASTER_SITES= ftp://dasher.wustl.edu/pub/ +DISTNAME= tinker +PKGNAME= tinker-3.6 +CATEGORIES= biology +MASTER_SITES= ftp://dasher.wustl.edu/pub/ -MAINTAINER= gjohnson@nola.srrc.usda.gov +MAINTAINER= gjohnson@nola.srrc.usda.gov +.include <bsd.port.pre.mk> + +.if ${OSVERSION} < 400005 LIB_DEPENDS= U77:${PORTSDIR}/devel/libU77 # If you have EGCS installed and wish to use it, do the following: # a) comment out the LIB_DEPENDS line above and uncomment the following line #BUILD_DEPENDS= g77:${PORTSDIR}/lang/egcs # b) set env variable 'FC' to 'g77' before running `make' +.else +MAKE_ENV+= HAVE_G2C=yes +.endif -.include <bsd.port.pre.mk> - -WRKSRC= ${WRKDIR}/tinker/source +WRKSRC= ${WRKDIR}/tinker/source -MAKEFILE= ${WRKDIR}/tinker/make/Makefile -ALL_TARGET= all listing -INSTALL_TARGET= rename +MAKEFILE= ${WRKDIR}/tinker/make/Makefile +ALL_TARGET= all listing +INSTALL_TARGET= rename -RESTRICTED= author requests no distribution except from his FTP site +RESTRICTED= author requests no distribution except from his FTP site post-install: ${MKDIR} ${PREFIX}/share/tinker/params diff --git a/biology/tinker/files/patch-aa b/biology/tinker/files/patch-aa index 455841a57a8e..fecd6d99f52c 100644 --- a/biology/tinker/files/patch-aa +++ b/biology/tinker/files/patch-aa @@ -1,5 +1,5 @@ *** ../make/Makefile.orig Sat Apr 11 11:38:14 1998 ---- ../make/Makefile Sat Nov 14 02:05:02 1998 +--- ../make/Makefile Sat May 22 15:08:09 1999 *************** *** 9,16 **** ## @@ -71,7 +71,7 @@ ## Machine: Silicon Graphics *************** *** 104,109 **** ---- 104,134 ---- +--- 104,141 ---- #diagq.o: # ${F77} ${F77FLAGS} -ffast-math diagq.f @@ -86,7 +86,11 @@ + RM = /bin/rm + + .if ${FC}==f77 ++ .if !defined(HAVE_G2C) + LIBS = -lU77 ++ .else ++ LIBS = -lg2c ++ .endif + F77FLAGS = -NL400 -c + LINKFLAGS = -L${PREFIX}/lib + .elseif ${FC}==g77 @@ -95,7 +99,10 @@ + LINKFLAGS = + .endif + -+ OPTFLAGS = ${FFLAGS} -ffast-math -malign-double ++ OPTFLAGS = ${FFLAGS} -ffast-math ++ .if ${MACHINE_ARCH} == "i386" ++ OPTFLAGS+= -malign-double ++ .endif + LIBFLAGS = -rcuv + diagq.o: + ${F77} ${F77FLAGS} -ffast-math diagq.f @@ -105,7 +112,7 @@ ################################################################# *************** *** 766,771 **** ---- 791,797 ---- +--- 798,804 ---- volume2.o \ writeout.o \ xyzatm.o @@ -165,7 +172,7 @@ remove_links: rm -f $(LINKDIR)/alchemy ---- 883,932 ---- +--- 890,939 ---- ${F77} ${LINKFLAGS} -o xyzsybyl.x xyzsybyl.o libtinker.a ${LIBS} rename: |