56 files changed, 1076 insertions, 751 deletions

diff --git a/print/pips2200/Makefile b/print/pips2200/Makefile
index ae2669e2c2c8..551e31cd47ad 100644
--- a/print/pips2200/Makefile
+++ b/print/pips2200/Makefile
@@ -10,4 +10,4 @@ COMMENT=	Photo Image Print System for Linux --- EPSON PM-2200C
 
 PRTYPE=		2200
 
-.include "${MASTERDIR}/Makefile"
+.include "${MASTERDIR}/Makefile.pips"
diff --git a/print/pips2200/distinfo b/print/pips2200/distinfo
index 3ddc3e646cbd..06d7fac00199 100644
--- a/print/pips2200/distinfo
+++ b/print/pips2200/distinfo
@@ -1,2 +1,2 @@
-MD5 (pips2200-1.3.1.i386.tgz) = a63d7212fb98c3a2a7aad8ef7ed73dcb
-SIZE (pips2200-1.3.1.i386.tgz) = 971318
+MD5 (pips2200-1.3.2.tar.gz) = 489fbc8a63daab8749a3642fdd06d536
+SIZE (pips2200-1.3.2.tar.gz) = 1163318
diff --git a/print/pips2200/pkg-descr b/print/pips2200/pkg-descr
index cfb756adec1c..a076497ad5c7 100644
--- a/print/pips2200/pkg-descr
+++ b/print/pips2200/pkg-descr
@@ -12,14 +12,3 @@ print out more than one page. Then you execute the next command:
 /usr/local/libexec/pips2200/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 pips2200          env LANG=fr pips2200	  
-  env LANG=de pips2200             env LANG=es pips2200	  
-  env LANG=it pips2200             env LANG=nl pips2200
-  env LANG=pt pips2200             env LANG=ko pips2200 (*)
-  env LANG=zh_CN pips2200 (*)(**)  env LANG=zh_TW.Big5 pips2200 (**)
-
-(*) These do not work well.
-(**) See more informations in /usr/local/share/doc/pips2200/readme_for_zh
diff --git a/print/pips3000/Makefile b/print/pips3000/Makefile
index f991bf93fdad..17363cb83c8b 100644
--- a/print/pips3000/Makefile
+++ b/print/pips3000/Makefile
@@ -10,4 +10,4 @@ COMMENT=	Photo Image Print System for Linux --- EPSON PM-3000C
 
 PRTYPE=		3000
 
-.include "${MASTERDIR}/Makefile"
+.include "${MASTERDIR}/Makefile.pips"
diff --git a/print/pips3000/distinfo b/print/pips3000/distinfo
index 5d04eab7067f..8557c78db26a 100644
--- a/print/pips3000/distinfo
+++ b/print/pips3000/distinfo
@@ -1,2 +1,2 @@
-MD5 (pips3000-1.3.1.i386.tgz) = 6ac0d9f597e3d7d59738b9d9178fbde4
-SIZE (pips3000-1.3.1.i386.tgz) = 1101797
+MD5 (pips3000-1.3.2.tar.gz) = 351e19da3bc796cf7946b19bb151ecd8
+SIZE (pips3000-1.3.2.tar.gz) = 1290656
diff --git a/print/pips3000/pkg-descr b/print/pips3000/pkg-descr
index 79533d8f4839..a237a63f71e0 100644
--- a/print/pips3000/pkg-descr
+++ b/print/pips3000/pkg-descr
@@ -12,14 +12,3 @@ print out more than one page. Then you execute the next command:
 /usr/local/libexec/pips3000/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 pips3000          env LANG=fr pips3000	  
-  env LANG=de pips3000             env LANG=es pips3000	  
-  env LANG=it pips3000             env LANG=nl pips3000
-  env LANG=pt pips3000             env LANG=ko pips3000 (*)
-  env LANG=zh_CN pips3000 (*)(**)  env LANG=zh_TW.Big5 pips3000 (**)
-
-(*) These do not work well.
-(**) See more informations in /usr/local/share/doc/pips3000/readme_for_zh
diff --git a/print/pips3300/Makefile b/print/pips3300/Makefile
index c8f147e8ed5d..77addaa7aaf7 100644
--- a/print/pips3300/Makefile
+++ b/print/pips3300/Makefile
@@ -5,11 +5,9 @@
 # $FreeBSD$
 #
 
-PORTVERSION=	1.3
-PORTREVISION=	1
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON PM-3300C
 
 PRTYPE=		3300
 
-.include "${MASTERDIR}/Makefile"
+.include "${MASTERDIR}/Makefile.pips"
diff --git a/print/pips3300/distinfo b/print/pips3300/distinfo
index 31aeb0fd71c6..191f7d8a4b73 100644
--- a/print/pips3300/distinfo
+++ b/print/pips3300/distinfo
@@ -1,2 +1,2 @@
-MD5 (pips3300-1.3.i386.tgz) = c7dca91bd130798c5bf7d19bc09f40a5
-SIZE (pips3300-1.3.i386.tgz) = 1196007
+MD5 (pips3300-1.3.2.tar.gz) = 1317d573643910570f7cdde721ff439f
+SIZE (pips3300-1.3.2.tar.gz) = 1393471
diff --git a/print/pips3300/pkg-descr b/print/pips3300/pkg-descr
index 8883c25eed38..4b71d6b10c41 100644
--- a/print/pips3300/pkg-descr
+++ b/print/pips3300/pkg-descr
@@ -12,6 +12,3 @@ print out more than one page. Then you execute the next command:
 /usr/local/libexec/pips3300/setup
 
 to setup /etc/printcap, make a spool in /var/spool/lpd/ and so on.
-
-To run with Japanese messages, you have to execute as follows:
- env LANG=ja_JP pips3300 -la JP
diff --git a/print/pips3500/Makefile b/print/pips3500/Makefile
index cc9642b6df1f..2efc4eddc2cf 100644
--- a/print/pips3500/Makefile
+++ b/print/pips3500/Makefile
@@ -5,10 +5,10 @@
 # $FreeBSD$
 #
 
-PORTVERSION=	1.3
+PORTVERSION=	2.1.2
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON PM-3500C
 
 PRTYPE=		3500
 
-.include "${MASTERDIR}/Makefile"
+.include "${MASTERDIR}/Makefile.pips"
diff --git a/print/pips3500/distinfo b/print/pips3500/distinfo
index 6d4dd52ba87b..8aba18a54887 100644
--- a/print/pips3500/distinfo
+++ b/print/pips3500/distinfo
@@ -1,2 +1,2 @@
-MD5 (pips3500-1.3.i386.tgz) = 2ade9da1484c4ff8f7c57b8bba0b7e05
-SIZE (pips3500-1.3.i386.tgz) = 1780967
+MD5 (pips3500-2.1.2.tar.gz) = d74a9a4d567bf6486581ef5bd445b1be
+SIZE (pips3500-2.1.2.tar.gz) = 2663413
diff --git a/print/pips3500/pkg-descr b/print/pips3500/pkg-descr
index a08283dbe09a..ab0e70f5486e 100644
--- a/print/pips3500/pkg-descr
+++ b/print/pips3500/pkg-descr
@@ -12,6 +12,3 @@ print out more than one page. Then you execute the next command:
 /usr/local/libexec/pips3500/setup
 
 to setup /etc/printcap, make a spool in /var/spool/lpd/ and so on.
-
-To run with Japanese messages, you have to execute as follows:
- env LANG=ja_JP pips3500 -la JP
diff --git a/print/pips670/Makefile b/print/pips670/Makefile
index a1dddf258d32..86b2133ce289 100644
--- a/print/pips670/Makefile
+++ b/print/pips670/Makefile
@@ -10,4 +10,4 @@ COMMENT=	Photo Image Print System for Linux --- EPSON PM-670C
 
 PRTYPE=		670
 
-.include "${MASTERDIR}/Makefile"
+.include "${MASTERDIR}/Makefile.pips"
diff --git a/print/pips670/distinfo b/print/pips670/distinfo
index 23fd86443c87..5941335c6d53 100644
--- a/print/pips670/distinfo
+++ b/print/pips670/distinfo
@@ -1,2 +1,2 @@
-MD5 (pips670-1.3.1.i386.tgz) = aef641fcdd3bce04c5bcc039573d5400
-SIZE (pips670-1.3.1.i386.tgz) = 641315
+MD5 (pips670-1.3.2.tar.gz) = 30987c5287f790690736a68f677ef10c
+SIZE (pips670-1.3.2.tar.gz) = 830207
diff --git a/print/pips670/pkg-descr b/print/pips670/pkg-descr
index 9bddb629c016..3079fbf37440 100644
--- a/print/pips670/pkg-descr
+++ b/print/pips670/pkg-descr
@@ -12,14 +12,3 @@ print out more than one page. Then you execute the next command:
 /usr/local/libexec/pips670/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 pips670          env LANG=fr pips670	  
-  env LANG=de pips670             env LANG=es pips670	  
-  env LANG=it pips670             env LANG=nl pips670
-  env LANG=pt pips670             env LANG=ko pips670 (*)
-  env LANG=zh_CN pips670 (*)(**)  env LANG=zh_TW.Big5 pips670 (**)
-
-(*) These do not work well.
-(**) See more informations in /usr/local/share/doc/pips670/readme_for_zh
diff --git a/print/pips750_2000/Makefile b/print/pips750_2000/Makefile
index 785f8a00e945..034ba2676770 100644
--- a/print/pips750_2000/Makefile
+++ b/print/pips750_2000/Makefile
@@ -5,10 +5,9 @@
 # $FreeBSD$
 #
 
-MASTER_SITES=	http://www.epkowa.on.arena.ne.jp/pips/data/750/
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON PM-750C PM-2000C
 
 PRTYPE=		750_2000
 
-.include "${MASTERDIR}/Makefile"
+.include "${MASTERDIR}/Makefile.pips"
diff --git a/print/pips750_2000/distinfo b/print/pips750_2000/distinfo
index ae6d84305cba..bb27da771a45 100644
--- a/print/pips750_2000/distinfo
+++ b/print/pips750_2000/distinfo
@@ -1,2 +1,2 @@
-MD5 (pips750_2000-1.3.1.i386.tgz) = 7693d867bf09a225b6c53fcdbb8435aa
-SIZE (pips750_2000-1.3.1.i386.tgz) = 642147
+MD5 (pips750_2000-1.3.2.tar.gz) = fd515c5ec5ecf1f45f57f802a3857e8a
+SIZE (pips750_2000-1.3.2.tar.gz) = 832425
diff --git a/print/pips760/Makefile b/print/pips760/Makefile
index 0c75ca154886..ce8f2deded1e 100644
--- a/print/pips760/Makefile
+++ b/print/pips760/Makefile
@@ -10,4 +10,4 @@ COMMENT=	Photo Image Print System for Linux --- EPSON PM-760C
 
 PRTYPE=		760
 
-.include "${MASTERDIR}/Makefile"
+.include "${MASTERDIR}/Makefile.pips"
diff --git a/print/pips760/distinfo b/print/pips760/distinfo
index b5dca3167a47..45dbe28c4751 100644
--- a/print/pips760/distinfo
+++ b/print/pips760/distinfo
@@ -1,2 +1,2 @@
-MD5 (pips760-1.3.1.i386.tgz) = 52eda64f50652114540278c913f3e776
-SIZE (pips760-1.3.1.i386.tgz) = 908560
+MD5 (pips760-1.3.2.tar.gz) = a39c8487b369a496db2ecea31d8621eb
+SIZE (pips760-1.3.2.tar.gz) = 1100390
diff --git a/print/pips760/pkg-descr b/print/pips760/pkg-descr
index aefe17647bbf..f819118a2a3a 100644
--- a/print/pips760/pkg-descr
+++ b/print/pips760/pkg-descr
@@ -12,14 +12,3 @@ print out more than one page. Then you execute the next command:
 /usr/local/libexec/pips760/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 pips760          env LANG=fr pips760	  
-  env LANG=de pips760             env LANG=es pips760	  
-  env LANG=it pips760             env LANG=nl pips760
-  env LANG=pt pips760             env LANG=ko pips760 (*)
-  env LANG=zh_CN pips760 (*)(**)  env LANG=zh_TW.Big5 pips760 (**)
-
-(*) These do not work well.
-(**) See more informations in /usr/local/share/doc/pips760/readme_for_zh
diff --git a/print/pips770/Makefile b/print/pips770/Makefile
index 6a5939a83c1f..795a86a22369 100644
--- a/print/pips770/Makefile
+++ b/print/pips770/Makefile
@@ -10,4 +10,4 @@ COMMENT=	Photo Image Print System for Linux --- EPSON PM-770C
 
 PRTYPE=		770
 
-.include "${MASTERDIR}/Makefile"
+.include "${MASTERDIR}/Makefile.pips"
diff --git a/print/pips770/distinfo b/print/pips770/distinfo
index d394eb084b72..77e8b8c15388 100644
--- a/print/pips770/distinfo
+++ b/print/pips770/distinfo
@@ -1,2 +1,2 @@
-MD5 (pips770-1.3.1.i386.tgz) = 6cdeaaf7ff90ed152f92f5f33d9b22c7
-SIZE (pips770-1.3.1.i386.tgz) = 947831
+MD5 (pips770-1.3.2.tar.gz) = 1b62c8cfa8dfe81fa8553f844a6d3617
+SIZE (pips770-1.3.2.tar.gz) = 1122819
diff --git a/print/pips770/pkg-descr b/print/pips770/pkg-descr
index c59cd506dd31..60b4d5159b6c 100644
--- a/print/pips770/pkg-descr
+++ b/print/pips770/pkg-descr
@@ -12,14 +12,3 @@ print out more than one page. Then you execute the next command:
 /usr/local/libexec/pips770/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 pips770          env LANG=fr pips770	  
-  env LANG=de pips770             env LANG=es pips770	  
-  env LANG=it pips770             env LANG=nl pips770
-  env LANG=pt pips770             env LANG=ko pips770 (*)
-  env LANG=zh_CN pips770 (*)(**)  env LANG=zh_TW.Big5 pips770 (**)
-
-(*) These do not work well.
-(**) See more informations in /usr/local/share/doc/pips770/readme_for_zh
diff --git a/print/pips780/Makefile b/print/pips780/Makefile
index 3b4194ab2e56..af08d3834134 100644
--- a/print/pips780/Makefile
+++ b/print/pips780/Makefile
@@ -5,10 +5,10 @@
 # $FreeBSD$
 #
 
-PORTVERSION=	1.3
+PORTVERSION=	2.1.2
 MASTERDIR=	${.CURDIR}/../pips800
-COMMENT=	Photo Image Print System for Linux --- EPSON PM-780C
+COMMENT=	Photo Image Print System for Linux --- EPSON PM-780C (LPR)
 
 PRTYPE=		780
 
-.include "${MASTERDIR}/Makefile"
+.include "${MASTERDIR}/Makefile.pips"
diff --git a/print/pips780/distinfo b/print/pips780/distinfo
index 4524250fa264..a4084cebe5f9 100644
--- a/print/pips780/distinfo
+++ b/print/pips780/distinfo
@@ -1,2 +1,2 @@
-MD5 (pips780-1.3.i386.tgz) = 2c5c5f450c0a09f4e7873e2364773bc6
-SIZE (pips780-1.3.i386.tgz) = 1780658
+MD5 (pips780-2.1.2.tar.gz) = e29a71f3d8831fc1706978afae9dddab
+SIZE (pips780-2.1.2.tar.gz) = 2668596
diff --git a/print/pips780/pkg-descr b/print/pips780/pkg-descr
index 395a9050c953..1842f2988e4c 100644
--- a/print/pips780/pkg-descr
+++ b/print/pips780/pkg-descr
@@ -12,6 +12,3 @@ print out more than one page. Then you execute the next command:
 /usr/local/libexec/pips780/setup
 
 to setup /etc/printcap, make a spool in /var/spool/lpd/ and so on.
-
-To run with Japanese messages, you have to execute as follows:
- env LANG=ja_JP pips780
diff --git a/print/pips800/Makefile b/print/pips800/Makefile
index 9eff33cc922d..ce1ab14fc8bb 100644
--- a/print/pips800/Makefile
+++ b/print/pips800/Makefile
@@ -5,318 +5,9 @@
 # $FreeBSD$
 #
 
-PORTNAME=	pips${PRTYPE}
-PORTVERSION?=	1.3.1
-#PORTREVISION=	1
-CATEGORIES?=	print linux
-.if defined(INTERNATIONAL_PRODUCTS)
-.if ${PRTYPE} == -sc20s
-MASTER_SITES?=	http://www.epkowa.on.arena.ne.jp/pips/data/sc20/
-.elif ${PRTYPE} == -sc40s
-MASTER_SITES?=	http://www.epkowa.on.arena.ne.jp/pips/data/sc40/
-.elif ${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
+MASTERDIR=	${.CURDIR}/../pips800
+COMMENT=	Photo Image Print System for Linux --- EPSON PM-800C
 
-MAINTAINER=	ume@FreeBSD.org
-COMMENT?=	Photo Image Print System for Linux --- EPSON PM-800C
+PRTYPE=		800
 
-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-png10
-.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} ETC_RC_D=${ETC_RC_D}
-MD5_FILE=	${.CURDIR}/distinfo
-
-.include <bsd.port.pre.mk>
-PRTYPE?=	800
-
-.if defined(INTERNATIONAL_PRODUCTS)
-LIB_FILE=	lib${PRTYPE:S/^-//}.so
-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
-PRT_MODEL=	PM${PRTYPE}C
-.endif
-.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
-DESCR=		${.CURDIR}/pkg-descr
-.if ${PORTVERSION} == 2.0 && !defined(INTERNATIONAL_PRODUCTS)
-LANGS=		ja
-PLIST=		${MASTERDIR}/pkg-plist20
-.elif ${PORTVERSION} == 1.3
-PLIST=		${MASTERDIR}/pkg-plist13
-.elif ${PORTVERSION} == "1.3.1"
-LANGS=		de es fr it ja ko nl pt zh zh_TW
-#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+=	${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+=	${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)
-
-.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,^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,$$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
-.if ${PORTVERSION} == 1.3
-	${SED}	-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,' \
-		${FILESDIR}/filter13.rev > ${WRKDIR}/filter${PRTYPE}.rev
-.else
-	${SED}	-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,' \
-		${FILESDIR}/filter.rev > ${WRKDIR}/filter${PRTYPE}.rev
-.endif
-.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_DATA} ${WRKSRC}/gsconfig${PRTYPE} ${PREFIX}/libexec/${BASE_NAME}
-	${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}
-	${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
-	${MKDIR} ${PREFIX}/share/doc/${BASE_NAME}/pips_mo
-	${INSTALL_DATA} ${WRKSRC}/pips_mo/* ${PREFIX}/share/doc/${BASE_NAME}/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
-.endif
-.if !defined(NOPORTDOCS)
-	${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_DESCR:
-.if defined(INTERNATIONAL_PRODUCTS)
-.if ${PRTYPE} != -sc880 || ${PORTVERSION} != 1.0
-.for file in pkg-descr
-.if ${PRTYPE} == -sc680_777
-	${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}
-.endif
-.endfor
-.endif
-.else # for defined(INTERNATIONAL_PRODUCTS)
-.if ${PRTYPE} != 800
-.for file in pkg-descr
-.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}
-.endif
-.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>
+.include "${MASTERDIR}/Makefile.pips"
diff --git a/print/pips800/Makefile.pips b/print/pips800/Makefile.pips
new file mode 100644
index 000000000000..84253b1f0526
--- /dev/null
+++ b/print/pips800/Makefile.pips
@@ -0,0 +1,280 @@
+# makefile for use of:	PIPS
+# Date created:		26 Aug 2004
+# Whom:			Hajimu UMEMOTO <ume@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	pips${PRTYPE}
+PORTVERSION?=	1.3.2
+#PORTREVISION=	1
+CATEGORIES?=	print
+MASTER_SITES=	http://www.epkowa3.on.arena.ne.jp/pips/data/%SUBDIR%/
+.if ${PRTYPE} == "750_2000"
+MASTER_SITE_SUBDIR=	pm750c_2000clpr
+.elif ${PRTYPE} == 780 || ${PRTYPE} == 880
+MASTER_SITE_SUBDIR=	${PRTYPE}_20
+.elif ${PRTYPE} == 870
+MASTER_SITE_SUBDIR=	${PRTYPE}Clpr
+.elif ${PRTYPE} == 3500
+MASTER_SITE_SUBDIR=	pm${PRTYPE}c
+.elif ${PRTYPE} == 4000
+MASTER_SITE_SUBDIR=	pm${PRTYPE}pxlpr
+.elif ${PORTVERSION} == 2.1.2
+MASTER_SITE_SUBDIR=	${PRTYPE}_21
+.else
+MASTER_SITE_SUBDIR=	pm${PRTYPE}clpr
+.endif
+
+MAINTAINER=	ume@FreeBSD.org
+
+LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
+RUN_DEPENDS=	gs:${PORTSDIR}/print/ghostscript-gnu \
+		pstops:${PORTSDIR}/print/psutils-${PAPERSIZE} \
+		${LOCALBASE}/lib/pluginwrapper/pips.so:${PORTSDIR}/www/linuxpluginwrapper
+
+USE_REINPLACE=	yes
+USE_GMAKE=	yes
+USE_GNOME=	glib12 gtk12
+USE_GETTEXT=	yes
+
+ONLY_FOR_ARCHS= i386
+MD5_FILE=	${.CURDIR}/distinfo
+DESCR=		${.CURDIR}/pkg-descr
+
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--libdir=${PREFIX}/lib/pips
+
+PLIST_SUB=	PRTYPE=${PRTYPE} \
+		PRT_MODEL=${PRT_MODEL} \
+		LIB_README=${LIB_README} \
+		MODEL_FILE=${MODEL_FILE} \
+		CUPS=${CUPS} \
+		LPR=${LPR} \
+		EKPNAVI=${EKPNAVI} \
+		DTRFILTER=${DTRFILTER} \
+		GSCONFIG=${GSCONFIG}
+
+.include <bsd.port.pre.mk>
+
+.if ${PORTVERSION} == 2.1.2 || ${PRTYPE} == 870
+PIPS_LPR_ONLY=	yes
+.endif
+
+CPPFLAGS=	-I${LOCALBASE}/include
+LDFLAGS=	-L${LOCALBASE}/lib
+.if ${PORTVERSION} == 2.1.2 || ${PORTVERSION} == 2.6.2
+CONFLICTS=	pips*-2.*
+USE_RC_SUBR=	yes
+EXTRA_PATCHES=	${FILESDIR}/extra-patch-2.6.2
+.if ${PORTVERSION} != 2.1.2
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-2.6.2-dtrfilter
+.endif
+.if defined(PIPS_LPR_ONLY)
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-2.6.2-lpr
+.else
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-2.6.2-common
+BUILD_DEPEND+=	${LOCALBASE}/bin/autoconf253:${PORTSDIR}/devel/autoconf253
+LIB_DEPENDS+=	cups.2:${PORTSDIR}/print/cups-base \
+		iconv.3:${PORTSDIR}/converters/libiconv
+.endif
+.if ${OSVERSION} < 500000
+LIB_DEPENDS+=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \
+		lthread.2:${PORTSDIR}/devel/linuxthreads
+CPPFLAGS+=	-I${LOCALBASE}/include/pthread/linuxthreads
+LDFLAGS+=	-lgnugetopt -llthread
+.else
+LDFLAGS+=	${PTHREAD_LIBS}
+.endif
+CPPFLAGS+=	${PTHREAD_CFLAGS}
+.endif
+CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+
+.if defined(INTERNATIONAL_PRODUCTS)
+LIB_FILE=	lib${PRTYPE:S/^-//}.so
+MODEL_FILE=	ekpm${PRTYPE:S/^-//}.ppd
+PRT_MODEL=	${PRTYPE:U:S/^-//}
+.else
+.if ${PRTYPE} == 790
+LIB_FILE=	libpm${PRTYPE}pt.so
+MODEL_FILE=	ekpm${PRTYPE}pt.ppd
+PRT_MODEL=	PM${PRTYPE}PT
+.elif ${PRTYPE} == "780cs"
+LIB_FILE=	libpm${PRTYPE}.so
+MODEL_FILE=	ekpm${PRTYPE}.ppd
+PRT_MODEL=	PM${PRTYPE:U}
+.elif ${PRTYPE} == "820ug"
+LIB_FILE=	libpm820cug.so
+MODEL_FILE=	ekpm${PRTYPE}cug.ppd
+PRT_MODEL=	PM820CUG
+.elif ${PRTYPE} == 4000
+LIB_FILE=	libpm${PRTYPE}px.so
+MODEL_FILE=	ekpm${PRTYPE}px.ppd
+PRT_MODEL=	PM${PRTYPE}PX
+.else
+LIB_FILE=	libpm${PRTYPE}c.so
+MODEL_FILE=	ekpm${PRTYPE}c.ppd
+PRT_MODEL=	PM${PRTYPE}C
+.endif
+.endif
+LIB_README=	${LIB_FILE:S/.so$//}.readme
+PAPERSIZE?=	a4
+.if ${PORTVERSION} == 2.1.2 || ${PORTVERSION} == 2.6.2
+FILTER_SRC=	filter.tmp
+.if ${PORTVERSION} == 2.1.2
+CUPS=		"@comment "
+LPR=		""
+EKPNAVI=	""
+DTRFILTER=	"@comment "
+GSCONFIG=	""
+.elif defined(PIPS_LPR_ONLY)
+CUPS=		"@comment "
+LPR=		""
+EKPNAVI=	""
+DTRFILTER=	""
+GSCONFIG=	"@comment "
+.elif defined(PIPS_CUPS_ONLY)
+CUPS=		""
+LPR=		"@comment "
+EKPNAVI=	"@comment "
+DTRFILTER=	""
+GSCONFIG=	"@comment "
+.else
+CUPS=		""
+LPR=		"@comment "
+EKPNAVI=	""
+DTRFILTER=	""
+GSCONFIG=	"@comment "
+.endif
+RC_SCRIPTS_SUB=	PREFIX=${PREFIX} \
+		RC_SUBR=${RC_SUBR} \
+		PRT_MODEL=${PRT_MODEL}
+WITH_EKPD?=	yes
+.elif ${PORTVERSION} == 1.3.2
+FILTER_SRC=	filter.org
+PLIST=		${MASTERDIR}/pkg-plist132
+.endif
+PKGMESSAGE=	${WRKDIR}/pkg-message
+
+DOCS=		COPYING COPYING.KOWA COPYING.KOWA.ja COPYING.LIB
+
+.if ${PORTVERSION} == 2.1.2 || \
+	(${PORTVERSION} == 2.6.2 && defined(PIPS_LPR_ONLY))
+post-extract:
+	cd ${WRKSRC}/ekpnavi && ${TAR} xf ekpnavi-1.1.2.tar.gz
+	cd ${WRKSRC}/ekpstm && ${TAR} xf ekpstm-1.0.2.tar.gz
+.endif
+
+post-patch:
+	${REINPLACE_CMD} -e '/^SUBDIRS =/s/setup//' \
+		-e '/inst-post.sh/s/^/#/' \
+		${WRKSRC}/Makefile.in
+	${REINPLACE_CMD} -e 's,^prefix=/usr$$,,' -e 's,^sysconfdir=/etc$$,,' \
+	    -e 's,/usr/local/EPKowa,${PREFIX}/libexec/pips,' \
+		${WRKSRC}/configure
+	${REINPLACE_CMD} -e 's,^pkgdatadir.*$$,pkgdatadir = ${DOCSDIR},' \
+		${WRKSRC}/doc/Makefile.in
+	${REINPLACE_CMD} -e 's,^EKPSTM.*$$,EKPSTM=${PREFIX}/bin/ekpstm,' \
+	    -e 's,/usr/local/EPKowa,${PREFIX}/libexec/pips,' \
+		-e 's,/usr/bin/pips,${PREFIX}/bin/pips,' \
+		-e 's,:/usr/local/bin$$,:${PREFIX}/bin,' \
+		-e 's,^GSCONF=%gsconfig_name%$$,GSCONF=${PREFIX}/bin/%gsconfig_name%,' \
+		${WRKSRC}/src/${FILTER_SRC}
+.if ${PORTVERSION} == 1.3.2
+	${REINPLACE_CMD} -e 's,^PREFIX.*$$,PREFIX=${PREFIX},' \
+		-e 's,^ETCDIR.*$$,ETCDIR=${PREFIX}/etc,' \
+		-e 's,/dev/lp0,/dev/lpt0,' \
+		-e 's,/usr/local/EPKowa,${PREFIX}/libexec/pips,' \
+		-e 's,/usr/bin/pips,${PREFIX}/bin/pips,' \
+		-e 's,:/usr/local/bin$$,:${PREFIX}/bin,' \
+		${WRKSRC}/setup/inst-post.sh
+.endif
+.if ${PORTVERSION} == 2.6.2
+	${REINPLACE_CMD} -e 's,dtrfilter_LDADD = -ldl,dtrfilter_LDADD =,' \
+		${WRKSRC}/dtrfilter/Makefile.in
+	${REINPLACE_CMD} -e 's,/etc/pipsrc,${PREFIX}/etc/pipsrc,' \
+		-e 's,/usr/local/EPKowa,${PREFIX}/libexec/pips,' \
+		${WRKSRC}/layout_script/gsconfig
+.endif
+.if ${PORTVERSION} == 2.1.2 || ${PORTVERSION} == 2.6.2
+	${REINPLACE_CMD} -e 's,/etc/ekpdrc,${PREFIX}/etc/ekpdrc,' \
+		${WRKSRC}/ekpd/cbtd_setup.c
+	${REINPLACE_CMD} -e 's,/dev/lp0,/dev/ulpt0,' \
+		-e 's,^SUBDIRS = rc$$,#SUBDIRS = rc,' \
+		${WRKSRC}/ekpd/Makefile.in
+	${REINPLACE_CMD} -e 's,/etc/ekpdrc,${PREFIX}/etc/ekpdrc,' \
+		${WRKSRC}/src/setup.c
+.endif
+
+.if ${PORTVERSION} == 2.6.2 && !defined(PIPS_LPR_ONLY)
+pre-configure:
+	cd ${WRKSRC}/libltdl && ${LOCALBASE}/bin/autoconf253
+.endif
+
+post-build:
+.if ${PORTVERSION} == 1.3.2
+	${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,' \
+		${WRKSRC}/src/filter${PRTYPE} > ${WRKSRC}/src/filter${PRTYPE}.rev
+.endif
+	${SED}	-e 's,%%PRTYPE%%,${PRTYPE},g' \
+		-e 's,%%PRT_MODEL%%,${PRT_MODEL},g' \
+		-e 's,%%VERSION%%,${PORTVERSION},'g \
+		-e 's,%%PREFIX%%,${PREFIX},g' \
+		-e 's,%%WITH_EKPD%%,${WITH_EKPD},g' \
+			${FILESDIR}/setup > ${WRKDIR}/setup.freebsd
+.if ${PORTVERSION} == 2.1.2 || ${PORTVERSION} == 2.6.2
+	${REINPLACE_CMD} -e 's,.rev$$,,' ${WRKDIR}/setup.freebsd
+	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
+		${FILESDIR}/ekpd.sh > ${WRKDIR}/ekpd.sh
+	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
+		${FILESDIR}/pips.sh > ${WRKDIR}/pips.sh
+.endif
+	${SED}	-e 's,%%LIB_FILE%%,${LIB_FILE},g' \
+		${MASTERDIR}/pkg-message > ${PKGMESSAGE}
+
+post-install:
+	${RM} -f ${PREFIX}/etc/pipsrc
+	${TOUCH} ${PREFIX}/etc/pipsrc
+	${CHMOD} 666 ${PREFIX}/etc/pipsrc
+	${INSTALL_SCRIPT} ${WRKDIR}/setup.freebsd \
+		${PREFIX}/libexec/pips/${PRT_MODEL}/setup
+	${MKDIR} ${PREFIX}/libexec/pips/${PRT_MODEL}/scripts
+	${INSTALL_DATA} ${FILESDIR}/en.lc \
+		${PREFIX}/libexec/pips/${PRT_MODEL}/scripts
+	${INSTALL_DATA} ${FILESDIR}/ja.lc \
+		${PREFIX}/libexec/pips/${PRT_MODEL}/scripts
+.if ${PORTVERSION} == 1.3.2
+	${INSTALL_SCRIPT} ${WRKSRC}/src/filter${PRTYPE}.rev \
+		${PREFIX}/libexec/pips/${PRT_MODEL}
+.endif
+.if !defined(NOPORTDOCS)
+.for f in ${DOCS}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
+.endfor
+.endif
+	@${ECHO_CMD} "lib/pips/${LIB_FILE}" >>${TMPPLIST}
+.if ${PORTVERSION} == 2.6.2 && !defined(PIPS_LPR_ONLY)
+	@${ECHO_CMD} "lib/pips/${LIB_FILE:S/.so/R1.so/}" >>${TMPPLIST}
+	@${ECHO_CMD} "lib/pips/${LIB_FILE:S/.so/R2.so/}" >>${TMPPLIST}
+.endif
+	@${ECHO_CMD} "@dirrm lib/pips" >>${TMPPLIST}
+.for f in ${PATCH_PRN}
+	@${ECHO_CMD} "libexec/pips/${PRT_MODEL}/${f}" >>${TMPPLIST}
+.endfor
+	@${ECHO_CMD} "@dirrm libexec/pips/${PRT_MODEL}" >>${TMPPLIST}
+	@${ECHO_CMD} "@dirrm libexec/pips" >>${TMPPLIST}
+.if ${PORTVERSION} == 2.1.2 || ${PORTVERSION} == 2.6.2
+	${INSTALL_SCRIPT} ${WRKDIR}/ekpd.sh ${PREFIX}/etc/rc.d
+	${INSTALL_SCRIPT} ${WRKDIR}/pips.sh ${PREFIX}/etc/rc.d
+	${PREFIX}/etc/rc.d/pips.sh start
+.endif
+	@${CAT} ${PKGMESSAGE}
+
+.include <bsd.port.post.mk>
diff --git a/print/pips800/distinfo b/print/pips800/distinfo
index 70ef3586f29b..8ba3db153e05 100644
--- a/print/pips800/distinfo
+++ b/print/pips800/distinfo
@@ -1,2 +1,2 @@
-MD5 (pips800-1.3.1.i386.tgz) = 7c42a48ca5350ac137dd12abdd75c6c5
-SIZE (pips800-1.3.1.i386.tgz) = 1063393
+MD5 (pips800-1.3.2.tar.gz) = dd23f135242386f1dd06771330be5f1e
+SIZE (pips800-1.3.2.tar.gz) = 1259738
diff --git a/print/pips800/files/ekpd.sh b/print/pips800/files/ekpd.sh
index d9f52a25966c..6c7b25186701 100644
--- a/print/pips800/files/ekpd.sh
+++ b/print/pips800/files/ekpd.sh
@@ -1,48 +1,38 @@
 #!/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
+# $FreeBSD$
+#
 
-NAME=ekpd
+# PROVIDE: ekpd
+# REQUIRE: DAEMON
+# BEFORE: LOGIN
+# KEYWORD: FreeBSD shutdown
 
-[ -f $DAEMON ] || exit 0
+# Define these ekpd_* variables in one of these files:
+#	/etc/rc.conf
+#	/etc/rc.conf.local
+#	/etc/rc.conf.d/ekpd
+#
+# DO NOT CHANGE THESE DEFAULT VALUES HERE
+#
+ekpd_enable=${ekpd_enable:-"NO"}		# Enable ekpd
+ekpd_flags=${ekpd_flags:-""}			# Flags to ekpd program
 
-OLDMASK=`umask`
-umask 000
+. %%RC_SUBR%%
 
-case "$1" in
+name="ekpd"
+rcvar=`set_rcvar`
+command="%%PREFIX%%/libexec/pips/printer/ekpd"
+start_precmd="ekpd_prestart"
 
-    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 && \
+ekpd_prestart() {
+	OLDMASK=`umask`
+	umask 000
+	[ ! -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
+}
 
-umask $OLDMASK
-exit 0
+load_rc_config $name
+run_rc_command "$1"
diff --git a/print/pips800/files/extra-patch-2.6.2 b/print/pips800/files/extra-patch-2.6.2
new file mode 100644
index 000000000000..23abbabb4ddb
--- /dev/null
+++ b/print/pips800/files/extra-patch-2.6.2
@@ -0,0 +1,109 @@
+Index: ekpd/cbtd.c
+diff -u -p ekpd/cbtd.c.orig ekpd/cbtd.c
+--- ekpd/cbtd.c.orig	Tue Jun 24 15:22:12 2003
++++ ekpd/cbtd.c	Tue Aug 24 19:41:40 2004
+@@ -293,3 +293,14 @@ end_epson_cbt (P_CBTD_INFO p_info)
+ 	
+ 	return err;
+ }
++
++#ifdef __FreeBSD__
++
++void
++__assert_fail(const char *assertion, const char *file, unsigned int line,
++	      const char *function)
++{
++	abort();
++}
++
++#endif
+Index: ekpd/cbtd_comserv.c
+diff -u -p ekpd/cbtd_comserv.c.orig ekpd/cbtd_comserv.c
+--- ekpd/cbtd_comserv.c.orig	Tue Jun 24 15:22:12 2003
++++ ekpd/cbtd_comserv.c	Tue Aug 24 23:37:04 2004
+@@ -591,9 +591,16 @@ servsock_open (int port)
+ 	fd = socket (AF_INET, SOCK_STREAM, 0);
+ 	if (fd < 0) return -1;
+ 
++	memset(&addr, 0, sizeof(addr));
+ 	addr.sin_family = AF_INET;
+ 	addr.sin_addr.s_addr = htonl (INADDR_ANY);
+ 	addr.sin_port = htons (port);
++#ifdef __FreeBSD__
++	addr.sin_len = sizeof(addr);
++#endif
++#if !defined(MSG_NOSIGNAL) && defined(SO_NOSIGPIPE)
++	setsockopt(fd, SOL_SOCKET, SO_NOSIGPIPE, &opt, sizeof(opt));
++#endif
+ 	bind (fd, (struct sockaddr *)&addr, sizeof (addr));
+ 	setsockopt (fd, SOL_SOCKET, SO_REUSEADDR, (char *)&opt, sizeof(int));
+ 	listen (fd, 5);
+@@ -611,7 +618,11 @@ sock_read (int fd, char* buf, int read_s
+ 
+ 	for (i = 0; i < SOCK_ACCSESS_WAIT_MAX; i++)
+ 	{
++#ifndef MSG_NOSIGNAL
++		size = recv (fd, buf, read_size, MSG_DONTWAIT);
++#else
+ 		size = recv (fd, buf, read_size, MSG_NOSIGNAL | MSG_DONTWAIT);
++#endif
+ 		if (size == read_size)
+ 		{
+ 			return 0;
+@@ -641,7 +652,11 @@ sock_write (int fd, char* buf, int write
+ 
+ 	for (i = 0; i < SOCK_ACCSESS_WAIT_MAX; i++)
+ 	{
++#ifndef MSG_NOSIGNAL
++		size = send (fd, buf, write_size, MSG_DONTWAIT);
++#else
+ 		size = send (fd, buf, write_size, MSG_NOSIGNAL | MSG_DONTWAIT);
++#endif
+ 		if (size == write_size)
+ 		{
+ 			fsync (fd);
+Index: src/pfpng.c
+diff -u -p src/pfpng.c.orig src/pfpng.c
+--- src/pfpng.c.orig	Tue Jun 24 15:41:46 2003
++++ src/pfpng.c	Tue Aug 24 19:41:41 2004
+@@ -57,6 +57,8 @@ lib_png_sig_cmp                *dl_png_s
+ void *
+ open_png_library (void)
+ {
++	if (dl_handle_libpng)
++		return (void *)dl_handle_libpng;
+ 	dl_handle_libpng = dlopen ("libpng.so", RTLD_LAZY);
+ 	if (dl_handle_libpng)
+ 	{
+@@ -116,8 +118,12 @@ open_png_library (void)
+ void
+ close_png_library (void)
+ {
+-	if (dl_handle_libpng)
++#if 0
++	if (dl_handle_libpng) {
+ 		dlclose (dl_handle_libpng);
++		dl_handle_libpng = NULL;
++	}
++#endif
+ 
+ 	return;
+ }
+Index: src/pipsCom.c
+diff -u -p src/pipsCom.c.orig src/pipsCom.c
+--- src/pipsCom.c.orig	Tue Jun 24 15:41:46 2003
++++ src/pipsCom.c	Tue Aug 24 23:38:06 2004
+@@ -56,9 +56,13 @@ connect_server (char *host)
+   if (!servinfo) return -1;
+ 
+   sockfd = socket (AF_INET, SOCK_STREAM, 0);
++  memset(&address, 0, sizeof(address));
+   address.sin_family = AF_INET;
+   address.sin_addr = *(struct in_addr *)*hostinfo->h_addr_list;
+   address.sin_port = servinfo->s_port;
++#ifdef __FreeBSD__
++  address.sin_len = sizeof(address);
++#endif
+ 
+   len = sizeof (address);
+   if (connect (sockfd, (struct sockaddr *)&address, len) == -1)
diff --git a/print/pips800/files/extra-patch-2.6.2-common b/print/pips800/files/extra-patch-2.6.2-common
new file mode 100644
index 000000000000..431b4982e7a3
--- /dev/null
+++ b/print/pips800/files/extra-patch-2.6.2-common
@@ -0,0 +1,215 @@
+Index: ekpnavi/ekpcom.c
+diff -u -p ekpnavi/ekpcom.c.orig ekpnavi/ekpcom.c
+--- ekpnavi/ekpcom.c.orig	Wed Jul 30 23:06:39 2003
++++ ekpnavi/ekpcom.c	Tue Aug 24 23:37:45 2004
+@@ -42,15 +42,25 @@ sock_open (void)
+ {
+   int sockfd, len;
+   struct sockaddr_in address;
++#ifndef MSG_NOSIGNAL
++  const int on = 1;
++#endif
+ 
+   if (server_sock_fd >= 0)
+     return 0;
+ 
+   /* ソケットオープン */
+   sockfd = socket (AF_INET, SOCK_STREAM, 0);
++#if !defined(MSG_NOSIGNAL) && defined(SO_NOSIGPIPE)
++  setsockopt(sockfd, SOL_SOCKET, SO_NOSIGPIPE, &on, sizeof(on));
++#endif
++  memset(&address, 0, sizeof(address));
+   address.sin_family = AF_INET;
+   address.sin_addr.s_addr = htonl (INADDR_ANY);
+   address.sin_port = htons (35586);
++#ifdef __FreeBSD__
++  address.sin_len = sizeof(address);
++#endif
+   len = sizeof (address);
+   if (connect (sockfd, (struct sockaddr *)&address, len))
+     {
+@@ -92,7 +102,11 @@ sock_write (char* buf, int* lp_wsize)
+   packet[4] = size % 0xFF;
+   memcpy (packet + Header_Size, buf, size);
+ 
++#ifndef MSG_NOSIGNAL
++  size = send (server_sock_fd, packet, size + Header_Size, 0);
++#else
+   size = send (server_sock_fd, packet, size + Header_Size, MSG_NOSIGNAL);
++#endif
+ 
+   if (size < 0)
+     return -1;
+@@ -116,7 +130,11 @@ sock_read (char* buf, int* lp_rsize)
+   if (size <= 0)
+     return 0;
+ 
++#ifndef MSG_NOSIGNAL
++  dsize = recv (server_sock_fd, packet, size, 0);
++#else
+   dsize = recv (server_sock_fd, packet, size, MSG_NOSIGNAL);
++#endif
+ 
+   if (dsize < 0)
+     return -1;
+Index: ekpstm/ekpcom.c
+diff -u -p ekpstm/ekpcom.c.orig ekpstm/ekpcom.c
+--- ekpstm/ekpcom.c.orig	Thu Jul 31 15:01:39 2003
++++ ekpstm/ekpcom.c	Tue Aug 24 23:37:56 2004
+@@ -42,15 +42,25 @@ sock_open (void)
+ {
+   int sockfd, len;
+   struct sockaddr_in address;
++#ifndef MSG_NOSIGNAL
++  const int on = 1;
++#endif
+ 
+   if (server_sock_fd >= 0)
+     return 0;
+ 
+   /* ソケットオープン */
+   sockfd = socket (AF_INET, SOCK_STREAM, 0);
++#if !defined(MSG_NOSIGNAL) && defined(SO_NOSIGPIPE)
++  setsockopt(sockfd, SOL_SOCKET, SO_NOSIGPIPE, &on, sizeof(on));
++#endif
++  memset(&address, 0, sizeof(address));
+   address.sin_family = AF_INET;
+   address.sin_addr.s_addr = htonl (INADDR_ANY);
+   address.sin_port = htons (35586);
++#ifdef __FreeBSD__
++  address.sin_len = sizeof(address);
++#endif
+   len = sizeof (address);
+   if (connect (sockfd, (struct sockaddr *)&address, len))
+     {
+@@ -92,7 +102,11 @@ sock_write (char* buf, int* lp_wsize)
+   packet[4] = size % 0xFF;
+   memcpy (packet + Header_Size, buf, size);
+ 
++#ifndef MSG_NOSIGNAL
++  size = send (server_sock_fd, packet, size + Header_Size, 0);
++#else
+   size = send (server_sock_fd, packet, size + Header_Size, MSG_NOSIGNAL);
++#endif
+ 
+   if (size < 0)
+     return -1;
+@@ -116,7 +130,11 @@ sock_read (char* buf, int* lp_rsize)
+   if (size <= 0)
+     return 0;
+ 
++#ifndef MSG_NOSIGNAL
++  dsize = recv (server_sock_fd, packet, size, 0);
++#else
+   dsize = recv (server_sock_fd, packet, size, MSG_NOSIGNAL);
++#endif
+ 
+   if (dsize < 0)
+     return -1;
+Index: ekpstm/main.c
+diff -u -p ekpstm/main.c.orig ekpstm/main.c
+--- ekpstm/main.c.orig	Thu Jul 31 15:01:39 2003
++++ ekpstm/main.c	Tue Aug 24 19:41:40 2004
+@@ -69,6 +69,7 @@ main (int argc, char *argv[])
+           break;
+ 	  
+         default:
++          break;
+         }
+     }
+   
+Index: src/Makefile.in
+diff -u src/Makefile.in.orig src/Makefile.in
+--- src/Makefile.in.orig	Fri Oct 24 16:12:54 2003
++++ src/Makefile.in	Tue Aug 24 19:41:40 2004
+@@ -131,7 +131,7 @@
+ # CUPS
+ AM_CFLAGS =  -DGS_PATH=\"gs\" -DLOCALEDIR=\"$(datadir)/locale\" -DPRINTER_MODEL="\"$(MODEL_FULL)\"" -D$(MODEL_L) -DLIBPATH=\"$(libdir)/lib$(MODEL).so\" -DRSC_PATH=\"$(sysconfdir)/pipsrc\" -DSPOOL_NAME=\"$(MODEL)\" -DLOCALE_PATH=\"$(datadir)/locale\" -DNAVI_PATH=\"$(bindir)/ekpnavi\" -DDATA_PATH=\"$(pkgdatadir)\" -DRULED_PATH=\"$(pkgdatadir)/BID.PRN\" -DPATCH_PATH=\"$(pkgdatadir)/PATCH.PRN\" -DBAND_PATH=\"$(pkgdatadir)/BAND.PRN\" -DCUT_PATH=\"$(pkgdatadir)/CUT.PRN\" -D_LPR_DIRECT -fsigned-char -DCUPS_FILTER_PATH=\"$(cupsfilterdir)\"
+ 
+-INCLUDES =  @GTK_CFLAGS@ 
++INCLUDES =  @GTK_CFLAGS@ $(INCLTDL)
+ 
+ libcutils_la_SOURCES =  	str.c str.h 	err.c err.h 	csv.c csv.h 	mem.c mem.h 	def.h
+ 
+@@ -146,12 +146,12 @@
+ rastertopips_SOURCES =  	rastertopips.c
+ 
+ 
+-pipstoprinter_LDFLAGS =  	@LIBLTDL@ 	@CUPS_LIBS@ 	libcutils.la
++pipstoprinter_LDFLAGS =  	@LIBLTDL@ 	@CUPS_LIBS@ -lintl 	libcutils.la
+ 
+ pipstoprinter_SOURCES =  	pipstoprinter.c 	libprtX.h 	debug.c debug.h 	ekpcom.c ekpcom.h 	getstat.c getstat.h
+ 
+ 
+-ekplp_LDFLAGS =  	@CUPS_LIBS@ 	libcutils.la
++ekplp_LDFLAGS =  	@CUPS_LIBS@ -lintl 	libcutils.la
+ 
+ ekplp_SOURCES =  	ekplp.c
+ 
+Index: src/ekpcom.c
+diff -u -p src/ekpcom.c.orig src/ekpcom.c
+--- src/ekpcom.c.orig	Wed Jul 30 22:11:04 2003
++++ src/ekpcom.c	Tue Aug 24 23:37:59 2004
+@@ -52,15 +52,25 @@ sock_open (void)
+ {
+   int sockfd, len;
+   struct sockaddr_in address;
++#ifndef MSG_NOSIGNAL
++  const int on = 1;
++#endif
+ 
+   if (server_sock_fd >= 0)
+     return 0;
+ 
+   /* Socket open */
+   sockfd = socket (AF_INET, SOCK_STREAM, 0);
++#if !defined(MSG_NOSIGNAL) && defined(SO_NOSIGPIPE)
++  setsockopt(sockfd, SOL_SOCKET, SO_NOSIGPIPE, &on, sizeof(on));
++#endif
++  memset(&address, 0, sizeof(address));
+   address.sin_family = AF_INET;
+   address.sin_addr.s_addr = htonl (INADDR_ANY);
+   address.sin_port = htons (PORT_NUMBER);
++#ifdef __FreeBSD__
++  address.sin_len = sizeof(address);
++#endif
+   len = sizeof (address);
+   if (connect (sockfd, (struct sockaddr *)&address, len))
+     {
+@@ -102,7 +112,11 @@ sock_write (char* buf, int* lp_wsize)
+   packet[4] = size % 0xFF;
+   memcpy (packet + Header_Size, buf, size);
+ 
++#ifndef MSG_NOSIGNAL
++  size = send (server_sock_fd, packet, size + Header_Size, 0);
++#else
+   size = send (server_sock_fd, packet, size + Header_Size, MSG_NOSIGNAL);
++#endif
+ 
+   if (size < 0)
+     return -1;
+@@ -126,7 +140,11 @@ sock_read (char* buf, int* lp_rsize)
+   if (size <= 0)
+     return 0;
+ 
++#ifndef MSG_NOSIGNAL
++  dsize = recv (server_sock_fd, packet, size, 0);
++#else
+   dsize = recv (server_sock_fd, packet, size, MSG_NOSIGNAL);
++#endif
+ 
+   if (dsize < 0)
+     return -1;
+Index: src/rastertopips.c
+diff -u -p src/rastertopips.c.orig src/rastertopips.c
+--- src/rastertopips.c.orig	Thu Sep  4 13:34:25 2003
++++ src/rastertopips.c	Tue Aug 24 19:41:41 2004
+@@ -32,6 +32,8 @@
+ #include <string.h>
+ #include <ctype.h>
+ 
++#define NAME_MAX 41
++
+ #define WIDTH_BYTES(bits) (((bits) + 31) / 32 * 4)
+ 
+ typedef struct rtp_filter_option {
diff --git a/print/pips800/files/extra-patch-2.6.2-dtrfilter b/print/pips800/files/extra-patch-2.6.2-dtrfilter
new file mode 100644
index 000000000000..107dc52c2ec7
--- /dev/null
+++ b/print/pips800/files/extra-patch-2.6.2-dtrfilter
@@ -0,0 +1,31 @@
+Index: dtrfilter/main.c
+diff -u -p dtrfilter/main.c.orig dtrfilter/main.c
+--- dtrfilter/main.c.orig	Tue Jun 24 15:25:32 2003
++++ dtrfilter/main.c	Tue Aug 24 19:41:40 2004
+@@ -148,3 +148,26 @@ dtr_fatal (char* msg)
+ 	exit (1);
+ }
+ 
++#if defined(__FreeBSD__) && __GNUC__ > 2
++
++int __rethrow = 0;
++
++void *
++__builtin_new(size_t sz /* XXX: ,std::nothrow_t& nothrow */)
++{
++	void *p;
++
++	if (sz == 0)
++		sz = 1;
++	p = malloc(sz);
++	/* XXX: ERROR HANDLER is not available */
++	return p;
++}
++void
++__builtin_delete(void *ptr)
++{
++	if (ptr)
++		free(ptr);
++}
++
++#endif
diff --git a/print/pips800/files/extra-patch-2.6.2-lpr b/print/pips800/files/extra-patch-2.6.2-lpr
new file mode 100644
index 000000000000..57f9993dc55e
--- /dev/null
+++ b/print/pips800/files/extra-patch-2.6.2-lpr
@@ -0,0 +1,233 @@
+Index: ekpnavi/Makefile.in
+diff -u ekpnavi/Makefile.in.orig ekpnavi/Makefile.in
+--- ekpnavi/Makefile.in.orig	Fri Dec 20 00:09:56 2002
++++ ekpnavi/Makefile.in	Wed Aug 25 18:57:41 2004
+@@ -232,7 +232,7 @@
+ 	if test ! -s Makefile; then \
+ 		./configure --prefix=$(prefix) ;\
+ 	fi ;\
+-	make
++	$(MAKE)
+ 
+ clean-local:
+ 	if test -d $(srcdir)/$(EKPNAVI_PKGNAME); then \
+@@ -243,7 +243,7 @@
+ install-exec-local:
+ 	if test -d $(srcdir)/$(EKPNAVI_PKGNAME); then \
+ 		cd $(srcdir)/$(EKPNAVI_PKGNAME) ;\
+-		make install ;\
++		$(MAKE) install ;\
+ 	fi
+ 
+ $(EKPNAVI_PKGNAME).tar.gz:
+Index: ekpnavi/ekpnavi-1.1.2/src/ekpcom.c
+diff -u -p ekpnavi/ekpnavi-1.1.2/src/ekpcom.c.orig ekpnavi/ekpnavi-1.1.2/src/ekpcom.c
+--- ekpnavi/ekpnavi-1.1.2/src/ekpcom.c.orig	Wed Jul 30 23:06:39 2003
++++ ekpnavi/ekpnavi-1.1.2/src/ekpcom.c	Tue Aug 24 23:37:45 2004
+@@ -42,15 +42,25 @@ sock_open (void)
+ {
+   int sockfd, len;
+   struct sockaddr_in address;
++#ifndef MSG_NOSIGNAL
++  const int on = 1;
++#endif
+ 
+   if (server_sock_fd >= 0)
+     return 0;
+ 
+   /* ソケットオープン */
+   sockfd = socket (AF_INET, SOCK_STREAM, 0);
++#if !defined(MSG_NOSIGNAL) && defined(SO_NOSIGPIPE)
++  setsockopt(sockfd, SOL_SOCKET, SO_NOSIGPIPE, &on, sizeof(on));
++#endif
++  memset(&address, 0, sizeof(address));
+   address.sin_family = AF_INET;
+   address.sin_addr.s_addr = htonl (INADDR_ANY);
+   address.sin_port = htons (35586);
++#ifdef __FreeBSD__
++  address.sin_len = sizeof(address);
++#endif
+   len = sizeof (address);
+   if (connect (sockfd, (struct sockaddr *)&address, len))
+     {
+@@ -92,7 +102,11 @@ sock_write (char* buf, int* lp_wsize)
+   packet[4] = size % 0xFF;
+   memcpy (packet + Header_Size, buf, size);
+ 
++#ifndef MSG_NOSIGNAL
++  size = send (server_sock_fd, packet, size + Header_Size, 0);
++#else
+   size = send (server_sock_fd, packet, size + Header_Size, MSG_NOSIGNAL);
++#endif
+ 
+   if (size < 0)
+     return -1;
+@@ -116,7 +130,11 @@ sock_read (char* buf, int* lp_rsize)
+   if (size <= 0)
+     return 0;
+ 
++#ifndef MSG_NOSIGNAL
++  dsize = recv (server_sock_fd, packet, size, 0);
++#else
+   dsize = recv (server_sock_fd, packet, size, MSG_NOSIGNAL);
++#endif
+ 
+   if (dsize < 0)
+     return -1;
++ #ifdef __FreeBSD__
++   address.sin_len = sizeof(address);
++ #endif
+Index: ekpstm/Makefile.in
+diff -u ekpstm/Makefile.in.orig ekpstm/Makefile.in
+--- ekpstm/Makefile.in.orig	Fri Dec 20 00:09:56 2002
++++ ekpstm/Makefile.in	Wed Aug 25 18:55:20 2004
+@@ -213,7 +213,7 @@
+ 			./configure --prefix=$(prefix) ;\
+ 		fi ;\
+ 	fi ;\
+-	make
++	$(MAKE)
+ 
+ clean-local:
+ 	if test -d $(srcdir)/$(EKPSTM_PKGNAME); then \
+@@ -224,7 +224,7 @@
+ install-exec-local:
+ 	if test -d $(srcdir)/$(EKPSTM_PKGNAME); then \
+ 		cd $(srcdir)/$(EKPSTM_PKGNAME) ;\
+-		make install ;\
++		$(MAKE) install ;\
+ 	fi
+ 
+ #dist-hook:
+Index: ekpstm/ekpstm-1.0.2/src/ekpcom.c
+diff -u -p ekpstm/ekpstm-1.0.2/src/ekpcom.c.orig ekpstm/ekpstm-1.0.2/src/ekpcom.c
+--- ekpstm/ekpstm-1.0.2/src/ekpcom.c.orig	Sat Oct 19 13:01:51 2002
++++ ekpstm/ekpstm-1.0.2/src/ekpcom.c	Wed Aug 25 18:34:15 2004
+@@ -52,14 +52,24 @@ sock_open (void)
+ {
+   int sockfd, len;
+   struct sockaddr_in address;
++#ifndef MSG_NOSIGNAL
++  const int on = 1;
++#endif
+ 
+   if (server_sock_fd >= 0)
+     return 0;
+ 
+   sockfd = socket (AF_INET, SOCK_STREAM, 0);
++#if !defined(MSG_NOSIGNAL) && defined(SO_NOSIGPIPE)
++  setsockopt(sockfd, SOL_SOCKET, SO_NOSIGPIPE, &on, sizeof(on));
++#endif
++  memset(&address, 0, sizeof(address));
+   address.sin_family = AF_INET;
+   address.sin_addr.s_addr = htonl (INADDR_ANY);
+   address.sin_port = htons (35586); /* did hard coding in port number (35586) */
++#ifdef __FreeBSD__
++  address.sin_len = sizeof(address);
++#endif
+   len = sizeof (address);
+   if (connect (sockfd, (struct sockaddr *)&address, len))
+     {
+@@ -114,7 +124,11 @@ sock_write (char* buf, int* lp_wsize)
+   packet[4] = size % 0xFF;	/* date size (lower) */
+   memcpy (packet + Header_Size, buf, size); /* date */
+ 
++#ifndef MSG_NOSIGNAL
++  size = send (server_sock_fd, packet, size + Header_Size, 0);
++#else
+   size = send (server_sock_fd, packet, size + Header_Size, MSG_NOSIGNAL);
++#endif
+ 
+   if (size < 0)
+     return -1;
+@@ -144,7 +158,11 @@ sock_read (char* buf, int* lp_rsize)
+   if (size <= 0)
+     return 0;
+ 
++#ifndef MSG_NOSIGNAL
++  dsize = recv (server_sock_fd, packet, size, 0);
++#else
+   dsize = recv (server_sock_fd, packet, size, MSG_NOSIGNAL);
++#endif
+ 
+   if (dsize < 0)
+     return -1;
+Index: ekpstm/ekpstm-1.0.2/src/main.c
+diff -u -p ekpstm/ekpstm-1.0.2/src/main.c.orig ekpstm/ekpstm-1.0.2/src/main.c
+--- ekpstm/ekpstm-1.0.2/src/main.c.orig	Thu Jul 31 15:01:39 2003
++++ ekpstm/ekpstm-1.0.2/src/main.c	Tue Aug 24 19:41:40 2004
+@@ -69,6 +69,7 @@ main (int argc, char *argv[])
+           break;
+ 	  
+         default:
++          break;
+         }
+     }
+   
+Index: src/Makefile.in
+diff -u src/Makefile.in.orig src/Makefile.in
+--- src/Makefile.in.orig	Fri Dec 20 00:09:54 2002
++++ src/Makefile.in	Wed Aug 25 18:31:51 2004
+@@ -104,7 +104,7 @@
+ MODEL_L = $(shell echo $(MODEL) | tr [:lower:] [:upper:])
+ CFLAGS =  -DGS_PATH=\"gs\" -DLOCALEDIR=\"$(datadir)/locale\" -DPRINTER_MODEL="\"$(MODEL_FULL)\"" -D$(MODEL_L) -DLIBPATH=\"$(libdir)/lib$(MODEL).so\" -DRSC_PATH=\"$(sysconfdir)/pipsrc\" -DSPOOL_NAME=\"$(MODEL)\" -DLOCALE_PATH=\"$(datadir)/locale\" -DNAVI_PATH=\"$(bindir)/ekpnavi\" -DDATA_PATH=\"$(pkgdatadir)\" -DRULED_PATH=\"$(pkgdatadir)/BID.PRN\" -DPATCH_PATH=\"$(pkgdatadir)/PATCH.PRN\" -DBAND_PATH=\"$(pkgdatadir)/BAND.PRN\" -DCUT_PATH=\"$(pkgdatadir)/CUT.PRN\" -D_LPR_DIRECT @CFLAGS@ -fsigned-char
+ 
+-INCLUDES =  @GTK_CFLAGS@ 
++INCLUDES =  @GTK_CFLAGS@ $(INCLTDL)
+ 
+ FILTER_RESOURCE = opt$(MODEL_L).rsc
+ 
+Index: src/ekpcom.c
+diff -u -p src/ekpcom.c.orig src/ekpcom.c
+--- src/ekpcom.c.orig	Sat Oct 19 16:56:12 2002
++++ src/ekpcom.c	Wed Aug 25 18:40:11 2004
+@@ -51,15 +51,25 @@ sock_open (void)
+ {
+   int sockfd, len;
+   struct sockaddr_in address;
++#ifndef MSG_NOSIGNAL
++  const int on = 1;
++#endif
+ 
+   if (server_sock_fd >= 0)
+     return 0;
+ 
+   /* ソケットオープン */
+   sockfd = socket (AF_INET, SOCK_STREAM, 0);
++#if !defined(MSG_NOSIGNAL) && defined(SO_NOSIGPIPE)
++  setsockopt(sockfd, SOL_SOCKET, SO_NOSIGPIPE, &on, sizeof(on));
++#endif
++  memset(&address, 0, sizeof(address));
+   address.sin_family = AF_INET;
+   address.sin_addr.s_addr = htonl (INADDR_ANY);
+   address.sin_port = htons (35586);
++#ifdef __FreeBSD__
++  address.sin_len = sizeof(address);
++#endif
+   len = sizeof (address);
+   if (connect (sockfd, (struct sockaddr *)&address, len))
+     {
+@@ -101,7 +111,11 @@ sock_write (char* buf, int* lp_wsize)
+   packet[4] = size % 0xFF;
+   memcpy (packet + Header_Size, buf, size);
+ 
++#ifndef MSG_NOSIGNAL
++  size = send (server_sock_fd, packet, size + Header_Size, 0);
++#else
+   size = send (server_sock_fd, packet, size + Header_Size, MSG_NOSIGNAL);
++#endif
+ 
+   if (size < 0)
+     return -1;
+@@ -125,7 +139,11 @@ sock_read (char* buf, int* lp_rsize)
+   if (size <= 0)
+     return 0;
+ 
++#ifndef MSG_NOSIGNAL
++  dsize = recv (server_sock_fd, packet, size, 0);
++#else
+   dsize = recv (server_sock_fd, packet, size, MSG_NOSIGNAL);
++#endif
+ 
+   if (dsize < 0)
+     return -1;
diff --git a/print/pips800/files/filter13.rev b/print/pips800/files/filter13.rev
deleted file mode 100644
index 7a5cdc9c487b..000000000000
--- a/print/pips800/files/filter13.rev
+++ /dev/null
@@ -1,15 +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 Ver. 1.3 (only pips3300)
-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/pips.sh b/print/pips800/files/pips.sh
new file mode 100644
index 000000000000..81e79446bf70
--- /dev/null
+++ b/print/pips800/files/pips.sh
@@ -0,0 +1,28 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: pips
+# REQUIRE: DAEMON
+# BEFORE: LOGIN
+# KEYWORD: FreeBSD shutdown
+
+# Define these pips_* variables in one of these files:
+#	/etc/rc.conf
+#	/etc/rc.conf.local
+#	/etc/rc.conf.d/pips
+#
+# DO NOT CHANGE THESE DEFAULT VALUES HERE
+#
+pips_enable=${pips_enable:-"YES"}		# Enable pips
+
+. %%RC_SUBR%%
+
+name="pips"
+rcvar=`set_rcvar`
+start_cmd="/sbin/ldconfig -m %%PREFIX%%/lib/pips"
+stop_cmd=":"
+
+load_rc_config $name
+run_rc_command "$1"
diff --git a/print/pips800/files/readme_for_zh b/print/pips800/files/readme_for_zh
deleted file mode 100644
index 6c7ff5ff49ff..000000000000
--- a/print/pips800/files/readme_for_zh
+++ /dev/null
@@ -1,32 +0,0 @@
-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
index 7388c31c101b..488d05be101c 100644
--- a/print/pips800/files/setup
+++ b/print/pips800/files/setup
@@ -6,13 +6,13 @@
 ### in pips900-2.1.i386.tgz
 ### by taoka
 
-SCRIPT_PATH=%%PREFIX%%/libexec/pips%%PRTYPE%%/scripts
+SCRIPT_PATH=%%PREFIX%%/libexec/pips/%%PRT_MODEL%%/scripts
 PRT_MODEL=%%PRT_MODEL%%
 PIPS_COMMAND=pips%%PRTYPE%%
-PIPS_FILTER_PATH=%%PREFIX%%/libexec/%%BASE_NAME%%/filter%%PRTYPE%%.rev
+PIPS_FILTER_PATH=%%PREFIX%%/libexec/pips/%%PRT_MODEL%%/filter%%PRTYPE%%.rev
 
-SETUP_PATH=%%PREFIX%%/libexec/pips%%PRTYPE%%/setup
-EKPDRC=%%LINUXBASE%%/etc/ekpdrc
+SETUP_PATH=%%PREFIX%%/libexec/pips/%%PRT_MODEL%%/setup
+EKPDRC=%%PREFIX%%/etc/ekpdrc
 VERSION=%%VERSION%%
 DEF_PRT_PATH=/dev/ulpt0
 WITH_EKPD=%%WITH_EKPD%%
diff --git a/print/pips800/pkg-descr b/print/pips800/pkg-descr
index 41d6b9c16446..ca837b624ae1 100644
--- a/print/pips800/pkg-descr
+++ b/print/pips800/pkg-descr
@@ -12,14 +12,3 @@ print out more than one page. Then you execute the next command:
 /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-message b/print/pips800/pkg-message
new file mode 100644
index 000000000000..afc07a93800c
--- /dev/null
+++ b/print/pips800/pkg-message
@@ -0,0 +1,8 @@
+
+You need to add following lines into /etc/libmap.conf:
+
+# Photo Image Print System (for EPSON bubble jet printer)
+[/usr/local/lib/pips/%%LIB_FILE%%]
+libc.so.6			pluginwrapper/pips.so
+libdl.so.2			pluginwrapper/pips.so
+
diff --git a/print/pips800/pkg-plist b/print/pips800/pkg-plist
new file mode 100644
index 000000000000..9f523e4a25c3
--- /dev/null
+++ b/print/pips800/pkg-plist
@@ -0,0 +1,63 @@
+%%EKPNAVI%%bin/ekpnavi
+bin/ekpstm
+%%GSCONFIG%%bin/gsconfig%%PRTYPE%%
+bin/pips%%PRTYPE%%
+%%CUPS%%libexec/cups/backend/ekplp
+%%CUPS%%libexec/cups/filter/pipstoprinter
+%%CUPS%%libexec/cups/filter/rastertopips
+%%CUPS%%libexec/pips/%%PRT_MODEL%%/cupsopt.csv
+libexec/pips/%%PRT_MODEL%%/filter%%PRTYPE%%
+libexec/pips/%%PRT_MODEL%%/lang
+libexec/pips/%%PRT_MODEL%%/setup
+libexec/pips/%%PRT_MODEL%%/scripts/en.lc
+libexec/pips/%%PRT_MODEL%%/scripts/ja.lc
+@dirrm libexec/pips/%%PRT_MODEL%%/scripts
+%%DTRFILTER%%libexec/pips/printer/dtrfilter
+libexec/pips/printer/ekpd
+%%DTRFILTER%%libexec/pips/printer/freset
+%%DTRFILTER%%libexec/pips/printer/gsconfig
+%%DTRFILTER%%libexec/pips/printer/paper_list.csv
+@dirrm libexec/pips/printer
+%%CUPS%%share/cups/model/%%MODEL_FILE%%
+%%PORTDOCS%%share/doc/pips%%PRTYPE%%/COPYING
+%%PORTDOCS%%share/doc/pips%%PRTYPE%%/COPYING.KOWA
+%%PORTDOCS%%share/doc/pips%%PRTYPE%%/COPYING.KOWA.ja
+%%PORTDOCS%%share/doc/pips%%PRTYPE%%/COPYING.LIB
+share/doc/pips%%PRTYPE%%/readme%%PRTYPE%%
+%%CUPS%%share/doc/pips%%PRTYPE%%/readme%%PRTYPE%%-cups
+share/doc/pips%%PRTYPE%%/%%LIB_README%%
+@dirrm share/doc/pips%%PRTYPE%%
+etc/rc.d/ekpd.sh
+etc/ekpdrc
+etc/pipsrc
+@exec chmod 666 %D/etc/pipsrc
+share/locale/de/LC_MESSAGES/pips%%PRTYPE%%.mo
+share/locale/es/LC_MESSAGES/pips%%PRTYPE%%.mo
+share/locale/fr/LC_MESSAGES/pips%%PRTYPE%%.mo
+share/locale/it/LC_MESSAGES/pips%%PRTYPE%%.mo
+share/locale/ja/LC_MESSAGES/pips%%PRTYPE%%.mo
+share/locale/ko/LC_MESSAGES/pips%%PRTYPE%%.mo
+share/locale/nl/LC_MESSAGES/pips%%PRTYPE%%.mo
+share/locale/pt/LC_MESSAGES/pips%%PRTYPE%%.mo
+share/locale/zh/LC_MESSAGES/pips%%PRTYPE%%.mo
+share/locale/zh_TW/LC_MESSAGES/pips%%PRTYPE%%.mo
+%%LPR%%share/locale/de/LC_MESSAGES/ekpnavi.mo
+%%LPR%%share/locale/es/LC_MESSAGES/ekpnavi.mo
+%%LPR%%share/locale/fr/LC_MESSAGES/ekpnavi.mo
+%%LPR%%share/locale/it/LC_MESSAGES/ekpnavi.mo
+%%LPR%%share/locale/ja/LC_MESSAGES/ekpnavi.mo
+%%LPR%%share/locale/ko/LC_MESSAGES/ekpnavi.mo
+%%LPR%%share/locale/nl/LC_MESSAGES/ekpnavi.mo
+%%LPR%%share/locale/pt/LC_MESSAGES/ekpnavi.mo
+%%LPR%%share/locale/zh/LC_MESSAGES/ekpnavi.mo
+%%LPR%%share/locale/zh_TW/LC_MESSAGES/ekpnavi.mo
+%%LPR%%share/locale/de/LC_MESSAGES/ekpstm.mo
+%%LPR%%share/locale/es/LC_MESSAGES/ekpstm.mo
+%%LPR%%share/locale/fr/LC_MESSAGES/ekpstm.mo
+%%LPR%%share/locale/it/LC_MESSAGES/ekpstm.mo
+%%LPR%%share/locale/ja/LC_MESSAGES/ekpstm.mo
+%%LPR%%share/locale/ko/LC_MESSAGES/ekpstm.mo
+%%LPR%%share/locale/nl/LC_MESSAGES/ekpstm.mo
+%%LPR%%share/locale/pt/LC_MESSAGES/ekpstm.mo
+%%LPR%%share/locale/zh/LC_MESSAGES/ekpstm.mo
+%%LPR%%share/locale/zh_TW/LC_MESSAGES/ekpstm.mo
diff --git a/print/pips800/pkg-plist10 b/print/pips800/pkg-plist10
deleted file mode 100644
index aa4f8c290385..000000000000
--- a/print/pips800/pkg-plist10
+++ /dev/null
@@ -1,40 +0,0 @@
-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-plist13 b/print/pips800/pkg-plist13
deleted file mode 100644
index 91b269e0ee2d..000000000000
--- a/print/pips800/pkg-plist13
+++ /dev/null
@@ -1,14 +0,0 @@
-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%%
-%%LIB_README%%
-@dirrm libexec/%%BASE_NAME%%
-@dirrm share/doc/%%BASE_NAME%%
-@cwd /compat/linux
-%%LIB_DIR_FILE%%
diff --git a/print/pips800/pkg-plist131 b/print/pips800/pkg-plist131
deleted file mode 100644
index aa4f8c290385..000000000000
--- a/print/pips800/pkg-plist131
+++ /dev/null
@@ -1,40 +0,0 @@
-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-plist132 b/print/pips800/pkg-plist132
new file mode 100644
index 000000000000..149b02616c5a
--- /dev/null
+++ b/print/pips800/pkg-plist132
@@ -0,0 +1,28 @@
+bin/pips%%PRTYPE%%
+libexec/pips/%%PRT_MODEL%%/filter%%PRTYPE%%
+libexec/pips/%%PRT_MODEL%%/filter%%PRTYPE%%.rev
+libexec/pips/%%PRT_MODEL%%/gsconfig%%PRTYPE%%
+libexec/pips/%%PRT_MODEL%%/lang
+libexec/pips/%%PRT_MODEL%%/setup
+libexec/pips/%%PRT_MODEL%%/scripts/en.lc
+libexec/pips/%%PRT_MODEL%%/scripts/ja.lc
+@dirrm libexec/pips/%%PRT_MODEL%%/scripts
+%%PORTDOCS%%share/doc/pips%%PRTYPE%%/COPYING
+%%PORTDOCS%%share/doc/pips%%PRTYPE%%/COPYING.KOWA
+%%PORTDOCS%%share/doc/pips%%PRTYPE%%/COPYING.KOWA.ja
+%%PORTDOCS%%share/doc/pips%%PRTYPE%%/COPYING.LIB
+share/doc/pips%%PRTYPE%%/readme%%PRTYPE%%
+share/doc/pips%%PRTYPE%%/%%LIB_README%%
+@dirrm share/doc/pips%%PRTYPE%%
+etc/pipsrc
+@exec chmod 666 %D/etc/pipsrc
+share/locale/de/LC_MESSAGES/pips%%PRTYPE%%.mo
+share/locale/es/LC_MESSAGES/pips%%PRTYPE%%.mo
+share/locale/fr/LC_MESSAGES/pips%%PRTYPE%%.mo
+share/locale/it/LC_MESSAGES/pips%%PRTYPE%%.mo
+share/locale/ja/LC_MESSAGES/pips%%PRTYPE%%.mo
+share/locale/ko/LC_MESSAGES/pips%%PRTYPE%%.mo
+share/locale/nl/LC_MESSAGES/pips%%PRTYPE%%.mo
+share/locale/pt/LC_MESSAGES/pips%%PRTYPE%%.mo
+share/locale/zh/LC_MESSAGES/pips%%PRTYPE%%.mo
+share/locale/zh_TW/LC_MESSAGES/pips%%PRTYPE%%.mo
diff --git a/print/pips800/pkg-plist20 b/print/pips800/pkg-plist20
deleted file mode 100644
index a22fc7e53d70..000000000000
--- a/print/pips800/pkg-plist20
+++ /dev/null
@@ -1,32 +0,0 @@
-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
deleted file mode 100644
index 15c0d1ff266f..000000000000
--- a/print/pips800/pkg-plist21
+++ /dev/null
@@ -1,75 +0,0 @@
-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
diff --git a/print/pips820/Makefile b/print/pips820/Makefile
index 854809142fe2..8820ef9d7eb2 100644
--- a/print/pips820/Makefile
+++ b/print/pips820/Makefile
@@ -5,10 +5,10 @@
 # $FreeBSD$
 #
 
-PORTVERSION=	1.3.1
+PORTVERSION=	1.3.2
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON PM-820C
 
 PRTYPE=		820
 
-.include "${MASTERDIR}/Makefile"
+.include "${MASTERDIR}/Makefile.pips"
diff --git a/print/pips820/distinfo b/print/pips820/distinfo
index 33c5dacfacd5..bd2753cc2886 100644
--- a/print/pips820/distinfo
+++ b/print/pips820/distinfo
@@ -1,2 +1,2 @@
-MD5 (pips820-1.3.1.i386.tgz) = e2030bc3ff5fad3a63d5b59ab07f5db5
-SIZE (pips820-1.3.1.i386.tgz) = 1214079
+MD5 (pips820-1.3.2.tar.gz) = 65ed339c0af3c9fa51193dc8fa818baf
+SIZE (pips820-1.3.2.tar.gz) = 1406958
diff --git a/print/pips820/pkg-descr b/print/pips820/pkg-descr
index 4621922a11ee..62279b4d4688 100644
--- a/print/pips820/pkg-descr
+++ b/print/pips820/pkg-descr
@@ -12,14 +12,3 @@ print out more than one page. Then you execute the next command:
 /usr/local/libexec/pips820/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 pips820          env LANG=fr pips820	  
-  env LANG=de pips820             env LANG=es pips820	  
-  env LANG=it pips820             env LANG=nl pips820
-  env LANG=pt pips820             env LANG=ko pips820 (*)
-  env LANG=zh_CN pips820 (*)(**)  env LANG=zh_TW.Big5 pips820 (**)
-
-(*) These do not work well.
-(**) See more informations in /usr/local/share/doc/pips820/readme_for_zh
diff --git a/print/pips880/Makefile b/print/pips880/Makefile
index 892582aeee76..f10d5944db42 100644
--- a/print/pips880/Makefile
+++ b/print/pips880/Makefile
@@ -5,10 +5,10 @@
 # $FreeBSD$
 #
 
-PORTVERSION=	1.3
+PORTVERSION=	2.1.2
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON PM-880C
 
 PRTYPE=		880
 
-.include "${MASTERDIR}/Makefile"
+.include "${MASTERDIR}/Makefile.pips"
diff --git a/print/pips880/distinfo b/print/pips880/distinfo
index 609840a4253b..462ce7fa359d 100644
--- a/print/pips880/distinfo
+++ b/print/pips880/distinfo
@@ -1,2 +1,2 @@
-MD5 (pips880-1.3.i386.tgz) = b427ec8fe8686e78b88d047f09a7f30d
-SIZE (pips880-1.3.i386.tgz) = 1780484
+MD5 (pips880-2.1.2.tar.gz) = 24f652fff185702017142afe7369f620
+SIZE (pips880-2.1.2.tar.gz) = 2669121
diff --git a/print/pips880/pkg-descr b/print/pips880/pkg-descr
index 99dba9d6cf1e..fafd10f7cc69 100644
--- a/print/pips880/pkg-descr
+++ b/print/pips880/pkg-descr
@@ -12,6 +12,3 @@ print out more than one page. Then you execute the next command:
 /usr/local/libexec/pips880/setup
 
 to setup /etc/printcap, make a spool in /var/spool/lpd/ and so on.
-
-To run with Japanese messages, you have to execute as follows:
- env LANG=ja_JP pips880
diff --git a/print/pips900/Makefile b/print/pips900/Makefile
index 481584844b0e..9275e93538e8 100644
--- a/print/pips900/Makefile
+++ b/print/pips900/Makefile
@@ -5,10 +5,10 @@
 # $FreeBSD$
 #
 
-PORTVERSION=	1.3
+PORTVERSION=	2.1.2
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON PM-900C
 
 PRTYPE=		900
 
-.include "${MASTERDIR}/Makefile"
+.include "${MASTERDIR}/Makefile.pips"
diff --git a/print/pips900/distinfo b/print/pips900/distinfo
index 5eeba67756f0..e62ad3843c6f 100644
--- a/print/pips900/distinfo
+++ b/print/pips900/distinfo
@@ -1,2 +1,2 @@
-MD5 (pips900-1.3.i386.tgz) = 2f133b29dc2f104553f32dbfffdf0b7a
-SIZE (pips900-1.3.i386.tgz) = 1139396
+MD5 (pips900-2.1.2.tar.gz) = cdd1ded907d20a8f6c76fb642d93e986
+SIZE (pips900-2.1.2.tar.gz) = 2017273
diff --git a/print/pips900/pkg-descr b/print/pips900/pkg-descr
index 9671d9e49528..630105e759c7 100644
--- a/print/pips900/pkg-descr
+++ b/print/pips900/pkg-descr
@@ -12,14 +12,3 @@ print out more than one page. Then you execute the next command:
 /usr/local/libexec/pips900/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 pips900          env LANG=fr pips900	  
-  env LANG=de pips900             env LANG=es pips900	  
-  env LANG=it pips900             env LANG=nl pips900
-  env LANG=pt pips900             env LANG=ko pips900 (*)
-  env LANG=zh_CN pips900 (*)(**)  env LANG=zh_TW.Big5 pips900 (**)
-
-(*) These do not work well.
-(**) See more informations in /usr/local/share/doc/pips900/readme_for_zh