academic/xcircuit: Updated for version 3.7.6.

5 files changed, 62 insertions, 51 deletions

diff --git a/academic/xcircuit/README b/academic/xcircuit/README
index 38d5649e3c1b..b8eca76d61cb 100644
--- a/academic/xcircuit/README
+++ b/academic/xcircuit/README
@@ -1,14 +1,10 @@
-XCircuit is a program for drawing publishable-quality electrical circuit 
-schematic diagrams and related figures, and produce circuit netlists through 
-schematic capture.  XCircuit regards circuits as inherently hierarchical, and 
-writes both hierarchical PostScript output and hierarchical SPICE netlists. 
-Circuit components are saved in and retrieved from libraries which are fully 
-editable.  XCircuit does not separate artistic expression from circuit 
-drawing; it maintains flexiblity in style without compromising the power 
-of schematic capture.
-
-XCircuit is flexible enough to be used as a generic program for drawing just 
-about anything, and is competitive with powerful programs such as xfig. 
-It is especially good for any task requiring repeated use of a standard set 
-of graphical objects, including architectural drawing, printed circuit board 
-(PCB) layouts, and music typography.
+XCircuit is a UNIX/X11 (and Windows, if you have an X-Server running,
+or Windows API, if not) program for drawing publishable-quality
+electrical circuit schematic diagrams and related figures, and produce
+circuit netlists through schematic capture. XCircuit regards circuits
+as inherently hierarchical, and writes both hierarchical PostScript
+output and hierarchical SPICE netlists. Circuit components are saved
+in and retrieved from libraries which are fully editable. XCircuit
+does not separate artistic expression from circuit drawing; it
+maintains flexiblity in style without compromising the power of
+schematic capture.
diff --git a/academic/xcircuit/doinst.sh b/academic/xcircuit/doinst.sh
index 4e8ba7071dea..4df207194f5b 100644
--- a/academic/xcircuit/doinst.sh
+++ b/academic/xcircuit/doinst.sh
@@ -1,4 +1,3 @@
 if [ -x /usr/bin/update-desktop-database ]; then
-  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+/usr/bin/update-desktop-database -q /usr/share/applications >/dev/null 2>&1
 fi
-
diff --git a/academic/xcircuit/slack-desc b/academic/xcircuit/slack-desc
index 42a61129c1d0..44ce023ff9ac 100644
--- a/academic/xcircuit/slack-desc
+++ b/academic/xcircuit/slack-desc
@@ -5,15 +5,15 @@
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
-         |-----handy-ruler-----------------------------------------------------|
-xcircuit: xcircuit (circuit schematic diagram tool)
-xcircuit:
-xcircuit: XCircuit is a program for drawing publishable-quality electrical
-xcircuit: circuit schematic diagrams and related figures, and produce circuit
-xcircuit: netlists through schematic capture.  XCircuit regards circuits as
-xcircuit: inherently hierarchical, and writes both hierarchical PostScript
-xcircuit: output and hierarchical SPICE netlists.  Circuit components are saved 
-xcircuit: in and retrieved from libraries which are fully editable.
-xcircuit:
-xcircuit: Homepage: http://opencircuitdesign.com/xcircuit/
-xcircuit:
+        |-----handy-ruler-----------------------------------------------------|
+xcircuit: XCircuit is a UNIX/X11 (and Windows, if you have an X-Server running,
+xcircuit: or Windows API, if not) program for drawing publishable-quality
+xcircuit: electrical circuit schematic diagrams and related figures, and 
+xcircuit: produce circuit netlists through schematic capture. XCircuit regards 
+xcircuit: circuits as inherently hierarchical, and writes both hierarchical 
+xcircuit: PostScript output and hierarchical SPICE netlists.
+xcircuit: Circuit components are saved in and retrieved from libraries which 
+xcircuit: are fully editable.
+xcircuit: 
+xcircuit: XCircuit was written and is maintained by Tim Edwards, currently 
+xcircuit: with the Johns Hopkins University Applied Physics Laboratory.
diff --git a/academic/xcircuit/xcircuit.SlackBuild b/academic/xcircuit/xcircuit.SlackBuild
index a89c9c7d368b..cc53ae825608 100644
--- a/academic/xcircuit/xcircuit.SlackBuild
+++ b/academic/xcircuit/xcircuit.SlackBuild
@@ -3,16 +3,18 @@
 # Slackware build script for grace
 # Written by B. Jogai <jogaib {at} comcast [dot] net>
 
+# Set initial variables:
+
 PRGNAM=xcircuit
-VERSION=3.7.5
+VERSION=3.7.6
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}
+TAG=${TAG:-"_SBo"}
 
 CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}
+TMP=${TMP:-"/tmp/SBo"}
 PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
+OUTPUT=${OUTPUT:-"/tmp"}
 
 if [ "$ARCH" = "i486" ]; then
     SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -36,6 +38,9 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
+chown -R root:root .
+chmod -R u+w,go+r-w,a-s .
+
 CFLAGS="$SLKCFLAGS" \
     ./configure \
     --prefix=/usr \
@@ -50,13 +55,22 @@ CFLAGS="$SLKCFLAGS" \
 make
 make DESTDIR=$PKG install
 
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/examples
+
+cp -a CHANGES README* TODO VERSION examples/ \
+    $PKG/usr/doc/$PRGNAM-$VERSION
+
+find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 644 {} \;
+
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 ( cd $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 || true
-)
+    find . | xargs file | grep "executable" | grep ELF | \
+	cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+    find . | xargs file | grep "shared object" | grep ELF | \
+	cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+    )
+
 
 # Add desktop menu entries
 mkdir -p $PKG/usr/share/{applications,pixmaps}
@@ -67,22 +81,24 @@ cat $CWD/xcircuit.desktop > $PKG/usr/share/applications/xcircuit.desktop
 # Don't move it in case the program needs it there for some reason.
 rm -rf $PKG/usr/man
 mkdir -p $PKG/usr/man/man1
+rm -f $PKG/usr/man/man1/*.1
 cp $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM-3.7/man/*.1 $PKG/usr/man/man1
 
-( 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/doc/$PRGNAM-$VERSION/examples
-cp -a CHANGES README* TODO VERSION examples/ \
-    $PKG/usr/doc/$PRGNAM-$VERSION
-find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 644 {} \;
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+# Compress the man pages if they exist
+if [ -d $PKG/usr/man ]; then
+    ( 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
+	) 
+fi
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
+
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/academic/xcircuit/xcircuit.info b/academic/xcircuit/xcircuit.info
index 4718967c2cd3..58e8481d7d56 100644
--- a/academic/xcircuit/xcircuit.info
+++ b/academic/xcircuit/xcircuit.info
@@ -1,10 +1,10 @@
 PRGNAM="xcircuit"
-VERSION="3.7.5"
+VERSION="3.7.6"
 HOMEPAGE="http://opencircuitdesign.com/xcircuit/"
-DOWNLOAD="http://opencircuitdesign.com/xcircuit/archive/xcircuit-3.7.5.tgz"
+DOWNLOAD="http://opencircuitdesign.com/xcircuit/archive/xcircuit-3.7.6.tgz"
 DOWNLOAD_x86_64=""
-MD5SUM="5cbcda1af745898f0f382325562b987b"
+MD5SUM="0b4122adcc2821791c5d2acaaf187996"
 MD5SUM_x86_64=""
 MAINTAINER="B. Jogai"
 EMAIL="jogaib <at> comcast {dot} net"
-APPROVED="dsomero"
+APPROVED="Erik Hanson"