(1) When I committed ports of pips{2200,3000,3300,670,750,900},

    I must commit modification for pips800 which is a master port for these.
    I forgot it.
(2) Simplify slave ports in japapese
    (modifying Makefile and deleting pkg-plist).

11 files changed, 26 insertions, 41 deletions

diff --git a/print/pips2200/Makefile b/print/pips2200/Makefile
index 5f42dbc264f..c8550facb6e 100644
--- a/print/pips2200/Makefile
+++ b/print/pips2200/Makefile
@@ -5,12 +5,8 @@
 # $FreeBSD$
 #
 
-CATEGORIES=	print linux
 PORTVERSION=	1.3
-MASTER_SITES=	http://www.epkowa.on.arena.ne.jp/pips/data/${PRTYPE}/
 MASTERDIR=	${.CURDIR}/../pips800
-COMMENT=	${.CURDIR}/pkg-comment
-DESCR=		${.CURDIR}/pkg-descr
 PRTYPE=		2200
 
 .include "${MASTERDIR}/Makefile"
diff --git a/print/pips3000/Makefile b/print/pips3000/Makefile
index 35b296c2ed9..344abdf4eba 100644
--- a/print/pips3000/Makefile
+++ b/print/pips3000/Makefile
@@ -5,12 +5,8 @@
 # $FreeBSD$
 #
 
-CATEGORIES=	print linux
 PORTVERSION=	1.3
-MASTER_SITES=	http://www.epkowa.on.arena.ne.jp/pips/data/${PRTYPE}/
 MASTERDIR=	${.CURDIR}/../pips800
-COMMENT=	${.CURDIR}/pkg-comment
-DESCR=		${.CURDIR}/pkg-descr
 PRTYPE=		3000
 
 .include "${MASTERDIR}/Makefile"
diff --git a/print/pips3300/Makefile b/print/pips3300/Makefile
index 2b1e018f550..0fa87164e97 100644
--- a/print/pips3300/Makefile
+++ b/print/pips3300/Makefile
@@ -5,12 +5,8 @@
 # $FreeBSD$
 #
 
-CATEGORIES=	print linux
 PORTVERSION=	1.3
-MASTER_SITES=	http://www.epkowa.on.arena.ne.jp/pips/data/${PRTYPE}/
 MASTERDIR=	${.CURDIR}/../pips800
-COMMENT=	${.CURDIR}/pkg-comment
-DESCR=		${.CURDIR}/pkg-descr
 PRTYPE=		3300
 
 .include "${MASTERDIR}/Makefile"
diff --git a/print/pips670/Makefile b/print/pips670/Makefile
index 803f1abd1d9..79f10e9d9a3 100644
--- a/print/pips670/Makefile
+++ b/print/pips670/Makefile
@@ -5,12 +5,8 @@
 # $FreeBSD$
 #
 
-CATEGORIES=	print linux
 PORTVERSION=	1.3
-MASTER_SITES=	http://www.epkowa.on.arena.ne.jp/pips/data/${PRTYPE}/
 MASTERDIR=	${.CURDIR}/../pips800
-COMMENT=	${.CURDIR}/pkg-comment
-DESCR=		${.CURDIR}/pkg-descr
 PRTYPE=		670
 
 .include "${MASTERDIR}/Makefile"
diff --git a/print/pips750_2000/Makefile b/print/pips750_2000/Makefile
index c2b018723cb..8fd4663b870 100644
--- a/print/pips750_2000/Makefile
+++ b/print/pips750_2000/Makefile
@@ -5,13 +5,9 @@
 # $FreeBSD$
 #
 
-CATEGORIES=	print linux
 PORTVERSION=	1.3
-#MASTER_SITES=	http://www.epkowa.on.arena.ne.jp/pips/data/${PRTYPE}/
 MASTER_SITES=	http://www.epkowa.on.arena.ne.jp/pips/data/750/
 MASTERDIR=	${.CURDIR}/../pips800
-COMMENT=	${.CURDIR}/pkg-comment
-DESCR=		${.CURDIR}/pkg-descr
 PRTYPE=		750_2000
 
 .include "${MASTERDIR}/Makefile"
diff --git a/print/pips760/Makefile b/print/pips760/Makefile
index ea5d531be6f..56d5f6c1511 100644
--- a/print/pips760/Makefile
+++ b/print/pips760/Makefile
@@ -5,10 +5,7 @@
 # $FreeBSD$
 #
 
-MASTER_SITES=	http://www.epkowa.on.arena.ne.jp/pips/data/${PRTYPE}/
 MASTERDIR=	${.CURDIR}/../pips800
-COMMENT=	${.CURDIR}/pkg-comment
-DESCR=		${.CURDIR}/pkg-descr
 PRTYPE=		760
 
 .include "${MASTERDIR}/Makefile"
diff --git a/print/pips770/Makefile b/print/pips770/Makefile
index 1d0d06de576..1065c884da8 100644
--- a/print/pips770/Makefile
+++ b/print/pips770/Makefile
@@ -5,10 +5,7 @@
 # $FreeBSD$
 #
 
-MASTER_SITES=	http://www.epkowa.on.arena.ne.jp/pips/data/${PRTYPE}/
 MASTERDIR=	${.CURDIR}/../pips800
-COMMENT=	${.CURDIR}/pkg-comment
-DESCR=		${.CURDIR}/pkg-descr
 PRTYPE=		770
 
 .include "${MASTERDIR}/Makefile"
diff --git a/print/pips800/Makefile b/print/pips800/Makefile
index c2ee82d551b..9c2b12e9aa0 100644
--- a/print/pips800/Makefile
+++ b/print/pips800/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	pips${PRTYPE}
-PORTVERSION=	1.2
-CATEGORIES=	print linux
-MASTER_SITES?=	http://www.epkowa.on.arena.ne.jp/pips/data/800/
+PORTVERSION?=	1.2
+CATEGORIES?=	print linux
+MASTER_SITES?=	http://www.epkowa.on.arena.ne.jp/pips/data/${PRTYPE}/
 DISTNAME?=	${PORTNAME}-${PORTVERSION}
 EXTRACT_SUFX=	.i386.tgz
 
@@ -20,11 +20,20 @@ RUN_DEPENDS+=	/compat/linux/lib/libc.so.6:${PORTSDIR}/emulators/linux_base \
 
 ONLY_FOR_ARCHS= i386
 NO_WRKSUBDIR=	yes
-PLIST_SUB=	BASE_NAME=${BASE_NAME} PRTYPE=${PRTYPE}
+PLIST_SUB=	BASE_NAME=${BASE_NAME} PRTYPE=${PRTYPE} LIB_DIR_FILE=usr/lib/${LIB_FILE} LIB_README=${LIB_NAME}
 MD5_FILE=	${.CURDIR}/distinfo
-
+.if (${PORTVERSION} == 1.2)
+LIB_FILE=	libPrt${PRTYPE}.so
+LIB_NAME=	"@comment Readme of the Lib for only 1.3 or later"
+.else
+LIB_FILE=	libpm${PRTYPE}c.so
+LIB_NAME=	share/doc/${BASE_NAME}/libpm${PRTYPE}c.readme
+.endif
 BASE_NAME=	pips${PRTYPE}
 PAPERSIZE?=	a4
+# for slave ports
+COMMENT=	${.CURDIR}/pkg-comment
+DESCR=		${.CURDIR}/pkg-descr
 
 .include <bsd.port.pre.mk>
 PRTYPE?=	800
@@ -47,16 +56,19 @@ do-install:
 #	${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}/libPrt${PRTYPE}.so /compat/linux/usr/lib/
+	${INSTALL_DATA} ${WRKSRC}/${LIB_FILE} /compat/linux/usr/lib/
 	-/compat/linux/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}/libpm${PRTYPE}c.readme ${PREFIX}/share/doc/${BASE_NAME}
+.endif
 .endif
 
-# target for maintainer
+# a target for the maintainer
 _MAKE_COMMENT_DESCR:
 .if ${PRTYPE} != 800
 .for file in pkg-comment pkg-descr
@@ -65,6 +77,11 @@ _MAKE_COMMENT_DESCR:
 		-e 's/pm800c/pm820c_3300c/g' \
 		-e 's/800/${PRTYPE}/g' \
 		${MASTERDIR}/${file} > ${.CURDIR}/${file}
+.elif ${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}
 .else
 	${SED}	-e 's/800/${PRTYPE}/g' ${MASTERDIR}/${file} \
 		> ${.CURDIR}/${file}
diff --git a/print/pips800/pkg-plist b/print/pips800/pkg-plist
index 345cfec523d..3c5261cd267 100644
--- a/print/pips800/pkg-plist
+++ b/print/pips800/pkg-plist
@@ -3,8 +3,9 @@ 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
-usr/lib/libPrt%%PRTYPE%%.so
+%%LIB_DIR_FILE%%
 @exec /compat/linux/sbin/ldconfig ; true
diff --git a/print/pips820_3300/Makefile b/print/pips820_3300/Makefile
index 7c9bb90cf87..43bfed2b07d 100644
--- a/print/pips820_3300/Makefile
+++ b/print/pips820_3300/Makefile
@@ -6,10 +6,7 @@
 #
 
 MASTER_SITES=	http://www.epkowa.on.arena.ne.jp/pips/data/${PRTYPE:S,_3300,,}/
-
 MASTERDIR=	${.CURDIR}/../pips800
-COMMENT=	${.CURDIR}/pkg-comment
-DESCR=		${.CURDIR}/pkg-descr
 PRTYPE=		820_3300
 
 .include "${MASTERDIR}/Makefile"
diff --git a/print/pips900/Makefile b/print/pips900/Makefile
index 63064c632e9..5bb17242d99 100644
--- a/print/pips900/Makefile
+++ b/print/pips900/Makefile
@@ -5,12 +5,8 @@
 # $FreeBSD$
 #
 
-CATEGORIES=	print linux
 PORTVERSION=	1.3
-MASTER_SITES=	http://www.epkowa.on.arena.ne.jp/pips/data/${PRTYPE}/
 MASTERDIR=	${.CURDIR}/../pips800
-COMMENT=	${.CURDIR}/pkg-comment
-DESCR=		${.CURDIR}/pkg-descr
 PRTYPE=		900
 
 .include "${MASTERDIR}/Makefile"