Update vertion to 1.3

26 files changed, 387 insertions, 133 deletions

diff --git a/print/bjfilter360/distinfo b/print/bjfilter360/distinfo
index 9a143ac90e58..298b5073b308 100644
--- a/print/bjfilter360/distinfo
+++ b/print/bjfilter360/distinfo
@@ -1 +1 @@
-MD5 (bjfilter/bjfilter360-1.1-0.i386.rpm) = ebef6d6c3ccf0b3921f72315c56e20ec
+MD5 (bjfilter/bjfilter360-1.3-0.i386.rpm) = 3386ca30f32e2461f855e51a3c67d7b1
diff --git a/print/bjfilter360/pkg-descr b/print/bjfilter360/pkg-descr
index 19fe00464443..35a43af37140 100644
--- a/print/bjfilter360/pkg-descr
+++ b/print/bjfilter360/pkg-descr
@@ -5,28 +5,17 @@ can print out as high quality as you use the Windows driver. See the
 below URLs:
 
 WWW: http://www.canon-sales.co.jp/drv-upd/linux/bjlinux100.html
-     file:/usr/local/share/doc/bjfiltercom-1.1_1/html/README.HTM
-     file:/usr/local/share/doc/bjfiltercom-1.1_1/html/INDEX.HTM
-     file:/usr/local/share/doc/bjfiltercom-1.1_1/html/FAQ.HTM
+     file:/usr/local/share/doc/bjfiltercom-1.3/html/README.HTM
+     file:/usr/local/share/doc/bjfiltercom-1.3/html/INDEX.HTM
+     file:/usr/local/share/doc/bjfiltercom-1.3/html/FAQ.HTM
 
 And then this port has filters filter360 and filter360_gui which are
-useful to print out more than one page. If you use it and connect it
-via "ulpt", you add the next entry into /etc/printcap.
+useful to print out more than one page. Then you execute the next
+command:
 
-bjfilter360|Canon BJ F360:\
-        :lp=/dev/ulpt0:\
-        :sh:\
-        :if=/usr/local/libexec/bjfilter360/filter360:\
-        :sd=/var/spool/lpd/bjfilter360:\
-        :mx#0:\
-        :lf=/var/log/lpd-errs
-bjfilter360_gui|Canon BJ F360 with GUI:\
-        :lp=/dev/ulpt0:\
-        :sh:\
-        :if=/usr/local/libexec/bjfilter360/filter360_gui:\
-        :sd=/var/spool/lpd/bjfilter360_gui:\
-        :mx#0:\
-        :lf=/var/log/lpd-errs
+/usr/local/libexec/bjfilter360/setup
+
+to setup /etc/printcap and make spools in /var/spool/lpd/.
 
 Notice: If you use filter360_gui in the printer server, for example
 hostA then you have to run X, execute "xhost hostA" and execute "lpr" on
diff --git a/print/bjfilter360/pkg-plist b/print/bjfilter360/pkg-plist
index 5c92da973e6f..6b738585c254 100644
--- a/print/bjfilter360/pkg-plist
+++ b/print/bjfilter360/pkg-plist
@@ -1,8 +1,16 @@
 bin/bjf360ps
+bin/bjf360raw
 libexec/bjfilter360/filter360
 libexec/bjfilter360/filter360_gui
+libexec/bjfilter360/setup
+libexec/bjfilter360/scripts/en.lc
+libexec/bjfilter360/scripts/ja.lc
+@dirrm libexec/bjfilter360/scripts
 @dirrm libexec/bjfilter360
 @cwd /compat/linux
 usr/lib/bjlib/cnb_0980.tbl
+usr/lib/libcnbpo098.so
 usr/lib/libcnbpo098.so.1.0.0
 @dirrm usr/lib/bjlib
+@exec /compat/linux/sbin/ldconfig ; true
+@unexec /compat/linux/sbin/ldconfig ; true
diff --git a/print/bjfilter850/Makefile b/print/bjfilter850/Makefile
index d64b212d9c96..ed3fb1ce8556 100644
--- a/print/bjfilter850/Makefile
+++ b/print/bjfilter850/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTNAME=	bjfilter${PRTYPE}${SUFIX_PRTYPE}
+PORTNAME=	bjfilter${PREFIX_PRTYPE}${PRTYPE}${SUFFIX_PRTYPE}
 MASTERDIR=	${.CURDIR}/../bjfiltercom
 
 SLAVE_PORT=	yes
@@ -13,4 +13,3 @@ PRTYPE?=	850
 SUFIX_PRTYPE?=	
 
 .include "${MASTERDIR}/Makefile"
-
diff --git a/print/bjfilter850/distinfo b/print/bjfilter850/distinfo
index 3fa67aebd04b..e50143a5fbbd 100644
--- a/print/bjfilter850/distinfo
+++ b/print/bjfilter850/distinfo
@@ -1 +1 @@
-MD5 (bjfilter/bjfilter850-1.1-0.i386.rpm) = 8e28df703927d9a9d7a146cab037cf5f
+MD5 (bjfilter/bjfilter850-1.3-0.i386.rpm) = f466cd588bdcd98021660450b338c71d
diff --git a/print/bjfilter850/pkg-descr b/print/bjfilter850/pkg-descr
index e10d4283db8e..8d7fe9ba36ef 100644
--- a/print/bjfilter850/pkg-descr
+++ b/print/bjfilter850/pkg-descr
@@ -5,28 +5,17 @@ can print out as high quality as you use the Windows driver. See the
 below URLs:
 
 WWW: http://www.canon-sales.co.jp/drv-upd/linux/bjlinux100.html
-     file:/usr/local/share/doc/bjfiltercom-1.1_1/html/README.HTM
-     file:/usr/local/share/doc/bjfiltercom-1.1_1/html/INDEX.HTM
-     file:/usr/local/share/doc/bjfiltercom-1.1_1/html/FAQ.HTM
+     file:/usr/local/share/doc/bjfiltercom-1.3/html/README.HTM
+     file:/usr/local/share/doc/bjfiltercom-1.3/html/INDEX.HTM
+     file:/usr/local/share/doc/bjfiltercom-1.3/html/FAQ.HTM
 
 And then this port has filters filter850 and filter850_gui which are
-useful to print out more than one page. If you use it and connect it
-via "ulpt", you add the next entry into /etc/printcap.
+useful to print out more than one page. Then you execute the next
+command:
 
-bjfilter850|Canon BJ F850:\
-        :lp=/dev/ulpt0:\
-        :sh:\
-        :if=/usr/local/libexec/bjfilter850/filter850:\
-        :sd=/var/spool/lpd/bjfilter850:\
-        :mx#0:\
-        :lf=/var/log/lpd-errs
-bjfilter850_gui|Canon BJ F850 with GUI:\
-        :lp=/dev/ulpt0:\
-        :sh:\
-        :if=/usr/local/libexec/bjfilter850/filter850_gui:\
-        :sd=/var/spool/lpd/bjfilter850_gui:\
-        :mx#0:\
-        :lf=/var/log/lpd-errs
+/usr/local/libexec/bjfilter850/setup
+
+to setup /etc/printcap and make spools in /var/spool/lpd/.
 
 Notice: If you use filter850_gui in the printer server, for example
 hostA then you have to run X, execute "xhost hostA" and execute "lpr" on
diff --git a/print/bjfilter850/pkg-plist b/print/bjfilter850/pkg-plist
index 12e65a2cb5ea..c2336f872122 100644
--- a/print/bjfilter850/pkg-plist
+++ b/print/bjfilter850/pkg-plist
@@ -1,8 +1,16 @@
 bin/bjf850ps
+bin/bjf850raw
 libexec/bjfilter850/filter850
 libexec/bjfilter850/filter850_gui
+libexec/bjfilter850/setup
+libexec/bjfilter850/scripts/en.lc
+libexec/bjfilter850/scripts/ja.lc
+@dirrm libexec/bjfilter850/scripts
 @dirrm libexec/bjfilter850
 @cwd /compat/linux
 usr/lib/bjlib/cnb_0740.tbl
+usr/lib/libcnbpo074.so
 usr/lib/libcnbpo074.so.1.0.0
 @dirrm usr/lib/bjlib
+@exec /compat/linux/sbin/ldconfig ; true
+@unexec /compat/linux/sbin/ldconfig ; true
diff --git a/print/bjfilter850ug/Makefile b/print/bjfilter850ug/Makefile
index b0cca716d076..d6eb93344401 100644
--- a/print/bjfilter850ug/Makefile
+++ b/print/bjfilter850ug/Makefile
@@ -8,6 +8,6 @@
 MASTERDIR=	${.CURDIR}/../bjfilter850
 
 PRTYPE=		850
-SUFIX_PRTYPE=	ug
+SUFFIX_PRTYPE=	ug
 
 .include "${MASTERDIR}/Makefile"
diff --git a/print/bjfilter850ug/distinfo b/print/bjfilter850ug/distinfo
index bd84b339b9f3..d15f751ca223 100644
--- a/print/bjfilter850ug/distinfo
+++ b/print/bjfilter850ug/distinfo
@@ -1 +1 @@
-MD5 (bjfilter/bjfilter850ug-1.1-0.i386.rpm) = 0402229614717647082f7848e16a0c6b
+MD5 (bjfilter/bjfilter850ug-1.3-0.i386.rpm) = 0506e13beb910da1267ca6990202dee3
diff --git a/print/bjfilter850ug/pkg-descr b/print/bjfilter850ug/pkg-descr
index ba5b7322253a..7a3c1d1e08ae 100644
--- a/print/bjfilter850ug/pkg-descr
+++ b/print/bjfilter850ug/pkg-descr
@@ -5,28 +5,17 @@ can print out as high quality as you use the Windows driver. See the
 below URLs:
 
 WWW: http://www.canon-sales.co.jp/drv-upd/linux/bjlinux100.html
-     file:/usr/local/share/doc/bjfiltercom-1.1_1/html/README.HTM
-     file:/usr/local/share/doc/bjfiltercom-1.1_1/html/INDEX.HTM
-     file:/usr/local/share/doc/bjfiltercom-1.1_1/html/FAQ.HTM
+     file:/usr/local/share/doc/bjfiltercom-1.3/html/README.HTM
+     file:/usr/local/share/doc/bjfiltercom-1.3/html/INDEX.HTM
+     file:/usr/local/share/doc/bjfiltercom-1.3/html/FAQ.HTM
 
 And then this port has filters filter850ug and filter850ug_gui which are
-useful to print out more than one page. If you use it and connect it
-via "ulpt", you add the next entry into /etc/printcap.
+useful to print out more than one page. Then you execute the next
+command:
 
-bjfilter850ug|Canon BJ F850ug:\
-        :lp=/dev/ulpt0:\
-        :sh:\
-        :if=/usr/local/libexec/bjfilter850ug/filter850ug:\
-        :sd=/var/spool/lpd/bjfilter850ug:\
-        :mx#0:\
-        :lf=/var/log/lpd-errs
-bjfilter850ug_gui|Canon BJ F850ug with GUI:\
-        :lp=/dev/ulpt0:\
-        :sh:\
-        :if=/usr/local/libexec/bjfilter850ug/filter850ug_gui:\
-        :sd=/var/spool/lpd/bjfilter850ug_gui:\
-        :mx#0:\
-        :lf=/var/log/lpd-errs
+/usr/local/libexec/bjfilter850ug/setup
+
+to setup /etc/printcap and make spools in /var/spool/lpd/.
 
 Notice: If you use filter850ug_gui in the printer server, for example
 hostA then you have to run X, execute "xhost hostA" and execute "lpr" on
diff --git a/print/bjfilter850ug/pkg-plist b/print/bjfilter850ug/pkg-plist
index ce559a7e9150..d10e03bb3f0b 100644
--- a/print/bjfilter850ug/pkg-plist
+++ b/print/bjfilter850ug/pkg-plist
@@ -1,8 +1,16 @@
 bin/bjf850ps
+bin/bjf850raw
 libexec/bjfilter850ug/filter850ug
 libexec/bjfilter850ug/filter850ug_gui
+libexec/bjfilter850ug/setup
+libexec/bjfilter850ug/scripts/en.lc
+libexec/bjfilter850ug/scripts/ja.lc
+@dirrm libexec/bjfilter850ug/scripts
 @dirrm libexec/bjfilter850ug
 @cwd /compat/linux
 usr/lib/bjlib/cnb_0740.tbl
+usr/lib/libcnbpo074.so
 usr/lib/libcnbpo074.so.1.0.0
 @dirrm usr/lib/bjlib
+@exec /compat/linux/sbin/ldconfig ; true
+@unexec /compat/linux/sbin/ldconfig ; true
diff --git a/print/bjfilter860/distinfo b/print/bjfilter860/distinfo
index 696babd8baf9..19c707474f80 100644
--- a/print/bjfilter860/distinfo
+++ b/print/bjfilter860/distinfo
@@ -1 +1 @@
-MD5 (bjfilter/bjfilter860-1.1-0.i386.rpm) = 21b363810282638410d45875ff0590a1
+MD5 (bjfilter/bjfilter860-1.3-0.i386.rpm) = 710447c2cd76034ac9d12f28a4b43bde
diff --git a/print/bjfilter860/pkg-descr b/print/bjfilter860/pkg-descr
index 9652cbdcaedd..f6984dd4cb87 100644
--- a/print/bjfilter860/pkg-descr
+++ b/print/bjfilter860/pkg-descr
@@ -5,28 +5,17 @@ can print out as high quality as you use the Windows driver. See the
 below URLs:
 
 WWW: http://www.canon-sales.co.jp/drv-upd/linux/bjlinux100.html
-     file:/usr/local/share/doc/bjfiltercom-1.1_1/html/README.HTM
-     file:/usr/local/share/doc/bjfiltercom-1.1_1/html/INDEX.HTM
-     file:/usr/local/share/doc/bjfiltercom-1.1_1/html/FAQ.HTM
+     file:/usr/local/share/doc/bjfiltercom-1.3/html/README.HTM
+     file:/usr/local/share/doc/bjfiltercom-1.3/html/INDEX.HTM
+     file:/usr/local/share/doc/bjfiltercom-1.3/html/FAQ.HTM
 
 And then this port has filters filter860 and filter860_gui which are
-useful to print out more than one page. If you use it and connect it
-via "ulpt", you add the next entry into /etc/printcap.
+useful to print out more than one page. Then you execute the next
+command:
 
-bjfilter860|Canon BJ F860:\
-        :lp=/dev/ulpt0:\
-        :sh:\
-        :if=/usr/local/libexec/bjfilter860/filter860:\
-        :sd=/var/spool/lpd/bjfilter860:\
-        :mx#0:\
-        :lf=/var/log/lpd-errs
-bjfilter860_gui|Canon BJ F860 with GUI:\
-        :lp=/dev/ulpt0:\
-        :sh:\
-        :if=/usr/local/libexec/bjfilter860/filter860_gui:\
-        :sd=/var/spool/lpd/bjfilter860_gui:\
-        :mx#0:\
-        :lf=/var/log/lpd-errs
+/usr/local/libexec/bjfilter860/setup
+
+to setup /etc/printcap and make spools in /var/spool/lpd/.
 
 Notice: If you use filter860_gui in the printer server, for example
 hostA then you have to run X, execute "xhost hostA" and execute "lpr" on
diff --git a/print/bjfilter860/pkg-plist b/print/bjfilter860/pkg-plist
index a120d6edb227..338f5758aa13 100644
--- a/print/bjfilter860/pkg-plist
+++ b/print/bjfilter860/pkg-plist
@@ -1,8 +1,16 @@
 bin/bjf860ps
+bin/bjf860raw
 libexec/bjfilter860/filter860
 libexec/bjfilter860/filter860_gui
+libexec/bjfilter860/setup
+libexec/bjfilter860/scripts/en.lc
+libexec/bjfilter860/scripts/ja.lc
+@dirrm libexec/bjfilter860/scripts
 @dirrm libexec/bjfilter860
 @cwd /compat/linux
 usr/lib/bjlib/cnb_1050.tbl
+usr/lib/libcnbpo105.so
 usr/lib/libcnbpo105.so.1.0.0
 @dirrm usr/lib/bjlib
+@exec /compat/linux/sbin/ldconfig ; true
+@unexec /compat/linux/sbin/ldconfig ; true
diff --git a/print/bjfilter870/distinfo b/print/bjfilter870/distinfo
index 21c6d6ea4182..b73961405c98 100644
--- a/print/bjfilter870/distinfo
+++ b/print/bjfilter870/distinfo
@@ -1 +1 @@
-MD5 (bjfilter/bjfilter870-1.1-0.i386.rpm) = b14d8d9a50fb90429a9ff42536610ba3
+MD5 (bjfilter/bjfilter870-1.3-0.i386.rpm) = 621dede7191228df73f75027a8e6d0cb
diff --git a/print/bjfilter870/pkg-descr b/print/bjfilter870/pkg-descr
index 112d2a71a3a3..96b1bf7e698b 100644
--- a/print/bjfilter870/pkg-descr
+++ b/print/bjfilter870/pkg-descr
@@ -5,28 +5,17 @@ can print out as high quality as you use the Windows driver. See the
 below URLs:
 
 WWW: http://www.canon-sales.co.jp/drv-upd/linux/bjlinux100.html
-     file:/usr/local/share/doc/bjfiltercom-1.1_1/html/README.HTM
-     file:/usr/local/share/doc/bjfiltercom-1.1_1/html/INDEX.HTM
-     file:/usr/local/share/doc/bjfiltercom-1.1_1/html/FAQ.HTM
+     file:/usr/local/share/doc/bjfiltercom-1.3/html/README.HTM
+     file:/usr/local/share/doc/bjfiltercom-1.3/html/INDEX.HTM
+     file:/usr/local/share/doc/bjfiltercom-1.3/html/FAQ.HTM
 
 And then this port has filters filter870 and filter870_gui which are
-useful to print out more than one page. If you use it and connect it
-via "ulpt", you add the next entry into /etc/printcap.
+useful to print out more than one page. Then you execute the next
+command:
 
-bjfilter870|Canon BJ F870:\
-        :lp=/dev/ulpt0:\
-        :sh:\
-        :if=/usr/local/libexec/bjfilter870/filter870:\
-        :sd=/var/spool/lpd/bjfilter870:\
-        :mx#0:\
-        :lf=/var/log/lpd-errs
-bjfilter870_gui|Canon BJ F870 with GUI:\
-        :lp=/dev/ulpt0:\
-        :sh:\
-        :if=/usr/local/libexec/bjfilter870/filter870_gui:\
-        :sd=/var/spool/lpd/bjfilter870_gui:\
-        :mx#0:\
-        :lf=/var/log/lpd-errs
+/usr/local/libexec/bjfilter870/setup
+
+to setup /etc/printcap and make spools in /var/spool/lpd/.
 
 Notice: If you use filter870_gui in the printer server, for example
 hostA then you have to run X, execute "xhost hostA" and execute "lpr" on
diff --git a/print/bjfilter870/pkg-plist b/print/bjfilter870/pkg-plist
index f3570f7d1ba3..955818c42f72 100644
--- a/print/bjfilter870/pkg-plist
+++ b/print/bjfilter870/pkg-plist
@@ -1,8 +1,16 @@
 bin/bjf870ps
+bin/bjf870raw
 libexec/bjfilter870/filter870
 libexec/bjfilter870/filter870_gui
+libexec/bjfilter870/setup
+libexec/bjfilter870/scripts/en.lc
+libexec/bjfilter870/scripts/ja.lc
+@dirrm libexec/bjfilter870/scripts
 @dirrm libexec/bjfilter870
 @cwd /compat/linux
 usr/lib/bjlib/cnb_1020.tbl
+usr/lib/libcnbpo102.so
 usr/lib/libcnbpo102.so.1.0.0
 @dirrm usr/lib/bjlib
+@exec /compat/linux/sbin/ldconfig ; true
+@unexec /compat/linux/sbin/ldconfig ; true
diff --git a/print/bjfiltercom/Makefile b/print/bjfiltercom/Makefile
index d7cf8d457b59..4236413dec9b 100644
--- a/print/bjfiltercom/Makefile
+++ b/print/bjfiltercom/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME?=	bjfiltercom
-PORTVERSION?=	1.1
-PORTREVISION=	1
+PORTVERSION?=	1.3
+#PORTREVISION=	1
 CATEGORIES=	print linux
 MASTER_SITES=	ftp://www.canon-sales.co.jp/pub/driver/printer/BJ/linux/
 DISTFILES=	${RPMFILE}
@@ -46,45 +46,69 @@ MD5_FILE=	${.CURDIR}/distinfo
 ONLY_FOR_ARCHS=	i386
 NO_FILTER_SHLIBS=	yes
 NO_MTREE=	yes
+RPMREVISION=	0
 .if defined(SLAVE_PORT)
-BIN_FILES=	bjf${PRTYPE}ps
-FILTER=		${FILESDIR}/filter
 PAPERSIZE?=	a4
-RPMREVISION=	0
 .else
 NO_BUILD=	yes
-RPMREVISION=	1
 .endif
 RPMFILE=	${PORTNAME}-${PORTVERSION}-${RPMREVISION}.i386.rpm
 DOC_DIR=	${PREFIX}/share/doc/${PKGNAME}
 HTML_DIR=	${DOC_DIR}/html
-DOC_DISTFILES=	readme.tar.gz instruction.tar.gz faq.tar.gz
+DOC_DISTFILES=	readme-${PORTVERSION}-${RPMREVISION}.tar.gz \
+		instruction-${PORTVERSION}-${RPMREVISION}.tar.gz \
+		faq-${PORTVERSION}-${RPMREVISION}.tar.gz
+FILTER_NAME=	filter${PREFIX_PRTYPE}${PRTYPE}${SUFFIX_PRTYPE}
+.if ! defined(PREFIX_PRTYPE)
+PRMODEL=	F${PRTYPE}
+.else
+PRMODEL=	${PREFIX_PRTYPE:U}${PRTYPE}
+.endif
+
+t:
+	echo ${PRMODEL} ${RPMFILE}
 
 do-build:
-	${SED}	-e 's,%%PRTYPE%%,${PRTYPE}${SUFIX_PRTYPE},' \
-		${FILTER} > ${WRKDIR}/filter${PRTYPE}${SUFIX_PRTYPE}
-	${SED}	-e 's,%%PRTYPE%%,${PRTYPE}${SUFIX_PRTYPE},' \
-		${FILTER}_gui > ${WRKDIR}/filter${PRTYPE}${SUFIX_PRTYPE}_gui
+	${SED}	-e 's,%%PRMODEL%%,${PRMODEL},' \
+		${FILESDIR}/filter > ${WRKDIR}/${FILTER_NAME}
+	${SED}	-e 's,%%PRMODEL%%,${PRMODEL},' \
+		-e 's,%%LINUXBASE%%,${LINUXBASE},g' \
+		${FILESDIR}/filter_gui > ${WRKDIR}/${FILTER_NAME}_gui
+	${SED}	-e 's,%%PORTNAME%%,${PORTNAME},g' \
+		-e 's,%%FILTER_NAME%%,${FILTER_NAME},g' \
+		-e 's,%%PRMODEL%%,${PRMODEL},g' \
+		-e 's,%%PREFIX%%,${PREFIX},g' \
+			${FILESDIR}/setup > ${WRKDIR}/setup.freebsd
 
 do-install:
-	${MKDIR} -p ${LINUXBASE}/usr/lib/bjlib
+	${MKDIR} ${LINUXBASE}/usr/lib/bjlib
 	${INSTALL_DATA} ${WRKDIR}/usr/lib/bjlib/* ${LINUXBASE}/usr/lib/bjlib
 	${INSTALL_DATA} ${WRKDIR}/usr/lib/lib* ${LINUXBASE}/usr/lib
+	-${LINUXBASE}/sbin/ldconfig
 	${INSTALL_SCRIPT} ${WRKDIR}/usr/local/bin/* ${PREFIX}/bin
 .if defined(SLAVE_PORT)
 	${MKDIR} ${PREFIX}/libexec/${PORTNAME}
-	${INSTALL_SCRIPT} ${WRKDIR}/filter${PRTYPE}${SUFIX_PRTYPE} \
+	${INSTALL_SCRIPT} ${WRKDIR}/${FILTER_NAME} \
 		${PREFIX}/libexec/${PORTNAME}
-	${INSTALL_SCRIPT} ${WRKDIR}/filter${PRTYPE}${SUFIX_PRTYPE}_gui \
+	${INSTALL_SCRIPT} ${WRKDIR}/${FILTER_NAME}_gui \
 		${PREFIX}/libexec/${PORTNAME}
+	${INSTALL_SCRIPT} ${WRKDIR}/setup.freebsd ${PREFIX}/libexec/${PORTNAME}/setup
+	${MKDIR} ${PREFIX}/libexec/${PORTNAME}/scripts
+	${INSTALL_DATA} ${FILESDIR}/en.lc ${PREFIX}/libexec/${PORTNAME}/scripts
+	${INSTALL_DATA} ${FILESDIR}/ja.lc ${PREFIX}/libexec/${PORTNAME}/scripts
 .else
-	${MKDIR} -p ${LINUXBASE}/usr/local/share/printui
-	${MKDIR} -p ${LINUXBASE}/usr/local/share/locale/ja/LC_MESSAGES
+	${MKDIR} ${LINUXBASE}/usr/local/share/printui
+	${MKDIR} ${LINUXBASE}/usr/local/share/locale/ja/LC_MESSAGES
 	${INSTALL_DATA} ${WRKDIR}/usr/local/share/printui/* ${LINUXBASE}/usr/local/share/printui
+#  The next file "i18n" is installed by ja-bjfilter*
+	${RM} ${LINUXBASE}/usr/local/share/printui/i18n
 	${INSTALL_DATA} ${WRKDIR}/usr/local/share/locale/ja/LC_MESSAGES/* \
 		${LINUXBASE}/usr/local/share/locale/ja/LC_MESSAGES
-	${MKDIR} ${HTML_DIR}
+	${MKDIR} ${LINUXBASE}/usr/local/share/stsmon/pixmaps
+	${INSTALL_DATA} ${WRKDIR}/usr/local/share/stsmon/pixmaps/* \
+		${LINUXBASE}/usr/local/share/stsmon/pixmaps
 .for i in ${DOC_DISTFILES}
+	${MKDIR} ${HTML_DIR}
 	${TAR} -C ${HTML_DIR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${i}
 	${INSTALL_DATA} ${FILESDIR}/license.txt.jp ${DOC_DIR}
 .endfor
@@ -94,10 +118,11 @@ do-install:
 _MAKE_COMMENT_DESCR:
 .if defined(SLAVE_PORT) && ${PORTNAME} != "bjfilter850"
 .for file in pkg-comment pkg-descr
-	${SED}	-e 's/850/${PRTYPE}${SUFIX_PRTYPE}/g' ../bjfilter850/${file} \
-		> ${.CURDIR}/${file}
+	${SED}	-e 's/F850/${PRMODEL}/g' \
+		-e 's/850/${PREFIX_PRTYPE}${PRTYPE}${SUFFIX_PRTYPE}/g' \
+		../bjfilter850/${file} > ${.CURDIR}/${file}
 .endfor
-.if defined(SUFIX_PRTYPE) && ${SUFIX_PRTYPE} == "ug"
+.if defined(SUFFIX_PRTYPE) && ${SUFFIX_PRTYPE} == "ug"
 	i=`cat ../bjfilter850/pkg-comment`; \
 	echo $$i "(supported BCI-6 inks)" > ${.CURDIR}/pkg-comment
 	echo "" >> ${.CURDIR}/pkg-descr
diff --git a/print/bjfiltercom/distinfo b/print/bjfiltercom/distinfo
index b272bba5611b..8f2edd2dca7c 100644
--- a/print/bjfiltercom/distinfo
+++ b/print/bjfiltercom/distinfo
@@ -1,4 +1,4 @@
-MD5 (bjfilter/bjfiltercom-1.1-1.i386.rpm) = 00d4f27f8d7a62005874d0d0fcb608f9
-MD5 (bjfilter/readme.tar.gz) = a51a8c29214d083b0aa27bc2665a07e4
-MD5 (bjfilter/instruction.tar.gz) = 23555971f6c857738f4b05a71bf9f0ec
-MD5 (bjfilter/faq.tar.gz) = 9259fcf37cd475e1198952c6adbc4845
+MD5 (bjfilter/bjfiltercom-1.3-0.i386.rpm) = 8e2f08b58df239be77679a0382c8ce95
+MD5 (bjfilter/readme-1.3-0.tar.gz) = aac580333d8ba5de006f29db688c361a
+MD5 (bjfilter/instruction-1.3-0.tar.gz) = 2f3cb20970cb12b5046ba1966326b267
+MD5 (bjfilter/faq-1.3-0.tar.gz) = c14d507c62b84853fc10946cac9ff385
diff --git a/print/bjfiltercom/files/en.lc b/print/bjfiltercom/files/en.lc
new file mode 100644
index 000000000000..c3fb5ceed157
--- /dev/null
+++ b/print/bjfiltercom/files/en.lc
@@ -0,0 +1,27 @@
+#!/bin/sh
+###############################################################################
+### 
+### From @(#) Photo Image Print System -Locale file of install script
+### in pips900-2.1.i386.tgz
+### by taoka
+
+A_TXT="It starts to set up of photo Image Print System.\n"\
+"If this product does not set up, it does not operate correctly.\n"
+
+B_TXT="Please specify the connection of a printer.\n"
+
+C_TXT="Please specify the printer name when it is using by lpr.\n"
+
+D_TXT="Setup is complete. Is it saved?\n"
+
+E1_TXT="The following files were changed.\n"\
+"/etc/printcap\n\n"\
+"The following directories were created.\n"\
+"/var/spool/lpd/${PRT_MODEL_LOW}\n"\
+"/var/spool/lpd/${PRT_MODEL_LOW}_gui\n"
+
+E2_TXT="\nIt saved. Setup is complete.\n"\
+"Start $SETUP_PATH to change setup.\n"
+
+F_TXT="Setup is canceled. Setup is not complete yet\n"\
+"Set up by starting $SETUP_PATH.\n"
diff --git a/print/bjfiltercom/files/filter b/print/bjfiltercom/files/filter
index c80cab4fa807..93af0d33b1ab 100644
--- a/print/bjfiltercom/files/filter
+++ b/print/bjfiltercom/files/filter
@@ -5,7 +5,7 @@ PATH=${PATH}:/usr/bin:/usr/local/bin
 hostname=localhost
 resolution=600
 papersize=a4
-printer=BJF%%PRTYPE%%
+printer=BJ%%PRMODEL%%
 
 GS="gs -q -r$resolution -dNOPROMPT -dSAFER \
       -sPAPERSIZE=$papersize -sDEVICE=bmp16m -sOutputFile=- -"
diff --git a/print/bjfiltercom/files/filter_gui b/print/bjfiltercom/files/filter_gui
index bda858c0f8e2..03469996580f 100644
--- a/print/bjfiltercom/files/filter_gui
+++ b/print/bjfiltercom/files/filter_gui
@@ -11,9 +11,16 @@ if [ "$2" != "" ]; then
   hostname=$2
 fi
 
+LANG_FILE=%%LINUXBASE%%/usr/local/share/printui/i18n
+
+export LANG=C
+if [ -f ${LANG_FILE} ]; then
+    export `grep LANG ${LANG_FILE}`
+fi
+
 resolution=600
 papersize=a4
-printer=BJF%%PRTYPE%%
+printer=BJ%%PRMODEL%%
 
 GS="gs -q -r$resolution -dNOPROMPT -dSAFER \
       -sPAPERSIZE=$papersize -sDEVICE=bmp16m -sOutputFile=- -"
diff --git a/print/bjfiltercom/files/ja.lc b/print/bjfiltercom/files/ja.lc
new file mode 100644
index 000000000000..b7d557559ce5
--- /dev/null
+++ b/print/bjfiltercom/files/ja.lc
@@ -0,0 +1,27 @@
+#!/bin/sh
+###############################################################################
+###
+### From @(#) Photo Image Print System -Locale file of install script
+### in pips900-2.1.i386.tgz
+### by taoka
+
+A_TXT="これより Photo Image Print System のセットアップを開始します。\n"\
+"本製品は設定を行わなければ正しく動作しません。\n"
+
+B_TXT="プリンタの接続先を指定してください。\n"
+
+C_TXT="lprで使用する際のプリンタ名を指定してください。\n"
+
+D_TXT="設定は以上です。設定を保存してよろしいですか?\n"
+
+E1_TXT="以下のファイルを変更しました。\n"\
+"/etc/printcap\n\n"\
+"以下のディレクトリを作成しました。\n"\
+"/var/spool/lpd/${PRT_MODEL_LOW}\n"\
+"/var/spool/lpd/${PRT_MODEL_LOW}_gui\n"
+
+E2_TXT="\n保存しました。セットアップを終了します。\n"\
+"設定を変更するには $SETUP_PATH を起動してください。\n"
+
+F_TXT="セットアップをキャンセルします。まだ設定は終了していません。\n"\
+"$SETUP_PATHを起動して、設定を行ってください。\n"
diff --git a/print/bjfiltercom/files/setup b/print/bjfiltercom/files/setup
new file mode 100644
index 000000000000..25643ff5897f
--- /dev/null
+++ b/print/bjfiltercom/files/setup
@@ -0,0 +1,145 @@
+#!/bin/sh
+###############################################################################
+###
+### From @(#) Photo Image Print System -Setup script
+###     Mon Apr 23 2001 sk
+### in pips900-2.1.i386.tgz :-)
+### by taoka
+
+SCRIPT_PATH=%%PREFIX%%/libexec/%%PORTNAME%%/scripts
+PRMODEL=%%PRMODEL%%
+PRT_MODEL=BJ${PRMODEL}
+BJF_COMMAND=%%PORTNAME%%
+BJF_FILTER_PATH=%%PREFIX%%/libexec/%%PORTNAME%%/%%FILTER_NAME%%
+
+SETUP_PATH=%%PREFIX%%/libexec/%%PORTNAME%%/setup
+DEF_PRT_PATH=/dev/ulpt0
+
+PRT_MODEL_LOW=`echo $PRT_MODEL | tr '[A-Z]' '[a-z]'`
+
+. $SCRIPT_PATH/en.lc
+
+trap 'echo; printf "$F_TXT"
+    exit 1' 0
+
+ID=`id | sed -e 's/uid=//' -e 's/(.*//'`
+
+if [ $ID -ne 0 ]; then
+    echo must run as root.
+    exit 0;
+fi
+
+echo "-----------------------------------------------"
+echo ""
+echo "           bjfilter Setup script"
+echo ""
+echo "-----------------------------------------------"
+
+echo Please select locale to use.
+echo Select : en ja #de es fr it ko nl pt zh zh_TW
+echo -n '(english) > '
+
+read SET_LANG
+case $SET_LANG in
+#    [Dd][Ee] ) . $SCRIPT_PATH/de.lc ;;
+#    [Ee][Ss] ) . $SCRIPT_PATH/es.lc ;;
+#    [Ff][Rr] ) . $SCRIPT_PATH/fr.lc ;;
+#    [Ii][Tt] ) . $SCRIPT_PATH/it.lc ;;
+    [Jj][Aa] ) . $SCRIPT_PATH/ja.lc ;;
+#    [Kk][Oo] ) . $SCRIPT_PATH/ko.lc ;;
+#    [Nn][Ll] ) . $SCRIPT_PATH/nl.lc ;;
+#    [Pp][Tt] ) . $SCRIPT_PATH/pt.lc ;;
+#    [Zz][Hh] ) . $SCRIPT_PATH/zh.lc ;;
+#    [Zz][Hh]_[Tt][Ww] ) . $SCRIPT_PATH/zh_TW.lc ;;
+    *);;
+esac
+
+printf "$A_TXT"
+echo
+
+while :
+do
+    printf "$B_TXT"
+    echo -n "($DEF_PRT_PATH) > "
+    
+    read PRT_PATH
+
+    if [ -z $PRT_PATH ]; then
+	PRT_PATH=$DEF_PRT_PATH
+    fi
+
+    if [ -n $PRT_PATH -a -r $PRT_PATH -a -w $PRT_PATH ]; then
+	break;
+    fi
+    echo "$PRT_PATH : No such file or directory."
+done
+
+
+while :
+do
+    printf "$D_TXT"
+    echo -n '(Yes/no) > '
+
+    read ANSWER
+    case $ANSWER in
+	[Yy] | [Yy]es | YES ) break ;;
+	[Nn] | [Nn]o | NO ) exit 0 ;;
+	* ) echo ? ;;
+    esac
+done
+
+trap 0
+printf "$E1_TXT"
+printf "$E2_TXT"
+
+
+#/etc/printcap
+if [ -s /etc/printcap ]; then
+    KEY=`grep "# written for $BJF_COMMAND" /etc/printcap`
+    if [ -n "$KEY" ]; then
+	mv /etc/printcap /etc/printcap.bak
+
+	SPOOLDIR=`cat /etc/printcap.bak | sed -n "/# written for $BJF_COMMAND/,/# $BJF_COMMAND  end/p" | grep ":sd=" | sed -e "s/^.*:sd=//" -e "s/:.*$//"`
+	rm -rf $SPOOLDIR
+
+	sed -e "/# written for $BJF_COMMAND/,/# $BJF_COMMAND  end/d" < /etc/printcap.bak > /etc/printcap
+
+    else
+	cp /etc/printcap /etc/printcap.bak
+
+    fi
+else
+    touch /etc/printcap
+fi
+
+cat <<EOF >>/etc/printcap
+# written for $BJF_COMMAND
+${PRT_MODEL_LOW}|Canon BJ $PRMODEL:\\
+	:sd=/var/spool/lpd/${PRT_MODEL_LOW}:\\
+	:mx#0:\\
+	:sh:\\
+	:lp=$PRT_PATH:\\
+	:if=$BJF_FILTER_PATH:\\
+	:lf=/var/log/lpd-errs:
+${PRT_MODEL_LOW}_gui|Canon BJ $PRMODEL with GUI:\\
+	:sd=/var/spool/lpd/${PRT_MODEL_LOW}_gui:\\
+	:mx#0:\\
+	:sh:\\
+	:lp=$PRT_PATH:\\
+	:if=${BJF_FILTER_PATH}_gui:\\
+	:lf=/var/log/lpd-errs:
+# $BJF_COMMAND  end
+EOF
+
+OLDMASK=`umask`
+umask 000
+
+mkdir -p /var/spool/lpd/${PRT_MODEL_LOW}
+chown daemon:daemon /var/spool/lpd/${PRT_MODEL_LOW}
+chmod 770 /var/spool/lpd/${PRT_MODEL_LOW}
+mkdir -p /var/spool/lpd/${PRT_MODEL_LOW}_gui
+chown daemon:daemon /var/spool/lpd/${PRT_MODEL_LOW}_gui
+chmod 770 /var/spool/lpd/${PRT_MODEL_LOW}_gui
+
+umask $OLDMASK
+exit 0
diff --git a/print/bjfiltercom/pkg-descr b/print/bjfiltercom/pkg-descr
index 5dce39e3f999..8aad6ab98d53 100644
--- a/print/bjfiltercom/pkg-descr
+++ b/print/bjfiltercom/pkg-descr
@@ -4,6 +4,6 @@ on. By using the driver you can print out as high quality as you use
 the Windows driver. See the below URLs:
 
 WWW: http://www.canon-sales.co.jp/drv-upd/linux/bjlinux100.html
-     file:/usr/local/share/doc/bjfiltercom-1.1_1/html/README.HTM
-     file:/usr/local/share/doc/bjfiltercom-1.1_1/html/INDEX.HTM
-     file:/usr/local/share/doc/bjfiltercom-1.1_1/html/FAQ.HTM
+     file:/usr/local/share/doc/bjfiltercom-1.3/html/README.HTM
+     file:/usr/local/share/doc/bjfiltercom-1.3/html/INDEX.HTM
+     file:/usr/local/share/doc/bjfiltercom-1.3/html/FAQ.HTM
diff --git a/print/bjfiltercom/pkg-plist b/print/bjfiltercom/pkg-plist
index bfa8c78280e5..375edeabada8 100644
--- a/print/bjfiltercom/pkg-plist
+++ b/print/bjfiltercom/pkg-plist
@@ -1,6 +1,6 @@
 bin/bjcmd
 bin/bjfilter
-bin/bjprn
+@comment bin/bjprn
 bin/lgmon
 bin/printui
 bin/stsmon
@@ -31,28 +31,67 @@ share/doc/bjfiltercom-%%PORTVERSION%%/html/WELCOME.HTM
 @cwd /compat/linux
 usr/lib/bjlib/bjfilter.conf
 usr/lib/bjlib/cnbpname.tbl
+usr/lib/libcnbpcmcm.so
 usr/lib/libcnbpcmcm.so.1.0.0
+usr/lib/libcnbphtmg.so
 usr/lib/libcnbphtmg.so.1.0.0
+usr/lib/libcnbpsmth.so
 usr/lib/libcnbpsmth.so.1.0.0
+usr/lib/libcnbpwcc.so
 usr/lib/libcnbpwcc.so.1.0.0
+usr/lib/libcnclapi.so
 usr/lib/libcnclapi.so.1.0.0
+usr/lib/libcnclbjcmd.so
 usr/lib/libcnclbjcmd.so.1.0.0
+usr/lib/libcnclui.so
 usr/lib/libcnclui.so.1.0.0
 usr/local/share/locale/ja/LC_MESSAGES/stsmon.mo
 usr/local/share/locale/ja/LC_MESSAGES/printui.mo
 usr/local/share/printui/black_bar.xpm
 usr/local/share/printui/cyan_bar.xpm
+@comment A next file is installed by ja-bjfilter*
+@comment usr/local/share/printui/i18n
 usr/local/share/printui/locale-table
 usr/local/share/printui/magenta_bar.xpm
 usr/local/share/printui/printui.glade
 usr/local/share/printui/printui.res
 usr/local/share/printui/yellow_bar.xpm
+usr/local/share/stsmon/pixmaps/Ink_bb.xpm
+usr/local/share/stsmon/pixmaps/Ink_bk.xpm
+usr/local/share/stsmon/pixmaps/Ink_cy.xpm
+usr/local/share/stsmon/pixmaps/Ink_el.xpm
+usr/local/share/stsmon/pixmaps/Ink_er.xpm
+usr/local/share/stsmon/pixmaps/Ink_low.xpm
+usr/local/share/stsmon/pixmaps/Ink_low_bb.xpm
+usr/local/share/stsmon/pixmaps/Ink_ma.xpm
+usr/local/share/stsmon/pixmaps/Ink_out.xpm
+usr/local/share/stsmon/pixmaps/Ink_out_bb.xpm
+usr/local/share/stsmon/pixmaps/Ink_pb.xpm
+usr/local/share/stsmon/pixmaps/Ink_pc.xpm
+usr/local/share/stsmon/pixmaps/Ink_pm.xpm
+usr/local/share/stsmon/pixmaps/Ink_sp.xpm
+usr/local/share/stsmon/pixmaps/Ink_ye.xpm
+usr/local/share/stsmon/pixmaps/Inkg_bb.xpm
+usr/local/share/stsmon/pixmaps/Inkg_bk.xpm
+usr/local/share/stsmon/pixmaps/Inkg_cy.xpm
+usr/local/share/stsmon/pixmaps/Inkg_el.xpm
+usr/local/share/stsmon/pixmaps/Inkg_er.xpm
+usr/local/share/stsmon/pixmaps/Inkg_ma.xpm
+usr/local/share/stsmon/pixmaps/Inkg_pb.xpm
+usr/local/share/stsmon/pixmaps/Inkg_pc.xpm
+usr/local/share/stsmon/pixmaps/Inkg_pm.xpm
+usr/local/share/stsmon/pixmaps/Inkg_sp.xpm
+usr/local/share/stsmon/pixmaps/Inkg_ye.xpm
 @dirrm usr/local/share/printui
 @dirrm usr/local/share/locale/ja/LC_MESSAGES
 @dirrm usr/local/share/locale/ja
 @dirrm usr/local/share/locale
+@dirrm usr/local/share/stsmon/pixmaps
+@dirrm usr/local/share/stsmon
 @dirrm usr/local/share
 @dirrm usr/local
 @dirrm usr/lib/bjlib
 @dirrm usr/lib
 @dirrm usr
+@exec /compat/linux/sbin/ldconfig ; true
+@unexec /compat/linux/sbin/ldconfig ; true