2 files changed, 19 insertions, 33 deletions

diff --git a/biology/fastdnaml/Makefile b/biology/fastdnaml/Makefile
index 39a3c51d8e2a..57b0369bf71d 100644
--- a/biology/fastdnaml/Makefile
+++ b/biology/fastdnaml/Makefile
@@ -7,30 +7,28 @@
 
 PORTNAME=	fastdnaml
 PORTVERSION=	1.2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	biology
-MASTER_SITES=	http://geta.life.uiuc.edu:80/~gary/programs/fastDNAml/
+MASTER_SITES=	http://www.life.illinois.edu/gary/programs/fastDNAml/
 DISTNAME=	fastDNAml_${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Faster DNAML, makes phylogenetic trees using maximum likelihood
 
-DEPRECATED=	No more public distfiles
-EXPIRATION_DATE=	2011-09-01
+LICENSE=	GPLv2 # (or later)
+LICENSE_FILE=	${WRKSRC}/GNU_GENERAL_PUBLIC_LICENSE
 
-USE_GMAKE=	yes
-do-build:
-	@(cd ${WRKSRC}/source; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
+BUILD_WRKSRC=	${WRKSRC}/source
+
+MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}"
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/source/fastDNAml ${PREFIX}/bin
-	${MKDIR} ${PREFIX}/bin/${PORTNAME}
+	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/fastDNAml ${PREFIX}/bin
+	@${MKDIR} ${PREFIX}/bin/${PORTNAME}
 	${INSTALL_SCRIPT} ${WRKSRC}/scripts/* ${PREFIX}/bin/${PORTNAME}
-
-post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/docs/*.txt ${PREFIX}/share/doc/${PORTNAME}
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/docs/*.txt ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/biology/fastdnaml/pkg-descr b/biology/fastdnaml/pkg-descr
index 391df7e37c84..92c534eac604 100644
--- a/biology/fastdnaml/pkg-descr
+++ b/biology/fastdnaml/pkg-descr
@@ -1,22 +1,10 @@
-fastDNAml is a program for estimating maximum likelihood phylogenetic trees
-from nucleotide sequences. 
+fastDNAml is a program derived from Joseph Felsenstein's version 3.3 DNAML
+(part of his PHYLIP package). Users should consult the documentation for
+DNAML before using this program.
 
-WWW: http://geta.life.uiuc.edu/~gary/programs/fastDNAml.html
+fastDNAml is an attempt to solve the same problem as DNAML, but to do so
+faster and using less memory, so that larger trees and/or more bootstrap
+replicates become tractable. Much of fastDNAml is merely a recoding of the
+PHYLIP 3.3 DNAML program from PASCAL to C.
 
-fastDNAml is an attempt to solve the same problem as Joseph Felsenstein's
-DNAML, but to do so faster and using less memory, so that larger trees and/or
-more bootstrap replicates become tractable. Much of fastDNAml is merely a
-recoding of the PHYLIP 3.3 DNAML program from PASCAL to C. 
-
-For Felsenstein's phylogenetic analysis softwares, including the latest
-versions of DNAML, visit the PHYLIP Home Page:
-	http://evolution.genetics.washington.edu/phylip.html
-
-When publishing work that based on results from fastDNAml please cite:
-
-   Felsenstein, J.  1981.  Evolutionary trees from DNA sequences:
-   A maximum likelihood approach.  J. Mol. Evol. 17: 368-376.
-
-   Olsen, G. J., Matsuda, H., Hagstrom, R., and Overbeek, R.  1994.
-   fastDNAml:  A tool for construction of phylogenetic trees of DNA
-   sequences using maximum likelihood.  Comput. Appl. Biosci. 10: 41-48.
+WWW: http://www.life.illinois.edu/gary/programs/fastDNAml.html