Update vertion to 1.3

12 files changed, 85 insertions, 133 deletions

diff --git a/japanese/bjfilter360/pkg-descr b/japanese/bjfilter360/pkg-descr
index fff7aa2..ccf12e6 100644
--- a/japanese/bjfilter360/pkg-descr
+++ b/japanese/bjfilter360/pkg-descr
@@ -5,35 +5,24 @@ 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 and Japanese messages:\
-        :lp=/dev/ulpt0:\
-        :sh:\
-        :if=/usr/local/libexec/ja-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
 the host which you are using.
 
 *********************************************************************
-To run with Japanese messages, you should execute with "env LANG=ja_JP"
+To run with Japanese messages, you have to execute with "env LANG=ja_JP"
 in a command line. For example,
-  env LANG=ja_JP bjfilter --gui --model BJF360 sample.bmp > /dev/lpt0
+  env LANG=ja_JP bjfilter --gui --model BJF360 sample.bmp > /dev/ulpt0
 *********************************************************************
diff --git a/japanese/bjfilter360/pkg-plist b/japanese/bjfilter360/pkg-plist
index 9b90d5b..e36b897 100644
--- a/japanese/bjfilter360/pkg-plist
+++ b/japanese/bjfilter360/pkg-plist
@@ -1,2 +1 @@
-libexec/ja-bjfilter360/filter360_gui
-@dirrm libexec/ja-bjfilter360
+usr/local/share/printui/i18n
diff --git a/japanese/bjfilter850/Makefile b/japanese/bjfilter850/Makefile
index 559e86e..674a1cb 100644
--- a/japanese/bjfilter850/Makefile
+++ b/japanese/bjfilter850/Makefile
@@ -5,8 +5,8 @@
 # $FreeBSD$
 #
 
-PORTNAME=	bjfilter${PRTYPE}${SUFIX_PRTYPE}
-PORTVERSION?=	1.1
+PORTNAME=	bjfilter${PREFIX_PRTYPE}${PRTYPE}${SUFFIX_PRTYPE}
+PORTVERSION?=	1.3
 CATEGORIES=	japanese print linux
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -14,36 +14,48 @@ DISTFILES=	# empty
 MAINTAINER=	taoka@FreeBSD.org
 
 RUN_DEPENDS=	${LINUXBASE}/usr/share/locale/ja_JP/LC_COLLATE:${PORTSDIR}/japanese/linux_locale \
-		${PREFIX}/libexec/bjfilter${PRTYPE}${SUFIX_PRTYPE}/filter${PRTYPE}${SUFIX_PRTYPE}:${PORTSDIR}/print/bjfilter${PRTYPE}${SUFIX_PRTYPE}
+		${LOCALBASE}/libexec/bjfilter${PREFIX_PRTYPE}${PRTYPE}${SUFFIX_PRTYPE}/filter${PREFIX_PRTYPE}${PRTYPE}${SUFFIX_PRTYPE}:${PORTSDIR}/print/bjfilter${PREFIX_PRTYPE}${PRTYPE}${SUFFIX_PRTYPE}
 
 ONLY_FOR_ARCHS= i386
 # for slave ports
 PLIST=		${.CURDIR}/pkg-plist
 COMMENT=	${.CURDIR}/pkg-comment
 DESCR=		${.CURDIR}/pkg-descr
-PRTYPE?=	850
+NO_BUILD=	yes
+USE_LINUX_PREFIX=	yes
 
+PRTYPE?=	850
 FILTER=		${FILESDIR}/filter
 
-do-build:
-	${SED}	-e 's,%%PRTYPE%%,${PRTYPE}${SUFIX_PRTYPE},' \
-		${FILTER}_gui > ${WRKDIR}/filter${PRTYPE}${SUFIX_PRTYPE}_gui
-do-install:     
-	${MKDIR} ${PREFIX}/libexec/${PKGNAMEPREFIX}${PORTNAME}
-	${INSTALL_SCRIPT} ${WRKDIR}/filter${PRTYPE}${SUFIX_PRTYPE}_gui \
-		${PREFIX}/libexec/${PKGNAMEPREFIX}${PORTNAME}
-
+do-install:
+	${MKDIR} ${PREFIX}/usr/local/share/printui
+	${ECHO} "LANG=ja_JP.eucJP" > ${PREFIX}/usr/local/share/printui/i18n
 
 .include <bsd.port.mk>
 
 # a target for the maintainer
 _MAKE_COMMENT_DESCR:
 .if ${PORTNAME} != "bjfilter850"
-.for file in pkg-comment pkg-descr pkg-plist
-	${SED}	-e 's/850/${PRTYPE}${SUFIX_PRTYPE}/g' ../bjfilter850/${file} \
-		> ${.CURDIR}/${file}
+.for file in pkg-comment pkg-descr
+.if defined(PREFIX_PRTYPE)
+	${SED}	-e 's/F850/${PREFIX_PRTYPE:U}${PRTYPE}${SUFFIX_PRTYPE}/g' \
+		-e 's/850/${PREFIX_PRTYPE}${PRTYPE}${SUFFIX_PRTYPE}/g' \
+		../bjfilter850/${file} > ${.CURDIR}/${file}
+.else
+	${SED}	-e 's/850/${PRTYPE}${SUFFIX_PRTYPE}/g' \
+		../bjfilter850/${file} > ${.CURDIR}/${file}
+.endif
+.endfor
+.for file in pkg-plist
+.if defined(PREFIX_PRTYPE)
+	${SED}	-e 's/850/${PREFIX_PRTYPE}${PRTYPE}${SUFFIX_PRTYPE}/g' \
+		../bjfilter850/${file} > ${.CURDIR}/${file}
+.else
+	${SED}	-e 's/850/${PRTYPE}${SUFFIX_PRTYPE}/g' \
+		../bjfilter850/${file} > ${.CURDIR}/${file}
+.endif
 .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/japanese/bjfilter850/pkg-descr b/japanese/bjfilter850/pkg-descr
index b9b232a..6b7b77d 100644
--- a/japanese/bjfilter850/pkg-descr
+++ b/japanese/bjfilter850/pkg-descr
@@ -5,35 +5,24 @@ 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 and Japanese messages:\
-        :lp=/dev/ulpt0:\
-        :sh:\
-        :if=/usr/local/libexec/ja-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
 the host which you are using.
 
 *********************************************************************
-To run with Japanese messages, you should execute with "env LANG=ja_JP"
+To run with Japanese messages, you have to execute with "env LANG=ja_JP"
 in a command line. For example,
-  env LANG=ja_JP bjfilter --gui --model BJF850 sample.bmp > /dev/lpt0
+  env LANG=ja_JP bjfilter --gui --model BJF850 sample.bmp > /dev/ulpt0
 *********************************************************************
diff --git a/japanese/bjfilter850/pkg-plist b/japanese/bjfilter850/pkg-plist
index 24ac930..e36b897 100644
--- a/japanese/bjfilter850/pkg-plist
+++ b/japanese/bjfilter850/pkg-plist
@@ -1,2 +1 @@
-libexec/ja-bjfilter850/filter850_gui
-@dirrm libexec/ja-bjfilter850
+usr/local/share/printui/i18n
diff --git a/japanese/bjfilter850ug/Makefile b/japanese/bjfilter850ug/Makefile
index 8c54332..3491849 100644
--- a/japanese/bjfilter850ug/Makefile
+++ b/japanese/bjfilter850ug/Makefile
@@ -7,6 +7,6 @@
 
 MASTERDIR=	${.CURDIR}/../bjfilter850
 PRTYPE=		850
-SUFIX_PRTYPE=	ug
+SUFFIX_PRTYPE=	ug
 
 .include "${MASTERDIR}/Makefile"
diff --git a/japanese/bjfilter850ug/pkg-descr b/japanese/bjfilter850ug/pkg-descr
index cff7ff4..e7af76e 100644
--- a/japanese/bjfilter850ug/pkg-descr
+++ b/japanese/bjfilter850ug/pkg-descr
@@ -5,37 +5,26 @@ 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.
-
-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 and Japanese messages:\
-        :lp=/dev/ulpt0:\
-        :sh:\
-        :if=/usr/local/libexec/ja-bjfilter850ug/filter850ug_gui:\
-        :sd=/var/spool/lpd/bjfilter850ug_gui:\
-        :mx#0:\
-        :lf=/var/log/lpd-errs
+useful to print out more than one page. Then you execute the next
+command:
+
+/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
 the host which you are using.
 
 *********************************************************************
-To run with Japanese messages, you should execute with "env LANG=ja_JP"
+To run with Japanese messages, you have to execute with "env LANG=ja_JP"
 in a command line. For example,
-  env LANG=ja_JP bjfilter --gui --model BJF850ug sample.bmp > /dev/lpt0
+  env LANG=ja_JP bjfilter --gui --model BJF850ug sample.bmp > /dev/ulpt0
 *********************************************************************
 
 Notice: This is supported BCI-6 inks.
diff --git a/japanese/bjfilter850ug/pkg-plist b/japanese/bjfilter850ug/pkg-plist
index b23523a..e36b897 100644
--- a/japanese/bjfilter850ug/pkg-plist
+++ b/japanese/bjfilter850ug/pkg-plist
@@ -1,2 +1 @@
-libexec/ja-bjfilter850ug/filter850ug_gui
-@dirrm libexec/ja-bjfilter850ug
+usr/local/share/printui/i18n
diff --git a/japanese/bjfilter860/pkg-descr b/japanese/bjfilter860/pkg-descr
index 29a55bb..f8ba0f4 100644
--- a/japanese/bjfilter860/pkg-descr
+++ b/japanese/bjfilter860/pkg-descr
@@ -5,35 +5,24 @@ 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 and Japanese messages:\
-        :lp=/dev/ulpt0:\
-        :sh:\
-        :if=/usr/local/libexec/ja-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
 the host which you are using.
 
 *********************************************************************
-To run with Japanese messages, you should execute with "env LANG=ja_JP"
+To run with Japanese messages, you have to execute with "env LANG=ja_JP"
 in a command line. For example,
-  env LANG=ja_JP bjfilter --gui --model BJF860 sample.bmp > /dev/lpt0
+  env LANG=ja_JP bjfilter --gui --model BJF860 sample.bmp > /dev/ulpt0
 *********************************************************************
diff --git a/japanese/bjfilter860/pkg-plist b/japanese/bjfilter860/pkg-plist
index a41f36b..e36b897 100644
--- a/japanese/bjfilter860/pkg-plist
+++ b/japanese/bjfilter860/pkg-plist
@@ -1,2 +1 @@
-libexec/ja-bjfilter860/filter860_gui
-@dirrm libexec/ja-bjfilter860
+usr/local/share/printui/i18n
diff --git a/japanese/bjfilter870/pkg-descr b/japanese/bjfilter870/pkg-descr
index d2cf73f..35cf06f 100644
--- a/japanese/bjfilter870/pkg-descr
+++ b/japanese/bjfilter870/pkg-descr
@@ -5,35 +5,24 @@ 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 and Japanese messages:\
-        :lp=/dev/ulpt0:\
-        :sh:\
-        :if=/usr/local/libexec/ja-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
 the host which you are using.
 
 *********************************************************************
-To run with Japanese messages, you should execute with "env LANG=ja_JP"
+To run with Japanese messages, you have to execute with "env LANG=ja_JP"
 in a command line. For example,
-  env LANG=ja_JP bjfilter --gui --model BJF870 sample.bmp > /dev/lpt0
+  env LANG=ja_JP bjfilter --gui --model BJF870 sample.bmp > /dev/ulpt0
 *********************************************************************
diff --git a/japanese/bjfilter870/pkg-plist b/japanese/bjfilter870/pkg-plist
index bb97399..e36b897 100644
--- a/japanese/bjfilter870/pkg-plist
+++ b/japanese/bjfilter870/pkg-plist
@@ -1,2 +1 @@
-libexec/ja-bjfilter870/filter870_gui
-@dirrm libexec/ja-bjfilter870
+usr/local/share/printui/i18n