aboutsummaryrefslogtreecommitdiff
path: root/network
diff options
context:
space:
mode:
authorB. Watson <urchlay@slackware.uk>2023-07-01 02:38:29 -0400
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2023-07-08 16:42:03 +0700
commita8690afa538cb951d832b2687af7a87955f7110a (patch)
treecb24041fea6a45f5a2e8132f852241bf6db607e0 /network
parent1aa18458b92099f71681f001c4e9a76321d57cdf (diff)
network/msmtp: Fix doinst.sh, add douninst.sh.
Signed-off-by: B. Watson <urchlay@slackware.uk> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'network')
-rw-r--r--network/msmtp/doinst.sh7
-rw-r--r--network/msmtp/msmtp.SlackBuild21
2 files changed, 15 insertions, 13 deletions
diff --git a/network/msmtp/doinst.sh b/network/msmtp/doinst.sh
index b7c8257e07462..1bef5020286ea 100644
--- a/network/msmtp/doinst.sh
+++ b/network/msmtp/doinst.sh
@@ -1 +1,6 @@
-chroot . /usr/bin/install-info /usr/info/msmtp.info.gz /usr/info/dir 2> /dev/null
+if [ -x /usr/bin/install-info -a -d usr/info ]; then
+ ( cd usr/info
+ rm -f dir
+ for i in *.info*; do /usr/bin/install-info $i dir 2>/dev/null; done
+ )
+fi
diff --git a/network/msmtp/msmtp.SlackBuild b/network/msmtp/msmtp.SlackBuild
index 07a593c7b9095..8f3cd8eb3bb66 100644
--- a/network/msmtp/msmtp.SlackBuild
+++ b/network/msmtp/msmtp.SlackBuild
@@ -20,11 +20,14 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# 20230701 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - use correct template for install-info in doinst.sh, add douninst.sh.
+
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=msmtp
VERSION=${VERSION:-1.8.20}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -36,9 +39,6 @@ if [ -z "$ARCH" ]; then
esac
fi
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -76,9 +76,9 @@ 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 \
+ -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 {} \;
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} +
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
@@ -93,13 +93,9 @@ CXXFLAGS="$SLKCFLAGS" \
--build=$ARCH-slackware-linux
make
-make install DESTDIR=$PKG
-
-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
+make install-strip DESTDIR=$PKG
-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
+gzip -9 $PKG/usr/man/man*/*
rm -f $PKG/usr/info/dir
gzip -9 $PKG/usr/info/*.info*
@@ -111,6 +107,7 @@ 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
+cat $CWD/doinst.sh > $PKG/install/douninst.sh
cd $PKG
/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE