summaryrefslogtreecommitdiffstats
path: root/source/a/findutils
diff options
context:
space:
mode:
Diffstat (limited to 'source/a/findutils')
-rwxr-xr-xsource/a/findutils/findutils.SlackBuild23
-rw-r--r--source/a/findutils/findutils.nolocate.diff83
2 files changed, 15 insertions, 91 deletions
diff --git a/source/a/findutils/findutils.SlackBuild b/source/a/findutils/findutils.SlackBuild
index 9db39fc43..3b23a6818 100755
--- a/source/a/findutils/findutils.SlackBuild
+++ b/source/a/findutils/findutils.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2005-2009, 2010, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2005-2009, 2010, 2018, 2022 Patrick J. Volkerding, Sebeka, Minnesota, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=findutils
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -64,7 +64,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG
cd $TMP
rm -rf findutils-$VERSION
-tar xvf $CWD/findutils-$VERSION.tar.?z* || exit 1
+tar xvf $CWD/findutils-$VERSION.tar.?z || exit 1
cd findutils-$VERSION || exit 1
chown -R root:root .
@@ -79,14 +79,10 @@ find . \
# like to be yelled at.
zcat $CWD/findutils.no.default.options.warnings.diff.gz | patch -p1 --verbose || exit 1
-# Don't include updatedb, locate, frcode:
-zcat $CWD/findutils.nolocate.diff.gz | patch -p1 --verbose || exit 1
-
-autoreconf -vif
-
CFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
+ --localstatedir=/var \
--mandir=/usr/man \
--infodir=/usr/info \
--build=$ARCH-slackware-linux || exit 1
@@ -95,12 +91,23 @@ make $NUMJOBS || make || exit 1
make install DESTDIR=$PKG || exit 1
make install-man DESTDIR=$PKG || exit 1
+# Remove stray directory:
+rmdir $PKG/var 2> /dev/null
+
# Now there is only FTS find, but make the old symlink in case any scripts
# out there are using it:
( cd $PKG/usr/bin
ln -sf find ftsfind
)
+# Don't include updatedb, locate, frcode:
+rm -f $PKG/usr/bin/{locate,updatedb}
+rm -f $PKG/usr/libexec/frcode
+rmdir $PKG/usr/libexec 2> /dev/null
+rm -f $PKG/usr/man/man1/{locate.1,updatedb.1}
+rm -f $PKG/usr/man/man5/locatedb.5
+rmdir $PKG/usr/man/man5 2> /dev/null
+
find $PKG | xargs file | grep -e "executable" -e "shared object" \
| grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
diff --git a/source/a/findutils/findutils.nolocate.diff b/source/a/findutils/findutils.nolocate.diff
deleted file mode 100644
index 8e1e29867..000000000
--- a/source/a/findutils/findutils.nolocate.diff
+++ /dev/null
@@ -1,83 +0,0 @@
---- ./doc/find.texi.orig 2021-01-10 13:04:33.075733220 -0600
-+++ ./doc/find.texi 2021-01-10 13:05:57.327728560 -0600
-@@ -7,8 +7,6 @@
- @c @setchapternewpage odd
- @c %**end of header
-
--@include dblocation.texi
--
- @iftex
- @finalout
- @end iftex
---- ./doc/Makefile.am.orig 2021-01-01 18:46:51.000000000 -0600
-+++ ./doc/Makefile.am 2021-01-10 13:04:33.075733220 -0600
-@@ -16,11 +16,9 @@
-
- info_TEXINFOS = find.texi find-maint.texi
- find_TEXINFOS = perm.texi parse-datetime.texi regexprops.texi fdl.texi
--BUILT_SOURCES = dblocation.texi
--nodist_find_TEXINFOS = dblocation.texi
- find_maint_TEXINFOS = fdl.texi
- MOSTLYCLEANFILES = find.cps
--CLEANFILES = find.txt find_mono.html findutils.texi_html_node.tar.gz dblocation.texi \
-+CLEANFILES = find.txt find_mono.html findutils.texi_html_node.tar.gz \
- find_mono.html findutils.texi_html_node.tar.gz \
- find-info.tar.gz find.texi.tar.gz \
- find.txt tmp-doc-install find_mono.html.gz
-@@ -72,10 +70,6 @@
- findutils.texi_html_node.tar.gz: find.html
- tar zcf $@ find.html
-
--
--dblocation.texi: ../locate/dblocation.texi
-- $(LN_S) ../locate/dblocation.texi $@
--
- find-info.tar.gz:
- $(MKDIR_P) tmp-doc-install/info
- $(MAKE) $(AM_MAKEFLAGS) \
---- ./configure.ac.orig 2021-01-05 16:55:23.000000000 -0600
-+++ ./configure.ac 2021-01-10 13:04:33.074733220 -0600
-@@ -92,7 +92,6 @@
-
- dnl for gnulib
- gl_EARLY
--AC_PROG_LN_S
- AC_PROG_INSTALL
- AC_CHECK_TOOLS([AR], [ar])
- AC_CHECK_TOOLS([RANLIB], [ranlib], [:])
-@@ -309,8 +308,6 @@
- gl/Makefile
- gl/lib/Makefile
- lib/Makefile
--locate/Makefile
--locate/testsuite/Makefile
- m4/Makefile
- po/Makefile.in
- po/Makefile
---- ./Makefile.am.orig 2021-01-01 18:46:51.000000000 -0600
-+++ ./Makefile.am 2021-01-10 13:04:33.076733220 -0600
-@@ -35,7 +35,7 @@
-
-
- # "gnulib-tests" is the gnulib unit test dir.
--SUBDIRS = gl build-aux lib find xargs locate doc po m4 gnulib-tests
-+SUBDIRS = gl build-aux lib find xargs doc po m4 gnulib-tests
-
- ALL_RECURSIVE_TARGETS =
-
---- ./Makefile.in.orig 2021-01-09 10:35:32.000000000 -0600
-+++ ./Makefile.in 2021-01-10 13:04:33.075733220 -0600
-@@ -2200,11 +2200,11 @@
- DISTCLEANFILES = tool-versions.txt
-
- # "gnulib-tests" is the gnulib unit test dir.
--SUBDIRS = gl build-aux lib find xargs locate doc po m4 gnulib-tests
-+SUBDIRS = gl build-aux lib find xargs doc po m4 gnulib-tests
- ALL_RECURSIVE_TARGETS = check-root
- ACLOCAL_AMFLAGS = -I gl/m4 -I m4
- TESTFILE_SUFFIXES = .exp .xo .xe .xi
--built_programs = find oldfind xargs frcode locate updatedb
-+built_programs = find oldfind xargs
-
- # Indirections required so that we'll still be able to know the
- # complete list of our tests even if the user overrides TESTS