Date: Thu, 19 Apr 2001 15:27:04 -0500 (CDT) From: gjohnson@srrc.ars.usda.gov To: FreeBSD-gnats-submit@freebsd.org Subject: ports/26710: Update of biology/tinker port Message-ID: <200104192027.f3JKR4E72148@node7.cluster.srrc.usda.gov>
next in thread | raw e-mail | index | archive | help
>Number: 26710
>Category: ports
>Synopsis: Update the biology/tinker port
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Thu Apr 19 13:30:02 PDT 2001
>Closed-Date:
>Last-Modified:
>Originator: Glenn Johnson
>Release: FreeBSD 4.2-STABLE i386
>Organization:
USDA,ARS, SRRC
>Environment:
>Description:
Update the biology/tinker port. The following changes have been
made:
[1] Update my e-mail address.
[2] The author updated the distfile. There is no version number in
distfile name so update PORTREVISION.
[3] Remove the cruft for building on older FreeBSD systems as I have no
way of knowing if this port still compiles and/or runs on systems
with older versions of FreeBSD.
>How-To-Repeat:
>Fix:
Apply the following patch to biology/tinker:
diff -ruN tinker.old/Makefile tinker/Makefile
--- tinker.old/Makefile Thu Apr 19 09:55:16 2001
+++ tinker/Makefile Thu Apr 19 14:57:16 2001
@@ -7,27 +7,14 @@
PORTNAME= tinker
PORTVERSION= 3.8
+PORTREVISION= 1
CATEGORIES= biology
MASTER_SITES= ftp://dasher.wustl.edu/pub/
DISTNAME= ${PORTNAME}
-MAINTAINER= gjohnson@nola.srrc.usda.gov
+MAINTAINER= gjohnson@srrc.ars.usda.gov
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 400005
-LIB_DEPENDS= U77:${PORTSDIR}/devel/libU77
-
-# If you wish to use g77 from EGCS, 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'; or 'make FC=g77'
-
-.else
MAKE_ENV+= HAVE_G2C=yes INSTALL_PROGRAM="${INSTALL_PROGRAM}"
-.endif
WRKSRC= ${WRKDIR}/tinker/source
@@ -37,7 +24,6 @@
RESTRICTED= author requests no distribution except from his FTP site
-
.if defined(WANT_VIEWER)
.if ${XFREE86_VERSION} == 3
BUILD_DEPENDS+= imake:${PORTSDIR}/devel/imake
@@ -122,7 +108,7 @@
.if defined(WANT_VIEWER)
${MKDIR} ${PREFIX}/share/tinker/rasmol
- ${INSTALL_PROGRAM} ${WRKDIR}/tinker/rasmol/tview-* ${PREFIX}/bin
+ ${INSTALL_PROGRAM} ${WRKDIR}/tinker/rasmol/tview-* ${PREFIX}/bin
${INSTALL_DATA} ${WRKDIR}/tinker/rasmol/rasmol.hlp ${PREFIX}/share/tinker/rasmol
.endif
@@ -132,8 +118,8 @@
@${ECHO} " The author requests that you return a license form "
@${ECHO} " to him if you find Tinker to be useful. "
@${ECHO} " "
- @${ECHO} " See ${PREFIX}/share/tinker/doc for license forms. "
+ @${ECHO} " See ${PREFIX}/share/doc/tinker for license forms. "
@${ECHO} " **********************************************************"
@${ECHO} ""
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -ruN tinker.old/distinfo tinker/distinfo
--- tinker.old/distinfo Thu Apr 19 09:55:16 2001
+++ tinker/distinfo Thu Apr 19 09:58:30 2001
@@ -1 +1 @@
-MD5 (tinker.tar.gz) = e3784b524b5e8acf80b592657c457602
+MD5 (tinker.tar.gz) = 11e66fb5452e2153a2ced410ea9acadb
diff -ruN tinker.old/files/patch-aa tinker/files/patch-aa
--- tinker.old/files/patch-aa Thu Apr 19 09:55:15 2001
+++ tinker/files/patch-aa Thu Apr 19 14:40:14 2001
@@ -1,5 +1,5 @@
--- ../make/Makefile.orig Mon Jan 15 12:39:52 2001
-+++ ../make/Makefile Mon Jan 15 15:48:37 2001
++++ ../make/Makefile Thu Apr 19 14:39:26 2001
@@ -9,8 +9,8 @@
##
## 1. make all Build all the TINKER executables
@@ -43,7 +43,7 @@
##
## Machine: IntelPC / Linux
-@@ -108,6 +108,35 @@
+@@ -108,6 +108,24 @@
#LIBFLAGS = -crusv
#LINKFLAGS =
@@ -52,23 +52,12 @@
+## CPU Type: Intel, AMD, Cyrix
+## Oper Sys: FreeBSD 4.2
+## Compiler: f77 , aka g77
++##
+
+F77 = ${FC}
-+.if ${FC}==f77
-+.if !defined(HAVE_G2C)
-+LIBS = -lU77
-+F77FLAGS = -NL400 -c -w
-+LINKFLAGS = -L${PREFIX}/lib
-+.else
-+LIBS =
-+F77FLAGS = -Wno-globals -fno-globals -c -w
-+LINKFLAGS =
-+.endif
-+.elseif ${FC}==g77
+LIBS =
+F77FLAGS = -Wno-globals -fno-globals -c -w
+LINKFLAGS =
-+.endif
+
+OPTFLAGS = ${FFLAGS} -ffast-math
+.if ${MACHINE_ARCH} == "i386"
@@ -79,7 +68,7 @@
#################################################################
## Should not be Necessary to Change Things Below this Point ##
#################################################################
-@@ -486,11 +515,13 @@
+@@ -486,11 +504,13 @@
xyzpdb.x \
xyzsybyl.x
@@ -95,7 +84,7 @@
all: ${EXEFILES}
-@@ -501,56 +532,56 @@
+@@ -501,56 +521,56 @@
cat *.i *.f > tinker.txt
rename:
@@ -202,7 +191,7 @@
remove_links:
rm -f $(LINKDIR)/alchemy
-@@ -671,8 +702,8 @@
+@@ -671,8 +691,8 @@
bspline.o \
calendar.o \
center.o \
diff -ruN tinker.old/pkg-plist tinker/pkg-plist
--- tinker.old/pkg-plist Thu Apr 19 09:55:16 2001
+++ tinker/pkg-plist Thu Apr 19 14:06:01 2001
@@ -159,6 +159,7 @@
share/tinker/test/azulene.xyz
share/tinker/test/bdna.int
share/tinker/test/bdna.key
+share/tinker/test/bdna.make
share/tinker/test/bdna.seq
share/tinker/test/bdna.xyz
share/tinker/test/bearing.key
diff -ruN tinker.old/pkg-plist.viewer tinker/pkg-plist.viewer
--- tinker.old/pkg-plist.viewer Thu Apr 19 09:55:16 2001
+++ tinker/pkg-plist.viewer Thu Apr 19 14:06:19 2001
@@ -163,6 +163,7 @@
share/tinker/test/azulene.xyz
share/tinker/test/bdna.int
share/tinker/test/bdna.key
+share/tinker/test/bdna.make
share/tinker/test/bdna.seq
share/tinker/test/bdna.xyz
share/tinker/test/bearing.key
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200104192027.f3JKR4E72148>