Update fastDNAml to version 1.2.2. Notable changes include:

* Now under GPL
* Convert to function definitions with parameter type lists
* General code clean-up

biology/fastDNAml/Makefile

@@ -1,30 +1,20 @@
-# $NetBSD: Makefile,v 1.5 2004/01/29 13:41:05 grant Exp $
+# $NetBSD: Makefile,v 1.6 2004/08/16 23:45:59 ben Exp $
 
-DISTNAME=	fastDNAml_1.2.1
-PKGNAME=	fastDNAml-1.2.1
+DISTNAME=	fastDNAml_1.2.2
+PKGNAME=	fastDNAml-1.2.2
 CATEGORIES=	biology
 MASTER_SITES=	http://geta.life.uiuc.edu/~gary/programs/fastDNAml/
 
 MAINTAINER=	[email protected]
 HOMEPAGE=	http://geta.life.uiuc.edu/~gary/programs/fastDNAml.html
 COMMENT=	Program derived from Joseph Felsenstein's version 3.3 DNAML
 
-RESTRICTED=	"No commercial distribution without a royalty agreement with the author"
-NO_SRC_ON_CDROM=	${RESTRICTED}
-NO_BIN_ON_CDROM=	${RESTRICTED}
+WRKSRC=		${WRKDIR}/${DISTNAME}/source
 
-WRKSRC=		${WRKDIR}/${DISTNAME}
-ALL_TARGET=	fastDNAml
-
-MAKE_FLAGS+=	CC="${CC}"
-MAKE_FLAGS+=	LDFLAGS=-lm
-
-do-build:
-	@cd ${WRKSRC}/source && \
-		${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${ALL_TARGET}
+MAKE_FLAGS+=	CC=${CC}
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/source/fastDNAml ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/fastDNAml ${PREFIX}/bin
 .for SCRIPT in ae2dnaml bootstrap categories categories_file		\
 		checkpoint_summary clean_checkpoints clean_jumbles	\
 		dnaml_progress fastDNAml_boot fastDNAml_loop		\
@@ -33,10 +23,11 @@ do-install:
 		quickadd restart scores transition treefile		\
 		treefile2prolog trees2NEXUS trees2prolog userlengths	\
 		usertree usertrees weights weights_categories
-	${INSTALL_SCRIPT} ${WRKSRC}/scripts/${SCRIPT} ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKDIR}/${DISTNAME}/scripts/${SCRIPT} ${PREFIX}/bin
 .endfor
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/fastDNAml
-	${INSTALL_DATA} ${WRKSRC}/docs/fastDNAml_doc_1.2.txt ${PREFIX}/share/doc/fastDNAml
-	${INSTALL_DATA} ${WRKSRC}/docs/fastDNAml_scripts.txt ${PREFIX}/share/doc/fastDNAml
+.for DOC in fastDNAml_doc_1.2.txt fastDNAml_scripts.txt
+	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/docs/${DOC} ${PREFIX}/share/doc/fastDNAml
+.endfor
 
 .include "../../mk/bsd.pkg.mk"

biology/fastDNAml/distinfo

@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 16:02:24 agc Exp $
+$NetBSD: distinfo,v 1.3 2004/08/16 23:45:59 ben Exp $
 
-SHA1 (fastDNAml_1.2.1.tar.gz) = f61a11f69746ad80e2009594f229db331cfbb8d0
-Size (fastDNAml_1.2.1.tar.gz) = 63110 bytes
+SHA1 (fastDNAml_1.2.2.tar.gz) = 78197cbd760163f65085ac80c36d4286a1f29e34
+Size (fastDNAml_1.2.2.tar.gz) = 70005 bytes