diff options
Diffstat (limited to 'source/ap/man-db')
| -rw-r--r-- | source/ap/man-db/dont_write_in_usr.diff | 50 | ||||
| -rwxr-xr-x | source/ap/man-db/man-db.SlackBuild | 13 |
2 files changed, 3 insertions, 60 deletions
diff --git a/source/ap/man-db/dont_write_in_usr.diff b/source/ap/man-db/dont_write_in_usr.diff deleted file mode 100644 index 8f7158598..000000000 --- a/source/ap/man-db/dont_write_in_usr.diff +++ /dev/null @@ -1,50 +0,0 @@ -diff -Naur man-db-2.7.6.1/configure man-db-2.7.6.1.patched/configure ---- man-db-2.7.6.1/configure 2016-12-12 07:43:48.000000000 -0500 -+++ man-db-2.7.6.1.patched/configure 2017-03-04 16:49:57.389893574 -0500 -@@ -25809,46 +25809,8 @@ - - - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for long file names" >&5 --$as_echo_n "checking for long file names... " >&6; } --if ${ac_cv_sys_long_file_names+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ac_cv_sys_long_file_names=yes --# Test for long file names in all the places we know might matter: --# . the current directory, where building will happen --# $prefix/lib where we will be installing things --# $exec_prefix/lib likewise --# $TMPDIR if set, where it might want to write temporary files --# /tmp where it might want to write temporary files --# /var/tmp likewise --# /usr/tmp likewise --for ac_dir in . "$TMPDIR" /tmp /var/tmp /usr/tmp "$prefix/lib" "$exec_prefix/lib"; do -- # Skip $TMPDIR if it is empty or bogus, and skip $exec_prefix/lib -- # in the usual case where exec_prefix is '${prefix}'. -- case $ac_dir in #( -- . | /* | ?:[\\/]*) ;; #( -- *) continue;; -- esac -- test -w "$ac_dir/." || continue # It is less confusing to not echo anything here. -- ac_xdir=$ac_dir/cf$$ -- (umask 077 && mkdir "$ac_xdir" 2>/dev/null) || continue -- ac_tf1=$ac_xdir/conftest9012345 -- ac_tf2=$ac_xdir/conftest9012346 -- touch "$ac_tf1" 2>/dev/null && test -f "$ac_tf1" && test ! -f "$ac_tf2" || -- ac_cv_sys_long_file_names=no -- rm -f -r "$ac_xdir" 2>/dev/null -- test $ac_cv_sys_long_file_names = no && break --done --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_long_file_names" >&5 --$as_echo "$ac_cv_sys_long_file_names" >&6; } --if test $ac_cv_sys_long_file_names = yes; then -- - $as_echo "#define HAVE_LONG_FILE_NAMES 1" >>confdefs.h - --fi -- - - - diff --git a/source/ap/man-db/man-db.SlackBuild b/source/ap/man-db/man-db.SlackBuild index d68b5fa3d..f589a7664 100755 --- a/source/ap/man-db/man-db.SlackBuild +++ b/source/ap/man-db/man-db.SlackBuild @@ -8,7 +8,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=man-db VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} MAN2HTML=${MAN2HTML:-20180101} @@ -174,13 +174,6 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -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 -# wrong (it assumes configure is always being run as root). We already -# know we have long filename support, because we live in the 21st century -# now, so this patch gets rid of the test and force-enables it. -zcat $CWD/dont_write_in_usr.diff.gz | patch -p1 --verbose || exit 1 - # The circumlocutions below are needed because doing it the sane way: # libpipeline_LIBS="-L$PKG/usr/lib$LIBDIRSUFFIX -lpipeline" # gets broken by libtool (it *insists* on replacing -lpipeline with @@ -250,8 +243,8 @@ rm -rf $PKG/etc/man_db.conf mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ - ChangeLog FAQ* NEWS* README* docs/COPYING* docs/HACKING docs/INSTALL.quick \ - docs/TODO docs/*lsm docs/*example* \ + ChangeLog FAQ* NEWS* README* COPYING* docs/HACKING* docs/INSTALL.quick \ + docs/TODO* docs/*lsm docs/*example* \ $PKG/usr/doc/$PKGNAM-$VERSION mkdir -p $PKG/install |