diff options
| author |   B. Watson <yalhcru@gmail.com> | 2022-04-14 11:35:41 -0400 |
|---|---|---|
| committer |   Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2022-04-16 12:11:28 +0700 |
| commit | f961c6c4384c83358304885b53e0cbf5889b3a6b (patch) | |
| tree | 29b0cab99a7e80a7c776187b0bdb2195126c5d7f /libraries/confuse | |
| parent | 7a2e9970e1f76d28055aaa42da7706aa2d545021 (diff) | |
| download | slackbuilds-f961c6c4384c83358304885b53e0cbf5889b3a6b.tar.gz slackbuilds-f961c6c4384c83358304885b53e0cbf5889b3a6b.tar.xz | |
libraries/confuse: Fix docs.
Signed-off-by: B. Watson <yalhcru@gmail.com>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'libraries/confuse')
| -rw-r--r-- | libraries/confuse/confuse.SlackBuild | 45 |
1 files changed, 22 insertions, 23 deletions
diff --git a/libraries/confuse/confuse.SlackBuild b/libraries/confuse/confuse.SlackBuild index 3fe6da89b6..1c3cfa5e2e 100644 --- a/libraries/confuse/confuse.SlackBuild +++ b/libraries/confuse/confuse.SlackBuild @@ -22,25 +22,27 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# 20220414 bkw: Modified by SlackBuilds.org, BUILD=3: +# - get rid of /usr/share/doc, put docs in right place. +# - i486 => i586. +# - use "set -e" in script, instead of littering "|| exit 1" everywhere. + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=confuse VERSION=${VERSION:-3.2} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; 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 @@ -50,8 +52,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -64,18 +66,20 @@ else LIBDIRSUFFIX="" fi +set -e + rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT -cd $TMP || exit 1 +cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || exit 1 -cd $PRGNAM-$VERSION || exit 1 +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +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 \ + -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 {} \+ # The "-Wno-unused" is needed on 13.0, but won't hurt anything for 12.2 CFLAGS="-Wno-unused $SLKCFLAGS" \ @@ -86,25 +90,20 @@ CFLAGS="-Wno-unused $SLKCFLAGS" \ --localstatedir=/var \ --enable-shared=yes \ --enable-static=no \ - --build=$ARCH-slackware-linux \ - || exit 1 - -make || exit 1 -make install-strip DESTDIR=$PKG || exit 1 + --build=$ARCH-slackware-linux -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true +make +make install-strip DESTDIR=$PKG mkdir -p $PKG/usr/man/man3 cp -a doc/man/man3/* $PKG/usr/man/man3/ gzip -9 $PKG/usr/man/man3/* -rmdir $PKG/usr/bin +rm -rf $PKG/usr/bin mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - ABOUT-NLS AUTHORS COPYING INSTALL NEWS README \ - $PKG/usr/doc/$PRGNAM-$VERSION +mv $PKG/usr/share/doc/$PRGNAM/* $PKG/usr/doc/$PRGNAM-$VERSION +rm -rf $PKG/usr/share/doc cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild rm -f $PKG/usr/lib*/*.la |