4 files changed, 47 insertions, 53 deletions
diff --git a/desktop/xdgmenumaker/README b/desktop/xdgmenumaker/README
index 46cae26fbf..0c9e907d48 100644
--- a/desktop/xdgmenumaker/README
+++ b/desktop/xdgmenumaker/README
@@ -1,10 +1,11 @@
-xdgmenumaker is a command line tool, written in python, that generates
-application menus using xdg information, by scanning *.desktop files
-in all $XDG_DATA_DIRS/applications directories. All applications are
-sorted according to the main categories as specified by freedesktop.org.
+xdgmenumaker (application menu generator for window managers)
 
-The menu entries that are generated by xdgmenumaker are localised
-according to the running user locale settings.
+xdgmenumaker is a command line tool, written in python, that generates
+application menus using xdg information, by scanning *.desktop files in
+all $XDG_DATA_DIRS/applications directories. All applications are sorted
+according to the main categories as specified by freedesktop.org. The
+menu entries that are generated by xdgmenumaker are localised according
+to the running user locale settings.
 
-xdgmenumaker currently supports generating menus for fluxbox, icewm and
-windowmaker.
+xdgmenumaker currently supports generating menus for fluxbox, icewm,
+jwm, pekwm and windowmaker.
diff --git a/desktop/xdgmenumaker/slack-desc b/desktop/xdgmenumaker/slack-desc
index 9f1a02e110..dbd8e1ba00 100644
--- a/desktop/xdgmenumaker/slack-desc
+++ b/desktop/xdgmenumaker/slack-desc
@@ -1,18 +1,18 @@
-# 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 ':' except on otherwise blank lines.
+
             |-----handy-ruler------------------------------------------------------|
-xdgmenumaker: xdgmenumaker (generates application menus)
+xdgmenumaker: xdgmenumaker (application menu generator for window managers)
 xdgmenumaker:
 xdgmenumaker: xdgmenumaker is a command line tool, written in python, that
 xdgmenumaker: generates application menus using xdg information, by scanning
-xdgmenumaker: *.desktop files in all $XDG_DATA_DIRS/applications directories.
-xdgmenumaker:
-xdgmenumaker: xdgmenumaker currently supports generating menus for fluxbox, icewm
-xdgmenumaker: and windowmaker.
-xdgmenumaker:
-xdgmenumaker:
+xdgmenumaker: *.desktop files in all $XDG_DATA_DIRS/applications directories. All
+xdgmenumaker: applications are sorted according to the main categories as specified
+xdgmenumaker: by freedesktop.org. The menu entries that are generated by xdgmenumaker
+xdgmenumaker: are localised according to the running user locale settings.
 xdgmenumaker:
+xdgmenumaker: xdgmenumaker currently supports generating menus for fluxbox, icewm,
+xdgmenumaker: jwm, pekwm and windowmaker.
diff --git a/desktop/xdgmenumaker/xdgmenumaker.SlackBuild b/desktop/xdgmenumaker/xdgmenumaker.SlackBuild
index c24fed036d..24765e4ad4 100644
--- a/desktop/xdgmenumaker/xdgmenumaker.SlackBuild
+++ b/desktop/xdgmenumaker/xdgmenumaker.SlackBuild
@@ -1,60 +1,53 @@
 #!/bin/sh
 
 # Slackware build script for xdgmenumaker
-
 # Copyright 2013, Andrew Tkalia, Ukraine, Kyiv
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# Written by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/
+# for details.
 
 PRGNAM=xdgmenumaker
-VERSION=${VERSION:-0.4}
+VERSION=${VERSION:-0.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+# pure python, no compiled code at all
+ARCH=noarch
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-ARCH=noarch
-
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar Jxvf $CWD/$PRGNAM-$VERSION.tar.xz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# install man pages where Slackware wants them:
+sed -i 's,share/man,man,' install.sh
+
+# I had to use the full path to xdgmenumaker to get a windowmaker
+# dynamic menu to work, the man page should reflect this:
+sed -i '/``xdgmenumaker -f windowmaker``/s,``,``/usr/bin/,' man/$PRGNAM.t2t
 
 DESTDIR=$PKG ./install.sh
 
+gzip $PKG/usr/man/man1/$PRGNAM.1
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  README INSTALL COPYING AUTHORS \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/desktop/xdgmenumaker/xdgmenumaker.info b/desktop/xdgmenumaker/xdgmenumaker.info
index 10780bc037..a0c043cbcc 100644
--- a/desktop/xdgmenumaker/xdgmenumaker.info
+++ b/desktop/xdgmenumaker/xdgmenumaker.info
@@ -1,10 +1,10 @@
 PRGNAM="xdgmenumaker"
-VERSION="0.4"
-HOMEPAGE="http://www.salixos.org/wiki/index.php/Xdgmenumaker"
-DOWNLOAD="http://salix.enialis.net/i486/14.0/source/xap/xdgmenumaker/xdgmenumaker-0.4.tar.xz"
-MD5SUM="4d5f97ac1b73c5fc642c88648d43e8b8"
+VERSION="0.5"
+HOMEPAGE="https://github.com/gapan/xdgmenumaker"
+DOWNLOAD="https://github.com/gapan/xdgmenumaker/archive/0.5.tar.gz"
 DOWNLOAD_x86_64=""
+MD5SUM="d4fad8709022ec9b3c0034871cdea962"
 MD5SUM_x86_64=""
-REQUIRES="pyxdg"
-MAINTAINER="Andrew Tkalia"
-EMAIL="anddt@yandex.ru"
+REQUIRES="pyxdg txt2tags"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"