- Update MASTER_SITES, obtained permission to mirror source

PR:		ports/120670
Submitted by:	bacon smithers.neuro.mcw.edu (maintainer)

4 files changed, 31 insertions, 18 deletions

diff --git a/math/rapid/Makefile b/math/rapid/Makefile
index 45fbb5d5e49a..4b8b33fe2393 100644
--- a/math/rapid/Makefile
+++ b/math/rapid/Makefile
@@ -1,7 +1,7 @@
 ############################################################################
 # New ports collection Makefile for:   RAPID
 # Date created:        18 July 2006
-# Whom:                Jason W. Bacon <bacon@smithers.neuro.mcw.edu>
+# Whom:                Jason W. Bacon <jwbacon@tds.net>
 #
 # $FreeBSD$
 #
@@ -11,15 +11,14 @@
 PORTNAME=	rapid
 PORTVERSION=	2.01
 CATEGORIES=	math science graphics
-MASTER_SITES=	http://www.cs.unc.edu/~geom/OBB/
-DISTNAME=	RAPID201_MSVC
+MASTER_SITES=	http://www.cs.sunysb.edu/~algorith/implement/RAPID/distrib/ \
+		http://www.neuro.mcw.edu/Ports/distfiles/
+DISTNAME=	RAPID_v2_01
 
 MAINTAINER=	bacon@smithers.neuro.mcw.edu
 COMMENT=	Robust and Accurate Polygon Interference Detection
 
-WRKSRC=		${WRKDIR}/RAPID201
-
-RESTRICTED=	Must register to download at http://www.cs.unc.edu/~geom/OBB/OBBT.html
+RESTRICTED=	For any commercial purpose, you must request a license from http://www.cs.unc.edu/~geom/OBB/OBBT.html
 
 SUB_FILES=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
@@ -30,10 +29,6 @@ MAN1=	rapid.1
 
 .include <bsd.port.pre.mk>
 
-.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
-IGNORE=	you must request a copy of ${DISTNAME}${EXTRACT_SUFX} from http://www.cs.unc.edu/~geom/OBB/OBBT.html, place it in ${DISTDIR}, and then run make again
-.endif
-
 post-extract:
 	${REINPLACE_CMD} -E "s/friend RAPID_Collide/friend int RAPID_Collide/" ${WRKSRC}/RAPID_private.H
 
@@ -41,7 +36,7 @@ do-install:
 	${MKDIR} ${PREFIX}/include/RAPID
 	${INSTALL_DATA}	${WRKSRC}/*.H ${PREFIX}/include/RAPID
 	${INSTALL_DATA}	${WRKSRC}/libRAPID.a ${PREFIX}/lib
-	${INSTALL_MAN} ${FILESDIR}/rapid.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${FILESDIR}/rapid.1 ${MANPREFIX}/man/man1
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/math/rapid/distinfo b/math/rapid/distinfo
index 5f1b1305b79b..537083932f86 100644
--- a/math/rapid/distinfo
+++ b/math/rapid/distinfo
@@ -1,3 +1,3 @@
-MD5 (RAPID201_MSVC.tar.gz) = 7508f5b51f859626114199cb120e363a
-SHA256 (RAPID201_MSVC.tar.gz) = 98e9f426cd69b2a9493399c631d51ff006e5d789f3f028504b846cceb727b4dc
-SIZE (RAPID201_MSVC.tar.gz) = 72005
+MD5 (RAPID_v2_01.tar.gz) = 401761ec42c91428902ab42527e71d38
+SHA256 (RAPID_v2_01.tar.gz) = f924759b9fe144a2ed40fab54047d3bad091ff2ee857e81b70e1b466dde91143
+SIZE (RAPID_v2_01.tar.gz) = 24123
diff --git a/math/rapid/files/pkg-message.in b/math/rapid/files/pkg-message.in
index b1130e7a471e..70756225f18a 100644
--- a/math/rapid/files/pkg-message.in
+++ b/math/rapid/files/pkg-message.in
@@ -1,6 +1,12 @@
 
-***********************************************************************
-Redistribution of RAPID in any form is strictly prohibited without the
-permission of UNC.
-***********************************************************************
+**************************************************************************
 
+The RAPID code is offered "as is" and is free for non-commercial use.
+
+To use RAPID for any commercial purpose, you must request a license from
+
+	http://www.cs.unc.edu/~geom/OBB/OBBT.html
+
+Redistribution of RAPID code in any form is strictly prohibited.
+
+**************************************************************************
diff --git a/math/rapid/pkg-descr b/math/rapid/pkg-descr
index 9a634c20be79..3c9646e9e905 100644
--- a/math/rapid/pkg-descr
+++ b/math/rapid/pkg-descr
@@ -2,3 +2,15 @@ RAPID is a  robust and accurate polygon interference detection library
 for large environments composed of unstructured models.
 
 WWW: http://www.cs.unc.edu/~geom/OBB/OBBT.html
+
+**************************************************************************
+
+The RAPID code is offered "as is" and is free for non-commercial use.
+
+To use RAPID for any commercial purpose, you must request a license from
+
+	http://www.cs.unc.edu/~geom/OBB/OBBT.html
+
+Redistribution of RAPID code in any form is strictly prohibited.
+
+**************************************************************************