4 files changed, 43 insertions, 11 deletions

diff --git a/biology/migrate/Makefile b/biology/migrate/Makefile
index c062600973df..f2fef7869215 100644
--- a/biology/migrate/Makefile
+++ b/biology/migrate/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	migrate
-PORTVERSION=	1.2.4
+PORTVERSION=	1.7.6.1
 CATEGORIES=	biology
 MASTER_SITES=	ftp://evolution.genetics.washington.edu/pub/lamarc/migrate/
 DISTNAME=	${PORTNAME}-${PORTVERSION}.src
@@ -14,22 +14,32 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}.src
 MAINTAINER=	wjv@FreeBSD.org
 COMMENT=	A program to estimate population sizes and migration rates
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-CONFIGURE_WRKSRC=	${WRKSRC}/src
-BUILD_WRKSRC=	${CONFIGURE_WRKSRC}
-INSTALL_WRKSRC=	${CONFIGURE_WRKSRC}
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
 GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 MAN1=		migrate.1
+MLINKS=		migrate.1 migrate-n.1
 
-post-install:
+DOCS=		HISTORY HOWTO-PARALLEL README migrate.html
+EXAMPLES=	README infile.benchmark infile.ep infile.msat infile.seq \
+		parmfile parmfile.benchmark parmfile.ep parmfile.msat \
+		parmfile.seq
+
+do-install:
+	@ ${INSTALL_PROGRAM} ${WRKSRC}/migrate-n ${PREFIX}/bin
 	@ cd ${PREFIX}/bin && ${LN} -s migrate-n migrate
+	@ ${INSTALL_MAN} ${WRKSRC}/migrate.1 ${MAN1PREFIX}/man/man1
 .if !defined(NOPORTDOCS)
 	@ ${MKDIR} ${DOCSDIR}/graphics
-.for docfile in HISTORY HOWTO-PARALLEL README migrate.html
-	@ ${INSTALL_DATA} ${WRKSRC}/${docfile} ${DOCSDIR}
+.for file in ${DOCS}
+	@ ${INSTALL_DATA} ${WRKSRC}/../${file} ${DOCSDIR}
+.endfor
+	@ ${MKDIR} ${EXAMPLESDIR}
+.for file in ${EXAMPLES}
+	@ ${INSTALL_DATA} ${WRKSRC}/../example/${file} ${EXAMPLESDIR}
 .endfor
-	@ ${INSTALL_DATA} ${WRKSRC}/graphics/* ${DOCSDIR}/graphics
+	@ ${INSTALL_DATA} ${WRKSRC}/../graphics/* ${DOCSDIR}/graphics
 .endif
 
 .include <bsd.port.pre.mk>
diff --git a/biology/migrate/distinfo b/biology/migrate/distinfo
index 5a9b49b70c8b..35882060c5ba 100644
--- a/biology/migrate/distinfo
+++ b/biology/migrate/distinfo
@@ -1,2 +1,2 @@
-MD5 (migrate-1.2.4.src.tar.gz) = d5b90497336bee7d559ac3a654043e13
-SIZE (migrate-1.2.4.src.tar.gz) = 312245
+MD5 (migrate-1.7.6.1.src.tar.gz) = 5e8f03923ca2a12e7d3dd460c17679a1
+SIZE (migrate-1.7.6.1.src.tar.gz) = 384925
diff --git a/biology/migrate/files/patch-Makefile.in b/biology/migrate/files/patch-Makefile.in
new file mode 100644
index 000000000000..2ab398e6810a
--- /dev/null
+++ b/biology/migrate/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Mon May 10 15:58:32 2004
++++ Makefile.in	Tue Jun  1 01:44:25 2004
+@@ -39,7 +39,7 @@
+ COMMONFLAGS =  -DHIGHBITS -DHAVE_CONFIG_H -DHAVE_MALLOCWRAP -DNEWSTYLE
+ #COMMONFLAGS =  -DHIGHBITS -DHAVE_CONFIG_H -DHAVE_MALLOCWRAP -DNEWSTYLE -DMERSENNE_TWISTER
+ COMMONVFLAGS =  $(COMMONFLAGS)
+-CFLAGS = @CFLAGS@ $(COMMONVFLAGS)  -DMIGRATEVERSION=\"\\\" $(MIGRATEVERSION)\\\"\"
++CFLAGS += @CFLAGS@ $(COMMONVFLAGS)  -DMIGRATEVERSION=\"\\\" $(MIGRATEVERSION)\\\"\"
+ # IBM PowerPC compiler on macosx needs also CC=xlc
+ #CFLAGS = -O3 -Q -qunroll -qalloca -qhot -qipa -qthreaded -Dpowerpc $(COMMONVFLAGS)  -DMIGRATEVERSION=\"\\\" $(MIGRATEVERSION)\\\"\"
+ THREADCFLAGS= @THREADCFLAGS@
diff --git a/biology/migrate/pkg-plist b/biology/migrate/pkg-plist
index 460d05c482ef..62135c58c177 100644
--- a/biology/migrate/pkg-plist
+++ b/biology/migrate/pkg-plist
@@ -8,5 +8,16 @@ bin/migrate-n
 %%PORTDOCS%%%%DOCSDIR%%/graphics/migrate.gif
 %%PORTDOCS%%%%DOCSDIR%%/graphics/packet.gif
 %%PORTDOCS%%%%DOCSDIR%%/migrate.html
+%%PORTDOCS%%%%EXAMPLESDIR%%/README
+%%PORTDOCS%%%%EXAMPLESDIR%%/infile.benchmark
+%%PORTDOCS%%%%EXAMPLESDIR%%/infile.ep
+%%PORTDOCS%%%%EXAMPLESDIR%%/infile.msat
+%%PORTDOCS%%%%EXAMPLESDIR%%/infile.seq
+%%PORTDOCS%%%%EXAMPLESDIR%%/parmfile
+%%PORTDOCS%%%%EXAMPLESDIR%%/parmfile.benchmark
+%%PORTDOCS%%%%EXAMPLESDIR%%/parmfile.ep
+%%PORTDOCS%%%%EXAMPLESDIR%%/parmfile.msat
+%%PORTDOCS%%%%EXAMPLESDIR%%/parmfile.seq
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/graphics
 %%PORTDOCS%%@dirrm %%DOCSDIR%%