3 files changed, 27 insertions, 11 deletions
diff --git a/development/apache-log4cxx/apache-log4cxx.SlackBuild b/development/apache-log4cxx/apache-log4cxx.SlackBuild
index 8e1adafefb..81eef41932 100644
--- a/development/apache-log4cxx/apache-log4cxx.SlackBuild
+++ b/development/apache-log4cxx/apache-log4cxx.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for apache-log4cxx
 
@@ -22,10 +22,17 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220408 bkw: Modified by SlackBuilds.org, BUILD=3:
+# - move docs to correct directory (not /usr/share/doc).
+# - get rid of static library.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=apache-log4cxx
-VERSION=${VERSION:-0.10.0}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-0.11.0}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +42,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -65,11 +76,11 @@ 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 {} \+
 
-zcat $CWD/fixincludes.patch.gz | patch -p1 || exit
+./autogen.sh
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -79,16 +90,21 @@ CXXFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
+  --disable-static \
   --build=$ARCH-slackware-linux
 
 make
 make install-strip DESTDIR=$PKG
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+mv $PKG/usr/share/doc/log4cxx/* $PKG/usr/doc/$PRGNAM-$VERSION
+rm -rf $PKG/usr/share # 20220408 bkw: nothing here but doc/
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+rm -f $PKG/usr/lib*/*.la
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/development/apache-log4cxx/apache-log4cxx.info b/development/apache-log4cxx/apache-log4cxx.info
index 4f23c19804..02fe5005b3 100644
--- a/development/apache-log4cxx/apache-log4cxx.info
+++ b/development/apache-log4cxx/apache-log4cxx.info
@@ -1,8 +1,8 @@
 PRGNAM="apache-log4cxx"
-VERSION="0.10.0"
+VERSION="0.11.0"
 HOMEPAGE="https://logging.apache.org/log4cxx/latest_stable/index.html"
-DOWNLOAD="http://www-us.apache.org/dist/logging/log4cxx/0.10.0/apache-log4cxx-0.10.0.tar.gz"
-MD5SUM="b30ffb8da3665178e68940ff7a61084c"
+DOWNLOAD="http://distcache.FreeBSD.org/ports-distfiles/apache-log4cxx-0.11.0.tar.gz"
+MD5SUM="bf8d5e2a1356ae593c952e45bf96c5d9"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/development/apache-log4cxx/fixincludes.patch.gz b/development/apache-log4cxx/fixincludes.patch.gz
deleted file mode 100644
index b2d23c84b2..0000000000
--- a/development/apache-log4cxx/fixincludes.patch.gz
+++ /dev/null