18 files changed, 197 insertions, 85 deletions

diff --git a/print/bjfilter360/pkg-comment b/print/bjfilter360/pkg-comment
index bdb2aa0d6875..a18a10806d7d 100644
--- a/print/bjfilter360/pkg-comment
+++ b/print/bjfilter360/pkg-comment
@@ -1 +1 @@
-Canon Bubble Jet Print Filter for Linux -- BJ F850
+Canon Bubble Jet Print Filter for Linux -- BJ F360
diff --git a/print/bjfilter360/pkg-descr b/print/bjfilter360/pkg-descr
index 018e0f12fd4f..9402cb7753f4 100644
--- a/print/bjfilter360/pkg-descr
+++ b/print/bjfilter360/pkg-descr
@@ -5,13 +5,13 @@ 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/html/README.HTM
-     file:/usr/local/share/doc/bjfiltercom-1.1/html/INDEX.HTM
-     file:/usr/local/share/doc/bjfiltercom-1.1/html/FAQ.HTM
+     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
 
-And then this port has a filter "filter360" which is useful to print
-out more than one page. If you use it, you add the next entry into
-/etc/printcap.
+And then this port has filters filter360 and filter360_gui which are
+useful to print out more than one page. If you use it, you add the
+next entry into /etc/printcap.
 
 bjfilter360|Canon BJ F360:\
         :lp=/dev/lpt0:\
@@ -20,3 +20,14 @@ bjfilter360|Canon BJ F360:\
         :sd=/var/spool/lpd/bjfilter360:\
         :mx#0:\
         :lf=/var/log/lpd-errs
+bjfilter360_gui|Canon BJ F360 with GUI:\
+        :lp=/dev/lpt0:\
+        :sh:\
+        :if=/usr/local/libexec/bjfilter360/filter360_gui:\
+        :sd=/var/spool/lpd/bjfilter360_gui:\
+        :mx#0:\
+        :lf=/var/log/lpd-errs
+
+Notice: If you use filter360_gui then the host which you are using
+have to be the printer saver. Then before using it, you have to run X
+and execute "xhost localhost".
diff --git a/print/bjfilter360/pkg-plist b/print/bjfilter360/pkg-plist
index aca9ae8cc5e5..5c92da973e6f 100644
--- a/print/bjfilter360/pkg-plist
+++ b/print/bjfilter360/pkg-plist
@@ -1,5 +1,6 @@
 bin/bjf360ps
 libexec/bjfilter360/filter360
+libexec/bjfilter360/filter360_gui
 @dirrm libexec/bjfilter360
 @cwd /compat/linux
 usr/lib/bjlib/cnb_0980.tbl
diff --git a/print/bjfilter850/pkg-comment b/print/bjfilter850/pkg-comment
index 9595a9077c57..bdb2aa0d6875 100644
--- a/print/bjfilter850/pkg-comment
+++ b/print/bjfilter850/pkg-comment
@@ -1 +1 @@
-Canon Bubble Jet Print Filter for Linux -- BJ F850 (supported BCI-5 inks)
+Canon Bubble Jet Print Filter for Linux -- BJ F850
diff --git a/print/bjfilter850/pkg-descr b/print/bjfilter850/pkg-descr
index 5fd169696180..f7fc53e9ce7e 100644
--- a/print/bjfilter850/pkg-descr
+++ b/print/bjfilter850/pkg-descr
@@ -1,25 +1,33 @@
-This port is for a printer filter of Canon BJ F850 (supported BCI-5
-inks). The filter is called Canon Bubble Jet Print Filter for Linux
-and there exist the filters for other Canon bubble jet printers. By
-using this driver you can print out as high quality as you use the
-Windows driver. See the below URLs:
+This port is for a printer filter of Canon BJ F850. The filter is
+called Canon Bubble Jet Print Filter for Linux and there exist the
+filters for other Canon bubble jet printers. By using this 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/html/README.HTM
-     file:/usr/local/share/doc/bjfiltercom-1.1/html/INDEX.HTM
-     file:/usr/local/share/doc/bjfiltercom-1.1/html/FAQ.HTM
+     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
 
-And then this port has a filter "filter850" which is useful to print
-out more than one page. If you use it, you add the next entry into
-/etc/printcap.
+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.
 
 bjfilter850|Canon BJ F850:\
-        :lp=/dev/lpt0:\
+        :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
 
-Notice: This ports bjfilter850 and bjfilter850ug cannot be installed
-simultaneously.
+Notice: If you use filter850_gui then the host which you are using
+have to be the printer saver. Then before using it, you have to run X
+and execute "xhost localhost".
diff --git a/print/bjfilter850/pkg-plist b/print/bjfilter850/pkg-plist
index bdb3b3c08548..12e65a2cb5ea 100644
--- a/print/bjfilter850/pkg-plist
+++ b/print/bjfilter850/pkg-plist
@@ -1,5 +1,6 @@
 bin/bjf850ps
 libexec/bjfilter850/filter850
+libexec/bjfilter850/filter850_gui
 @dirrm libexec/bjfilter850
 @cwd /compat/linux
 usr/lib/bjlib/cnb_0740.tbl
diff --git a/print/bjfilter850ug/pkg-descr b/print/bjfilter850ug/pkg-descr
index a14cced8c565..0ed7cb3914f0 100644
--- a/print/bjfilter850ug/pkg-descr
+++ b/print/bjfilter850ug/pkg-descr
@@ -1,25 +1,37 @@
-This port is for a printer filter of Canon BJ F850 (supported BCI-6
-inks). The filter is called Canon Bubble Jet Print Filter for Linux
-and there exist the filters for other Canon bubble jet printers. By
-using this driver you can print out as high quality as you use the
-Windows driver. See the below URLs:
+This port is for a printer filter of Canon BJ F850ug. The filter is
+called Canon Bubble Jet Print Filter for Linux and there exist the
+filters for other Canon bubble jet printers. By using this 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/html/README.HTM
-     file:/usr/local/share/doc/bjfiltercom-1.1/html/INDEX.HTM
-     file:/usr/local/share/doc/bjfiltercom-1.1/html/FAQ.HTM
+     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
 
-And then this port has a filter "filter850" which is useful to print
-out more than one page. If you use it, you add the next entry into
-/etc/printcap.
+And then this port has filters filter850ug and filter850ug_gui which are
+useful to print out more than one page. If you use it, you add the
+next entry into /etc/printcap.
 
-bjfilter850|Canon BJ F850:\
+bjfilter850ug|Canon BJ F850ug:\
         :lp=/dev/lpt0:\
         :sh:\
-        :if=/usr/local/libexec/bjfilter850/filter850:\
-        :sd=/var/spool/lpd/bjfilter850:\
+        :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/lpt0:\
+        :sh:\
+        :if=/usr/local/libexec/bjfilter850ug/filter850ug_gui:\
+        :sd=/var/spool/lpd/bjfilter850ug_gui:\
+        :mx#0:\
+        :lf=/var/log/lpd-errs
+
+Notice: If you use filter850ug_gui then the host which you are using
+have to be the printer saver. Then before using it, you have to run X
+and execute "xhost localhost".
+
+Notice: This is supported BCI-6 inks.
 
-Notice: This ports bjfilter850ug and bjfilter850 cannot be installed
-simultaneously.
+Notice: bjfilter850 and bjfilter850ug cannot be installed simultaneously.
diff --git a/print/bjfilter850ug/pkg-plist b/print/bjfilter850ug/pkg-plist
index bdb3b3c08548..ce559a7e9150 100644
--- a/print/bjfilter850ug/pkg-plist
+++ b/print/bjfilter850ug/pkg-plist
@@ -1,6 +1,7 @@
 bin/bjf850ps
-libexec/bjfilter850/filter850
-@dirrm libexec/bjfilter850
+libexec/bjfilter850ug/filter850ug
+libexec/bjfilter850ug/filter850ug_gui
+@dirrm libexec/bjfilter850ug
 @cwd /compat/linux
 usr/lib/bjlib/cnb_0740.tbl
 usr/lib/libcnbpo074.so.1.0.0
diff --git a/print/bjfilter860/pkg-descr b/print/bjfilter860/pkg-descr
index dd343cddebcd..2e5cafe3f326 100644
--- a/print/bjfilter860/pkg-descr
+++ b/print/bjfilter860/pkg-descr
@@ -5,13 +5,13 @@ 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/html/README.HTM
-     file:/usr/local/share/doc/bjfiltercom-1.1/html/INDEX.HTM
-     file:/usr/local/share/doc/bjfiltercom-1.1/html/FAQ.HTM
+     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
 
-And then this port has a filter "filter860" which is useful to print
-out more than one page. If you use it, you add the next entry into
-/etc/printcap.
+And then this port has filters filter860 and filter860_gui which are
+useful to print out more than one page. If you use it, you add the
+next entry into /etc/printcap.
 
 bjfilter860|Canon BJ F860:\
         :lp=/dev/lpt0:\
@@ -20,3 +20,14 @@ bjfilter860|Canon BJ F860:\
         :sd=/var/spool/lpd/bjfilter860:\
         :mx#0:\
         :lf=/var/log/lpd-errs
+bjfilter860_gui|Canon BJ F860 with GUI:\
+        :lp=/dev/lpt0:\
+        :sh:\
+        :if=/usr/local/libexec/bjfilter860/filter860_gui:\
+        :sd=/var/spool/lpd/bjfilter860_gui:\
+        :mx#0:\
+        :lf=/var/log/lpd-errs
+
+Notice: If you use filter860_gui then the host which you are using
+have to be the printer saver. Then before using it, you have to run X
+and execute "xhost localhost".
diff --git a/print/bjfilter860/pkg-plist b/print/bjfilter860/pkg-plist
index 8d9c9ef9810b..a120d6edb227 100644
--- a/print/bjfilter860/pkg-plist
+++ b/print/bjfilter860/pkg-plist
@@ -1,5 +1,6 @@
 bin/bjf860ps
 libexec/bjfilter860/filter860
+libexec/bjfilter860/filter860_gui
 @dirrm libexec/bjfilter860
 @cwd /compat/linux
 usr/lib/bjlib/cnb_1050.tbl
diff --git a/print/bjfilter870/pkg-descr b/print/bjfilter870/pkg-descr
index a82e24136114..89ac9a4543be 100644
--- a/print/bjfilter870/pkg-descr
+++ b/print/bjfilter870/pkg-descr
@@ -5,13 +5,13 @@ 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/html/README.HTM
-     file:/usr/local/share/doc/bjfiltercom-1.1/html/INDEX.HTM
-     file:/usr/local/share/doc/bjfiltercom-1.1/html/FAQ.HTM
+     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
 
-And then this port has a filter "filter870" which is useful to print
-out more than one page. If you use it, you add the next entry into
-/etc/printcap.
+And then this port has filters filter870 and filter870_gui which are
+useful to print out more than one page. If you use it, you add the
+next entry into /etc/printcap.
 
 bjfilter870|Canon BJ F870:\
         :lp=/dev/lpt0:\
@@ -20,3 +20,14 @@ bjfilter870|Canon BJ F870:\
         :sd=/var/spool/lpd/bjfilter870:\
         :mx#0:\
         :lf=/var/log/lpd-errs
+bjfilter870_gui|Canon BJ F870 with GUI:\
+        :lp=/dev/lpt0:\
+        :sh:\
+        :if=/usr/local/libexec/bjfilter870/filter870_gui:\
+        :sd=/var/spool/lpd/bjfilter870_gui:\
+        :mx#0:\
+        :lf=/var/log/lpd-errs
+
+Notice: If you use filter870_gui then the host which you are using
+have to be the printer saver. Then before using it, you have to run X
+and execute "xhost localhost".
diff --git a/print/bjfilter870/pkg-plist b/print/bjfilter870/pkg-plist
index ff6adc8d7a0d..f3570f7d1ba3 100644
--- a/print/bjfilter870/pkg-plist
+++ b/print/bjfilter870/pkg-plist
@@ -1,5 +1,6 @@
 bin/bjf870ps
 libexec/bjfilter870/filter870
+libexec/bjfilter870/filter870_gui
 @dirrm libexec/bjfilter870
 @cwd /compat/linux
 usr/lib/bjlib/cnb_1020.tbl
diff --git a/print/bjfiltercom/Makefile b/print/bjfiltercom/Makefile
index ed627b0398e3..d7cf8d457b59 100644
--- a/print/bjfiltercom/Makefile
+++ b/print/bjfiltercom/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME?=	bjfiltercom
 PORTVERSION?=	1.1
+PORTREVISION=	1
 CATEGORIES=	print linux
 MASTER_SITES=	ftp://www.canon-sales.co.jp/pub/driver/printer/BJ/linux/
 DISTFILES=	${RPMFILE}
@@ -22,21 +23,21 @@ BUILD_DEPENDS=  rpm2cpio:${PORTSDIR}/archivers/rpm2cpio
 RUN_DEPENDS=	stsmon:${PORTSDIR}/print/bjfiltercom \
 		pstops:${PORTSDIR}/print/psutils-${PAPERSIZE}
 .else
-RUN_DEPENDS=	/compat/linux/lib/libc.so.6:${PORTSDIR}/emulators/linux_base \
-		/compat/linux/usr/lib/libxml.so.1:${PORTSDIR}/textproc/linux-libxml \
-		/compat/linux/usr/lib/libjpeg.so.62:${PORTSDIR}/graphics/linux-jpeg \
-		/compat/linux/usr/lib/libtiff.so.3:${PORTSDIR}/graphics/linux-tiff \
-		/compat/linux/usr/lib/libglade.so.0:${PORTSDIR}/devel/linux-libglade \
-		/compat/linux/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux-gtk
+RUN_DEPENDS=	${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base \
+		${LINUXBASE}/usr/lib/libxml.so.1:${PORTSDIR}/textproc/linux-libxml \
+		${LINUXBASE}/usr/lib/libjpeg.so.62:${PORTSDIR}/graphics/linux-jpeg \
+		${LINUXBASE}/usr/lib/libtiff.so.3:${PORTSDIR}/graphics/linux-tiff \
+		${LINUXBASE}/usr/lib/libglade.so.0:${PORTSDIR}/devel/linux-libglade \
+		${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux-gtk
 
-BIN_FILES=	bjprn stsmon printui lgmon bjfilter
+BIN_FILES=	bjcmd  bjfilter  bjprn  lgmon  printui  stsmon
 .endif
 
 EXTRACT_CMD=	rpm2cpio
 EXTRACT_BEFORE_ARGS=
 EXTRACT_AFTER_ARGS=	| cpio -id --quiet
 
-PLIST_SUB+=	PORTVERSION=${PORTVERSION}
+PLIST_SUB+=	PORTVERSION=${PORTVERSION}${_SUF1}${_SUF2}
 DIST_SUBDIR=	bjfilter
 PLIST=		${.CURDIR}/pkg-plist
 COMMENT=	${.CURDIR}/pkg-comment
@@ -45,33 +46,43 @@ MD5_FILE=	${.CURDIR}/distinfo
 ONLY_FOR_ARCHS=	i386
 NO_FILTER_SHLIBS=	yes
 NO_MTREE=	yes
-RPMFILE=	${PORTNAME}-${PORTVERSION}-0.i386.rpm
 .if defined(SLAVE_PORT)
 BIN_FILES=	bjf${PRTYPE}ps
 FILTER=		${FILESDIR}/filter
 PAPERSIZE?=	a4
+RPMREVISION=	0
 .else
 NO_BUILD=	yes
+RPMREVISION=	1
 .endif
-DOC_DIR=	${PREFIX}/share/doc/bjfiltercom-${PORTVERSION}
+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
 
 do-build:
-	${SED}	-e 's,%%PRTYPE%%,${PRTYPE},' \
-		${FILTER} > ${WRKDIR}/filter${PRTYPE}
+	${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
 
 do-install:
-	cd ${WRKDIR}; \
-	${TAR} cf - usr | ${TAR} xf - -C /compat/linux
-.for i in ${BIN_FILES}
-	${MV} -f /compat/linux/usr/local/bin/$i ${PREFIX}/bin
-.endfor
+	${MKDIR} -p ${LINUXBASE}/usr/lib/bjlib
+	${INSTALL_DATA} ${WRKDIR}/usr/lib/bjlib/* ${LINUXBASE}/usr/lib/bjlib
+	${INSTALL_DATA} ${WRKDIR}/usr/lib/lib* ${LINUXBASE}/usr/lib
+	${INSTALL_SCRIPT} ${WRKDIR}/usr/local/bin/* ${PREFIX}/bin
 .if defined(SLAVE_PORT)
 	${MKDIR} ${PREFIX}/libexec/${PORTNAME}
-	${INSTALL_SCRIPT} ${WRKDIR}/filter${PRTYPE} \
+	${INSTALL_SCRIPT} ${WRKDIR}/filter${PRTYPE}${SUFIX_PRTYPE} \
+		${PREFIX}/libexec/${PORTNAME}
+	${INSTALL_SCRIPT} ${WRKDIR}/filter${PRTYPE}${SUFIX_PRTYPE}_gui \
 		${PREFIX}/libexec/${PORTNAME}
 .else
+	${MKDIR} -p ${LINUXBASE}/usr/local/share/printui
+	${MKDIR} -p ${LINUXBASE}/usr/local/share/locale/ja/LC_MESSAGES
+	${INSTALL_DATA} ${WRKDIR}/usr/local/share/printui/* ${LINUXBASE}/usr/local/share/printui
+	${INSTALL_DATA} ${WRKDIR}/usr/local/share/locale/ja/LC_MESSAGES/* \
+		${LINUXBASE}/usr/local/share/locale/ja/LC_MESSAGES
 	${MKDIR} ${HTML_DIR}
 .for i in ${DOC_DISTFILES}
 	${TAR} -C ${HTML_DIR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${i}
@@ -81,11 +92,19 @@ do-install:
 
 # a target for the maintainer
 _MAKE_COMMENT_DESCR:
-.if defined(SLAVE_PORT) && ${PRTYPE} != "850"
+.if defined(SLAVE_PORT) && ${PORTNAME} != "bjfilter850"
 .for file in pkg-comment pkg-descr
-	${SED}	-e 's/850/${PRTYPE}/g' ../bjfilter850/${file} \
+	${SED}	-e 's/850/${PRTYPE}${SUFIX_PRTYPE}/g' ../bjfilter850/${file} \
 		> ${.CURDIR}/${file}
 .endfor
+.if defined(SUFIX_PRTYPE) && ${SUFIX_PRTYPE} == "ug"
+	i=`cat ../bjfilter850/pkg-comment`; \
+	echo $$i "(supported BCI-6 inks)" > ${.CURDIR}/pkg-comment
+	echo "" >> ${.CURDIR}/pkg-descr
+	echo "Notice: This is supported BCI-6 inks." >> ${.CURDIR}/pkg-descr
+	echo "" >> ${.CURDIR}/pkg-descr
+	echo "Notice: bjfilter850 and bjfilter850ug cannot be installed simultaneously." >> ${.CURDIR}/pkg-descr
+.endif
 .endif
 
 .include <bsd.port.mk>
diff --git a/print/bjfiltercom/distinfo b/print/bjfiltercom/distinfo
index d29a854984db..e6db29d2900b 100644
--- a/print/bjfiltercom/distinfo
+++ b/print/bjfiltercom/distinfo
@@ -1,4 +1,4 @@
-MD5 (bjfilter/bjfiltercom-1.1-0.i386.rpm) = 087a441acd85c02ca1031c40837e1d88
+MD5 (bjfilter/bjfiltercom-1.1-1.i386.rpm) = 00d4f27f8d7a62005874d0d0fcb608f9
 MD5 (bjfilter/readme.tar.gz) = a51a8c29214d083b0aa27bc2665a07e4
 MD5 (bjfilter/instruction.tar.gz) = eda07761dcf1f70b92b7d1c3737291f2
 MD5 (bjfilter/faq.tar.gz) = ef12e6782ed07b9620524f3d5fda8ddc
diff --git a/print/bjfiltercom/files/filter b/print/bjfiltercom/files/filter
index 4efd25918dd6..c80cab4fa807 100644
--- a/print/bjfiltercom/files/filter
+++ b/print/bjfiltercom/files/filter
@@ -2,11 +2,13 @@
 
 PATH=${PATH}:/usr/bin:/usr/local/bin
 
-MODEL=BJF%%PRTYPE%%
-RESOLUTION=600
-PAGESIZE=a4
-GS="gs -r${RESOLUTION} -q -dNOPROMPT -dSAFER \
-      -sPAPERSIZE=${PAGESIZE} -sDEVICE=bmp16m -sOutputFile=- -"
-BJFILTER="bjfilter --model ${MODEL} --imageres ${RESOLUTION}"
-
-psselect -r | ${GS} | ${BJFILTER}
+hostname=localhost
+resolution=600
+papersize=a4
+printer=BJF%%PRTYPE%%
+
+GS="gs -q -r$resolution -dNOPROMPT -dSAFER \
+      -sPAPERSIZE=$papersize -sDEVICE=bmp16m -sOutputFile=- -"
+BJFILTER="bjfilter --model $printer --imageres $resolution --fit"
+
+psselect -r | bjcmd "${GS} | ${BJFILTER}"
diff --git a/print/bjfiltercom/files/filter_gui b/print/bjfiltercom/files/filter_gui
new file mode 100644
index 000000000000..bda858c0f8e2
--- /dev/null
+++ b/print/bjfiltercom/files/filter_gui
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+PATH=${PATH}:/usr/bin:/usr/local/bin
+
+while [ "$1" != "-h" ] && [ "$1" != "" ]; do
+  shift
+done
+
+hostname=localhost
+if [ "$2" != "" ]; then
+  hostname=$2
+fi
+
+resolution=600
+papersize=a4
+printer=BJF%%PRTYPE%%
+
+GS="gs -q -r$resolution -dNOPROMPT -dSAFER \
+      -sPAPERSIZE=$papersize -sDEVICE=bmp16m -sOutputFile=- -"
+BJFILTER="bjfilter --display $hostname:0.0 \
+--gui --model $printer --imageres $resolution --fit"
+# --lgmon
+
+psselect -r | bjcmd "${GS} | ${BJFILTER}"
diff --git a/print/bjfiltercom/pkg-descr b/print/bjfiltercom/pkg-descr
index 23446700133b..5dce39e3f999 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/html/README.HTM
-     file:/usr/local/share/doc/bjfiltercom-1.1/html/INDEX.HTM
-     file:/usr/local/share/doc/bjfiltercom-1.1/html/FAQ.HTM
+     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
diff --git a/print/bjfiltercom/pkg-plist b/print/bjfiltercom/pkg-plist
index d7d951d0c01d..bfa8c78280e5 100644
--- a/print/bjfiltercom/pkg-plist
+++ b/print/bjfiltercom/pkg-plist
@@ -1,3 +1,4 @@
+bin/bjcmd
 bin/bjfilter
 bin/bjprn
 bin/lgmon
@@ -38,6 +39,7 @@ usr/lib/libcnclapi.so.1.0.0
 usr/lib/libcnclbjcmd.so.1.0.0
 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
 usr/local/share/printui/locale-table
@@ -45,5 +47,12 @@ 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
-@dirrm usr/lib/bjlib
 @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
+@dirrm usr/local
+@dirrm usr/lib/bjlib
+@dirrm usr/lib
+@dirrm usr