academic/ImageJ: Updated for version 1.46.

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>

4 files changed, 22 insertions, 35 deletions

diff --git a/academic/ImageJ/ImageJ.SlackBuild b/academic/ImageJ/ImageJ.SlackBuild
index a10cf37730..5d230524af 100644
--- a/academic/ImageJ/ImageJ.SlackBuild
+++ b/academic/ImageJ/ImageJ.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for ImageJ
 
-# Copyright 2012  Petar Petrov, ppetrov@paju.oulu.fi
+# Copyright 2012-2013  Petar Petrov, ppetrov@paju.oulu.fi
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,19 +22,19 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-PRGNAM=ImageJ		
-VERSION=${VERSION:-1.45}
+PRGNAM=ImageJ
+VERSION=${VERSION:-1.46}
 ARCH=noarch
 BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}	
+TAG=${TAG:-_SBo}
 
 SRCNAM=ij
-SRCVER=145
+SRCVER=146
 
 CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}	
+TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}	
+OUTPUT=${OUTPUT:-/tmp}
 
 set -e
 
@@ -44,7 +44,6 @@ cd $TMP
 rm -rf $PRGNAM
 unzip $CWD/${SRCNAM}${SRCVER}.zip
 cd $PRGNAM
-unzip $CWD/ucsd-plugins.zip
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -55,22 +54,16 @@ find . \
 mkdir -p $PKG/usr/share/$PRGNAM
 cp -a luts macros plugins ij.jar $PKG/usr/share/$PRGNAM
 
-# Install bio-formats plugins 
-mkdir -p $PKG/usr/share/$PRGNAM/plugins/LOCI
-cp -a $CWD/loci_tools.jar $PKG/usr/share/$PRGNAM/plugins/LOCI
-
-# Install UCSD confocal microscopy plugins
-cp -a UCSD\ Plugins $PKG/usr/share/$PRGNAM/plugins/
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a README.html $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 # Fix permissions
 find $PKG -type d -exec chmod 755 {} \; -o \
-          -type f -exec chmod 644 {} \; 
+          -type f -exec chmod 644 {} \;
 
-# Install wrapper of ij.jar
+# Install the wrapper of ij.jar, taken from the link below:
+# http://rsb.info.nih.gov/ij/download/linux/unix-script.txt
 install -D -m755 $CWD/imagej $PKG/usr/bin/imagej
 
 mkdir -p $PKG/usr/share/{applications,pixmaps}
diff --git a/academic/ImageJ/ImageJ.info b/academic/ImageJ/ImageJ.info
index 00fe254697..5bd65d54f4 100644
--- a/academic/ImageJ/ImageJ.info
+++ b/academic/ImageJ/ImageJ.info
@@ -1,12 +1,8 @@
 PRGNAM="ImageJ"
-VERSION="1.45"
+VERSION="1.46"
 HOMEPAGE="http://rsb.info.nih.gov/ij/"
-DOWNLOAD="http://rsb.info.nih.gov/ij/download/zips/ij145.zip \
-          http://www.loci.wisc.edu/files/software/loci_tools.jar \
-          http://rsbweb.nih.gov/ij/plugins/download/ucsd-plugins.zip"
-MD5SUM="c0e0202c4a358e886ce1582dd2c9b830 \
-        2914600d36ce0c077526a0380b59f099 \
-        277dec926cc27ade8ef01b8ae4bb69cb"
+DOWNLOAD="http://rsb.info.nih.gov/ij/download/zips/ij146.zip"
+MD5SUM="61b96882acc037e72d5da3c41396cad6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jdk"
diff --git a/academic/ImageJ/README b/academic/ImageJ/README
index 3c15f5325e..75120f2ee0 100644
--- a/academic/ImageJ/README
+++ b/academic/ImageJ/README
@@ -26,9 +26,7 @@ ImageJ was designed with an open architecture that provides
 extensibility via Java plugins. User-written plugins make it possible
 to solve almost any image processing or analysis problem.
 
-This includes the following additional plugins:
-1) Bio-Formats.
-2) UCSD confocal microscopy plugins.
-
-For a complete list of available plugins, check the corresponding
-section at the program website.
+NOTE ABOUT PLUGINS:
+If you are looking for additional features, search for ImageJ plugins
+already available at SBo (ij-plugins-*) or check the program website
+for more.
diff --git a/academic/ImageJ/slack-desc b/academic/ImageJ/slack-desc
index 637ac00056..f74d9aff79 100644
--- a/academic/ImageJ/slack-desc
+++ b/academic/ImageJ/slack-desc
@@ -1,9 +1,9 @@
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
 
       |-----handy-ruler------------------------------------------------------|
 ImageJ: ImageJ (Image processing and analysis in Java)