aboutsummaryrefslogtreecommitdiff
path: root/libraries
diff options
context:
space:
mode:
authorB. Watson <urchlay@slackware.uk>2023-06-30 19:43:59 -0400
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2023-07-08 16:42:02 +0700
commit1dadcc001ce3c41cfb01eef41b43d92fa1cafd2f (patch)
tree49d79fe948c34781c3f6f2468197630393e5cc74 /libraries
parent6b4229fa0deccde600ccd07e78e0e410cec590d4 (diff)
libraries/libmicrohttpd: Fix /usr/info files.
Signed-off-by: B. Watson <urchlay@slackware.uk> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'libraries')
-rw-r--r--libraries/libmicrohttpd/doinst.sh6
-rw-r--r--libraries/libmicrohttpd/libmicrohttpd.SlackBuild33
2 files changed, 27 insertions, 12 deletions
diff --git a/libraries/libmicrohttpd/doinst.sh b/libraries/libmicrohttpd/doinst.sh
new file mode 100644
index 0000000000000..1bef5020286ea
--- /dev/null
+++ b/libraries/libmicrohttpd/doinst.sh
@@ -0,0 +1,6 @@
+if [ -x /usr/bin/install-info -a -d usr/info ]; then
+ ( cd usr/info
+ rm -f dir
+ for i in *.info*; do /usr/bin/install-info $i dir 2>/dev/null; done
+ )
+fi
diff --git a/libraries/libmicrohttpd/libmicrohttpd.SlackBuild b/libraries/libmicrohttpd/libmicrohttpd.SlackBuild
index 598af51f01551..27bcb9db753a8 100644
--- a/libraries/libmicrohttpd/libmicrohttpd.SlackBuild
+++ b/libraries/libmicrohttpd/libmicrohttpd.SlackBuild
@@ -23,11 +23,16 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# 20230630 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - move .png file out of /usr/info.
+# - add doinst.sh to handle /usr/info/dir.
+# - rm generic INSTALL instructions from doc dir.
+
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=libmicrohttpd
VERSION=${VERSION:-0.9.75}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -48,7 +53,7 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-DOCS="AUTHORS COPYING ChangeLog INSTALL README"
+DOCS="AUTHORS COPYING ChangeLog README"
if [ "$ARCH" = "i586" ]; then
SLKCFLAGS="-O2 -march=i586 -mtune=i686"
@@ -76,9 +81,9 @@ 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 \
+ -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 {} \;
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} +
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
@@ -93,24 +98,28 @@ CXXFLAGS="$SLKCFLAGS" \
--build=$ARCH-slackware-linux
make
-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
+make install-strip DESTDIR=$PKG
-find $PKG/usr/man -type f -exec gzip -9 {} \;
+gzip -9 $PKG/usr/man/man*/*
rm -f $PKG/usr/info/dir
gzip -9 $PKG/usr/info/*.info*
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $DOCS $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 $DOCS $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
+
+# 20230630 bkw: this is documentation, but not an .info file, put in the
+# main doc dir.
+mv $PKG/usr/info/*.png $PKGDOC
rm -f $PKG/usr/lib*/*.la
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+cat $CWD/doinst.sh > $PKG/install/douninst.sh
cd $PKG
/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE