- Update to 2.1.0

PR:		146611
Submitted by:	bf <bf1783@gmail.com> (maintainer)

3 files changed, 38 insertions, 32 deletions

diff --git a/math/jags/Makefile b/math/jags/Makefile
index ebac02385887..23126290672d 100644
--- a/math/jags/Makefile
+++ b/math/jags/Makefile
@@ -7,10 +7,10 @@
 #
 
 PORTNAME=	mcmc-jags
-DISTVERSION=	2.0.0-20100430
+PORTVERSION=	2.1.0
 CATEGORIES=	math
 MASTER_SITES=	SF:1,2,3
-MASTER_SITE_SUBDIR=	${PORTNAME}/JAGS/2.0/Source/:1 \
+MASTER_SITE_SUBDIR=	${PORTNAME}/JAGS/2.x/Source/:1 \
 		${PORTNAME}/Examples/2.0/:2 \
 		${PORTNAME}/Manuals/2.0/:3
 DISTFILES=	${DISTNAME:S/mcmc-//:U}${EXTRACT_SUFX}:1
@@ -23,17 +23,10 @@ EXTRACT_ONLY=	${DISTNAME:S/mcmc-//:U}${EXTRACT_SUFX}
 MAINTAINER=	bf1783@gmail.com
 COMMENT=	Just Another Gibbs Sampler
 
-.if defined(WITH_ATLAS)
-LIB_DEPENDS+=	atlas.2:${PORTSDIR}/math/atlas
-CONFIGURE_ARGS=	--with-lapack=-lalapack --with-blas=-lf77blas
-.else
-LIB_DEPENDS+=	blas.2:${PORTSDIR}/math/blas
-LIB_DEPENDS+=	lapack.4:${PORTSDIR}/math/lapack
-CONFIGURE_ARGS=	--with-lapack=-llapack --with-blas=-lblas
-.endif
+OPTIONS=	ATLAS "use ATLAS libraries instead of BLAS and LAPACK" off
 
 DIST_SUBDIR=	${PORTNAME}
-WRKSRC=		${WRKDIR}/${PKGNAME:S/mcmc-//:U:R}
+WRKSRC=		${WRKDIR}/${PKGNAME:S/mcmc-//:U}
 
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -42,6 +35,18 @@ CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 USE_FORTRAN=	yes
 USE_LDCONFIG=	yes
 USE_BISON=	build
+PLIST_SUB=	PORTVERSION=${PORTVERSION}
+
+.include <bsd.port.options.mk>
+
+.if defined(WITH_ATLAS)
+LIB_DEPENDS+=	atlas.2:${PORTSDIR}/math/atlas
+CONFIGURE_ARGS=	--with-lapack=-lalapack --with-blas=-lf77blas
+.else
+LIB_DEPENDS+=	blas.2:${PORTSDIR}/math/blas
+LIB_DEPENDS+=	lapack.4:${PORTSDIR}/math/lapack
+CONFIGURE_ARGS=	--with-lapack=-llapack --with-blas=-lblas
+.endif
 
 post-patch:
 	${REINPLACE_CMD} -e 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \
diff --git a/math/jags/distinfo b/math/jags/distinfo
index ffe9c2ec8269..a50009f56a71 100644
--- a/math/jags/distinfo
+++ b/math/jags/distinfo
@@ -1,9 +1,9 @@
-MD5 (mcmc-jags/JAGS-2.0.0-20100430.tar.gz) = 0e027c98a7f3ade409a10b5b7ebd0e35
-SHA256 (mcmc-jags/JAGS-2.0.0-20100430.tar.gz) = 9bffe5ebee0896125bf497f22c88f1a751487ed9500f3ddf71bf63fd72d697fc
-SIZE (mcmc-jags/JAGS-2.0.0-20100430.tar.gz) = 1169874
-MD5 (mcmc-jags/classic-bugs.tar.gz) = 7df4366dfb5278cbd4ce43f21b4d9e6c
-SHA256 (mcmc-jags/classic-bugs.tar.gz) = 3814414bb5d23b1757f85cea549561389cf6d514cecad9a9ef945e21f806c3af
-SIZE (mcmc-jags/classic-bugs.tar.gz) = 81193
+MD5 (mcmc-jags/JAGS-2.1.0.tar.gz) = ddb5eb745cb48537517aba186d7030c8
+SHA256 (mcmc-jags/JAGS-2.1.0.tar.gz) = c713a7f1856f2153a94e96bdf26d1e2dff4e3dc9156864d6798d6b3b157d6e68
+SIZE (mcmc-jags/JAGS-2.1.0.tar.gz) = 1171371
+MD5 (mcmc-jags/classic-bugs.tar.gz) = 98d32deaaf134ade265c0a6146291796
+SHA256 (mcmc-jags/classic-bugs.tar.gz) = 3e4902c08c7823a948fba4d7dc32f5140e56c59f170b12e63ac7f4ffc4a7f8cc
+SIZE (mcmc-jags/classic-bugs.tar.gz) = 81313
 MD5 (mcmc-jags/jags_developer_manual.pdf) = 850864bef54ff17858f8bf341b0c13c1
 SHA256 (mcmc-jags/jags_developer_manual.pdf) = 09d06b202adcbc9a52bd889c19c741ffb13f68b6657b9a0a999ad3f89259eb19
 SIZE (mcmc-jags/jags_developer_manual.pdf) = 71199
diff --git a/math/jags/pkg-plist b/math/jags/pkg-plist
index 37e3ecc2f464..8ad17a568e2c 100644
--- a/math/jags/pkg-plist
+++ b/math/jags/pkg-plist
@@ -74,20 +74,20 @@ include/JAGS/util/integer.h
 include/JAGS/util/logical.h
 include/JAGS/util/nainf.h
 include/JAGS/version.h
-lib/JAGS/modules-2.0.0/basemod.la
-lib/JAGS/modules-2.0.0/basemod.so
-lib/JAGS/modules-2.0.0/bugs.la
-lib/JAGS/modules-2.0.0/bugs.so
-lib/JAGS/modules-2.0.0/dic.la
-lib/JAGS/modules-2.0.0/dic.so
-lib/JAGS/modules-2.0.0/glm.la
-lib/JAGS/modules-2.0.0/glm.so
-lib/JAGS/modules-2.0.0/lecuyer.la
-lib/JAGS/modules-2.0.0/lecuyer.so
-lib/JAGS/modules-2.0.0/mix.la
-lib/JAGS/modules-2.0.0/mix.so
-lib/JAGS/modules-2.0.0/msm.la
-lib/JAGS/modules-2.0.0/msm.so
+lib/JAGS/modules-%%PORTVERSION%%/basemod.la
+lib/JAGS/modules-%%PORTVERSION%%/basemod.so
+lib/JAGS/modules-%%PORTVERSION%%/bugs.la
+lib/JAGS/modules-%%PORTVERSION%%/bugs.so
+lib/JAGS/modules-%%PORTVERSION%%/dic.la
+lib/JAGS/modules-%%PORTVERSION%%/dic.so
+lib/JAGS/modules-%%PORTVERSION%%/glm.la
+lib/JAGS/modules-%%PORTVERSION%%/glm.so
+lib/JAGS/modules-%%PORTVERSION%%/lecuyer.la
+lib/JAGS/modules-%%PORTVERSION%%/lecuyer.so
+lib/JAGS/modules-%%PORTVERSION%%/mix.la
+lib/JAGS/modules-%%PORTVERSION%%/mix.so
+lib/JAGS/modules-%%PORTVERSION%%/msm.la
+lib/JAGS/modules-%%PORTVERSION%%/msm.so
 lib/libjags.la
 lib/libjags.so
 lib/libjags.so.2
@@ -328,6 +328,7 @@ libexec/jags-terminal
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vol2/cervix/cervix-data.R
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vol2/cervix/cervix-inits.R
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vol2/cervix/cervix.bug
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vol2/cervix/test1.R
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vol2/cervix/test1.cmd
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vol2/dugongs/bench-test1.R
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vol2/dugongs/dugongs-data.R
@@ -456,7 +457,7 @@ libexec/jags-terminal
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/R
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm lib/JAGS/modules-2.0.0
+@dirrm lib/JAGS/modules-%%PORTVERSION%%
 @dirrm lib/JAGS
 @dirrm include/JAGS/util
 @dirrm include/JAGS/sarray