diff options
Diffstat (limited to 'system/man-db/man-db.SlackBuild')
| -rw-r--r-- | system/man-db/man-db.SlackBuild | 32 |
1 files changed, 12 insertions, 20 deletions
diff --git a/system/man-db/man-db.SlackBuild b/system/man-db/man-db.SlackBuild index 4d5e2e10c6..56740da46d 100644 --- a/system/man-db/man-db.SlackBuild +++ b/system/man-db/man-db.SlackBuild @@ -6,11 +6,11 @@ # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. -# 20180801 bkw: -# - update for v2.8.4. +# 20191201 bkw: update for v2.9.0 (to match -current again). +# Also got rid of the systemd-specific stuff properly (via configure opts). -# 20180611 bkw: -# - update for v2.8.3, to match what Pat has in -current. +# 20180801 bkw: update for v2.8.4. +# 20180611 bkw: update for v2.8.3, to match what Pat has in -current. # 20180208 bkw: update for man-db 2.8.0, libpipeline 1.5.0. # This may be the last SBo update, since Pat has imported man-db @@ -52,7 +52,7 @@ # - update README and README.Slackware slightly. PRGNAM=man-db -VERSION=${VERSION:-2.8.4} +VERSION=${VERSION:-2.9.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -109,18 +109,15 @@ mkdir -p $TMP $PKG $OUTPUT # Instead of making it a separate build and external dep, we'll just # bundle it here. LIBNAM=libpipeline -LIBVER=1.5.0 +LIBVER=1.5.1 cd $TMP rm -rf $LIBNAM-$LIBVER tar xvf $CWD/$LIBNAM-$LIBVER.tar.gz cd $LIBNAM-$LIBVER 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 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ + \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -146,11 +143,8 @@ rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.xz 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 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ + \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ # The 'checking for long filenames' test in the configure script writes to # /usr/lib, which is bad behaviour for a configure script. Not to mention @@ -170,6 +164,8 @@ libpipeline_LIBS="-L$PKG/usr/lib$LIBDIRSUFFIX $PKG/usr/lib$LIBDIRSUFFIX/libpipel CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ + --with-systemdtmpfilesdir=no \ + --with-systemdsystemunitdir=no \ --disable-setuid \ --disable-cache-owner \ --prefix=/usr \ @@ -185,10 +181,6 @@ CXXFLAGS="$SLKCFLAGS" \ make make install-strip DESTDIR=$PKG -# This stuff is for systemd, we don't need it (and it might confuse -# people coming from systemd distros): -rm -rf $PKG/usr/lib/tmpfiles.d/ - # There will always be man pages here, regardless of USR=yes or no. 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 |