4 files changed, 39 insertions, 21 deletions
diff --git a/graphics/baires/baires.SlackBuild b/graphics/baires/baires.SlackBuild
index 71eea79775e5..554e35d49930 100644
--- a/graphics/baires/baires.SlackBuild
+++ b/graphics/baires/baires.SlackBuild
@@ -21,6 +21,15 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# Modified by B. Watson, 20141208:
+# - took over as maintainer
+# - use archive.org URLs in .info file
+# - install shipped HTML docs, have the Help option use
+#   them instead of upstream's site (which no longer exists)
+# - use 128px icon instead of 48px
+# - make .desktop file validate
+# - minor script cleanups
+
 PRGNAM=baires
 VERSION=${VERSION:-1.2r1}
 BUILD=${BUILD:-1}
@@ -54,7 +63,7 @@ else
   LIBDIRSUFFIX=""
 fi
 
-DOCS="CHANGELOG LICENSE"
+DOCS="CHANGELOG LICENSE documentation/*.html snapshots"
 
 set -e
 
@@ -71,20 +80,35 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+# use locally installed copies of HTML docs, since upstream's site has
+# gone away.
+sed -i \
+  "s,http://www.beli.ws/apps/baires/help/,file:///usr/doc/$PRGNAM-$VERSION/," \
+  mainwindow.cpp
+
+# the HTML docs have fully qualified URLs for images, use local copies
+# for these, too.
+ICON=/usr/share/pixmaps/$PRGNAM.png
+SNAPS=/usr/doc/$PRGNAM-$VERSION/snapshots
+sed -i \
+  -e "s,http://www\.beli\.ws/images/baires-64\.png,file://$ICON," \
+  -e "s,http://www\.beli\.ws/images/\(baires._..\.png\),file://$SNAPS/\1," \
+  documentation/*.html
+
 qmake QMAKE_CFLAGS="$SLKCFLAGS" \
 	QMAKE_CXXFLAGS="$SLKCFLAGS" \
 	$PRGNAM.pro
 
 make
-install -d -m 755 $PKG/usr/bin
-install -m 755 $TMP/$PRGNAM/$PRGNAM $PKG/usr/bin
-install -d -m 755 $PKG/usr/share/pixmaps
-install -m 644 $TMP/$PRGNAM/icons/baires-48.png $PKG/usr/share/pixmaps/baires.png
-install -d -m 755 $PKG/usr/share/applications
-install -m 644 $PRGNAM.desktop $PKG/usr/share/applications
-
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/bin $PKG/usr/share/pixmaps $PKG/usr/share/applications
+install -s -m 755 $PRGNAM $PKG/usr/bin
+cat icons/$PRGNAM-128.png > $PKG/$ICON
+
+# Get rid of deprecated & nonstandard keys from .desktop, for
+# desktop-file-validate.
+grep -v -e ^Encoding -e ^X-SuSE $PRGNAM.desktop \
+  > $PKG/usr/share/applications/$PRGNAM.desktop
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/graphics/baires/baires.info b/graphics/baires/baires.info
index 99938926315d..80fb86e3d5fa 100644
--- a/graphics/baires/baires.info
+++ b/graphics/baires/baires.info
@@ -1,10 +1,10 @@
 PRGNAM="baires"
 VERSION="1.2r1"
-HOMEPAGE="http://www.beli.ws/apps/baires/"
-DOWNLOAD="http://www.beli.ws/apps/baires/baires.tar.gz"
+HOMEPAGE="http://web.archive.org/web/20140813021625/http://www.beli.ws/apps/baires/"
+DOWNLOAD="http://web.archive.org/web/20110910073638/http://www.beli.ws/apps/baires/baires.tar.gz"
 MD5SUM="2ef963760336f595c071efb61813bfaf"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Bojan Popovic"
-EMAIL="bocke@slackware-srbija.org"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/graphics/baires/doinst.sh b/graphics/baires/doinst.sh
index 3e5691a052b5..5fb28930db0b 100644
--- a/graphics/baires/doinst.sh
+++ b/graphics/baires/doinst.sh
@@ -1,9 +1,3 @@
 if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
-
-if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
-  if [ -x /usr/bin/gtk-update-icon-cache ]; then
-    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
-  fi
-fi
diff --git a/graphics/baires/slack-desc b/graphics/baires/slack-desc
index fd03371e799a..f857e3d4e8a5 100644
--- a/graphics/baires/slack-desc
+++ b/graphics/baires/slack-desc
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
       |-----handy-ruler------------------------------------------------------|
-baires: Baires (Batch image resizer)
+baires: baires (Batch image resizer)
 baires:
 baires: Baires is a small batch image resizer Qt GUI.
 baires: