4 files changed, 24 insertions, 27 deletions
diff --git a/system/cups-bjnp/README b/system/cups-bjnp/README
index 230f05788f..542f5dda29 100644
--- a/system/cups-bjnp/README
+++ b/system/cups-bjnp/README
@@ -1,4 +1,6 @@
-This is a CUPS back-end for the canon printers using the proprietary USB over 
-IP BJNP protocol. This back-end allows Cups to print over the network
-to a Canon printer. It currently supports Cups 1.2 and later. It is
-designed using reverse engineering of the protocol.
+cups-bjnp (CUPS backend using the BJNP protocol)
+
+This is a CUPS back-end for the Canon printers using the proprietary
+USB over IP BJNP protocol. This back-end allows CUPS to print over
+the network to a Canon printer. It currently supports CUPs 1.2 and
+later. It is designed using reverse engineering of the protocol.
diff --git a/system/cups-bjnp/cups-bjnp.SlackBuild b/system/cups-bjnp/cups-bjnp.SlackBuild
index d705ca34a8..faeb7851c1 100644
--- a/system/cups-bjnp/cups-bjnp.SlackBuild
+++ b/system/cups-bjnp/cups-bjnp.SlackBuild
@@ -22,25 +22,25 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220212 bkw: Modified by SlackBuilds.org: updated for v2.0.3,
+# for Slackware 15.0.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=cups-bjnp
-VERSION=${VERSION:-1.2}
+VERSION=${VERSION:-2.0.3}
 BUILD=${BUILD:-1}
 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 +50,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"
@@ -75,26 +75,21 @@ 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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ -exec chmod 644 {} \+
 
-CFLAGS="$SLKCFLAGS -Wno-error=stringop-truncation" \
-CXXFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -Wno-error" \
 ./configure \
   --prefix=/usr \
   --with-cupsbackenddir=/usr/lib${LIBDIRSUFFIX}/cups/backend \
   --build=$ARCH-slackware-linux
 
 make
-make install DESTDIR=$PKG
-
-find $PKG -print0 | xargs -0 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
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  AUTHORS COPYING ChangeLog INSTALL NEWS README TODO \
+cp -a AUTHORS COPYING ChangeLog NEWS README TODO \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/system/cups-bjnp/cups-bjnp.info b/system/cups-bjnp/cups-bjnp.info
index 1d96d3b238..925ff4f886 100644
--- a/system/cups-bjnp/cups-bjnp.info
+++ b/system/cups-bjnp/cups-bjnp.info
@@ -1,8 +1,8 @@
 PRGNAM="cups-bjnp"
-VERSION="1.2"
+VERSION="2.0.3"
 HOMEPAGE="https://sourceforge.net/projects/cups-bjnp/"
-DOWNLOAD="https://downloads.sourceforge.net/cups-bjnp/cups-bjnp-1.2.tar.gz"
-MD5SUM="8672b4585b71dee6dcefa00fbbbe7698"
+DOWNLOAD="https://downloads.sourceforge.net/cups-bjnp/cups-bjnp-2.0.3.tar.gz"
+MD5SUM="1d5a1588f3649ce7c5758cbea5a86900"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/cups-bjnp/slack-desc b/system/cups-bjnp/slack-desc
index 84480ebce1..f350ccbd42 100644
--- a/system/cups-bjnp/slack-desc
+++ b/system/cups-bjnp/slack-desc
@@ -8,9 +8,9 @@
          |-----handy-ruler------------------------------------------------------|
 cups-bjnp: cups-bjnp (CUPS backend using the BJNP protocol)
 cups-bjnp:
-cups-bjnp: CUPS back-end for the canon printers using the proprietary USB over
-cups-bjnp: IP BJNP protocol. This back-end allows Cups to print over the network
-cups-bjnp: to a Canon printer. It currently supports Cups 1.2 and later. It is
+cups-bjnp: CUPS back-end for the Canon printers using the proprietary USB over
+cups-bjnp: IP BJNP protocol. This back-end allows CUPS to print over the network
+cups-bjnp: to a Canon printer. It currently supports CUPS 1.2 and later. It is
 cups-bjnp: designed using reverse engineering of the protocol.
 cups-bjnp:
 cups-bjnp: