4 files changed, 28 insertions, 14 deletions

diff --git a/math/fbm/Makefile b/math/fbm/Makefile
index 97fb57dab233..93bf05d0ad0c 100644
--- a/math/fbm/Makefile
+++ b/math/fbm/Makefile
@@ -6,18 +6,18 @@
 #
 
 PORTNAME=	fbm
-PORTVERSION=	20030629
+PORTVERSION=	20041110
 CATEGORIES=	math
 MASTER_SITES=	ftp://ftp.cs.utoronto.ca/pub/radford/
-DISTNAME=	${PORTNAME}.2003-06-29
+DISTNAME=	${PORTNAME}.2004-11-10
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Flexible Bayesian Modeling and Markov Chain Sampling
 
+NO_LATEST_LINK=	yes
 USE_REINPLACE=	yes
 
-NO_LATEST_LINK=	yes
 SCRIPTS =	bvg-circ bvg-wrap dist-circ dist-wrap gp-circ	\
 		gp-wrap dft-circ dft-wrap mix-circ mix-wrap 	\
 		net-circ net-wrap
@@ -41,7 +41,7 @@ PROGRAMS =	bvg-grad-test bvg-hist bvg-initial bvg-mc	\
 		net-gd net-gen net-genp net-grad-test net-hist	\
 		net-mc net-plt net-pred net-rej net-spec	\
 		net-stepsizes net-tbl rand-seed series
-TEXT=		dft-genp mix-genp
+OTHER=		dft-genp mix-genp
 
 post-patch:
 	@${REINPLACE_CMD} -e 's+%%CC%%+${CC}+g;' ${WRKSRC}/make.include
@@ -51,8 +51,10 @@ do-build:
 
 do-install:
 	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${SH} install-arch)
-.for i in ${SCRIPTS}
-	@${INSTALL_SCRIPT} ${WRKSRC}/bin.${ARCH}/${i} ${PREFIX}/bin
+.for s in ${SCRIPTS}
+	@${REINPLACE_CMD} -e 's+/bin/bash+ ${SH}+;s+exit -1+exit 1+'	\
+		${WRKSRC}/bin.${ARCH}/${s}
+	@${INSTALL_SCRIPT} ${WRKSRC}/bin.${ARCH}/${s} ${PREFIX}/bin
 .endfor
 .for i in ${PROGRAMS}
 	@${INSTALL_PROGRAM} ${WRKSRC}/bin.${ARCH}/${i} ${PREFIX}/bin
@@ -61,14 +63,19 @@ do-install:
 	@${INSTALL_DATA} ${WRKSRC}/util/randfile ${PREFIX}/share/fbm
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	@${CP} -R $(WRKSRC)/doc/* ${DOCSDIR}
+	@${CP} -R ${WRKSRC}/doc/* ${DOCSDIR}
 .for i in make-html make-manual rm-html
 	@${RM}  ${DOCSDIR}/${i}
 .endfor
 	@${MKDIR} ${DOCSDIR}/html
 	@${MV} ${DOCSDIR}/*.html ${DOCSDIR}/html
 	@${MKDIR} ${EXAMPLESDIR}
-	@${CP} -R $(WRKSRC)/ex-* ${EXAMPLESDIR}
+	@${CP} -R ${WRKSRC}/ex-* ${EXAMPLESDIR}
 .endif
 
+post-install:
+	@${ECHO_MSG}
+	@${CAT} ${PKGMESSAGE}
+	@${ECHO_MSG}
+
 .include <bsd.port.mk>
diff --git a/math/fbm/distinfo b/math/fbm/distinfo
index bd946a9789df..71f0739ae862 100644
--- a/math/fbm/distinfo
+++ b/math/fbm/distinfo
@@ -1,2 +1,2 @@
-MD5 (fbm.2003-06-29.tar.Z) = d883b507c88878757a3208c3fc72b630
-SIZE (fbm.2003-06-29.tar.Z) = 1374677
+MD5 (fbm.2004-11-10.tar.Z) = 9a76f13502de10a3888076718fbe074c
+SIZE (fbm.2004-11-10.tar.Z) = 1422628
diff --git a/math/fbm/pkg-message b/math/fbm/pkg-message
index 7b6eab8663a0..59a6e9b3f5a2 100644
--- a/math/fbm/pkg-message
+++ b/math/fbm/pkg-message
@@ -1,4 +1,4 @@
-  Copyright (c) 1995-2003 by Radford M. Neal
+  Copyright (c) 1995-2004 by Radford M. Neal
   
   Permission is granted for anyone to copy, use, modify, or distribute these
   programs and accompanying documents for any purpose, provided this copyright
diff --git a/math/fbm/pkg-plist b/math/fbm/pkg-plist
index b7dfbc1b45c0..05492e99e1e5 100644
--- a/math/fbm/pkg-plist
+++ b/math/fbm/pkg-plist
@@ -97,8 +97,8 @@ bin/net-tbl
 bin/net-wrap
 bin/rand-seed
 bin/series
-share/fbm/randfile
-@dirrm share/fbm
+%%DATADIR%%/randfile
+@dirrm %%DATADIR%%
 %%PORTDOCS%%%%DOCSDIR%%/Acknowledgements.doc
 %%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
 %%PORTDOCS%%%%DOCSDIR%%/Contents.doc
@@ -142,6 +142,7 @@ share/fbm/randfile
 %%PORTDOCS%%%%DOCSDIR%%/Release.2000-08-21.doc
 %%PORTDOCS%%%%DOCSDIR%%/Release.2001-08-31.doc
 %%PORTDOCS%%%%DOCSDIR%%/Release.2003-06-29.doc
+%%PORTDOCS%%%%DOCSDIR%%/Release.2004-11-10.doc
 %%PORTDOCS%%%%DOCSDIR%%/bvg-initial.doc
 %%PORTDOCS%%%%DOCSDIR%%/bvg-mc.doc
 %%PORTDOCS%%%%DOCSDIR%%/bvg-plt.doc
@@ -193,6 +194,7 @@ share/fbm/randfile
 %%PORTDOCS%%%%DOCSDIR%%/manual
 %%PORTDOCS%%%%DOCSDIR%%/mc-ais.doc
 %%PORTDOCS%%%%DOCSDIR%%/mc-quantities.doc
+%%PORTDOCS%%%%DOCSDIR%%/mc-reweight.doc
 %%PORTDOCS%%%%DOCSDIR%%/mc-spec.doc
 %%PORTDOCS%%%%DOCSDIR%%/mc-temp-filter.doc
 %%PORTDOCS%%%%DOCSDIR%%/mc-temp-sched.doc
@@ -231,6 +233,7 @@ share/fbm/randfile
 %%PORTDOCS%%%%DOCSDIR%%/xxx-circ.doc
 %%PORTDOCS%%%%DOCSDIR%%/xxx-genp.doc
 %%PORTDOCS%%%%DOCSDIR%%/xxx-grad-test.doc
+%%PORTDOCS%%%%DOCSDIR%%/xxx-his.doc
 %%PORTDOCS%%%%DOCSDIR%%/xxx-hist.doc
 %%PORTDOCS%%%%DOCSDIR%%/xxx-mc.doc
 %%PORTDOCS%%%%DOCSDIR%%/xxx-plt.doc
@@ -277,9 +280,10 @@ share/fbm/randfile
 %%PORTDOCS%%%%DOCSDIR%%/html/Release.1999-03-13.html
 %%PORTDOCS%%%%DOCSDIR%%/html/Release.1999-12-06.html
 %%PORTDOCS%%%%DOCSDIR%%/html/Release.2000-08-21.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Release.2001-08-31.html
 %%PORTDOCS%%%%DOCSDIR%%/html/Release.2003-06-29.html
+%%PORTDOCS%%%%DOCSDIR%%/html/Release.2004-11-10.html
 %%PORTDOCS%%%%DOCSDIR%%/html/gp.html
-%%PORTDOCS%%%%DOCSDIR%%/html/Release.2001-08-31.html
 %%PORTDOCS%%%%DOCSDIR%%/html/bvg-initial.html
 %%PORTDOCS%%%%DOCSDIR%%/html/bvg-mc.html
 %%PORTDOCS%%%%DOCSDIR%%/html/bvg-plt.html
@@ -329,6 +333,7 @@ share/fbm/randfile
 %%PORTDOCS%%%%DOCSDIR%%/html/log.html
 %%PORTDOCS%%%%DOCSDIR%%/html/mc-ais.html
 %%PORTDOCS%%%%DOCSDIR%%/html/mc-quantities.html
+%%PORTDOCS%%%%DOCSDIR%%/html/mc-reweight.html
 %%PORTDOCS%%%%DOCSDIR%%/html/mc-spec.html
 %%PORTDOCS%%%%DOCSDIR%%/html/mc-temp-filter.html
 %%PORTDOCS%%%%DOCSDIR%%/html/mc-temp-sched.html
@@ -366,6 +371,7 @@ share/fbm/randfile
 %%PORTDOCS%%%%DOCSDIR%%/html/xxx-circ.html
 %%PORTDOCS%%%%DOCSDIR%%/html/xxx-genp.html
 %%PORTDOCS%%%%DOCSDIR%%/html/xxx-grad-test.html
+%%PORTDOCS%%%%DOCSDIR%%/html/xxx-his.html
 %%PORTDOCS%%%%DOCSDIR%%/html/xxx-hist.html
 %%PORTDOCS%%%%DOCSDIR%%/html/xxx-mc.html
 %%PORTDOCS%%%%DOCSDIR%%/html/xxx-plt.html
@@ -493,6 +499,7 @@ share/fbm/randfile
 %%PORTDOCS%%%%EXAMPLESDIR%%/ex-mixdft/scmds-nmet
 %%PORTDOCS%%%%EXAMPLESDIR%%/ex-mixdft/scmds-nogaps
 %%PORTDOCS%%%%EXAMPLESDIR%%/ex-mixdft/sdata
+%%PORTDOCS%%%%EXAMPLESDIR%%/ex-mixdft/trace.txt
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/ex-mixdft
 %%PORTDOCS%%%%EXAMPLESDIR%%/ex-netgp/README
 %%PORTDOCS%%%%EXAMPLESDIR%%/ex-netgp/bcmds.gpl