academic/wxmacmolplt: Updated for version 7.4

6 files changed, 36 insertions, 24 deletions

diff --git a/academic/wxmacmolplt/README b/academic/wxmacmolplt/README
index 9f96e6c41c41..05cbd3082601 100644
--- a/academic/wxmacmolplt/README
+++ b/academic/wxmacmolplt/README
@@ -1,8 +1,7 @@
 The MacMolPlt molecular visualization program
 
-MacMolPlt is designed to display the input and output of
-the GAMESS(US) and PCGAMESS quantum chemistry packages.
-It produces animations and/or publication quality output
-from a variety of input file formats.
+MacMolPlt is designed to display the input and output of the GAMESS(US) 
+and PCGAMESS quantum chemistry packages.  It produces animations and/or 
+publication quality output from a variety of input file formats.
 
-wxMacMolPlt requres wxGTK built with OpenGL support.
+This requires wxGTK built with OpenGL support.
diff --git a/academic/wxmacmolplt/doinsh.sh b/academic/wxmacmolplt/doinst.sh
index 9830478e8cc7..9830478e8cc7 100644
--- a/academic/wxmacmolplt/doinsh.sh
+++ b/academic/wxmacmolplt/doinst.sh
diff --git a/academic/wxmacmolplt/slack-desc b/academic/wxmacmolplt/slack-desc
index 91a0a32b0650..6e3a0e885912 100644
--- a/academic/wxmacmolplt/slack-desc
+++ b/academic/wxmacmolplt/slack-desc
@@ -6,7 +6,7 @@
 # leave one space after the ':'.
 
            |-----handy-ruler------------------------------------------------------|
-wxmacmolplt: MacMolPlt (molecular visualization program)
+wxmacmolplt: wxmacmolplt (The MacMolPlt molecular visualization program)
 wxmacmolplt:
 wxmacmolplt: MacMolPlt is designed to display the input and output of
 wxmacmolplt: the GAMESS quantum chemistry package. It produces animations
diff --git a/academic/wxmacmolplt/wxmacmolplt-7.4-firefly.patch b/academic/wxmacmolplt/wxmacmolplt-7.4-firefly.patch
new file mode 100644
index 000000000000..540ec0bb5c01
--- /dev/null
+++ b/academic/wxmacmolplt/wxmacmolplt-7.4-firefly.patch
@@ -0,0 +1,11 @@
+--- a/src/BFiles.cpp	2009-11-13 06:42:20.000000000 +0300
++++ b/src/BFiles.cpp	2009-12-09 21:08:16.000000000 +0300
+@@ -294,6 +294,8 @@
+ 	while ((ByteCount <= FileSize)&&(Type == kUnknown)) {
+ 		if (LocateKeyWord("GAMESS VERSION", 14, -1))
+ 			Type = kGAMESSlogType;
++		else if (LocateKeyWord("Firefly (PC GAMESS) version", 27, -1))
++			Type = kGAMESSlogType;
+ 		else if (LocateKeyWord("===== IRC DATA PACKET", 21, -1))
+ 			Type = kGAMESSTRJType;
+ 		else if (LocateKeyWord("===== DRC DATA PACKET", 21, -1))
diff --git a/academic/wxmacmolplt/wxmacmolplt.SlackBuild b/academic/wxmacmolplt/wxmacmolplt.SlackBuild
index d1791a0ccb1a..54cb8516e326 100644
--- a/academic/wxmacmolplt/wxmacmolplt.SlackBuild
+++ b/academic/wxmacmolplt/wxmacmolplt.SlackBuild
@@ -5,9 +5,9 @@
 # Written by Daniil Bratashov <dn2010@gmail.com>
 
 PRGNAM=wxmacmolplt
-VERSION=${VERSION:-7.3}
+VERSION=${VERSION:-7.4}
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
@@ -35,9 +35,6 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 
-# Fix for PCGAMESS new raman activities format
-patch -p1 -E < $CWD/wxmacmolplt-7.2.1-raman.patch
-
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -45,6 +42,11 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+# Fix for PCGAMESS new raman activities format
+patch -p1 < $CWD/wxmacmolplt-7.2.1-raman.patch
+# Fix for Firefly format autodetection
+patch -p1 < $CWD/wxmacmolplt-7.4-firefly.patch
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -65,23 +67,21 @@ make install DESTDIR=$PKG
   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
     xargs strip --strip-unneeded 2> /dev/null || true
   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
-    xargs strip --strip-unneeded 2> /dev/null
+    xargs strip --strip-unneeded 2> /dev/null || true
 )
 
-mkdir -p $PKG/usr/share/icons/hicolor/128x128/apps
-cp resources/wxmacmolplt.png $PKG/usr/share/icons/hicolor/128x128/apps
-mkdir -p $PKG/usr/share/applications
-cp resources/wxmacmolplt.desktop $PKG/usr/share/applications
-
 ( cd $PKG/usr/man
   find . -type f -exec gzip -9 {} \;
   for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 )
 
+mkdir -p $PKG/usr/share/icons/hicolor/128x128/apps
+cp resources/wxmacmolplt.png $PKG/usr/share/icons/hicolor/128x128/apps
+mkdir -p $PKG/usr/share/applications
+cp resources/wxmacmolplt.desktop $PKG/usr/share/applications
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  AUTHORS LICENSE NEWS README \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS LICENSE NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 mv $PKG/usr/share/$PRGNAM/MacMolPlt_Manual.html $PKG/usr/doc/$PRGNAM-$VERSION
 mv $PKG/usr/share/$PRGNAM/Manual_pages $PKG/usr/doc/$PRGNAM-$VERSION
@@ -90,4 +90,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/academic/wxmacmolplt/wxmacmolplt.info b/academic/wxmacmolplt/wxmacmolplt.info
index bc6e1b8a1167..206ce850a189 100644
--- a/academic/wxmacmolplt/wxmacmolplt.info
+++ b/academic/wxmacmolplt/wxmacmolplt.info
@@ -1,8 +1,10 @@
 PRGNAM="wxmacmolplt"
-VERSION="7.3"
+VERSION="7.4"
 HOMEPAGE="http://www.scl.ameslab.gov/MacMolPlt/"
-DOWNLOAD="http://www.scl.ameslab.gov/MacMolPlt/download/wxmacmolplt-7.3.tar.gz"
-MD5SUM="867071582b2eaff49efdf0bfa2094252"
+DOWNLOAD="http://www.scl.ameslab.gov/MacMolPlt/download/wxmacmolplt-7.4.tar.gz"
+MD5SUM="26e1a2f5e5860334f29edc3b5f5c30e9"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Daniil Bratashov"
 EMAIL="dn2010@gmail.com"
 APPROVED="rworkman"