3 files changed, 27 insertions, 12 deletions
diff --git a/system/xchm/doinst.sh b/system/xchm/doinst.sh
new file mode 100644
index 000000000000..65c7e2eeb9aa
--- /dev/null
+++ b/system/xchm/doinst.sh
@@ -0,0 +1,9 @@
+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 -f usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
diff --git a/system/xchm/xchm.SlackBuild b/system/xchm/xchm.SlackBuild
index 3ac57e98a103..cff147c1b518 100644
--- a/system/xchm/xchm.SlackBuild
+++ b/system/xchm/xchm.SlackBuild
@@ -9,7 +9,8 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=xchm
-VERSION=${VERSION:-1.23}
+SRCNAM=xCHM
+VERSION=${VERSION:-1.36}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -50,9 +51,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -62,10 +63,11 @@ find -L . \
 
 CFLAGS=$SLKCFLAGS \
 CXXFLAGS=$SLKCFLAGS \
-./configure  \
-  --with-wx-config=/usr/lib$LIBDIRSUFFIX/wx/config/gtk2-unicode-release-2.8 \
+./bootstrap
+./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --mandir=/usr/man \
   --build=$ARCH-slackware-linux \
   --host=$ARCH-slackware-linux
 
@@ -73,14 +75,18 @@ make
 make install DESTDIR=$PKG
 strip --strip-unneeded $PKG/usr/bin/$PRGNAM 2> /dev/null
 
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  ABOUT-NLS AUTHORS ChangeLog COPYING INSTALL README README.xmlrpc \
+  ABOUT-NLS AUTHORS ChangeLog COPYING README README.xmlrpc \
     $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 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
diff --git a/system/xchm/xchm.info b/system/xchm/xchm.info
index c8429ae45023..cb1f366bca43 100644
--- a/system/xchm/xchm.info
+++ b/system/xchm/xchm.info
@@ -1,10 +1,10 @@
 PRGNAM="xchm"
-VERSION="1.23"
-HOMEPAGE="http://xchm.sourceforge.net/"
-DOWNLOAD="http://ftp.netbsd.org/pub/pkgsrc/distfiles/xchm-1.23.tar.gz"
-MD5SUM="486d029bd81071a2d04e7181909b1602"
+VERSION="1.36"
+HOMEPAGE="https://github.com/rzvncj/xCHM/"
+DOWNLOAD="https://github.com/rzvncj/xCHM/archive/1.36/xCHM-1.36.tar.gz"
+MD5SUM="8bc0d01cb95b6495cccde0d1ec9a851f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="wxPython"
+REQUIRES="wxWidgets"
 MAINTAINER="Michael Gehring"
 EMAIL="mg@ebfe.org"