Update to version 1.1

o bjfiltercom
PR: ports/27976
Submitted by: Patrick Li <pat@databits.net>

o the other bjfilter*
Submitted by: maintainer (taoka)

4 files changed, 18 insertions, 16 deletions

diff --git a/print/bjfiltercom/Makefile b/print/bjfiltercom/Makefile
index 807b6e779362..ed627b0398e3 100644
--- a/print/bjfiltercom/Makefile
+++ b/print/bjfiltercom/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	bjfiltercom
-PORTVERSION?=	1.0
+PORTVERSION?=	1.1
 CATEGORIES=	print linux
 MASTER_SITES=	ftp://www.canon-sales.co.jp/pub/driver/printer/BJ/linux/
 DISTFILES=	${RPMFILE}
@@ -26,7 +26,9 @@ 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/libglade.so.0:${PORTSDIR}/devel/linux-libglade \
+		/compat/linux/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux-gtk
+
 BIN_FILES=	bjprn stsmon printui lgmon bjfilter
 .endif
 
@@ -34,7 +36,7 @@ EXTRACT_CMD=	rpm2cpio
 EXTRACT_BEFORE_ARGS=
 EXTRACT_AFTER_ARGS=	| cpio -id --quiet
 
-PLIST_SUB=	PORTVERSION=${PORTVERSION}
+PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 DIST_SUBDIR=	bjfilter
 PLIST=		${.CURDIR}/pkg-plist
 COMMENT=	${.CURDIR}/pkg-comment
@@ -45,7 +47,7 @@ NO_FILTER_SHLIBS=	yes
 NO_MTREE=	yes
 RPMFILE=	${PORTNAME}-${PORTVERSION}-0.i386.rpm
 .if defined(SLAVE_PORT)
-BIN_FILES=	bjpsprn
+BIN_FILES=	bjf${PRTYPE}ps
 FILTER=		${FILESDIR}/filter
 PAPERSIZE?=	a4
 .else
diff --git a/print/bjfiltercom/distinfo b/print/bjfiltercom/distinfo
index 7ecbdeb778c8..d29a854984db 100644
--- a/print/bjfiltercom/distinfo
+++ b/print/bjfiltercom/distinfo
@@ -1,4 +1,4 @@
-MD5 (bjfilter/bjfiltercom-1.0-0.i386.rpm) = 2a04d0ef584a274b671730219cfc08b7
-MD5 (bjfilter/readme.tar.gz) = 44e6453be626ff5ff74347c02a003058
-MD5 (bjfilter/instruction.tar.gz) = 4c56f4b15123593938533e4661773484
-MD5 (bjfilter/faq.tar.gz) = dc38ef243063ebf23eed2355631cacd6
+MD5 (bjfilter/bjfiltercom-1.1-0.i386.rpm) = 087a441acd85c02ca1031c40837e1d88
+MD5 (bjfilter/readme.tar.gz) = a51a8c29214d083b0aa27bc2665a07e4
+MD5 (bjfilter/instruction.tar.gz) = eda07761dcf1f70b92b7d1c3737291f2
+MD5 (bjfilter/faq.tar.gz) = ef12e6782ed07b9620524f3d5fda8ddc
diff --git a/print/bjfiltercom/pkg-descr b/print/bjfiltercom/pkg-descr
index 5dd2e4f5688f..23446700133b 100644
--- a/print/bjfiltercom/pkg-descr
+++ b/print/bjfiltercom/pkg-descr
@@ -4,7 +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.0/html/README.HTM
-     file:/usr/local/share/doc/bjfiltercom-1.0/html/INDEX.HTM
-     file:/usr/local/share/doc/bjfiltercom-1.0/html/FAQ.HTM
-
+     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
diff --git a/print/bjfiltercom/pkg-plist b/print/bjfiltercom/pkg-plist
index 55878fa00448..d7d951d0c01d 100644
--- a/print/bjfiltercom/pkg-plist
+++ b/print/bjfiltercom/pkg-plist
@@ -9,10 +9,12 @@ share/doc/bjfiltercom-%%PORTVERSION%%/html/CONTENTS.HTM
 share/doc/bjfiltercom-%%PORTVERSION%%/html/DELETE.HTM
 share/doc/bjfiltercom-%%PORTVERSION%%/html/FAQ.HTM
 share/doc/bjfiltercom-%%PORTVERSION%%/html/IMAGE002.JPG
+share/doc/bjfiltercom-%%PORTVERSION%%/html/IMAGE003.JPG
 share/doc/bjfiltercom-%%PORTVERSION%%/html/IMAGE004.JPG
 share/doc/bjfiltercom-%%PORTVERSION%%/html/IMAGE006.JPG
 share/doc/bjfiltercom-%%PORTVERSION%%/html/IMAGE008.JPG
 share/doc/bjfiltercom-%%PORTVERSION%%/html/IMAGE010.JPG
+share/doc/bjfiltercom-%%PORTVERSION%%/html/IMAGE011.JPG
 share/doc/bjfiltercom-%%PORTVERSION%%/html/IMAGE012.JPG
 share/doc/bjfiltercom-%%PORTVERSION%%/html/IMAGE014.JPG
 share/doc/bjfiltercom-%%PORTVERSION%%/html/IMAGE016.JPG
@@ -26,6 +28,7 @@ share/doc/bjfiltercom-%%PORTVERSION%%/html/WELCOME.HTM
 @dirrm share/doc/bjfiltercom-%%PORTVERSION%%/html
 @dirrm share/doc/bjfiltercom-%%PORTVERSION%%
 @cwd /compat/linux
+usr/lib/bjlib/bjfilter.conf
 usr/lib/bjlib/cnbpname.tbl
 usr/lib/libcnbpcmcm.so.1.0.0
 usr/lib/libcnbphtmg.so.1.0.0
@@ -39,10 +42,8 @@ usr/local/share/printui/black_bar.xpm
 usr/local/share/printui/cyan_bar.xpm
 usr/local/share/printui/locale-table
 usr/local/share/printui/magenta_bar.xpm
-usr/local/share/printui/ui-jpn.glade
-usr/local/share/printui/ui-jpn.res
-usr/local/share/printui/ui-usa.glade
-usr/local/share/printui/ui-usa.res
+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