diff --git a/print/bjfilter850/Makefile b/print/bjfilter850/Makefile index f4ed832d42fc..d64b212d9c96 100644 --- a/print/bjfilter850/Makefile +++ b/print/bjfilter850/Makefile @@ -5,11 +5,12 @@ # $FreeBSD$ # -PORTNAME= bjfilter${PRTYPE} +PORTNAME= bjfilter${PRTYPE}${SUFIX_PRTYPE} MASTERDIR= ${.CURDIR}/../bjfiltercom SLAVE_PORT= yes PRTYPE?= 850 +SUFIX_PRTYPE?= .include "${MASTERDIR}/Makefile" diff --git a/print/bjfilter850/distinfo b/print/bjfilter850/distinfo index d939f9b563ce..3fa67aebd04b 100644 --- a/print/bjfilter850/distinfo +++ b/print/bjfilter850/distinfo @@ -1 +1 @@ -MD5 (bjfilter/bjfilter850-1.0-0.i386.rpm) = 65d2b069a81c5aadee8f03efcd0fbce2 +MD5 (bjfilter/bjfilter850-1.1-0.i386.rpm) = 8e28df703927d9a9d7a146cab037cf5f diff --git a/print/bjfilter850/pkg-comment b/print/bjfilter850/pkg-comment index bdb2aa0d6875..9595a9077c57 100644 --- a/print/bjfilter850/pkg-comment +++ b/print/bjfilter850/pkg-comment @@ -1 +1 @@ -Canon Bubble Jet Print Filter for Linux -- BJ F850 +Canon Bubble Jet Print Filter for Linux -- BJ F850 (supported BCI-5 inks) diff --git a/print/bjfilter850/pkg-descr b/print/bjfilter850/pkg-descr index ea115b4fbde1..5fd169696180 100644 --- a/print/bjfilter850/pkg-descr +++ b/print/bjfilter850/pkg-descr @@ -1,13 +1,13 @@ -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: +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: 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 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 @@ -20,3 +20,6 @@ bjfilter850|Canon BJ F850:\ :sd=/var/spool/lpd/bjfilter850:\ :mx#0:\ :lf=/var/log/lpd-errs + +Notice: This ports bjfilter850 and bjfilter850ug cannot be installed +simultaneously. diff --git a/print/bjfilter850/pkg-plist b/print/bjfilter850/pkg-plist index 13598b232e64..bdb3b3c08548 100644 --- a/print/bjfilter850/pkg-plist +++ b/print/bjfilter850/pkg-plist @@ -1,4 +1,4 @@ -bin/bjpsprn +bin/bjf850ps libexec/bjfilter850/filter850 @dirrm libexec/bjfilter850 @cwd /compat/linux diff --git a/print/bjfilter860/distinfo b/print/bjfilter860/distinfo index e2cc02c94d56..696babd8baf9 100644 --- a/print/bjfilter860/distinfo +++ b/print/bjfilter860/distinfo @@ -1 +1 @@ -MD5 (bjfilter/bjfilter860-1.0-0.i386.rpm) = 266b3d46ece34c021b562acddbe1f053 +MD5 (bjfilter/bjfilter860-1.1-0.i386.rpm) = 21b363810282638410d45875ff0590a1 diff --git a/print/bjfilter860/pkg-descr b/print/bjfilter860/pkg-descr index eb3dc574ce96..dd343cddebcd 100644 --- a/print/bjfilter860/pkg-descr +++ b/print/bjfilter860/pkg-descr @@ -5,9 +5,9 @@ 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 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 diff --git a/print/bjfilter860/pkg-plist b/print/bjfilter860/pkg-plist index 5424a522e6a5..8d9c9ef9810b 100644 --- a/print/bjfilter860/pkg-plist +++ b/print/bjfilter860/pkg-plist @@ -1,4 +1,4 @@ -bin/bjpsprn +bin/bjf860ps libexec/bjfilter860/filter860 @dirrm libexec/bjfilter860 @cwd /compat/linux diff --git a/print/bjfilter870/distinfo b/print/bjfilter870/distinfo index 6691bda1e812..21c6d6ea4182 100644 --- a/print/bjfilter870/distinfo +++ b/print/bjfilter870/distinfo @@ -1 +1 @@ -MD5 (bjfilter/bjfilter870-1.0-0.i386.rpm) = be27d379f57cfb6c677da36a13e8ee1d +MD5 (bjfilter/bjfilter870-1.1-0.i386.rpm) = b14d8d9a50fb90429a9ff42536610ba3 diff --git a/print/bjfilter870/pkg-descr b/print/bjfilter870/pkg-descr index 2198110a82f7..a82e24136114 100644 --- a/print/bjfilter870/pkg-descr +++ b/print/bjfilter870/pkg-descr @@ -5,9 +5,9 @@ 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 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 diff --git a/print/bjfilter870/pkg-plist b/print/bjfilter870/pkg-plist index 36da6efc2ba9..ff6adc8d7a0d 100644 --- a/print/bjfilter870/pkg-plist +++ b/print/bjfilter870/pkg-plist @@ -1,4 +1,4 @@ -bin/bjpsprn +bin/bjf870ps libexec/bjfilter870/filter870 @dirrm libexec/bjfilter870 @cwd /compat/linux 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