2 files changed, 17 insertions, 17 deletions
diff --git a/system/passwordsafe/passwordsafe.SlackBuild b/system/passwordsafe/passwordsafe.SlackBuild
index c467e2a3c2..6bb77d31e6 100644
--- a/system/passwordsafe/passwordsafe.SlackBuild
+++ b/system/passwordsafe/passwordsafe.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=passwordsafe
-VERSION=${VERSION:-0.97BETA}
+VERSION=${VERSION:-0.99BETA}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 SRCNAM=pwsafe
@@ -83,7 +83,7 @@ find -L . \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 # Change path to help files to the proper directory.
-sed -i 's/\/usr\/share\/doc\/passwordsafe\/help\//\/usr\/share\/pwsafe\/help\//' src/os/linux/dir.cpp
+sed -i 's/\/usr\/share\/doc\/passwordsafe\/help\//\/usr\/share\/passwordsafe\/help\//' src/os/unix/dir.cpp
 
 CFLAGS="$SLKCFLAGS"
 CXXFLAGS="$SLKCFLAGS"
@@ -100,10 +100,10 @@ mkdir -p $PKG/usr/bin
 cp -a src/ui/wxWidgets/GCCUnicodeRelease/pwsafe $PKG/usr/bin
 
 mkdir -p $PKG/usr/man/man1
-cp -a docs/pwsafe.1 $PKG/usr/man/man1/$SRCNAM.1
+cp -a docs/pwsafe.1 $PKG/usr/man/man1
 mkdir -p $PKG/usr/share/{pixmaps,applications,locale}
-cp -a install/graphics/pwsafe.png $PKG/usr/share/pixmaps
-cp -a install/desktop/pwsafe.desktop $PKG/usr/share/applications
+cp -a install/graphics/pwsafe.png $PKG/usr/share/pixmaps/$PRGNAM.png
+cp -a install/desktop/pwsafe.desktop $PKG/usr/share/applications/$PRGNAM.desktop
 cp -aR src/ui/wxWidgets/I18N/mos/* $PKG/usr/share/locale
 
 find $PKG -type f -print0 | xargs -0 --no-run-if-empty chmod 644
@@ -115,16 +115,16 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 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/$SRCNAM-$VERSION/docs
-cp -a docs/*.{txt,rtf,html} $PKG/usr/doc/$SRCNAM-$VERSION/docs
-cp -a README* LICENSE install/copyright $PKG/usr/doc/$SRCNAM-$VERSION
-mkdir -p $PKG/usr/share/$SRCNAM/{help,xml}
-cp -a help/help*.zip $PKG/usr/share/$SRCNAM/help
-cp -a xml/* $PKG/usr/share/$SRCNAM/xml
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$SRCNAM-$VERSION/$PRGNAM.SlackBuild
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/docs
+cp -a docs/*.{txt,rtf,html} $PKG/usr/doc/$PRGNAM-$VERSION/docs
+cp -a README* LICENSE install/copyright $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/share/$PRGNAM/{help,xml}
+cp -a help/help*.zip $PKG/usr/share/$PRGNAM/help
+cp -a xml/* $PKG/usr/share/$PRGNAM/xml
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 # Compress program documentation files > 4k.
-find $PKG/usr/doc/$SRCNAM-$VERSION -type f -size 4k ! -iname *.htm ! -iname *.html \
+find $PKG/usr/doc/$PRGNAM-$VERSION -type f -size 4k ! -iname *.htm ! -iname *.html \
   ! -iname *.sh ! -iname *.zip -print0 | xargs -0 --no-run-if-empty /bin/gzip \
   --verbose --best
 
diff --git a/system/passwordsafe/passwordsafe.info b/system/passwordsafe/passwordsafe.info
index bf5a91516a..9e72aeeeb4 100644
--- a/system/passwordsafe/passwordsafe.info
+++ b/system/passwordsafe/passwordsafe.info
@@ -1,8 +1,8 @@
 PRGNAM="passwordsafe"
-VERSION="0.97BETA"
-HOMEPAGE="http://passwordsafe.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/project/passwordsafe/Linux-BETA/0.97/pwsafe-0.97BETA-src.tgz"
-MD5SUM="20ae6d1247ff6cf785d344e09d4db3c9"
+VERSION="0.99BETA"
+HOMEPAGE="http://pwsafe.org"
+DOWNLOAD="https://sourceforge.net/projects/passwordsafe/files/Linux-BETA/0.99/pwsafe-0.99BETA-src.tgz"
+MD5SUM="e3ff6a407542a06050cdca3235d7265c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="ykpers xerces-c wxGTK3 xvkbd"