1 files changed, 26 insertions, 32 deletions
diff --git a/slackpkg.SlackBuild b/slackpkg.SlackBuild
index 706d3f5..81ead2d 100755
--- a/slackpkg.SlackBuild
+++ b/slackpkg.SlackBuild
@@ -40,78 +40,72 @@ cd $CWD/files
 
 # Install main script:
 mkdir -pv $PKG/usr/sbin
-cp -av slackpkg.gz $PKG/usr/sbin
-gzip -d $PKG/usr/sbin/slackpkg.gz
+cp -av slackpkg $PKG/usr/sbin
 chmod 755 $PKG/usr/sbin/slackpkg
 chown root:root $PKG/usr/sbin/slackpkg
 
 # Prepare /etc directory:
 mkdir -pv $PKG/etc/slackpkg
-cp -av blacklist.new.gz slackpkg.conf.new.gz $PKG/etc/slackpkg
-gzip -d $PKG/etc/slackpkg/*
+cp -av blacklist.new slackpkg.conf.new $PKG/etc/slackpkg
 chmod 644 $PKG/etc/slackpkg/*
 chown root:root $PKG/etc/slackpkg/*
 mkdir -pv $PKG/etc/slackpkg/templates
 
 # Install support scripts in /usr/libexec/slackpkg:
 mkdir -pv $PKG/usr/libexec/slackpkg
-cp -av core-functions.sh.gz cutpkg.awk.gz filelist.awk.gz install-new.awk.gz pkglist.awk.gz \
+cp -av core-functions.sh cutpkg.awk filelist.awk install-new.awk pkglist.awk \
   $PKG/usr/libexec/slackpkg
-gzip -d $PKG/usr/libexec/slackpkg/*
 chmod 755 $PKG/usr/libexec/slackpkg/*
 chown root:root $PKG/usr/libexec/slackpkg/*
 mkdir -pv $PKG/usr/libexec/slackpkg/functions.d
-cp -av dialog-functions.sh.gz post-functions.sh.gz \
+cp -av dialog-functions.sh post-functions.sh \
   $PKG/usr/libexec/slackpkg/functions.d
-gzip -d $PKG/usr/libexec/slackpkg/functions.d/*
 chmod 755 $PKG/usr/libexec/slackpkg/functions.d/*
 chown root:root $PKG/usr/libexec/slackpkg/functions.d/*
 
 # Install man pages:
 mkdir -pv $PKG/usr/man/man5
-cp -av slackpkg.conf.5.gz $PKG/usr/man/man5
-chmod 644 $PKG/usr/man/man5/slackpkg.conf.5.gz
-chown root:root $PKG/usr/man/man5/slackpkg.conf.5.gz
+cp -av slackpkg.conf.5 $PKG/usr/man/man5
+chmod 644 $PKG/usr/man/man5/slackpkg.conf.5
+chown root:root $PKG/usr/man/man5/slackpkg.conf.5
 mkdir -pv $PKG/usr/man/man8
-cp -av slackpkg.8.gz $PKG/usr/man/man8
-chmod 644 $PKG/usr/man/man8/slackpkg.8.gz
-chown root:root $PKG/usr/man/man8/slackpkg.8.gz
+cp -av slackpkg.8 $PKG/usr/man/man8
+chmod 644 $PKG/usr/man/man8/slackpkg.8
+chown root:root $PKG/usr/man/man8/slackpkg.8
 
 # Install internationalized man pages from
 # http://slint.fr/forSlackware/man_l10n/slackpkg/
-( cd $PKG/usr/man
-  tar xf $CWD/manpages-l10n.tar.xz
-  for page in manpages-l10n/*slackpkg.conf ; do
-    manpage=$(basename $page)
-    mkdir -p ${manpage%%.*}/man5
-    mv $page ${manpage%%.*}/man5/${page#*.}.5
-  done
-  for page in manpages-l10n/* ; do
-    manpage=$(basename $page)
-    mkdir -p ${manpage%%.*}/man8
-    mv $page ${manpage%%.*}/man8/${page#*.}.8
-  done
-  gzip -9 */man?/*.?
-  rmdir manpages-l10n
-)
+for page in manpages-l10n/*slackpkg.conf ; do
+  manpage=$(basename $page)
+  mkdir -p $PKG/usr/man/${manpage%%.*}/man5
+  cp -av $page $PKG/usr/man/${manpage%%.*}/man5/${page#*.}.5
+done
+for page in manpages-l10n/* ; do
+  manpage=$(basename $page)
+  mkdir -p $PKG/usr/man/${manpage%%.*}/man8
+  cp -av $page $PKG/usr/man/${manpage%%.*}/man8/${page#*.}.8
+done
+chown -R root:root $PKG/usr/man
+
+# Compress manual pages
+find $PKG/usr/man -type f -exec gzip -9 {} \;
 
 # Update version number:
 sed -i "s/@VERSION@/$VERSION/g" $PKG/usr/sbin/slackpkg
 
 # Prepare documentation directory:
 mkdir -pv $PKG/usr/doc/slackpkg-$VERSION
-cp -av ChangeLog.gz GPL.gz README.gz mirrors* \
+cp -av ChangeLog GPL README mirrors* \
   $PKG/usr/doc/slackpkg-$VERSION
 chown root:root $PKG/usr/doc/slackpkg-$VERSION/*
 chmod 644 $PKG/usr/doc/slackpkg-$VERSION/*
-gzip -d $PKG/usr/doc/slackpkg-$VERSION/*
 
 # Create additional directories needed by slackpkg:
 mkdir -pv $PKG/var/lib/slackpkg
 mkdir -pv $PKG/var/cache/packages
 
 mkdir -p $PKG/install
-zcat $CWD/doinst.sh.gz | sed -e "s/@VERSION@/$VERSION/g" > $PKG/install/doinst.sh
+cat $CWD/doinst.sh | sed -e "s/@VERSION@/$VERSION/g" > $PKG/install/doinst.sh
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG