system/cnijfilter2: Updated for version 5.80.1.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 52 insertions, 34 deletions

diff --git a/system/cnijfilter2/README b/system/cnijfilter2/README
index 2edd9930f4..bd7d23ec82 100644
--- a/system/cnijfilter2/README
+++ b/system/cnijfilter2/README
@@ -3,6 +3,18 @@ cnijfilter2 (Canon IJ Printer Driver)
 cnijfilter2 provides printing functions for Canon Inkjet printers operating
 under the CUPS (Common UNIX Printing System) environment.
 
-It supports MG7500 series, MG6700 series, MG6600 series, MG5600 series, MG2900
-series, MB2000 series, MB2300, iB4000 series, MB5000 series, MB5300 series,
-iP110 series, E450 series, MX490 series, E480 series.
+Supported series:
+- MG2900, MG3000, MG3600, MG5600, MG5700, MG6600, MG6700, MG6800, MG6900, MG7700,
+  MG7500
+- MB2700, MB2300, MB2100, MB2000, MB5000, MB5300
+- G4010, G4000, G3010, G3000
+- iB4100, iB4000, iP110
+- E450, E480, E470, E300, E200, E3100, E4200, MX490
+- TR4500, TR7500, TR7530, TR8500, TR8530, TR8580, TR9530
+- TS9500, TS8230, TS8280, TS8200, TS6280, TS6230, TS6200, TS200, TS300, TS3100,
+  TS5100, TS6100, TS6130, TS6180, TS8100, TS8180, TS9100, TS9180, TS8130, TS9580
+- XK80, XK70, XK50
+
+NB. see also SBo system/pixma SlackBuild for support of related Canon
+printers. It supports MG2500, MG2400, MG3500, MG5500, MG6400, MG6500, MG7100
+and P200 series.
diff --git a/system/cnijfilter2/cnijfilter2.SlackBuild b/system/cnijfilter2/cnijfilter2.SlackBuild
index d8e84dd3dc..0fb2c334e3 100644
--- a/system/cnijfilter2/cnijfilter2.SlackBuild
+++ b/system/cnijfilter2/cnijfilter2.SlackBuild
@@ -23,7 +23,9 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=cnijfilter2
-VERSION=${VERSION:-5.10-1}
+SRCNAM=$PRGNAM-source
+SRCVERSION=${VERSION:-5.80-1}
+VERSION=${SRCVERSION/-/.}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -43,17 +45,17 @@ OUTPUT=${OUTPUT:-/tmp}
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
-  LDFLAGS="-L$TMP/${PRGNAM}-source-${VERSION}/com/libs_bin32"
+  LDFLAGS="-L$TMP/${SRCNAM}-${SRCVERSION}/com/libs_bin32"
   BITS="i386"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
-  LDFLAGS="-L$TMP/${PRGNAM}-source-${VERSION}/com/libs_bin32"
+  LDFLAGS="-L$TMP/${SRCNAM}-${SRCVERSION}/com/libs_bin32"
   BITS="i386"
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
-  LDFLAGS="-L$TMP/${PRGNAM}-source-${VERSION}/com/libs_bin64"
+  LDFLAGS="-L$TMP/${SRCNAM}-${SRCVERSION}/com/libs_bin64"
   BITS="amd64"
 else
   echo "Package for $(uname -m) architecture is not available."
@@ -65,25 +67,27 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-source-$VERSION
+rm -rf $SRCNAM-$SRCVERSION
 
-tar xvzf $CWD/$PRGNAM-source-${VERSION}.tar.gz
-cd $PRGNAM-source-$VERSION
+tar xvzf $CWD/$SRCNAM-${SRCVERSION}.tar.gz
+cd $SRCNAM-$SRCVERSION
 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 {} \;
+find -L . \
+ \( -type f \! -name autogen.sh \) \
+  -exec chmod 644 {} \;
 
-for dir in cnijbe2 cmdtocanonij2 rastertocanonij tocnpwg tocanonij; do
+common_pkg="cmdtocanonij2 cmdtocanonij3 cnijbe2 lgmon3 rastertocanonij tocanonij tocnpwg"
+for dir in $common_pkg; do
   ( cd $dir
     ./autogen.sh --prefix=/usr LDFLAGS="$LDFLAGS"
     make
-    make install-strip DESTDIR=$PKG
-  )
+    make install-strip DESTDIR=$PKG )
 done
-
 ( cd lgmon3 ; ./autogen.sh --prefix=/usr --enable-libpath=/usr/lib/bjlib2 \
                            LDFLAGS="$LDFLAGS"
   make
@@ -92,33 +96,35 @@ done
 if [ "$ARCH" = "x86_64" ]; then
   mv $PKG/usr/lib $PKG/usr/lib64
   mkdir $PKG/usr/lib64/bjlib2
-  cp -a com/ini/cnnet.ini $PKG/usr/lib64/bjlib2/
-  cp -a com/libs_bin64/libcnbpcnclapicom2.so.5.0.0 $PKG/usr/lib64/
-  ln -s libcnbpcnclapicom2.so.5.0.0 $PKG/usr/lib64/libcnbpcnclapicom2.so
-  cp -a com/libs_bin64/libcnnet2.so.1.2.3 $PKG/usr/lib64/
-  ln -s libcnnet2.so.1.2.3 $PKG/usr/lib64/libcnnet2.so
+  install -c -m 644 com/ini/cnnet.ini $PKG/usr/lib64/bjlib2/
+  install -c -m 755 com/libs_bin64/libcnnet2.so.* $PKG/usr/lib64/
+  install -c -m 755 com/libs_bin64/libcnbpnet20.so.* $PKG/usr/lib64/
+  install -c -m 755 com/libs_bin64/libcnbpnet30.so.* $PKG/usr/lib64/
+  install -c -m 755 com/libs_bin64/libcnbpcnclapicom2.so.* $PKG/usr/lib64/
 elif [ "$ARCH" = "i686" ]; then
   mkdir $PKG/usr/lib/bjlib2
-  cp -a com/ini/cnnet.ini $PKG/usr/lib/bjlib2/
-  cp -a com/libs_bin32/libcnbpcnclapicom2.so.5.0.0 $PKG/usr/lib/
-  ln -s libcnbpcnclapicom2.so.5.0.0 $PKG/usr/lib/libcnbpcnclapicom2.so
-  cp -a com/libs_bin32/libcnnet2.so.1.2.3 $PKG/usr/lib/
-  ln -s libcnnet2.so.1.2.3 $PKG/usr/lib/libcnnet2.so
+  install -c -m 644 com/ini/cnnet.ini $PKG/usr/lib/bjlib2/
+  install -c -m 755 com/libs_bin32/libcnnet2.so.* $PKG/usr/lib/
+  install -c -m 755 com/libs_bin32/libcnbpnet20.so.* $PKG/usr/lib/
+  install -c -m 755 com/libs_bin32/libcnbpnet30.so.* $PKG/usr/lib/
+  install -c -m 755 com/libs_bin32/libcnbpcnclapicom2.so.* $PKG/usr/lib/
 fi
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION $PKG/usr/share/ppd/cnijfilter2 \
       $PKG/usr/doc/$PRGNAM-$VERSION/lproptions
-# We just pick one dir to copy the LICENSE, ChangeLog, etc since they are
-# the same across the dirs.
-( cd cmdtocanonij2 ; cp -a AUTHORS COPYING ChangeLog INSTALL LICENSE \
-                  $PKG/usr/doc/$PRGNAM-$VERSION )
 cp -a doc/* $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a lproptions/lpr* $PKG/usr/doc/$PRGNAM-$VERSION/lproptions
 cat ppd/NEWS > $PKG/usr/doc/$PRGNAM-$VERSION/NEWS
 cp -a ppd/*.ppd $PKG/usr/share/ppd/cnijfilter2
 
-for dir in cnijbe2 cmdtocanonij2 lgmon3 rastertocanonij tocnpwg tocanonij; do
-  ( cd $dir ; cp -a README $PKG/usr/doc/$PRGNAM-$VERSION/README.$dir )
+# Copy all README to /usr/doc
+for dir in $common_pkg; do
+  mkdir $PKG/usr/doc/$PRGNAM-$VERSION/$dir
+  ( cd $dir
+    for file in AUTHORS COPYING ChangeLog INSTALL LICENSE NEWS README; do
+      [ -f $file ] && cp -a $file $PKG/usr/doc/$PRGNAM-$VERSION/$dir
+    done
+  )
 done
 cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README
 
diff --git a/system/cnijfilter2/cnijfilter2.info b/system/cnijfilter2/cnijfilter2.info
index 55691b6f93..59ea334515 100644
--- a/system/cnijfilter2/cnijfilter2.info
+++ b/system/cnijfilter2/cnijfilter2.info
@@ -1,8 +1,8 @@
 PRGNAM="cnijfilter2"
-VERSION="5.10-1"
-HOMEPAGE="http://support-asia.canon-asia.com/contents/ASIA/EN/0100666902.html"
-DOWNLOAD="http://gdlp01.c-wss.com/gds/7/0100006667/01/cnijfilter2-source-5.10-1.tar.gz"
-MD5SUM="1a60d912e5628bac75713b23d74f6278"
+VERSION="5.80.1"
+HOMEPAGE="https://support-asia.canon-asia.com/contents/ASIA/EN/0101027301.html"
+DOWNLOAD="http://gdlp01.c-wss.com/gds/3/0100010273/01/cnijfilter2-source-5.80-1.tar.gz"
+MD5SUM="c201a3b93802ede86041616e678abba2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""