From 5d238b61c8ed858fc4a5a496901c312796883a39 Mon Sep 17 00:00:00 2001 From: "B. Watson" Date: Sun, 24 Apr 2022 16:50:40 -0400 Subject: [PATCH] libraries/slib: Fix docs, make noarch. Signed-off-by: B. Watson --- libraries/slib/slib.SlackBuild | 43 +++++++++------------------------- libraries/slib/slib.info | 2 +- 2 files changed, 12 insertions(+), 33 deletions(-) diff --git a/libraries/slib/slib.SlackBuild b/libraries/slib/slib.SlackBuild index 71d880ad4e..bc65bad462 100644 --- a/libraries/slib/slib.SlackBuild +++ b/libraries/slib/slib.SlackBuild @@ -22,25 +22,21 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# 20220424 bkw: Modified by SlackBuilds.org, BUILD=3: +# - make noarch (no compiled code or lib64 dir here). +# - fix doc permissions. +# - remove extraneous /usr/doc/$PRGNAM- dir. + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=slib VERSION=${VERSION:-3b5} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i486 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi +ARCH=noarch -# 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,20 +46,6 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - set -e rm -rf $PKG @@ -75,9 +57,9 @@ cd $PRGNAM 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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ # We don't have ginstall-info sed -i s,ginstall-info,install-info,g Makefile @@ -98,9 +80,6 @@ SCHEME=guile1.8 \ TEXI2HTML="$(which texi2html) -split -verbose" \ make install DESTDIR=$PKG -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - # https://www.gnu.org/software/guile/manual/html_node/SLIB-installation.html mkdir -p $PKG/usr/share/guile/1.8/ ln -s ../../slib $PKG/usr/share/guile/1.8/ @@ -114,10 +93,10 @@ cat $CWD/guile-slibcat.script > $PKG/usr/libexec/slib/guile-slibcat.script chmod 0755 $PKG/usr/libexec/slib/guile-slibcat.script gzip -9 $PKG/usr/man/man1/*.1 -rm -f $PKG/usr/info/dir +rm -rf $PKG/usr/info/dir $PKG/usr/doc/$PRGNAM- mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a ANNOUNCE ChangeLog COPYING FAQ README $PKG/usr/doc/$PRGNAM-$VERSION +install -m0644 ANNOUNCE ChangeLog COPYING FAQ README $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild rm -f $PKG/usr/lib*/*.la diff --git a/libraries/slib/slib.info b/libraries/slib/slib.info index 8900e100ce..99bfb09057 100644 --- a/libraries/slib/slib.info +++ b/libraries/slib/slib.info @@ -1,7 +1,7 @@ PRGNAM="slib" VERSION="3b5" HOMEPAGE="http://www-swiss.ai.mit.edu/~jaffer/SLIB.html" -DOWNLOAD="http://groups.csail.mit.edu/mac/ftpdir/scm/slib-3b5.zip" +DOWNLOAD="http://distcache.freebsd.org/ports-distfiles/slib-3b5.zip" MD5SUM="b3181fa98bbb4153a4fc984c3e71a86b" DOWNLOAD_x86_64="" MD5SUM_x86_64=""