From ee764ed613409b426f53192a17c915002e89f0a9 Mon Sep 17 00:00:00 2001 From: "B. Watson" Date: Fri, 15 Apr 2022 13:15:25 -0400 Subject: [PATCH] development/ocaml: Fix docs. Signed-off-by: B. Watson Signed-off-by: Willy Sudiarto Raharjo --- development/ocaml/ocaml.SlackBuild | 34 ++++++++++++++++-------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/development/ocaml/ocaml.SlackBuild b/development/ocaml/ocaml.SlackBuild index d829c46138..a882b4e60b 100644 --- a/development/ocaml/ocaml.SlackBuild +++ b/development/ocaml/ocaml.SlackBuild @@ -24,12 +24,15 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# 20220415 bkw: Modified by SlackBuilds.org, BUILD=2: +# - fix doc permissions, remove useless INSTALL doc. + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=ocaml VERSION=${VERSION:-4.13.1} MANVER=${MANVER:-4.13} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -41,9 +44,6 @@ if [ -z "$ARCH" ]; then 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 @@ -69,6 +69,11 @@ fi set -e +fixperms() { + find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \ + \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+ +} + rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP @@ -76,11 +81,7 @@ 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 {} \; +fixperms sed "s|@CFLAGS@|$SLKCFLAGS|" $CWD/configure.patch | patch -p1 @@ -92,17 +93,18 @@ sed "s|@CFLAGS@|$SLKCFLAGS|" $CWD/configure.patch | patch -p1 make world.opt make DESTDIR=$PKG install +gzip -9 $PKG/usr/man/man*/* find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -find $PKG/usr/man -type f -exec gzip -9 {} \; - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a Changes INSTALL* LICENSE README* VERSION \ - $PKG/usr/doc/$PRGNAM-$VERSION -tar -xvf $CWD/ocaml-$MANVER-refman-html.tar.gz --no-same-owner -C $PKG/usr/doc/$PRGNAM-$VERSION/ -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION +mkdir -p $PKGDOC +cp -a Changes LICENSE README* VERSION $PKGDOC +cd $PKGDOC +tar -xvf $CWD/ocaml-$MANVER-refman-html.tar.gz --no-same-owner +fixperms +cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc