trim headers; switch to the new options format; fix builds after src r248751;

update math/lrng to 20130314, and switch it to a versioned DIST_SUBDIR

3 files changed, 67 insertions, 68 deletions

diff --git a/math/lrng/Makefile b/math/lrng/Makefile
index 84c84726d209..7ce0df052323 100644
--- a/math/lrng/Makefile
+++ b/math/lrng/Makefile
@@ -1,24 +1,17 @@
-# New ports collection makefile for:    lrng
-# Date created:         25 May 2011
-# Whom:                 b.f. <bf@FreeBSD.org>
-#
+# Created by: b.f. <bf@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	lrng
-PORTVERSION=	20111031
+PORTVERSION=	20130314
 CATEGORIES=	math
 MASTER_SITES=	http://www.iro.umontreal.ca/%SUBDIR%/:1,2 \
-	${MASTER_SITE_LOCAL:S|%SUBDIR%/$|bf/${PORTNAME}/:1,2|}
+	${MASTER_SITE_LOCAL:S|%SUBDIR%/$|bf/${PORTNAME}/${PORTVERSION}/:1,2|}
 MASTER_SITE_SUBDIR=	~simardr/rng/:1 ~lecuyer/myftp/papers/:2
 DISTFILES=	ex1.c:1 lfsr258.c:1 lfsr113.c:1 WELL1024a.h:1 WELL19937a.h:1 WELL512a.h:1 \
 		WELL44497a.h:1 WELL19937a.c:1 WELL1024a.c:1 WELL512a.c:1 WELL44497a.c:1 \
 		MRG63k3a.c:1 MRG32k3a.c:1 MRG32k5a.c:1 MRG63k3a.h:1 MRG32k5a.h:1 MRG32k3a.h:1 \
 		lfsr258.h:1 lfsr113.h:1
-.if !defined(NOPORTDOCS) || make(makesum)
-DISTFILES+=	combmrg2.ps:2 lfsr04.pdf:2 tausme2.ps:2
-.endif
-DIST_SUBDIR=	${PORTNAME}
+DIST_SUBDIR=	${PORTNAME}/${PORTVERSION}
 EXTRACT_ONLY=
 
 MAINTAINER=	bf@FreeBSD.org
@@ -33,25 +26,31 @@ MAKE_ENV+=	CLEANFILES="${CLEANFILES}" \
 	LIB="${LIB}" LIBDIR="${LIBDIR}" SHLIB_MAJOR="${SHLIB_MAJOR}" \
 	SRCS="${SRCS}" SRCCONF="${SRCCONF}"
 NO_WRKSUBDIR=	yes
-OPTIONS=	PROFILE "Build a profiling library" OFF
+OPTIONS_DEFINE=	PROFILE
 PLIST_DIRS=	include/${PORTNAME}
 PLIST_FILES=	${DISTFILES:M*.h\:1:S|:1$||:S|^|include/${PORTNAME}/|:} \
 		lib/lib${LIB}.a lib/lib${LIB}.so \
 		lib/lib${LIB}.so.${SHLIB_MAJOR}
-.if !defined(NOPORTDOCS)
-PORTDOCS=	${DISTFILES:M*\:2:S|:2||}
-.endif
-.if !defined(NOPORTEXAMPLES)
-PORTEXAMPLES=	ex1.c
-.endif
 SHLIB_MAJOR=	0
-SRCCONF=	${NONEXISTENT}
+SRCCONF=	/dev/null
 SRCS=	${DISTFILES:M*.c\:1:Nex1.c\:1:S|:1$||}
 USE_LDCONFIG=	yes
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_PROFILE)
+.if ${PORT_OPTIONS:MDOCS} || make(makesum)
+DISTFILES+=	combmrg2.ps:2 lfsr04.pdf:2 tausme2.ps:2
+.endif
+
+.if ${PORT_OPTIONS:MDOCS}
+PORTDOCS=	${DISTFILES:M*\:2:S|:2||}
+.endif
+
+.if ${PORT_OPTIONS:MEXAMPLES}
+PORTEXAMPLES=	ex1.c
+.endif
+
+.if ${PORT_OPTIONS:MPROFILE}
 .if defined(NOPROFILE) || defined(NO_PROFILE) || defined(WITHOUT_PROFILE)
 IGNORE =	you have defined WITH_PROFILE, but have also defined\
 WITHOUT_PROFILE, NOPROFILE, or NO_PROFILE
@@ -61,7 +60,7 @@ base system profiling libraries
 .endif
 PLIST_FILES+=	lib/lib${LIB}_p.a
 .else
-MAKE_ENV+=	NO_PROFILE=
+MAKE_ENV+=	NO_PROFILE=yes
 .endif
 
 post-extract:
@@ -71,11 +70,11 @@ post-extract:
 post-install:
 	@${MKDIR} ${PREFIX}/include/${PORTNAME}
 	@${INSTALL_DATA} ${WRKSRC}/*.h ${PREFIX}/include/${PORTNAME}
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	@(cd ${WRKSRC}; ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR})
 .endif
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${EXAMPLESDIR}
 	@(cd ${WRKSRC}; ${INSTALL_DATA} ${PORTEXAMPLES} ${EXAMPLESDIR})
 .endif
diff --git a/math/lrng/distinfo b/math/lrng/distinfo
index ceaed4812225..d5bb2474e05f 100644
--- a/math/lrng/distinfo
+++ b/math/lrng/distinfo
@@ -1,44 +1,44 @@
-SHA256 (lrng/ex1.c) = 684265bceaa13392d422fd6280d3e5787cbc406eb72a646e9592d00dbf382856
-SIZE (lrng/ex1.c) = 531
-SHA256 (lrng/lfsr258.c) = 2d5907e4e56db892491ffdc31c4b3643cdcef060125a9be340b0d6ec74b11821
-SIZE (lrng/lfsr258.c) = 1068
-SHA256 (lrng/lfsr113.c) = b9d310cf685a4dc707f65c7206743e43ae916f0e7bc450be134cb52ae5ca3bb3
-SIZE (lrng/lfsr113.c) = 847
-SHA256 (lrng/WELL1024a.h) = 5a09d8f69c8bbfc8a15fe93903a78c7deca8240a48181b954b0d40801a0f93b9
-SIZE (lrng/WELL1024a.h) = 872
-SHA256 (lrng/WELL19937a.h) = e59bb0128c725d9df5f05cf49b8ca7be15085a01dbbb393e3fd5ec137d3cf953
-SIZE (lrng/WELL19937a.h) = 885
-SHA256 (lrng/WELL512a.h) = 468b7ae06dc8f2c86e0fb5c08984fff01de0bd7c8308f193290548e269fedde1
-SIZE (lrng/WELL512a.h) = 870
-SHA256 (lrng/WELL44497a.h) = 80fd0ff770f1ea2a8f69f284dfe1aa113a59a5882f4674b1d5584c06adfef1ca
-SIZE (lrng/WELL44497a.h) = 884
-SHA256 (lrng/WELL19937a.c) = 8b87fa7f016a19ae3f64f09ab15185d9c9fc0589255f6ac22cceb32c4446b4ae
-SIZE (lrng/WELL19937a.c) = 5836
-SHA256 (lrng/WELL1024a.c) = 937c755949846981609bf40eee54063459ba07c46feab2a26ab4fa2281926af8
-SIZE (lrng/WELL1024a.c) = 1900
-SHA256 (lrng/WELL512a.c) = b17767704b27bd89b56e3b2da44449e8a3b7187f1acb404768c1b264236c4481
-SIZE (lrng/WELL512a.c) = 2066
-SHA256 (lrng/WELL44497a.c) = ccea88384bf733e7ad95fe31696f58eb3d4d64152a593ed472e88ae0ce48148e
-SIZE (lrng/WELL44497a.c) = 6077
-SHA256 (lrng/MRG63k3a.c) = 3852f3a8aa4704c33035fab70af4caa3826b95a3b78e3a7eb666be8669210558
-SIZE (lrng/MRG63k3a.c) = 1929
-SHA256 (lrng/MRG32k3a.c) = 6b01098b27c90a7039427d5e32fd252f1630368804168cd95eabd4dd81ffebfc
-SIZE (lrng/MRG32k3a.c) = 1328
-SHA256 (lrng/MRG32k5a.c) = b3c200ba3854f340ae35ae87b109de78f653f2d58aac9215aacf135c50ecede0
-SIZE (lrng/MRG32k5a.c) = 1631
-SHA256 (lrng/MRG63k3a.h) = 29306ef3967513d8268527f98bdda8eebbfe981c563bbd04e717cd477c72e82a
-SIZE (lrng/MRG63k3a.h) = 24
-SHA256 (lrng/MRG32k5a.h) = 3be5045730a5b6c8c4f9167eb978ea673bcb0cbce4b90e8550ab797385054e72
-SIZE (lrng/MRG32k5a.h) = 24
-SHA256 (lrng/MRG32k3a.h) = 85312af4702c8242068f3766c452a61538458465942143f1b5649a793331221a
-SIZE (lrng/MRG32k3a.h) = 24
-SHA256 (lrng/lfsr258.h) = 18ca608b12f0099840e398230a6effec63a59be7ccb8166e1d6682811401e249
-SIZE (lrng/lfsr258.h) = 23
-SHA256 (lrng/lfsr113.h) = 18a572d6dc48cf9a6c9927ae760358c4b9ef7b9d26513a8077ab69d7dbd68b7c
-SIZE (lrng/lfsr113.h) = 23
-SHA256 (lrng/combmrg2.ps) = faadb37331a7a41bf36b20f3c5484de5ec3ecc0788a2561d26ded57fbae4e20a
-SIZE (lrng/combmrg2.ps) = 490416
-SHA256 (lrng/lfsr04.pdf) = e0e567b553cf3fdf066bc1757c0d45eedb70f67ce872b0e1c8a922ce118be873
-SIZE (lrng/lfsr04.pdf) = 300551
-SHA256 (lrng/tausme2.ps) = fb29919410f7e6dce45a15787f99a0873be6c31c6ed5958d82e4b8f182c0c522
-SIZE (lrng/tausme2.ps) = 106659
+SHA256 (lrng/20130314/ex1.c) = 684265bceaa13392d422fd6280d3e5787cbc406eb72a646e9592d00dbf382856
+SIZE (lrng/20130314/ex1.c) = 531
+SHA256 (lrng/20130314/lfsr258.c) = 4cceaf692afb49d6fe02c99282cd92438d3966529b8091c715fa15c0a7462ef4
+SIZE (lrng/20130314/lfsr258.c) = 1042
+SHA256 (lrng/20130314/lfsr113.c) = b60b094513e1502c220a48570bd14a052688f4b2ac01af7505ef91a5fe44af67
+SIZE (lrng/20130314/lfsr113.c) = 857
+SHA256 (lrng/20130314/WELL1024a.h) = 5a09d8f69c8bbfc8a15fe93903a78c7deca8240a48181b954b0d40801a0f93b9
+SIZE (lrng/20130314/WELL1024a.h) = 872
+SHA256 (lrng/20130314/WELL19937a.h) = e59bb0128c725d9df5f05cf49b8ca7be15085a01dbbb393e3fd5ec137d3cf953
+SIZE (lrng/20130314/WELL19937a.h) = 885
+SHA256 (lrng/20130314/WELL512a.h) = 468b7ae06dc8f2c86e0fb5c08984fff01de0bd7c8308f193290548e269fedde1
+SIZE (lrng/20130314/WELL512a.h) = 870
+SHA256 (lrng/20130314/WELL44497a.h) = 80fd0ff770f1ea2a8f69f284dfe1aa113a59a5882f4674b1d5584c06adfef1ca
+SIZE (lrng/20130314/WELL44497a.h) = 884
+SHA256 (lrng/20130314/WELL19937a.c) = 8b87fa7f016a19ae3f64f09ab15185d9c9fc0589255f6ac22cceb32c4446b4ae
+SIZE (lrng/20130314/WELL19937a.c) = 5836
+SHA256 (lrng/20130314/WELL1024a.c) = 937c755949846981609bf40eee54063459ba07c46feab2a26ab4fa2281926af8
+SIZE (lrng/20130314/WELL1024a.c) = 1900
+SHA256 (lrng/20130314/WELL512a.c) = b17767704b27bd89b56e3b2da44449e8a3b7187f1acb404768c1b264236c4481
+SIZE (lrng/20130314/WELL512a.c) = 2066
+SHA256 (lrng/20130314/WELL44497a.c) = ccea88384bf733e7ad95fe31696f58eb3d4d64152a593ed472e88ae0ce48148e
+SIZE (lrng/20130314/WELL44497a.c) = 6077
+SHA256 (lrng/20130314/MRG63k3a.c) = 3852f3a8aa4704c33035fab70af4caa3826b95a3b78e3a7eb666be8669210558
+SIZE (lrng/20130314/MRG63k3a.c) = 1929
+SHA256 (lrng/20130314/MRG32k3a.c) = 6b01098b27c90a7039427d5e32fd252f1630368804168cd95eabd4dd81ffebfc
+SIZE (lrng/20130314/MRG32k3a.c) = 1328
+SHA256 (lrng/20130314/MRG32k5a.c) = b3c200ba3854f340ae35ae87b109de78f653f2d58aac9215aacf135c50ecede0
+SIZE (lrng/20130314/MRG32k5a.c) = 1631
+SHA256 (lrng/20130314/MRG63k3a.h) = 29306ef3967513d8268527f98bdda8eebbfe981c563bbd04e717cd477c72e82a
+SIZE (lrng/20130314/MRG63k3a.h) = 24
+SHA256 (lrng/20130314/MRG32k5a.h) = 3be5045730a5b6c8c4f9167eb978ea673bcb0cbce4b90e8550ab797385054e72
+SIZE (lrng/20130314/MRG32k5a.h) = 24
+SHA256 (lrng/20130314/MRG32k3a.h) = 85312af4702c8242068f3766c452a61538458465942143f1b5649a793331221a
+SIZE (lrng/20130314/MRG32k3a.h) = 24
+SHA256 (lrng/20130314/lfsr258.h) = 18ca608b12f0099840e398230a6effec63a59be7ccb8166e1d6682811401e249
+SIZE (lrng/20130314/lfsr258.h) = 23
+SHA256 (lrng/20130314/lfsr113.h) = 18a572d6dc48cf9a6c9927ae760358c4b9ef7b9d26513a8077ab69d7dbd68b7c
+SIZE (lrng/20130314/lfsr113.h) = 23
+SHA256 (lrng/20130314/combmrg2.ps) = faadb37331a7a41bf36b20f3c5484de5ec3ecc0788a2561d26ded57fbae4e20a
+SIZE (lrng/20130314/combmrg2.ps) = 490416
+SHA256 (lrng/20130314/lfsr04.pdf) = e0e567b553cf3fdf066bc1757c0d45eedb70f67ce872b0e1c8a922ce118be873
+SIZE (lrng/20130314/lfsr04.pdf) = 300551
+SHA256 (lrng/20130314/tausme2.ps) = fb29919410f7e6dce45a15787f99a0873be6c31c6ed5958d82e4b8f182c0c522
+SIZE (lrng/20130314/tausme2.ps) = 106659
diff --git a/math/lrng/pkg-descr b/math/lrng/pkg-descr
index 8c801778d625..280b051950e1 100644
--- a/math/lrng/pkg-descr
+++ b/math/lrng/pkg-descr
@@ -2,4 +2,4 @@ lrng is a collection of uniform pseudorandom number
 generators, written in C, and based on algorithms by Francois
 Panneton, Pierre L'Ecuyer, and Makoto Matsumoto.
 
-WWW:	http://www.iro.umontreal.ca/~simardr/
+WWW: http://www.iro.umontreal.ca/~simardr/