6 files changed, 42 insertions, 20 deletions

diff --git a/math/lensnns/Makefile b/math/lensnns/Makefile
index f53970b3e8c8..9a6da5673835 100644
--- a/math/lensnns/Makefile
+++ b/math/lensnns/Makefile
@@ -1,15 +1,16 @@
 # New ports collection makefile for:	lensnns
 # Date created:		9 jan 2007
-# Whom:			Jason W. Bacon <bacon@smithers.neuro.mcw.edu>
+# Whom:			Jason W. Bacon <jwbacon@tds.net>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	lensnns
 PORTVERSION=	2.63
+PORTREVISION=	1
 CATEGORIES=	math science
 MASTER_SITES=	http://tedlab.mit.edu/~dr/Lens/Dist/ \
-		http://www.neuro.mcw.edu/~bacon/Ports/distfiles/
+		http://www.neuro.mcw.edu/Ports/distfiles/
 DISTNAME=	lens
 
 MAINTAINER=	bacon@smithers.neuro.mcw.edu
@@ -17,27 +18,16 @@ COMMENT=	Light Efficient Neural Network Simulator
 
 LIB_DEPENDS=	tcl83.1:${PORTSDIR}/lang/tcl83 \
 		tk83.1:${PORTSDIR}/x11-toolkits/tk83
+RUN_DEPENDS=	runsomebrowser:${PORTSDIR}/www/runsomebrowser
 
 USE_GMAKE=	yes
 
-MAKE_ENV+=	HOSTTYPE="FreeBSD"
-
 MAN1=		lensnns.1
 
-SUB_FILES=	pkg-message lensnns.1
+SUB_FILES=	pkg-message lensnns.1 lensnns.cshrc lensnns.profile
 PKGMESSAGE=	${WRKDIR}/pkg-message
-WEB_BROWSER?=	konqueror
-
-pre-everything::
-	@${ECHO_CMD} ""
-	@${ECHO_CMD} "========================================================"
-	@${ECHO_CMD} "The default WEB browser for viewing the manual is KDE's"
-	@${ECHO_CMD} "konqueror.  If you want to change this, type Ctrl+C now,"
-	@${ECHO_CMD} "and run make again with -DWEB_BROWSER, e.g."
-	@${ECHO_CMD} ""
-	@${ECHO_CMD} "	make -DWEB_BROWSER=firefox"
-	@${ECHO_CMD} "========================================================"
-	@${ECHO_CMD} ""
+WEB_BROWSER?=	runsomebrowser
+MAKE_ENV+=	HOSTTYPE="FreeBSD"
 
 post-extract:
 	${MKDIR} ${WRKDIR}/lens
@@ -49,7 +39,7 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/Bin/FreeBSD/lens-2.63 ${PREFIX}/bin
 	${LN} -s ${PREFIX}/bin/alens-2.63 ${PREFIX}/bin/alensnns
 	${LN} -s ${PREFIX}/bin/lens-2.63 ${PREFIX}/bin/lensnns
-	${INSTALL_MAN} ${WRKDIR}/lensnns.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKDIR}/lensnns.1 ${MAN1PREFIX}/man/man1
 	${MKDIR} ${PREFIX}/share/${PORTNAME}/Src/Images
 	${MKDIR} ${PREFIX}/share/${PORTNAME}/Examples
 	${MKDIR} ${PREFIX}/share/${PORTNAME}/Commands
@@ -61,6 +51,9 @@ do-install:
 		${PREFIX}/share/${PORTNAME}/Examples
 	${INSTALL_DATA} ${WRKSRC}/Commands/* \
 		${PREFIX}/share/${PORTNAME}/Commands
+	${MKDIR} ${PREFIX}/etc/mri
+	${INSTALL_SCRIPT} ${WRKDIR}/lensnns.cshrc ${WRKDIR}/lensnns.profile \
+		${PREFIX}/etc/mri
 
 post-install:
 	@${ECHO_CMD}; ${CAT} ${PKGMESSAGE}; ${ECHO_CMD}
diff --git a/math/lensnns/files/lensnns.cshrc.in b/math/lensnns/files/lensnns.cshrc.in
new file mode 100644
index 000000000000..0e5ebb586445
--- /dev/null
+++ b/math/lensnns/files/lensnns.cshrc.in
@@ -0,0 +1 @@
+setenv LENSDIR %%DATADIR%%
diff --git a/math/lensnns/files/lensnns.profile.in b/math/lensnns/files/lensnns.profile.in
new file mode 100644
index 000000000000..486e8903470a
--- /dev/null
+++ b/math/lensnns/files/lensnns.profile.in
@@ -0,0 +1,2 @@
+LENSDIR=%%DATADIR%%
+export LENSDIR
diff --git a/math/lensnns/files/pkg-message.in b/math/lensnns/files/pkg-message.in
index 00853dcbec09..7bc5a2910600 100644
--- a/math/lensnns/files/pkg-message.in
+++ b/math/lensnns/files/pkg-message.in
@@ -4,16 +4,37 @@ For quick instructions, type
 
 	man lensnns
 
+---
+
 To use the default configuration, set the environment variable LENSDIR to
 
         %%DATADIR%%
 
+As an alternative to manual setup shown above, this port (and many other MRI
+ports) include configuration scripts to automaticaly perform this setup.
+Using these scripts, a single addition to your shell's startup script will
+automatically configure the environment for all MRI ports that include
+a configuration script.
+
+To utilize these scripts in C-shell compatible shells, add the following
+to your .cshrc:
+
+foreach script (%%PREFIX%%/etc/mri/*.cshrc)
+    source ${script}
+end
+
+For Bourne-shell compatibles, add the following to your .profile:
+
+for script in %%PREFIX%%/etc/mri/*.profile; do
+    . ${script}
+done
+
+---
+
 If you want to customize your environment, make a complete copy of
 
         %%DATADIR%%
 
 and set LENSDIR to the full pathname of your copy.
 
-Firefox is required to view the manual from the Help menu.
-
 ===========================================================================
diff --git a/math/lensnns/pkg-descr b/math/lensnns/pkg-descr
index 3cd328003360..74275fd08ae6 100644
--- a/math/lensnns/pkg-descr
+++ b/math/lensnns/pkg-descr
@@ -1,3 +1,5 @@
 Lens is an efficient, yet flexible, neural network simulator that runs on
 a variety of platforms, is able to handle large, complex simulations, but
 is also reasonably easy for novices to operate.
+
+WWW: http://tedlab.mit.edu/~dr/Lens/
diff --git a/math/lensnns/pkg-plist b/math/lensnns/pkg-plist
index 3eb5b1e70668..aca10ba607aa 100644
--- a/math/lensnns/pkg-plist
+++ b/math/lensnns/pkg-plist
@@ -2,6 +2,8 @@ bin/alensnns
 bin/alens-2.63
 bin/lensnns
 bin/lens-2.63
+etc/mri/lensnns.cshrc
+etc/mri/lensnns.profile
 %%DATADIR%%/Commands/addGroup.txt
 %%DATADIR%%/Commands/addLinkType.txt
 %%DATADIR%%/Commands/addNet.txt
@@ -232,3 +234,4 @@ bin/lens-2.63
 @dirrm %%DATADIR%%/Examples
 @dirrm %%DATADIR%%/Commands
 @dirrm %%DATADIR%%
+@dirrmtry etc/mri