Update version to 1.3.1

14 files changed, 773 insertions, 87 deletions

diff --git a/print/pips800/Makefile b/print/pips800/Makefile
index b01b32086897..1bf7326879f8 100644
--- a/print/pips800/Makefile
+++ b/print/pips800/Makefile
@@ -6,98 +6,268 @@
 #
 
 PORTNAME=	pips${PRTYPE}
-PORTVERSION?=	1.2
-PORTREVISION=	1
+PORTVERSION?=	1.3.1
+#PORTREVISION=	1
 CATEGORIES?=	print linux
+.if defined(INTERNATIONAL_PRODUCTS)
+.if ${PORTVERSION} == 2.0 || ${PORTVERSION} == 2.1
+MASTER_SITES?=	http://www.epkowa.on.arena.ne.jp/pips/data/${PRTYPE:S/^-//}_${PORTVERSION:S/.//}/
+.else
+MASTER_SITES?=	http://www.epkowa.on.arena.ne.jp/pips/data/${PRTYPE:S/^-//}/
+.endif
+.elif ${PORTVERSION} == 2.0 || ${PORTVERSION} == 2.1
+MASTER_SITES?=	http://www.epkowa.on.arena.ne.jp/pips/data/${PRTYPE}_${PORTVERSION:S/.//}/ \
+		http://www.epkowa.on.arena.ne.jp/pips/data/${PRTYPE}/
+.else
 MASTER_SITES?=	http://www.epkowa.on.arena.ne.jp/pips/data/${PRTYPE}/
+.endif
 DISTNAME?=	${PORTNAME}-${PORTVERSION}
 EXTRACT_SUFX=	.i386.tgz
 
 MAINTAINER=	taoka@FreeBSD.org
 
-RUN_DEPENDS+=	/compat/linux/lib/libc.so.6:${PORTSDIR}/emulators/linux_base \
-		/compat/linux/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux-gtk \
-		pstops:${PORTSDIR}/print/psutils-${PAPERSIZE}
+RUN_DEPENDS=	${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base \
+		${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux-gtk \
+		pstops:${PORTSDIR}/print/psutils-${PAPERSIZE} \
+		${LINUXBASE}/usr/lib/libpng.so.2:${PORTSDIR}/graphics/linux-png
+.if ${PORTVERSION} == 2.0 || ${PORTVERSION} == 2.1
+RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libgnome.so.32:${PORTSDIR}/x11/linux-gnomelibs \
+		${LINUXBASE}/usr/lib/libgdk_imlib.so.1:${PORTSDIR}/graphics/linux-imlib \
+		${LINUXBASE}/usr/lib/libesd.so.0:${PORTSDIR}/audio/linux-esound \
+		${LINUXBASE}/usr/lib/libaudiofile.so.0:${PORTSDIR}/audio/linux-libaudiofile
+.endif
 
 ONLY_FOR_ARCHS= i386
 NO_WRKSUBDIR=	yes
-PLIST_SUB=	BASE_NAME=${BASE_NAME} PRTYPE=${PRTYPE} LIB_DIR_FILE=usr/lib/${LIB_FILE} LIB_README=${LIB_README}
+PLIST_SUB=	BASE_NAME=${BASE_NAME} PRTYPE=${PRTYPE} LIB_DIR_FILE=usr/lib/${LIB_FILE} LIB_README=${LIB_README} ETC_RC_D=${ETC_RC_D}
 MD5_FILE=	${.CURDIR}/distinfo
-.if (${PORTVERSION} == 1.2)
-LIB_FILE=	libPrt${PRTYPE}.so
-LIB_README=	"@comment Readme of the Lib for only 1.3 or later"
-FILTER=		${FILESDIR}/filter.rev_1.2
-.else
-RUN_DEPENDS+=	/compat/linux/usr/lib/libpng.so.2:${PORTSDIR}/graphics/linux-png
+
+.include <bsd.port.pre.mk>
+PRTYPE?=	800
+
 .if defined(INTERNATIONAL_PRODUCTS)
 LIB_FILE=	lib${PRTYPE:S/^-//}.so
-LIB_README=	share/doc/${BASE_NAME}/lib${PRTYPE:S/^-//}.readme
-PLIST=		${MASTERDIR}/pkg-plist.ip
-RUN_DEPENDS+=	/compat/linux/usr/share/locale/ja_JP/LC_COLLATE:${PORTSDIR}/japanese/linux_locale \
-		/compat/linux/usr/share/locale/ko/LC_COLLATE:${PORTSDIR}/korean/linux_locale
+PRT_MODEL=	${PRTYPE:U:S/^-//}
+.else
+.if ${PRTYPE} == 790
+LIB_FILE=	libpm${PRTYPE}pt.so
+PRT_MODEL=	PM${PRTYPE}PT
+.elif ${PRTYPE} == 780cs
+LIB_FILE=	libpm${PRTYPE}.so
+PRT_MODEL=	PM${PRTYPE:U}
+.elif ${PRTYPE} == 820ug
+LIB_FILE=	libpm820cug.so
+PRT_MODEL=	PM820CUG
 .else
 LIB_FILE=	libpm${PRTYPE}c.so
-LIB_README=	share/doc/${BASE_NAME}/libpm${PRTYPE}c.readme
+PRT_MODEL=	PM${PRTYPE}C
 .endif
-FILTER=		${FILESDIR}/filter.rev
 .endif
+LIB_README=	share/doc/${BASE_NAME}/${LIB_FILE:S/.so$//}.readme
+FILTER=		${FILESDIR}/filter.rev
 BASE_NAME=	pips${PRTYPE}
 PAPERSIZE?=	a4
 # for slave ports
 COMMENT=	${.CURDIR}/pkg-comment
 DESCR=		${.CURDIR}/pkg-descr
+.if ${PORTVERSION} == 2.0 && !defined(INTERNATIONAL_PRODUCTS)
+LANGS=		ja
+RUN_DEPENDS+=	${LINUXBASE}/usr/share/locale/ja_JP/LC_COLLATE:${PORTSDIR}/japanese/linux_locale
+PLIST=		${MASTERDIR}/pkg-plist20
+.elif ${PORTVERSION} == 1.3.1
+LANGS=		de es fr it ja ko nl pt zh zh_TW
+RUN_DEPENDS+=	${LINUXBASE}/usr/share/locale/ja_JP/LC_COLLATE:${PORTSDIR}/japanese/linux_locale
+RUN_DEPENDS+=	${LINUXBASE}/usr/share/locale/ko/LC_COLLATE:${PORTSDIR}/korean/linux_locale
+RUN_DEPENDS+=	${LINUXBASE}/usr/share/locale/zh_TW.Big5/LC_COLLATE:${PORTSDIR}/chinese/linux_locale
+#RUN_DEPENDS+=	${X11BASE}/lib/X11/fonts/local/cmex16m.pcf.gz:${PORTSDIR}/chinese/cmexfonts
+PLIST=		${MASTERDIR}/pkg-plist131
+.elif ${PORTVERSION} == 1.0
+LANGS=		de es fr it ja ko nl pt zh zh_TW
+RUN_DEPENDS+=	${LINUXBASE}/usr/share/locale/ja_JP/LC_COLLATE:${PORTSDIR}/japanese/linux_locale
+RUN_DEPENDS+=	${LINUXBASE}/usr/share/locale/ko/LC_COLLATE:${PORTSDIR}/korean/linux_locale
+RUN_DEPENDS+=	${LINUXBASE}/usr/share/locale/zh_TW.Big5/LC_COLLATE:${PORTSDIR}/chinese/linux_locale
+#RUN_DEPENDS+=	${X11BASE}/lib/X11/fonts/local/cmex16m.pcf.gz:${PORTSDIR}/chinese/cmexfonts
+PLIST=		${MASTERDIR}/pkg-plist10
+.elif defined(INTERNATIONAL_PRODUCTS) || ${PORTVERSION} == 2.1
+LANGS=		de es fr it ja ko nl pt zh zh_TW
+RUN_DEPENDS+=	${LINUXBASE}/usr/share/locale/ja_JP/LC_COLLATE:${PORTSDIR}/japanese/linux_locale
+RUN_DEPENDS+=	${LINUXBASE}/usr/share/locale/ko/LC_COLLATE:${PORTSDIR}/korean/linux_locale
+RUN_DEPENDS+=	${LINUXBASE}/usr/share/locale/zh_TW.Big5/LC_COLLATE:${PORTSDIR}/chinese/linux_locale
+#RUN_DEPENDS+=	${X11BASE}/lib/X11/fonts/local/cmex16m.pcf.gz:${PORTSDIR}/chinese/cmexfonts
+PLIST=		${MASTERDIR}/pkg-plist21
+.endif
+# Unfortunately printing out by using ekpd is not supported on FreeBSD.
+# So much difference between USB drivers of FreeBSD and Linux ?
+.if defined(WITH_EKPD)
+ETC_RC_D=	"etc/rc.d/ekpd.sh"
+WITH_EKPD=	yes # redefine
+.else
+ETC_RC_D=	"@comment etc/rc.d/ekpd.sh: ekpd is not supported on FreeBSD"
+.endif #defined(WITH_EKPD)
 
-.include <bsd.port.pre.mk>
-PRTYPE?=	800
+.if ! defined(WITH_EKPD)
+.if ${PORTVERSION} == 2.0 || ${PORTVERSION} == 2.1
+pre-everything::
+	@${ECHO_MSG} "##############################################"
+	@${ECHO_MSG} "You execute \"make install WITH_EKPD=yes\""
+	@${ECHO_MSG} "to try to test ekpd."
+	@${ECHO_MSG} "Maintainer tried to use ekpd but it could not work."
+	@${ECHO_MSG} "##############################################"
+.endif
+.elif ${PORTVERSION} != 2.0 && ${PORTVERSION} != 2.1
+pre-everything::
+	@${ECHO_MSG} "##############################################"
+	@${ECHO_MSG} "You can \"make\" with WITH_EKPD=yes"
+	@${ECHO_MSG} "in the case with \$${PORTVERSION} = 2.0 or 2.1."
+	@${ECHO_MSG} "##############################################"
+	${FALSE}
+.endif
 
 do-build:
 	${MV} ${WRKDIR}/filter${PRTYPE} ${WRKDIR}/filter${PRTYPE}.org
-	${SED}	-e 's,/usr/local/EPKowa/PM${PRTYPE}C/gsconfig${PRTYPE},${PREFIX}/libexec/pips${PRTYPE}/gsconfig${PRTYPE},' \
-		-e 's,/usr/bin/pips${PRTYPE},${PREFIX}/bin/pips${PRTYPE},' \
+	${SED}	-e 's,^EKPSTM.*$$,EKPSTM=${PREFIX}/bin/ekpstm,' \
+		-e 's,^LANGPATH.*$$,LANGPATH=${PREFIX}/etc/pips${PRTYPE}/lang,' \
+		-e 's,^GSCONF.*$$,GSCONF=${PREFIX}/libexec/pips${PRTYPE}/gsconfig${PRTYPE},' \
+		-e 's,^PIPS.*$$,PIPS=${PREFIX}/bin/pips${PRTYPE},' \
 		-e 's,:/usr/local/bin$$,:${PREFIX}/bin,' \
 		${WRKDIR}/filter${PRTYPE}.org > ${WRKDIR}/filter${PRTYPE}
-	${SED}	-e 's,/usr/local/EPKowa/PM800C/gsconfig800,${PREFIX}/libexec/pips${PRTYPE}/gsconfig${PRTYPE},' \
-		-e 's,/usr/local/bin/pips800,${PREFIX}/bin/pips${PRTYPE},' \
+	${SED}	-e 's,$$GSCONF | $$PIPS -ui C,TMP=/tmp/pips.$$$$;\
+trap "rm -rf $$TMP; exit" 0 2 3 4 6 7 8 10 11 12 13 15;\
+psselect -r > $$TMP;\
+$${GSCONF} < $$TMP | $${PIPS} -ui C,' \
+		-e 's,$${GSCONF} | $${PIPS} -ui C,TMP=/tmp/pips.$$$$;\
+trap "rm -rf $$TMP; exit" 0 2 3 4 6 7 8 10 11 12 13 15;\
+psselect -r > $$TMP;\
+$${GSCONF} < $$TMP | $${PIPS} -ui C,' \
+		${WRKDIR}/filter${PRTYPE} > ${WRKDIR}/filter${PRTYPE}.rev
+.if ! defined(WITH_EKPD)
+# Remake filter${PRTYPE}.rev
+	${SED}	-e 's,$${GSCONF} | $${PIPS} -ui C,TMP=/tmp/pips.$$$$;\
+trap "rm -rf $$TMP; exit" 0 2 3 4 6 7 8 10 11 12 13 15;\
+psselect -r > $$TMP;\
+$${GSCONF} < $$TMP | $${PIPS} -ui C,' \
+		-e 's,^GSCONF.*$$,GSCONF=${PREFIX}/libexec/pips${PRTYPE}/gsconfig${PRTYPE},' \
+		-e 's,^PIPS.*$$,PIPS=${PREFIX}/bin/pips${PRTYPE},' \
 		-e 's,:/usr/local/bin$$,:${PREFIX}/bin,' \
-		${FILTER} > ${WRKDIR}/filter${PRTYPE}.rev
+		${FILESDIR}/filter.rev > ${WRKDIR}/filter${PRTYPE}.rev
+.endif #defined(WITH_EKPD)
+.if ${PORTVERSION} == 2.0 || ${PORTVERSION} == 2.1
+	${MV} ${WRKDIR}/ekpdrc ${WRKDIR}/ekpdrc.org
+	${SED}	-e 's,/dev/usb/lp0,/dev/ulpt0,' \
+		${WRKDIR}/ekpdrc.org > ${WRKDIR}/ekpdrc
+.endif
+
+post-build:
+	${SED}	-e 's,%%BASE_NAME%%,${BASE_NAME},g' \
+		-e 's,%%PRTYPE%%,${PRTYPE},g' \
+		-e 's,%%PRT_MODEL%%,${PRT_MODEL},g' \
+		-e 's,%%VERSION%%,${PORTVERSION},'g \
+		-e 's,%%LINUXBASE%%,${LINUXBASE},g' \
+		-e 's,%%PREFIX%%,${PREFIX},g' \
+		-e 's,%%WITH_EKPD%%,${WITH_EKPD},g' \
+			${FILESDIR}/setup > ${WRKDIR}/setup.freebsd
 
 do-install:
 	${MKDIR} ${PREFIX}/libexec/${BASE_NAME}
 	${INSTALL_SCRIPT} ${WRKDIR}/filter${PRTYPE} ${PREFIX}/libexec/${BASE_NAME}
 	${INSTALL_SCRIPT} ${WRKDIR}/filter${PRTYPE}.rev ${PREFIX}/libexec/${BASE_NAME}
-#	${INSTALL_SCRIPT} ${FILESDIR}/pips_filter ${PREFIX}/libexec/${BASE_NAME}
 	${INSTALL_DATA} ${WRKSRC}/gsconfig${PRTYPE} ${PREFIX}/libexec/${BASE_NAME}
-	chmod +x ${PREFIX}/libexec/${BASE_NAME}/gsconfig${PRTYPE}
-	${INSTALL_DATA} ${WRKSRC}/${LIB_FILE} /compat/linux/usr/lib/
-	-/compat/linux/sbin/ldconfig
+	${CHMOD} +x ${PREFIX}/libexec/${BASE_NAME}/gsconfig${PRTYPE}
+	${INSTALL_DATA} ${WRKSRC}/${LIB_FILE} ${LINUXBASE}/usr/lib/
+	-${LINUXBASE}/sbin/ldconfig
 	${INSTALL_DATA} ${WRKSRC}/pips${PRTYPE} ${PREFIX}/bin
 	${CHMOD} +x ${PREFIX}/bin/pips${PRTYPE}
-.if !defined(NOPORTSDOCS)
-	${MKDIR} ${PREFIX}/share/doc/${BASE_NAME}
-	${INSTALL_DATA} ${WRKSRC}/readme${PRTYPE} ${PREFIX}/share/doc/${BASE_NAME}
-.if (${PORTVERSION} != 1.2)
-	${INSTALL_DATA} ${WRKSRC}/${LIB_README:T} ${PREFIX}/${LIB_README}
+	${RM} -f ${LINUXBASE}/etc/pipsrc
+	${TOUCH} ${LINUXBASE}/etc/pipsrc
+	${CHMOD} 666 ${LINUXBASE}/etc/pipsrc
+	${INSTALL_SCRIPT} ${WRKDIR}/setup.freebsd ${PREFIX}/libexec/${BASE_NAME}/setup
+	${MKDIR} ${PREFIX}/libexec/${BASE_NAME}/scripts
+	${INSTALL_DATA} ${FILESDIR}/en.lc ${PREFIX}/libexec/${BASE_NAME}/scripts
+	${INSTALL_DATA} ${FILESDIR}/ja.lc ${PREFIX}/libexec/${BASE_NAME}/scripts
+.if ${PORTVERSION} == 2.0 || ${PORTVERSION} == 2.1
+	${INSTALL_DATA} ${WRKSRC}/ekpnavi ${PREFIX}/bin
+	${CHMOD} +x ${PREFIX}/bin/ekpnavi
+	${INSTALL_DATA} ${WRKSRC}/ekpstm ${PREFIX}/bin
+	${CHMOD} +x ${PREFIX}/bin/ekpstm
+	${INSTALL_DATA} ${WRKSRC}/ekpd ${PREFIX}/libexec
+	${CHMOD} +x ${PREFIX}/libexec/ekpd
+	${INSTALL_DATA} ${WRKSRC}/ekpdrc ${LINUXBASE}/etc
+.if defined(WITH_EKPD)
+	${INSTALL_SCRIPT} ${FILESDIR}/ekpd.sh ${PREFIX}/etc/rc.d
+.endif #defined(WITH_EKPD)
 .endif
+.if defined(LANGS)
+.if ${PORTVERSION} == 2.0 || ${PORTVERSION} == 2.1
+	${MKDIR} ${PREFIX}/share/doc/${BASE_NAME}/ekpnavi_mo
+	${MKDIR} ${PREFIX}/share/doc/${BASE_NAME}/ekpstm_mo
+	${INSTALL_DATA} ${WRKSRC}/ekpnavi_mo/* ${PREFIX}/share/doc/${BASE_NAME}/ekpnavi_mo
+	${INSTALL_DATA} ${WRKSRC}/ekpstm_mo/* ${PREFIX}/share/doc/${BASE_NAME}/ekpstm_mo
 .endif
-.if defined(INTERNATIONAL_PRODUCTS)
 	${MKDIR} ${PREFIX}/share/doc/${BASE_NAME}/pips_mo
 	${INSTALL_DATA} ${WRKSRC}/pips_mo/* ${PREFIX}/share/doc/${BASE_NAME}/pips_mo
-# zh zh_TW are not supported. en.gmo is not necessary.
-.for lc in de es fr it ko nl pt
-	${INSTALL_DATA} ${WRKSRC}/pips_mo/${lc}.gmo /compat/linux/usr/share/locale/${lc}/LC_MESSAGES/pips.mo
+.if ${PORTVERSION} == 1.0
+	${RM} ${PREFIX}/share/doc/${BASE_NAME}/pips_mo/en.gmo
+.endif
+.for lc in ${LANGS}
+	if [ "${lc}" = "ja" ]; then \
+		[ -f ${WRKSRC}/pips_mo/${lc}.gmo ] && \
+		   ${MKDIR} ${LINUXBASE}/usr/share/locale/ja_JP/LC_MESSAGES; \
+		[ -f ${WRKSRC}/ekpnavi_mo/${lc}.gmo ] && \
+		   ${INSTALL_DATA} ${WRKSRC}/ekpnavi_mo/${lc}.gmo ${LINUXBASE}/usr/share/locale/ja_JP/LC_MESSAGES/ekpnavi.mo; \
+		[ -f ${WRKSRC}/ekpstm_mo/${lc}.gmo ] && \
+		   ${INSTALL_DATA} ${WRKSRC}/ekpstm_mo/${lc}.gmo ${LINUXBASE}/usr/share/locale/ja_JP/LC_MESSAGES/ekpstm.mo; \
+		[ -f ${WRKSRC}/pips_mo/${lc}.gmo ] && \
+		   ${INSTALL_DATA} ${WRKSRC}/pips_mo/${lc}.gmo ${LINUXBASE}/usr/share/locale/ja_JP/LC_MESSAGES/pips.mo; \
+	else \
+		[ -f ${WRKSRC}/pips_mo/${lc}.gmo ] && \
+		   ${MKDIR} ${LINUXBASE}/usr/share/locale/${lc}/LC_MESSAGES; \
+		[ -f ${WRKSRC}/ekpnavi_mo/${lc}.gmo ] && \
+		   ${INSTALL_DATA} ${WRKSRC}/ekpnavi_mo/${lc}.gmo ${LINUXBASE}/usr/share/locale/${lc}/LC_MESSAGES/ekpnavi.mo; \
+		[ -f ${WRKSRC}/ekpstm_mo/${lc}.gmo ] && \
+		   ${INSTALL_DATA} ${WRKSRC}/ekpstm_mo/${lc}.gmo ${LINUXBASE}/usr/share/locale/${lc}/LC_MESSAGES/ekpstm.mo; \
+		[ -f ${WRKSRC}/pips_mo/${lc}.gmo ] && \
+		   ${INSTALL_DATA} ${WRKSRC}/pips_mo/${lc}.gmo ${LINUXBASE}/usr/share/locale/${lc}/LC_MESSAGES/pips.mo; \
+	fi
 .endfor
-	${INSTALL_DATA} ${WRKSRC}/pips_mo/ja.gmo /compat/linux/usr/share/locale/ja_JP/LC_MESSAGES/pips.mo
+.endif
+.if !defined(NOPORTSDOCS)
+	${MKDIR} ${PREFIX}/share/doc/${BASE_NAME}
+	${INSTALL_DATA} ${WRKSRC}/readme${PRTYPE} ${PREFIX}/share/doc/${BASE_NAME}
+	${INSTALL_DATA} ${WRKSRC}/${LIB_README:T} ${PREFIX}/share/doc/${BASE_NAME}
+.if ! (${PORTVERSION} == 1.3 || (${PORTVERSION} == 2.0 && !defined(INTERNATIONAL_PRODUCTS)))
+	${INSTALL_DATA} ${FILESDIR}/readme_for_zh ${PREFIX}/share/doc/${BASE_NAME}
+.endif
+.endif
+
+.if ${PORTVERSION} == 2.0 || ${PORTVERSION} == 2.1
+.if defined(WITH_EKPD)
+post-install:
+	${SETENV} PKG_PREFIX=${PREFIX} \
+	${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+.endif #defined(WITH_EKPD)
 .endif
 
 # a target for the maintainer
 _MAKE_COMMENT_DESCR:
 .if defined(INTERNATIONAL_PRODUCTS)
-.if ${PRTYPE} != -sc880
+.if ${PRTYPE} != -sc880 || ${PORTVERSION} != 1.0
 .for file in pkg-comment pkg-descr
 .if ${PRTYPE} == -sc680_777
-	${SED}	-e 's,Stylus Color880,Stylus Color680/Stylus Color777,g' \
+	${SED}	-e 's,Stylus Color 880,Stylus Color 680/Stylus Color 777,g' \
+		-e 's/880/${PRTYPE:S/^-sc//}/g' \
+		${.CURDIR}/../pips-sc880/${file} > ${.CURDIR}/${file}
+.elif ${PRTYPE} == -sc20s
+	${SED}	-e 's,Stylus Color 880,Stylus SC20,g' \
 		-e 's/880/${PRTYPE:S/^-sc//}/g' \
 		${.CURDIR}/../pips-sc880/${file} > ${.CURDIR}/${file}
+.elif ${PRTYPE} == -sc40s
+	${SED}	-e 's,Stylus Color 880,Stylus SC40,g' \
+		-e 's/880/${PRTYPE:S/^-sc//}/g' \
+		${.CURDIR}/../pips-sc880/${file} > ${.CURDIR}/${file}
+.elif ${PRTYPE} == -sp810_820
+	${SED}	-e 's,Stylus Color 880,Stylus Photo 810/Stylus Photo 820,g' \
+		-e 's/880/${PRTYPE:S/^-sp//}/g' \
+		${.CURDIR}/../pips-sc880/${file} > ${.CURDIR}/${file}
 .else
 	${SED}	-e 's/880/${PRTYPE:S/^-sc//}/g' \
 		${.CURDIR}/../pips-sc880/${file} > ${.CURDIR}/${file}
@@ -107,16 +277,26 @@ _MAKE_COMMENT_DESCR:
 .else # for defined(INTERNATIONAL_PRODUCTS)
 .if ${PRTYPE} != 800
 .for file in pkg-comment pkg-descr
-.if ${PRTYPE} == 820_3300
-	${SED}	-e 's/PM-800C/PM-820C PM-3300C/g' \
-		-e 's/pm800c/pm820c_3300c/g' \
-		-e 's/800/${PRTYPE}/g' \
-		${MASTERDIR}/${file} > ${.CURDIR}/${file}
-.elif ${PRTYPE} == 750_2000
+.if ${PRTYPE} == 750_2000
 	${SED}	-e 's/PM-800C/PM-750C PM-2000C/g' \
 		-e 's/pm800c/pm750c_2000c/g' \
 		-e 's/800/${PRTYPE}/g' \
 		${MASTERDIR}/${file} > ${.CURDIR}/${file}
+.elif ${PRTYPE} == 790
+	${SED}	-e 's/PM-800C/PM-790PT/g' \
+		-e 's/pm800c/pm790pt/g' \
+		-e 's/800/${PRTYPE}/g' \
+		${MASTERDIR}/${file} > ${.CURDIR}/${file}
+.elif ${PRTYPE} == 780cs
+	${SED}	-e 's/PM-800C/PM-780CS/g' \
+		-e 's/pm800c/pm780cs/g' \
+		-e 's/800/${PRTYPE}/g' \
+		${MASTERDIR}/${file} > ${.CURDIR}/${file}
+.elif ${PRTYPE} == 820ug
+	${SED}	-e 's/PM-800C/PM-820CUG/g' \
+		-e 's/pm800c/pm820cug/g' \
+		-e 's/800/${PRTYPE}/g' \
+		${MASTERDIR}/${file} > ${.CURDIR}/${file}
 .else
 	${SED}	-e 's/800/${PRTYPE}/g' ${MASTERDIR}/${file} \
 		> ${.CURDIR}/${file}
@@ -124,5 +304,20 @@ _MAKE_COMMENT_DESCR:
 .endfor
 .endif
 .endif # for defined(INTERNATIONAL_PRODUCTS)
+.if ${PORTVERSION} == 1.3
+	${MV} ${.CURDIR}/pkg-descr  ${.CURDIR}/pkg-descr.org
+	${SED} "/To run with Japanese/,//d" \
+		${.CURDIR}/pkg-descr.org > ${.CURDIR}/pkg-descr
+	printf "To run with Japanese messages, you have to execute as follows:\n\
+  env LANG=ja_JP pips${PRTYPE} -la JP\n" >> ${.CURDIR}/pkg-descr
+	${RM} ${.CURDIR}/pkg-descr.org
+.elif ${PORTVERSION} == 2.0 && !defined(INTERNATIONAL_PRODUCTS)
+	${MV} ${.CURDIR}/pkg-descr  ${.CURDIR}/pkg-descr.org
+	${SED} "/To run with Japanese/,//d" \
+		${.CURDIR}/pkg-descr.org > ${.CURDIR}/pkg-descr
+	printf "To run with Japanese messages, you have to execute as follows:\n\
+  env LANG=ja_JP pips${PRTYPE}\n" >> ${.CURDIR}/pkg-descr
+	${RM} ${.CURDIR}/pkg-descr.org
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/print/pips800/distinfo b/print/pips800/distinfo
index f3ee9ad0fc4f..b66754dccec8 100644
--- a/print/pips800/distinfo
+++ b/print/pips800/distinfo
@@ -1 +1 @@
-MD5 (pips800-1.2.i386.tgz) = 05c8bc03eea57b525641f0123962baa6
+MD5 (pips800-1.3.1.i386.tgz) = 7c42a48ca5350ac137dd12abdd75c6c5
diff --git a/print/pips800/files/ekpd.sh b/print/pips800/files/ekpd.sh
new file mode 100644
index 000000000000..d9f52a25966c
--- /dev/null
+++ b/print/pips800/files/ekpd.sh
@@ -0,0 +1,48 @@
+#!/bin/sh
+#
+#  ekpd
+
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+DAEMON=/usr/local/libexec/ekpd
+LOCK=/var/ekpd/lpr_lock
+
+NAME=ekpd
+
+[ -f $DAEMON ] || exit 0
+
+OLDMASK=`umask`
+umask 000
+
+case "$1" in
+
+    start)
+	if [ -x $DAEMON ]; then
+	    echo -n "Starting $NAME:"
+	    [ ! -d /var/ekpd ] && mkdir -p /var/ekpd && chmod 1777 /var/ekpd
+	    [ ! -e /var/ekpd/ekplp0 ] && rm -f /var/ekpd/ekplp0 && \
+		mkfifo -m 666 /var/ekpd/ekplp0
+	    $DAEMON 2>/dev/null
+	    echo
+	fi
+	;;
+
+    stop)
+	echo -n "Stopping ekpd:"
+	killall ${NAME} 2>/dev/null
+	echo
+	;;
+
+    restart)
+	$0 stop
+	sleep 2
+	$0 start
+	;;
+
+    *)
+	echo "Usage: ekpd { start | stop | restart }" >&2
+	exit 1
+	;;
+esac
+
+umask $OLDMASK
+exit 0
diff --git a/print/pips800/files/en.lc b/print/pips800/files/en.lc
new file mode 100644
index 000000000000..9cb41ede7296
--- /dev/null
+++ b/print/pips800/files/en.lc
@@ -0,0 +1,47 @@
+#!/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"
+
+if [ "$VERSION" = "2.0" -o "$VERSION" = "2.1" ]; then
+if [ X"$WITH_EKPD" != X ]; then
+E1_TXT="The following files were changed.\n"\
+"$EKPDRC\n/etc/printcap\n/etc/services\n\n"\
+"The following directories were created.\n"\
+"/var/spool/lpd/$PRT_NAME_LOW\n"
+else
+E1_TXT="The following files were changed.\n"\
+"$EKPDRC\n/etc/printcap\n\n"\
+"The following directories were created.\n"\
+"/var/spool/lpd/$PRT_NAME_LOW\n"
+fi
+else
+E1_TXT="The following files were changed.\n"\
+"/etc/printcap\n\n"\
+"The following directories were created.\n"\
+"/var/spool/lpd/$PRT_NAME_LOW\n"
+fi
+
+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"
+
+S1_TXT="\nThis system has already an entry for ${SERV_NAME} in ${SERV_FILE}.\n"
+
+S2_TXT="\nThis system has no entry for ${SERV_NAME} in ${SERV_FILE}.\n"
+
+S3_TXT="The original file is saved as ${SERV_BACK}.\n"
+
diff --git a/print/pips800/files/filter.rev_1.2 b/print/pips800/files/filter.rev_1.2
deleted file mode 100644
index 028eb3205669..000000000000
--- a/print/pips800/files/filter.rev_1.2
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-PATH=${PATH}:/usr/bin:/usr/local/bin
-
-GSCONF=/usr/local/EPKowa/PM800C/gsconfig800
-PIPS=/usr/local/bin/pips800
-
-TMP=/tmp/pips.$$
-
-trap "rm -rf $TMP; exit" 0 2 3 4 6 7 8 10 11 12 13 15
-psselect -r > $TMP
-
-# To support printing via USB port for pips{760,770,800,820_3300}
-perl -e 'print "\000\000\000\033\001\@EJL\ 1284.4\n\@EJL     \n\033\@"'
-
-${GSCONF} < $TMP | ${PIPS} -ui C
-rm -rf $TMP
diff --git a/print/pips800/files/ja.lc b/print/pips800/files/ja.lc
new file mode 100644
index 000000000000..41882558d0f5
--- /dev/null
+++ b/print/pips800/files/ja.lc
@@ -0,0 +1,47 @@
+#!/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"
+
+if [ "$VERSION" = "2.0" -o "$VERSION" = "2.1" ]; then
+if [ X"$WITH_EKPD" != X ]; then
+    E1_TXT="以下のファイルを変更しました。\n"\
+"$EKPDRC\n/etc/printcap\n/etc/services\n\n"\
+"以下のディレクトリを作成しました。\n"\
+"/var/spool/lpd/$PRT_NAME_LOW\n"
+else
+    E1_TXT="t以下のファイルを変更しました。\n"\
+"$EKPDRC\n/etc/printcap\n\n"\
+"以下のディレクトリを作成しました。\n"\
+"/var/spool/lpd/$PRT_NAME_LOW\n"
+fi
+else
+E1_TXT="s以下のファイルを変更しました。\n"\
+"/etc/printcap\n\n"\
+"以下のディレクトリを作成しました。\n"\
+"/var/spool/lpd/$PRT_NAME_LOW\n"
+fi
+
+E2_TXT="\n保存しました。セットアップを終了します。\n"\
+"設定を変更するには $SETUP_PATH を起動してください。\n"
+
+F_TXT="セットアップをキャンセルします。まだ設定は終了していません。\n"\
+"$SETUP_PATHを起動して、設定を行ってください。\n"
+
+S1_TXT="\nこのシステムの${SERV_FILE}には、すでに${SERV_NAME}のエントリがあります。\n"
+
+S2_TXT="\nこのシステムの${SERV_FILE}には、${SERV_NAME}のエントリがありません。\n"
+
+S3_TXT="オリジナルファイルは${SERV_BACK}としてセーブしています。\n"
+
diff --git a/print/pips800/files/readme_for_zh b/print/pips800/files/readme_for_zh
new file mode 100644
index 000000000000..6c7ff5ff49ff
--- /dev/null
+++ b/print/pips800/files/readme_for_zh
@@ -0,0 +1,32 @@
+Notice for "env LANG=zh_CN pips800" and "env LANG=zh_TW.Big5 pips800"
+
+(1) Installing zh-linux-gtk and zh-cle_base leads not to work well
+commands with the other locales. So this port depends on yet another
+linux_locale for Chinese: chinese/linux_locale.
+
+(2) You add the following two files by hand:
+
+[/compat/linux/etc/gtk/gtkrc.zh_CN.GB2312]
+style "default" {
+  fontset = "-adobe-helvetica-medium-r-normal--14-100-100-100-p-76-iso8859-1,\
+             -*-*-medium-*-*--16-*-*-*-*-*-gb2312.1980-*"
+}
+class "GtkWidget" style "default"
+
+
+[/compat/linux/etc/gtk/gtkrc.zh_TW.Big5]
+style "default" {
+  fontset = "-adobe-helvetica-medium-r-normal--14-100-100-100-p-76-iso8859-1,\
+             -*-*-medium-*-*-*-16-*-*-*-*-*-big5-*"
+}
+class "GtkWidget" style "default"
+
+and make a symlink by the next command:
+
+# ln -s gtkrc.zh_CN.GB2312 /compat/linux/etc/gtk/gtkrc.zh_CN
+
+(3) You have to install suitable fonts for zh_TW.Big5,
+e.g. zh-cmexfonts.
+
+(4) But "env LANG=zh_CN pips800" dose not work well even if you do the
+above (1) through (3).
diff --git a/print/pips800/files/setup b/print/pips800/files/setup
new file mode 100644
index 000000000000..7388c31c101b
--- /dev/null
+++ b/print/pips800/files/setup
@@ -0,0 +1,182 @@
+#!/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/pips%%PRTYPE%%/scripts
+PRT_MODEL=%%PRT_MODEL%%
+PIPS_COMMAND=pips%%PRTYPE%%
+PIPS_FILTER_PATH=%%PREFIX%%/libexec/%%BASE_NAME%%/filter%%PRTYPE%%.rev
+
+SETUP_PATH=%%PREFIX%%/libexec/pips%%PRTYPE%%/setup
+EKPDRC=%%LINUXBASE%%/etc/ekpdrc
+VERSION=%%VERSION%%
+DEF_PRT_PATH=/dev/ulpt0
+WITH_EKPD=%%WITH_EKPD%%
+
+
+#/etc/services
+SERV_FILE=/etc/services
+SERV_BACK=${SERV_FILE}.bak
+SERV_NAME=cbtd
+PORT=35586/tcp
+COMMENT=""
+
+PRT_NAME_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 "           Photo Image Print System"
+echo ""
+echo "                 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"
+#echo $PRT_NAME
+printf "$E2_TXT"
+
+
+#/etc/ekpdrc
+if [ -s $EKPDRC ]; then
+    cp $EKPDRC $EKPDRC.bak
+fi
+
+cat <<EOF >$EKPDRC
+PrinterName = $PRT_NAME_LOW
+PrinterDevicePath = $PRT_PATH
+DummyDevicePath = /var/ekpd/ekplp0
+CommandServerPort = 35586
+EOF
+
+#/etc/services
+if [ X"$WITH_EKPD" != X ]; then
+  if sed 's/#.*//' ${SERV_FILE} | grep -qw ${SERV_NAME}; then
+      printf "$S1_TXT"
+  else
+      printf "$S2_TXT"
+      cp -f ${SERV_FILE} ${SERV_BACK}
+      printf "$S3_TXT"
+      
+      if sed 's/#.*//' ${SERV_FILE} | grep -qw ${PORT}; then
+  	  sed 's,^\([^#]*[ 	]'${PORT}'\),\1	'${SERV_NAME}, ${SERV_BACK} > ${SERV_FILE}
+      else
+  	  echo "${SERV_NAME}		${PORT}   #${COMMENT}" >> ${SERV_FILE}
+      fi
+      echo "${SERV_FILE} was changed."
+  fi
+fi
+
+#/etc/printcap
+if [ -s /etc/printcap ]; then
+    KEY=`grep "# written for $PIPS_COMMAND" /etc/printcap`
+    if [ -n "$KEY" ]; then
+	mv /etc/printcap /etc/printcap.bak
+
+	SPOOLDIR=`cat /etc/printcap.bak | sed -n "/# written for $PIPS_COMMAND/,/# $PIPS_COMMAND  end/p" | grep ":sd=" | sed -e "s/^.*:sd=//" -e "s/:.*$//"`
+	rm -rf $SPOOLDIR
+
+	sed -e "/# written for $PIPS_COMMAND/,/# $PIPS_COMMAND  end/d" < /etc/printcap.bak > /etc/printcap
+
+    else
+	cp /etc/printcap /etc/printcap.bak
+
+    fi
+else
+    touch /etc/printcap
+fi
+
+if [ X"$WITH_EKPD" != X ]; then
+    tmp_PRT_PATH=/var/ekpd/ekplp0
+else
+    tmp_PRT_PATH=$PRT_PATH
+fi
+
+cat <<EOF >>/etc/printcap
+# written for $PIPS_COMMAND
+$PRT_NAME_LOW|EPSON $PRT_MODEL:\\
+	:sd=/var/spool/lpd/$PRT_NAME_LOW:\\
+	:mx#0:\\
+	:sh:\\
+	:lp=$tmp_PRT_PATH:\\
+	:if=$PIPS_FILTER_PATH:\\
+	:lf=/var/log/lpd-errs:
+# $PIPS_COMMAND  end
+EOF
+
+OLDMASK=`umask`
+umask 000
+
+mkdir -p /var/spool/lpd/$PRT_NAME_LOW
+chown daemon:daemon /var/spool/lpd/$PRT_NAME_LOW; chmod 770 /var/spool/lpd/$PRT_NAME_LOW
+
+umask $OLDMASK
+exit 0
diff --git a/print/pips800/pkg-descr b/print/pips800/pkg-descr
index ea317e304f57..41d6b9c16446 100644
--- a/print/pips800/pkg-descr
+++ b/print/pips800/pkg-descr
@@ -6,14 +6,20 @@ URL:
 
 WWW: http://www.epkowa.co.jp/
 
-And then this port has a modified filter "filter800.rev" which is
-useful to print out more than one page. If you use it, you add the
-next entries into /etc/printcap.
+This port has a modified filter "filter800.rev" which is useful to
+print out more than one page. Then you execute the next command:
 
-pm800c|EPSON PM-800C:\
-        :lp=/dev/lpt0:\
-        :sh:\
-        :if=/usr/local/libexec/pips800/filter800.rev:\
-        :sd=/var/spool/lpd/pm800c:\
-        :mx#0:\
-        :lf=/var/log/lpd-errs
+/usr/local/libexec/pips800/setup
+
+to setup /etc/printcap, make a spool in /var/spool/lpd/ and so on.
+
+To run with Japanese/French/Germany/Spanish/Italian/Dutch/
+Portugue/Korean messages, you should execute as follows:
+  env LANG=ja_JP pips800          env LANG=fr pips800	  
+  env LANG=de pips800             env LANG=es pips800	  
+  env LANG=it pips800             env LANG=nl pips800
+  env LANG=pt pips800             env LANG=ko pips800 (*)
+  env LANG=zh_CN pips800 (*)(**)  env LANG=zh_TW.Big5 pips800 (**)
+
+(*) These do not work well.
+(**) See more informations in /usr/local/share/doc/pips800/readme_for_zh
diff --git a/print/pips800/pkg-plist b/print/pips800/pkg-plist
deleted file mode 100644
index 9506065e14e1..000000000000
--- a/print/pips800/pkg-plist
+++ /dev/null
@@ -1,10 +0,0 @@
-bin/pips%%PRTYPE%%
-libexec/%%BASE_NAME%%/filter%%PRTYPE%%
-libexec/%%BASE_NAME%%/filter%%PRTYPE%%.rev
-libexec/%%BASE_NAME%%/gsconfig%%PRTYPE%%
-share/doc/%%BASE_NAME%%/readme%%PRTYPE%%
-%%LIB_README%%
-@dirrm libexec/%%BASE_NAME%%
-@dirrm share/doc/%%BASE_NAME%%
-@cwd /compat/linux
-%%LIB_DIR_FILE%%
diff --git a/print/pips800/pkg-plist.ip b/print/pips800/pkg-plist10
index da9dc09a522c..aa4f8c290385 100644
--- a/print/pips800/pkg-plist.ip
+++ b/print/pips800/pkg-plist10
@@ -2,9 +2,13 @@ bin/pips%%PRTYPE%%
 libexec/%%BASE_NAME%%/filter%%PRTYPE%%
 libexec/%%BASE_NAME%%/filter%%PRTYPE%%.rev
 libexec/%%BASE_NAME%%/gsconfig%%PRTYPE%%
+libexec/%%BASE_NAME%%/setup
+libexec/%%BASE_NAME%%/scripts/en.lc
+libexec/%%BASE_NAME%%/scripts/ja.lc
+@dirrm libexec/%%BASE_NAME%%/scripts
 share/doc/%%BASE_NAME%%/readme%%PRTYPE%%
+share/doc/%%BASE_NAME%%/readme_for_zh
 share/doc/%%BASE_NAME%%/pips_mo/de.gmo
-share/doc/%%BASE_NAME%%/pips_mo/en.gmo
 share/doc/%%BASE_NAME%%/pips_mo/es.gmo
 share/doc/%%BASE_NAME%%/pips_mo/fr.gmo
 share/doc/%%BASE_NAME%%/pips_mo/it.gmo
@@ -20,12 +24,17 @@ share/doc/%%BASE_NAME%%/pips_mo/zh_TW.gmo
 @dirrm share/doc/%%BASE_NAME%%
 @cwd /compat/linux
 %%LIB_DIR_FILE%%
+etc/pipsrc
+@exec chmod 666 %D/etc/pipsrc
 @exec /compat/linux/sbin/ldconfig ; true
+@unexec /compat/linux/sbin/ldconfig ; true
 usr/share/locale/de/LC_MESSAGES/pips.mo
 usr/share/locale/es/LC_MESSAGES/pips.mo
 usr/share/locale/fr/LC_MESSAGES/pips.mo
 usr/share/locale/it/LC_MESSAGES/pips.mo
+usr/share/locale/ja_JP/LC_MESSAGES/pips.mo
 usr/share/locale/ko/LC_MESSAGES/pips.mo
 usr/share/locale/nl/LC_MESSAGES/pips.mo
 usr/share/locale/pt/LC_MESSAGES/pips.mo
-usr/share/locale/ja_JP/LC_MESSAGES/pips.mo
+usr/share/locale/zh/LC_MESSAGES/pips.mo
+usr/share/locale/zh_TW/LC_MESSAGES/pips.mo
diff --git a/print/pips800/pkg-plist131 b/print/pips800/pkg-plist131
new file mode 100644
index 000000000000..aa4f8c290385
--- /dev/null
+++ b/print/pips800/pkg-plist131
@@ -0,0 +1,40 @@
+bin/pips%%PRTYPE%%
+libexec/%%BASE_NAME%%/filter%%PRTYPE%%
+libexec/%%BASE_NAME%%/filter%%PRTYPE%%.rev
+libexec/%%BASE_NAME%%/gsconfig%%PRTYPE%%
+libexec/%%BASE_NAME%%/setup
+libexec/%%BASE_NAME%%/scripts/en.lc
+libexec/%%BASE_NAME%%/scripts/ja.lc
+@dirrm libexec/%%BASE_NAME%%/scripts
+share/doc/%%BASE_NAME%%/readme%%PRTYPE%%
+share/doc/%%BASE_NAME%%/readme_for_zh
+share/doc/%%BASE_NAME%%/pips_mo/de.gmo
+share/doc/%%BASE_NAME%%/pips_mo/es.gmo
+share/doc/%%BASE_NAME%%/pips_mo/fr.gmo
+share/doc/%%BASE_NAME%%/pips_mo/it.gmo
+share/doc/%%BASE_NAME%%/pips_mo/ja.gmo
+share/doc/%%BASE_NAME%%/pips_mo/ko.gmo
+share/doc/%%BASE_NAME%%/pips_mo/nl.gmo
+share/doc/%%BASE_NAME%%/pips_mo/pt.gmo
+share/doc/%%BASE_NAME%%/pips_mo/zh.gmo
+share/doc/%%BASE_NAME%%/pips_mo/zh_TW.gmo
+@dirrm share/doc/%%BASE_NAME%%/pips_mo
+%%LIB_README%%
+@dirrm libexec/%%BASE_NAME%%
+@dirrm share/doc/%%BASE_NAME%%
+@cwd /compat/linux
+%%LIB_DIR_FILE%%
+etc/pipsrc
+@exec chmod 666 %D/etc/pipsrc
+@exec /compat/linux/sbin/ldconfig ; true
+@unexec /compat/linux/sbin/ldconfig ; true
+usr/share/locale/de/LC_MESSAGES/pips.mo
+usr/share/locale/es/LC_MESSAGES/pips.mo
+usr/share/locale/fr/LC_MESSAGES/pips.mo
+usr/share/locale/it/LC_MESSAGES/pips.mo
+usr/share/locale/ja_JP/LC_MESSAGES/pips.mo
+usr/share/locale/ko/LC_MESSAGES/pips.mo
+usr/share/locale/nl/LC_MESSAGES/pips.mo
+usr/share/locale/pt/LC_MESSAGES/pips.mo
+usr/share/locale/zh/LC_MESSAGES/pips.mo
+usr/share/locale/zh_TW/LC_MESSAGES/pips.mo
diff --git a/print/pips800/pkg-plist20 b/print/pips800/pkg-plist20
new file mode 100644
index 000000000000..a22fc7e53d70
--- /dev/null
+++ b/print/pips800/pkg-plist20
@@ -0,0 +1,32 @@
+bin/ekpnavi
+bin/ekpstm
+bin/pips%%PRTYPE%%
+libexec/ekpd
+libexec/%%BASE_NAME%%/filter%%PRTYPE%%
+libexec/%%BASE_NAME%%/filter%%PRTYPE%%.rev
+libexec/%%BASE_NAME%%/gsconfig%%PRTYPE%%
+libexec/%%BASE_NAME%%/setup
+libexec/%%BASE_NAME%%/scripts/en.lc
+libexec/%%BASE_NAME%%/scripts/ja.lc
+@dirrm libexec/%%BASE_NAME%%/scripts
+share/doc/%%BASE_NAME%%/readme%%PRTYPE%%
+share/doc/%%BASE_NAME%%/ekpnavi_mo/ja.gmo
+@dirrm share/doc/%%BASE_NAME%%/ekpnavi_mo
+share/doc/%%BASE_NAME%%/ekpstm_mo/ja.gmo
+@dirrm share/doc/%%BASE_NAME%%/ekpstm_mo
+share/doc/%%BASE_NAME%%/pips_mo/ja.gmo
+@dirrm share/doc/%%BASE_NAME%%/pips_mo
+%%LIB_README%%
+%%ETC_RC_D%%
+@dirrm libexec/%%BASE_NAME%%
+@dirrm share/doc/%%BASE_NAME%%
+@cwd /compat/linux
+%%LIB_DIR_FILE%%
+etc/ekpdrc
+etc/pipsrc
+@exec chmod 666 %D/etc/pipsrc
+@exec /compat/linux/sbin/ldconfig ; true
+@unexec /compat/linux/sbin/ldconfig ; true
+usr/share/locale/ja_JP/LC_MESSAGES/ekpnavi.mo
+usr/share/locale/ja_JP/LC_MESSAGES/ekpstm.mo
+usr/share/locale/ja_JP/LC_MESSAGES/pips.mo
diff --git a/print/pips800/pkg-plist21 b/print/pips800/pkg-plist21
new file mode 100644
index 000000000000..15c0d1ff266f
--- /dev/null
+++ b/print/pips800/pkg-plist21
@@ -0,0 +1,75 @@
+bin/ekpnavi
+bin/ekpstm
+bin/pips%%PRTYPE%%
+libexec/ekpd
+libexec/%%BASE_NAME%%/filter%%PRTYPE%%
+libexec/%%BASE_NAME%%/filter%%PRTYPE%%.rev
+libexec/%%BASE_NAME%%/gsconfig%%PRTYPE%%
+libexec/%%BASE_NAME%%/setup
+libexec/%%BASE_NAME%%/scripts/en.lc
+libexec/%%BASE_NAME%%/scripts/ja.lc
+@dirrm libexec/%%BASE_NAME%%/scripts
+share/doc/%%BASE_NAME%%/readme%%PRTYPE%%
+share/doc/%%BASE_NAME%%/readme_for_zh
+share/doc/%%BASE_NAME%%/ekpnavi_mo/de.gmo
+share/doc/%%BASE_NAME%%/ekpnavi_mo/es.gmo
+share/doc/%%BASE_NAME%%/ekpnavi_mo/fr.gmo
+share/doc/%%BASE_NAME%%/ekpnavi_mo/it.gmo
+share/doc/%%BASE_NAME%%/ekpnavi_mo/ja.gmo
+share/doc/%%BASE_NAME%%/ekpnavi_mo/nl.gmo
+share/doc/%%BASE_NAME%%/ekpnavi_mo/pt.gmo
+@dirrm share/doc/%%BASE_NAME%%/ekpnavi_mo
+share/doc/%%BASE_NAME%%/ekpstm_mo/de.gmo
+share/doc/%%BASE_NAME%%/ekpstm_mo/es.gmo
+share/doc/%%BASE_NAME%%/ekpstm_mo/fr.gmo
+share/doc/%%BASE_NAME%%/ekpstm_mo/it.gmo
+share/doc/%%BASE_NAME%%/ekpstm_mo/ja.gmo
+share/doc/%%BASE_NAME%%/ekpstm_mo/nl.gmo
+share/doc/%%BASE_NAME%%/ekpstm_mo/pt.gmo
+@dirrm share/doc/%%BASE_NAME%%/ekpstm_mo
+share/doc/%%BASE_NAME%%/pips_mo/de.gmo
+share/doc/%%BASE_NAME%%/pips_mo/es.gmo
+share/doc/%%BASE_NAME%%/pips_mo/fr.gmo
+share/doc/%%BASE_NAME%%/pips_mo/it.gmo
+share/doc/%%BASE_NAME%%/pips_mo/ja.gmo
+share/doc/%%BASE_NAME%%/pips_mo/ko.gmo
+share/doc/%%BASE_NAME%%/pips_mo/nl.gmo
+share/doc/%%BASE_NAME%%/pips_mo/pt.gmo
+share/doc/%%BASE_NAME%%/pips_mo/zh.gmo
+share/doc/%%BASE_NAME%%/pips_mo/zh_TW.gmo
+@dirrm share/doc/%%BASE_NAME%%/pips_mo
+%%LIB_README%%
+%%ETC_RC_D%%
+@dirrm libexec/%%BASE_NAME%%
+@dirrm share/doc/%%BASE_NAME%%
+@cwd /compat/linux
+%%LIB_DIR_FILE%%
+etc/ekpdrc
+etc/pipsrc
+@exec chmod 666 %D/etc/pipsrc
+@exec /compat/linux/sbin/ldconfig ; true
+@unexec /compat/linux/sbin/ldconfig ; true
+usr/share/locale/de/LC_MESSAGES/ekpnavi.mo
+usr/share/locale/es/LC_MESSAGES/ekpnavi.mo
+usr/share/locale/fr/LC_MESSAGES/ekpnavi.mo
+usr/share/locale/it/LC_MESSAGES/ekpnavi.mo
+usr/share/locale/ja_JP/LC_MESSAGES/ekpnavi.mo
+usr/share/locale/nl/LC_MESSAGES/ekpnavi.mo
+usr/share/locale/pt/LC_MESSAGES/ekpnavi.mo
+usr/share/locale/de/LC_MESSAGES/ekpstm.mo
+usr/share/locale/es/LC_MESSAGES/ekpstm.mo
+usr/share/locale/fr/LC_MESSAGES/ekpstm.mo
+usr/share/locale/it/LC_MESSAGES/ekpstm.mo
+usr/share/locale/ja_JP/LC_MESSAGES/ekpstm.mo
+usr/share/locale/nl/LC_MESSAGES/ekpstm.mo
+usr/share/locale/pt/LC_MESSAGES/ekpstm.mo
+usr/share/locale/de/LC_MESSAGES/pips.mo
+usr/share/locale/es/LC_MESSAGES/pips.mo
+usr/share/locale/fr/LC_MESSAGES/pips.mo
+usr/share/locale/it/LC_MESSAGES/pips.mo
+usr/share/locale/ja_JP/LC_MESSAGES/pips.mo
+usr/share/locale/ko/LC_MESSAGES/pips.mo
+usr/share/locale/nl/LC_MESSAGES/pips.mo
+usr/share/locale/pt/LC_MESSAGES/pips.mo
+usr/share/locale/zh/LC_MESSAGES/pips.mo
+usr/share/locale/zh_TW/LC_MESSAGES/pips.mo