- master site was moved.

- most of the tarballs were rerolled.
- preparation for adding EPSON Stylus C80 Series support.

75 files changed, 126 insertions, 101 deletions

diff --git a/print/pips-sc60s/Makefile b/print/pips-sc60s/Makefile
index 3ed4748..75bc218 100644
--- a/print/pips-sc60s/Makefile
+++ b/print/pips-sc60s/Makefile
@@ -6,10 +6,12 @@
 #
 
 PORTVERSION=	2.5.2
+PORTREVISION=	1
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON Stylus C60 Series
 
 PRTYPE=		-sc60s
+SUBDIR_SUFFIX=	.1
 
 PATCH_PRN=	BID.PRN
 
diff --git a/print/pips-sc60s/distinfo b/print/pips-sc60s/distinfo
index 5aee73f..0061c04 100644
--- a/print/pips-sc60s/distinfo
+++ b/print/pips-sc60s/distinfo
@@ -1,2 +1,2 @@
-MD5 (pips-sc60s-2.5.2.tar.gz) = 62f6799c78d2229293de1c9b7ae4f1ed
-SIZE (pips-sc60s-2.5.2.tar.gz) = 2012413
+MD5 (pips-sc60s-2.5.2.tar.gz) = ef798c89ee91c14477df997f73975829
+SIZE (pips-sc60s-2.5.2.tar.gz) = 2017464
diff --git a/print/pips-sc65_66s/Makefile b/print/pips-sc65_66s/Makefile
index fa47ee3..cd4e245 100644
--- a/print/pips-sc65_66s/Makefile
+++ b/print/pips-sc65_66s/Makefile
@@ -6,6 +6,7 @@
 #
 
 PORTVERSION=	2.6.2
+PORTREVISION=	1
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON Stylus C65/C66 Series
 
diff --git a/print/pips-sc65_66s/distinfo b/print/pips-sc65_66s/distinfo
index 276cfc9..acedea7 100644
--- a/print/pips-sc65_66s/distinfo
+++ b/print/pips-sc65_66s/distinfo
@@ -1,2 +1,2 @@
-MD5 (pips-sc65_66s-2.6.2.tar.gz) = e56154ed4dff1550be42e1e99c317604
-SIZE (pips-sc65_66s-2.6.2.tar.gz) = 2535799
+MD5 (pips-sc65_66s-2.6.2.tar.gz) = 61b5197c18e13f78648a0a7fbe77020d
+SIZE (pips-sc65_66s-2.6.2.tar.gz) = 2541029
diff --git a/print/pips-sc84_83s/Makefile b/print/pips-sc84_83s/Makefile
index 6d89d81..42cdb85 100644
--- a/print/pips-sc84_83s/Makefile
+++ b/print/pips-sc84_83s/Makefile
@@ -6,6 +6,7 @@
 #
 
 PORTVERSION=	2.6.2
+PORTREVISION=	1
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON Stylus C84/C83 Series
 
diff --git a/print/pips-sc84_83s/distinfo b/print/pips-sc84_83s/distinfo
index 8f834d9..c6cd3c9 100644
--- a/print/pips-sc84_83s/distinfo
+++ b/print/pips-sc84_83s/distinfo
@@ -1,2 +1,2 @@
-MD5 (pips-sc84_83s-2.6.2.tar.gz) = a5babf46d8f954f2b7a270b538aee584
-SIZE (pips-sc84_83s-2.6.2.tar.gz) = 2497589
+MD5 (pips-sc84_83s-2.6.2.tar.gz) = 4892217177fbd4aaf69d55c761746d25
+SIZE (pips-sc84_83s-2.6.2.tar.gz) = 2489796
diff --git a/print/pips-sc85_86s/Makefile b/print/pips-sc85_86s/Makefile
index 15c144e..fd77252 100644
--- a/print/pips-sc85_86s/Makefile
+++ b/print/pips-sc85_86s/Makefile
@@ -6,6 +6,7 @@
 #
 
 PORTVERSION=	2.6.2
+PORTREVISION=	1
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON Stylus C85/C86 Series
 
diff --git a/print/pips-sc85_86s/distinfo b/print/pips-sc85_86s/distinfo
index 2f20146..30b8700 100644
--- a/print/pips-sc85_86s/distinfo
+++ b/print/pips-sc85_86s/distinfo
@@ -1,2 +1,2 @@
-MD5 (pips-sc85_86s-2.6.2.tar.gz) = 3228cbe80e27ce1a1249b463bb1878bb
-SIZE (pips-sc85_86s-2.6.2.tar.gz) = 2559877
+MD5 (pips-sc85_86s-2.6.2.tar.gz) = aed75345c5cbde53e168745ef8a35751
+SIZE (pips-sc85_86s-2.6.2.tar.gz) = 2563964
diff --git a/print/pips-sp2100_2200/Makefile b/print/pips-sp2100_2200/Makefile
index 41b9283..72f6ff3 100644
--- a/print/pips-sp2100_2200/Makefile
+++ b/print/pips-sp2100_2200/Makefile
@@ -6,6 +6,7 @@
 #
 
 PORTVERSION=	2.6.2
+PORTREVISION=	1
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON Stylus Photo 2100/2200
 
diff --git a/print/pips-sp2100_2200/distinfo b/print/pips-sp2100_2200/distinfo
index 76755dd..5780ff6 100644
--- a/print/pips-sp2100_2200/distinfo
+++ b/print/pips-sp2100_2200/distinfo
@@ -1,2 +1,2 @@
-MD5 (pips-sp2100_2200-2.6.2.tar.gz) = 976c2fed9406ea0d0a82456a11c336b4
-SIZE (pips-sp2100_2200-2.6.2.tar.gz) = 4853473
+MD5 (pips-sp2100_2200-2.6.2.tar.gz) = 8dc59b771cc78b3e27fe9242c306877f
+SIZE (pips-sp2100_2200-2.6.2.tar.gz) = 4856400
diff --git a/print/pips-spr200_210/Makefile b/print/pips-spr200_210/Makefile
index 9b6298b..2b4b410 100644
--- a/print/pips-spr200_210/Makefile
+++ b/print/pips-spr200_210/Makefile
@@ -6,6 +6,7 @@
 #
 
 PORTVERSION=	2.6.2
+PORTREVISION=	1
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON Stylus Photo R200/R210
 
diff --git a/print/pips-spr200_210/distinfo b/print/pips-spr200_210/distinfo
index 945666d..f0bed5f 100644
--- a/print/pips-spr200_210/distinfo
+++ b/print/pips-spr200_210/distinfo
@@ -1,2 +1,2 @@
-MD5 (pips-spr200_210-2.6.2.tar.gz) = 5fb0cbbc92274fc3ffd8f4c6511bd36d
-SIZE (pips-spr200_210-2.6.2.tar.gz) = 4733287
+MD5 (pips-spr200_210-2.6.2.tar.gz) = b511c068b5a3fa69277cd05d45375045
+SIZE (pips-spr200_210-2.6.2.tar.gz) = 4727066
diff --git a/print/pips-spr300_310/Makefile b/print/pips-spr300_310/Makefile
index d683534..e9b052d 100644
--- a/print/pips-spr300_310/Makefile
+++ b/print/pips-spr300_310/Makefile
@@ -6,6 +6,7 @@
 #
 
 PORTVERSION=	2.6.2
+PORTREVISION=	1
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON Stylus Photo R300/R310
 
diff --git a/print/pips-spr300_310/distinfo b/print/pips-spr300_310/distinfo
index b88c229..2c31f49 100644
--- a/print/pips-spr300_310/distinfo
+++ b/print/pips-spr300_310/distinfo
@@ -1,2 +1,2 @@
-MD5 (pips-spr300_310-2.6.2.tar.gz) = 7f920a406115ebc3551733524e53fc61
-SIZE (pips-spr300_310-2.6.2.tar.gz) = 4739421
+MD5 (pips-spr300_310-2.6.2.tar.gz) = 3e08e4e199bc16ba6489f1bc47c48b87
+SIZE (pips-spr300_310-2.6.2.tar.gz) = 4731228
diff --git a/print/pips-spr800/Makefile b/print/pips-spr800/Makefile
index e2cef91..90dd984 100644
--- a/print/pips-spr800/Makefile
+++ b/print/pips-spr800/Makefile
@@ -6,6 +6,7 @@
 #
 
 PORTVERSION=	2.6.2
+PORTREVISION=	1
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON Stylus Photo R800
 
diff --git a/print/pips-spr800/distinfo b/print/pips-spr800/distinfo
index 60349861..a59f2c3 100644
--- a/print/pips-spr800/distinfo
+++ b/print/pips-spr800/distinfo
@@ -1,2 +1,2 @@
-MD5 (pips-spr800-2.6.2.tar.gz) = 4597d1905210da77467825bfc73f8373
-SIZE (pips-spr800-2.6.2.tar.gz) = 3730865
+MD5 (pips-spr800-2.6.2.tar.gz) = 6ab10c603355ce8113e9fa43390abd4b
+SIZE (pips-spr800-2.6.2.tar.gz) = 3734066
diff --git a/print/pips2200/Makefile b/print/pips2200/Makefile
index 551e31c..c48a607 100644
--- a/print/pips2200/Makefile
+++ b/print/pips2200/Makefile
@@ -5,9 +5,11 @@
 # $FreeBSD$
 #
 
+PORTREVISION=	1
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON PM-2200C
 
+SUBDIR_SUFFIX=	.1
 PRTYPE=		2200
 
 .include "${MASTERDIR}/Makefile.pips"
diff --git a/print/pips2200/distinfo b/print/pips2200/distinfo
index 06d7fac..8da323e 100644
--- a/print/pips2200/distinfo
+++ b/print/pips2200/distinfo
@@ -1,2 +1,2 @@
-MD5 (pips2200-1.3.2.tar.gz) = 489fbc8a63daab8749a3642fdd06d536
-SIZE (pips2200-1.3.2.tar.gz) = 1163318
+MD5 (pips2200-1.3.2.tar.gz) = b88b8ed87f49a39d30c455c8b539b760
+SIZE (pips2200-1.3.2.tar.gz) = 1167523
diff --git a/print/pips3000/Makefile b/print/pips3000/Makefile
index 17363cb..2a32ddb 100644
--- a/print/pips3000/Makefile
+++ b/print/pips3000/Makefile
@@ -5,9 +5,11 @@
 # $FreeBSD$
 #
 
+PORTREVISION=	1
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON PM-3000C
 
+SUBDIR_SUFFIX=	.1
 PRTYPE=		3000
 
 .include "${MASTERDIR}/Makefile.pips"
diff --git a/print/pips3000/distinfo b/print/pips3000/distinfo
index 8557c78..27dd55f 100644
--- a/print/pips3000/distinfo
+++ b/print/pips3000/distinfo
@@ -1,2 +1,2 @@
-MD5 (pips3000-1.3.2.tar.gz) = 351e19da3bc796cf7946b19bb151ecd8
-SIZE (pips3000-1.3.2.tar.gz) = 1290656
+MD5 (pips3000-1.3.2.tar.gz) = c927a6c33d8d65333fabf21384813887
+SIZE (pips3000-1.3.2.tar.gz) = 1295728
diff --git a/print/pips3300/Makefile b/print/pips3300/Makefile
index 77addaa..8936a95 100644
--- a/print/pips3300/Makefile
+++ b/print/pips3300/Makefile
@@ -5,6 +5,7 @@
 # $FreeBSD$
 #
 
+PORTREVISION=	1
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON PM-3300C
 
diff --git a/print/pips3300/distinfo b/print/pips3300/distinfo
index 191f7d8..e3e4b91 100644
--- a/print/pips3300/distinfo
+++ b/print/pips3300/distinfo
@@ -1,2 +1,2 @@
-MD5 (pips3300-1.3.2.tar.gz) = 1317d573643910570f7cdde721ff439f
-SIZE (pips3300-1.3.2.tar.gz) = 1393471
+MD5 (pips3300-1.3.2.tar.gz) = 7f6b4e158c87b76410bb8ce531ca63cf
+SIZE (pips3300-1.3.2.tar.gz) = 1398380
diff --git a/print/pips3500/Makefile b/print/pips3500/Makefile
index 2efc4ed..8dfeb1a 100644
--- a/print/pips3500/Makefile
+++ b/print/pips3500/Makefile
@@ -6,6 +6,7 @@
 #
 
 PORTVERSION=	2.1.2
+PORTREVISION=	1
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON PM-3500C
 
diff --git a/print/pips3500/distinfo b/print/pips3500/distinfo
index 8aba18a..835d9cb 100644
--- a/print/pips3500/distinfo
+++ b/print/pips3500/distinfo
@@ -1,2 +1,2 @@
-MD5 (pips3500-2.1.2.tar.gz) = d74a9a4d567bf6486581ef5bd445b1be
-SIZE (pips3500-2.1.2.tar.gz) = 2663413
+MD5 (pips3500-2.1.2.tar.gz) = decf095d599d768bd26c8a4f885ab374
+SIZE (pips3500-2.1.2.tar.gz) = 2669874
diff --git a/print/pips4000/Makefile b/print/pips4000/Makefile
index ea0cc82..700ede5 100644
--- a/print/pips4000/Makefile
+++ b/print/pips4000/Makefile
@@ -6,6 +6,7 @@
 #
 
 PORTVERSION=	2.6.2
+PORTREVISION=	1
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON PM-4000PX
 
diff --git a/print/pips4000/distinfo b/print/pips4000/distinfo
index fd28cd7..97daf42 100644
--- a/print/pips4000/distinfo
+++ b/print/pips4000/distinfo
@@ -1,2 +1,2 @@
-MD5 (pips4000-2.6.2.tar.gz) = adf96dc1c7309bf31ee274530419f2ca
-SIZE (pips4000-2.6.2.tar.gz) = 4635544
+MD5 (pips4000-2.6.2.tar.gz) = 162fbf7ec02bdf9fa0c80188134604a5
+SIZE (pips4000-2.6.2.tar.gz) = 4638382
diff --git a/print/pips670/Makefile b/print/pips670/Makefile
index 86b2133..4835b59 100644
--- a/print/pips670/Makefile
+++ b/print/pips670/Makefile
@@ -5,9 +5,11 @@
 # $FreeBSD$
 #
 
+PORTREVISION=	1
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON PM-670C
 
+SUBDIR_SUFFIX=	.1
 PRTYPE=		670
 
 .include "${MASTERDIR}/Makefile.pips"
diff --git a/print/pips670/distinfo b/print/pips670/distinfo
index 5941335..b274385 100644
--- a/print/pips670/distinfo
+++ b/print/pips670/distinfo
@@ -1,2 +1,2 @@
-MD5 (pips670-1.3.2.tar.gz) = 30987c5287f790690736a68f677ef10c
-SIZE (pips670-1.3.2.tar.gz) = 830207
+MD5 (pips670-1.3.2.tar.gz) = 758961aeb5dee20d46d9a17c35b5d080
+SIZE (pips670-1.3.2.tar.gz) = 834238
diff --git a/print/pips730/Makefile b/print/pips730/Makefile
index 27d57c6..f542908 100644
--- a/print/pips730/Makefile
+++ b/print/pips730/Makefile
@@ -6,6 +6,7 @@
 #
 
 PORTVERSION=	2.5.2
+PORTREVISION=	1
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON PM-730C
 
diff --git a/print/pips730/distinfo b/print/pips730/distinfo
index acab25b..15a5699 100644
--- a/print/pips730/distinfo
+++ b/print/pips730/distinfo
@@ -1,2 +1,2 @@
-MD5 (pips730-2.5.2.tar.gz) = 288440a2bb143144c98859a3502cafac
-SIZE (pips730-2.5.2.tar.gz) = 2582843
+MD5 (pips730-2.5.2.tar.gz) = 7aaf0c1555ec64f434f574a59bd0f12f
+SIZE (pips730-2.5.2.tar.gz) = 2588505
diff --git a/print/pips740-cups/Makefile b/print/pips740-cups/Makefile
index a562cb1..96e9fa0 100644
--- a/print/pips740-cups/Makefile
+++ b/print/pips740-cups/Makefile
@@ -6,6 +6,7 @@
 #
 
 PORTVERSION=	2.6.2
+PORTREVISION=	1
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON PM-740C (for CUPS)
 
diff --git a/print/pips740-cups/distinfo b/print/pips740-cups/distinfo
index 7e4660b..4366708 100644
--- a/print/pips740-cups/distinfo
+++ b/print/pips740-cups/distinfo
@@ -1,2 +1,2 @@
-MD5 (pips740-cups-2.6.2.tar.gz) = eb130356dc62bb0e5bcc3ad74a1ca745
-SIZE (pips740-cups-2.6.2.tar.gz) = 2438919
+MD5 (pips740-cups-2.6.2.tar.gz) = e338a4536e311606ff89a1249430e386
+SIZE (pips740-cups-2.6.2.tar.gz) = 2443154
diff --git a/print/pips740/Makefile b/print/pips740/Makefile
index 32d2a38..a08402c 100644
--- a/print/pips740/Makefile
+++ b/print/pips740/Makefile
@@ -6,6 +6,7 @@
 #
 
 PORTVERSION=	2.6.2
+PORTREVISION=	1
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON PM-740C (for LPR)
 
diff --git a/print/pips740/distinfo b/print/pips740/distinfo
index 6a375ae..87573a5 100644
--- a/print/pips740/distinfo
+++ b/print/pips740/distinfo
@@ -1,2 +1,2 @@
-MD5 (pips740-2.6.2.tar.gz) = fb21195ea479f1eed05fabfe31fd2e9a
-SIZE (pips740-2.6.2.tar.gz) = 3049719
+MD5 (pips740-2.6.2.tar.gz) = c0a36b20586325c7aba59f5adde6c414
+SIZE (pips740-2.6.2.tar.gz) = 3054714
diff --git a/print/pips750_2000/Makefile b/print/pips750_2000/Makefile
index 034ba26..dc04015 100644
--- a/print/pips750_2000/Makefile
+++ b/print/pips750_2000/Makefile
@@ -5,9 +5,11 @@
 # $FreeBSD$
 #
 
+PORTREVISION=	1
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON PM-750C PM-2000C
 
+SUBDIR_SUFFIX=	.1
 PRTYPE=		750_2000
 
 .include "${MASTERDIR}/Makefile.pips"
diff --git a/print/pips750_2000/distinfo b/print/pips750_2000/distinfo
index bb27da7..58674a3 100644
--- a/print/pips750_2000/distinfo
+++ b/print/pips750_2000/distinfo
@@ -1,2 +1,2 @@
-MD5 (pips750_2000-1.3.2.tar.gz) = fd515c5ec5ecf1f45f57f802a3857e8a
-SIZE (pips750_2000-1.3.2.tar.gz) = 832425
+MD5 (pips750_2000-1.3.2.tar.gz) = bf4db3ee1ff95cfaa213450cd6d0624c
+SIZE (pips750_2000-1.3.2.tar.gz) = 835912
diff --git a/print/pips760/Makefile b/print/pips760/Makefile
index ce8f2de..f2b8c3d 100644
--- a/print/pips760/Makefile
+++ b/print/pips760/Makefile
@@ -5,6 +5,7 @@
 # $FreeBSD$
 #
 
+PORTREVISION=	1
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON PM-760C
 
diff --git a/print/pips760/distinfo b/print/pips760/distinfo
index 45dbe28..e3c2a8a 100644
--- a/print/pips760/distinfo
+++ b/print/pips760/distinfo
@@ -1,2 +1,2 @@
-MD5 (pips760-1.3.2.tar.gz) = a39c8487b369a496db2ecea31d8621eb
-SIZE (pips760-1.3.2.tar.gz) = 1100390
+MD5 (pips760-1.3.2.tar.gz) = f365878b0d3153dc00a865e841a046aa
+SIZE (pips760-1.3.2.tar.gz) = 1103413
diff --git a/print/pips770/Makefile b/print/pips770/Makefile
index 795a86a..e3f60f3 100644
--- a/print/pips770/Makefile
+++ b/print/pips770/Makefile
@@ -5,9 +5,11 @@
 # $FreeBSD$
 #
 
+PORTREVISION=	1
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON PM-770C
 
+SUBDIR_SUFFIX=	.1
 PRTYPE=		770
 
 .include "${MASTERDIR}/Makefile.pips"
diff --git a/print/pips770/distinfo b/print/pips770/distinfo
index 77e8b8c..4d8f945 100644
--- a/print/pips770/distinfo
+++ b/print/pips770/distinfo
@@ -1,2 +1,2 @@
-MD5 (pips770-1.3.2.tar.gz) = 1b62c8cfa8dfe81fa8553f844a6d3617
-SIZE (pips770-1.3.2.tar.gz) = 1122819
+MD5 (pips770-1.3.2.tar.gz) = b94406accb6c04866209c6f83a20c8df
+SIZE (pips770-1.3.2.tar.gz) = 1127369
diff --git a/print/pips780/Makefile b/print/pips780/Makefile
index 5c48c73..98ba6bd 100644
--- a/print/pips780/Makefile
+++ b/print/pips780/Makefile
@@ -6,9 +6,11 @@
 #
 
 PORTVERSION=	2.1.2
+PORTREVISION=	1
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON PM-780C
 
+SUBDIR_SUFFIX=	.1
 PRTYPE=		780
 
 .include "${MASTERDIR}/Makefile.pips"
diff --git a/print/pips780/distinfo b/print/pips780/distinfo
index a4084ce..cd3e621 100644
--- a/print/pips780/distinfo
+++ b/print/pips780/distinfo
@@ -1,2 +1,2 @@
-MD5 (pips780-2.1.2.tar.gz) = e29a71f3d8831fc1706978afae9dddab
-SIZE (pips780-2.1.2.tar.gz) = 2668596
+MD5 (pips780-2.1.2.tar.gz) = ae3064efbc91f2ba6faac54bea0e3f8b
+SIZE (pips780-2.1.2.tar.gz) = 2674369
diff --git a/print/pips800/Makefile b/print/pips800/Makefile
index ce1ab14..990dd43 100644
--- a/print/pips800/Makefile
+++ b/print/pips800/Makefile
@@ -5,6 +5,7 @@
 # $FreeBSD$
 #
 
+PORTREVISION=	1
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON PM-800C
 
diff --git a/print/pips800/Makefile.pips b/print/pips800/Makefile.pips
index 0a25e30..5bea8aa 100644
--- a/print/pips800/Makefile.pips
+++ b/print/pips800/Makefile.pips
@@ -7,9 +7,8 @@
 
 PORTNAME=	pips${PRTYPE}
 PORTVERSION?=	1.3.2
-#PORTREVISION=	1
 CATEGORIES?=	print
-MASTER_SITES=	http://www.epkowa3.on.arena.ne.jp/pips/data/%SUBDIR%/
+MASTER_SITES=	http://www.epkowa1.on.arena.ne.jp/pips/%SUBDIR%/
 
 PIPS_MAJOR=	${PORTVERSION:C|^([0-9]+).([0-9]+).([0-9]+)$|\1|}
 PIPS_MINOR=	${PORTVERSION:C|^([0-9]+).([0-9]+).([0-9]+)$|\2|}
@@ -46,30 +45,12 @@ PRT_MODEL=	PM${PRTYPE}C
 .endif
 
 .if !defined(MASTER_SITE_SUBDIR)
-.if ${PRTYPE} == -sc60s
-MASTER_SITE_SUBDIR=	${PRTYPE:C|^-(sc[0-9]+)s$|\1|}
-.elif ${PRTYPE} == -sc65_66s || ${PRTYPE} == -sc84_83s || \
-	${PRTYPE} == -sc85_86s || ${PRTYPE} == -sp2100_2200
-MASTER_SITE_SUBDIR=	${PRTYPE:C|^-(s[cp])([0-9]+)_([0-9]+)(s?)$|\1\2\4_\1\3\4|}lpr
+.if ${PRTYPE:C|^(...).+(.)$|\1\2|} == "-scs"
+MASTER_SITE_SUBDIR=	${PRTYPE:C|^-(sc.+)s$|\1|}${SUBDIR_SUFFIX}
 .elif ${PRTYPE:C|^(.).*$|\1|} == "-"
-MASTER_SITE_SUBDIR=	${PRTYPE:S/^-//}lpr
-.elif ${PRTYPE} == 730
-MASTER_SITE_SUBDIR=	${PRTYPE}
-.elif ${PRTYPE} == "750_2000"
-MASTER_SITE_SUBDIR=	pm750c_2000clpr
-.elif ${PRTYPE} == 780 || ${PRTYPE} == 880
-MASTER_SITE_SUBDIR=	${PRTYPE}_20
-.elif ${PRTYPE} == 970
-MASTER_SITE_SUBDIR=	${PRT_MODEL}
-.elif ${PIPS_LEVEL} == 201
-MASTER_SITE_SUBDIR=	${PRTYPE}_21
-.elif ${PIPS_MAJOR} >= 2 && (${DIST_TYPE} == cups || ${DIST_TYPE} == lpr) && \
-	${PRTYPE} != v700
-MASTER_SITE_SUBDIR=	${PRTYPE}C${DIST_TYPE}
-.elif ${DIST_TYPE} != cups && ${DIST_TYPE} != lpr
-MASTER_SITE_SUBDIR=	${PRT_MODEL:L}lpr
+MASTER_SITE_SUBDIR=	${PRTYPE:S/^-//}${SUBDIR_SUFFIX}
 .else
-MASTER_SITE_SUBDIR=	${PRT_MODEL:L}${DIST_TYPE}
+MASTER_SITE_SUBDIR=	${PRT_MODEL:L}${SUBDIR_SUFFIX}
 .endif
 .endif
 
@@ -161,13 +142,13 @@ LIB_FILE=	lib${PRT_MODEL:L}.so
 MODEL_FILE=	ek${PRT_MODEL:L}.ppd
 
 .if ${PIPS_LEVEL} == 201 || (${PIPS_LEVEL} >= 205 && ${DIST_TYPE} == lpr)
-EKPNAVI_VER=	1.1.2
+EKPNAVI_VER?=	1.1.2
 .endif
 .if defined(EKPNAVI_VER) || ${DIST_TYPE} == cups
 .if ${PRTYPE} == 970 || ${PRTYPE} == v700
-EKPSTM_VER=	1.1.2
+EKPSTM_VER?=	1.1.2
 .else
-EKPSTM_VER=	1.0.2
+EKPSTM_VER?=	1.0.2
 .endif
 .endif
 
diff --git a/print/pips800/distinfo b/print/pips800/distinfo
index 8ba3db1..c012f3f 100644
--- a/print/pips800/distinfo
+++ b/print/pips800/distinfo
@@ -1,2 +1,2 @@
-MD5 (pips800-1.3.2.tar.gz) = dd23f135242386f1dd06771330be5f1e
-SIZE (pips800-1.3.2.tar.gz) = 1259738
+MD5 (pips800-1.3.2.tar.gz) = e659d7e6d016bf5a1c39b4d868ee09d1
+SIZE (pips800-1.3.2.tar.gz) = 1263997
diff --git a/print/pips820/Makefile b/print/pips820/Makefile
index 8820ef9d..c4cd677 100644
--- a/print/pips820/Makefile
+++ b/print/pips820/Makefile
@@ -6,6 +6,7 @@
 #
 
 PORTVERSION=	1.3.2
+PORTREVISION=	1
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON PM-820C
 
diff --git a/print/pips820/distinfo b/print/pips820/distinfo
index bd2753c..c5a1dc8 100644
--- a/print/pips820/distinfo
+++ b/print/pips820/distinfo
@@ -1,2 +1,2 @@
-MD5 (pips820-1.3.2.tar.gz) = 65ed339c0af3c9fa51193dc8fa818baf
-SIZE (pips820-1.3.2.tar.gz) = 1406958
+MD5 (pips820-1.3.2.tar.gz) = bba0c3bd210d55ae7dc6179033cc3f42
+SIZE (pips820-1.3.2.tar.gz) = 1411460
diff --git a/print/pips870-cups/Makefile b/print/pips870-cups/Makefile
index e642598..04e8972 100644
--- a/print/pips870-cups/Makefile
+++ b/print/pips870-cups/Makefile
@@ -6,6 +6,7 @@
 #
 
 PORTVERSION=	2.6.2
+PORTREVISION=	1
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON PM-870C (for CUPS)
 
diff --git a/print/pips870-cups/distinfo b/print/pips870-cups/distinfo
index 9e5b000..8049d50 100644
--- a/print/pips870-cups/distinfo
+++ b/print/pips870-cups/distinfo
@@ -1,2 +1,2 @@
-MD5 (pips870-cups-2.6.2.tar.gz) = 7e387f03c1d94c99a4e9b36b24d9d423
-SIZE (pips870-cups-2.6.2.tar.gz) = 2946265
+MD5 (pips870-cups-2.6.2.tar.gz) = cc6344faf0dfd74fb4fa88f3de7a03be
+SIZE (pips870-cups-2.6.2.tar.gz) = 2950888
diff --git a/print/pips870/Makefile b/print/pips870/Makefile
index 309576a..7b178e5 100644
--- a/print/pips870/Makefile
+++ b/print/pips870/Makefile
@@ -6,6 +6,7 @@
 #
 
 PORTVERSION=	2.6.2
+PORTREVISION=	1
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON PM-870C (for LPR)
 
diff --git a/print/pips870/distinfo b/print/pips870/distinfo
index 1416c16..24a8f22 100644
--- a/print/pips870/distinfo
+++ b/print/pips870/distinfo
@@ -1,2 +1,2 @@
-MD5 (pips870-2.6.2.tar.gz) = 4f716397e5bc1f273e32cdb051137e8a
-SIZE (pips870-2.6.2.tar.gz) = 4214425
+MD5 (pips870-2.6.2.tar.gz) = 7f5533b3156a95870525bde671422dd8
+SIZE (pips870-2.6.2.tar.gz) = 4220416
diff --git a/print/pips880/Makefile b/print/pips880/Makefile
index f10d594..a9c5bae 100644
--- a/print/pips880/Makefile
+++ b/print/pips880/Makefile
@@ -6,6 +6,7 @@
 #
 
 PORTVERSION=	2.1.2
+PORTREVISION=	1
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON PM-880C
 
diff --git a/print/pips880/distinfo b/print/pips880/distinfo
index 462ce7f..db20648 100644
--- a/print/pips880/distinfo
+++ b/print/pips880/distinfo
@@ -1,2 +1,2 @@
-MD5 (pips880-2.1.2.tar.gz) = 24f652fff185702017142afe7369f620
-SIZE (pips880-2.1.2.tar.gz) = 2669121
+MD5 (pips880-2.1.2.tar.gz) = 48d000d8c16ccdfe75224cf51eed5827
+SIZE (pips880-2.1.2.tar.gz) = 2674644
diff --git a/print/pips900/Makefile b/print/pips900/Makefile
index 9275e93..7cbef8c 100644
--- a/print/pips900/Makefile
+++ b/print/pips900/Makefile
@@ -6,6 +6,7 @@
 #
 
 PORTVERSION=	2.1.2
+PORTREVISION=	1
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON PM-900C
 
diff --git a/print/pips900/distinfo b/print/pips900/distinfo
index e62ad38..b73823f 100644
--- a/print/pips900/distinfo
+++ b/print/pips900/distinfo
@@ -1,2 +1,2 @@
-MD5 (pips900-2.1.2.tar.gz) = cdd1ded907d20a8f6c76fb642d93e986
-SIZE (pips900-2.1.2.tar.gz) = 2017273
+MD5 (pips900-2.1.2.tar.gz) = 609b7f699f0f62f526b7d6ad60f36e5c
+SIZE (pips900-2.1.2.tar.gz) = 2024063
diff --git a/print/pips940/Makefile b/print/pips940/Makefile
index 26bf629..f932dd9 100644
--- a/print/pips940/Makefile
+++ b/print/pips940/Makefile
@@ -6,6 +6,7 @@
 #
 
 PORTVERSION=	2.6.2
+PORTREVISION=	1
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON PM-940C
 
diff --git a/print/pips940/distinfo b/print/pips940/distinfo
index 9056679..22f78cb 100644
--- a/print/pips940/distinfo
+++ b/print/pips940/distinfo
@@ -1,2 +1,2 @@
-MD5 (pips940-2.6.2.tar.gz) = 1267377f3a1ef38223ab23f2cc2c4a93
-SIZE (pips940-2.6.2.tar.gz) = 6545696
+MD5 (pips940-2.6.2.tar.gz) = 15a17b805158189c04b2b5886d943013
+SIZE (pips940-2.6.2.tar.gz) = 6548253
diff --git a/print/pips970-cups/Makefile b/print/pips970-cups/Makefile
index 67241cd..7ceb90e 100644
--- a/print/pips970-cups/Makefile
+++ b/print/pips970-cups/Makefile
@@ -6,6 +6,7 @@
 #
 
 PORTVERSION=	2.6.2
+PORTREVISION=	1
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON PM-970C (for CUPS)
 
diff --git a/print/pips970-cups/distinfo b/print/pips970-cups/distinfo
index 854c470..740fd92 100644
--- a/print/pips970-cups/distinfo
+++ b/print/pips970-cups/distinfo
@@ -1,2 +1,2 @@
-MD5 (pips970-cups-2.6.2.tar.gz) = 79138e93599b371186d2475cfa824c2e
-SIZE (pips970-cups-2.6.2.tar.gz) = 4584516
+MD5 (pips970-cups-2.6.2.tar.gz) = 22e029c0cfb212facdc51a27029cc404
+SIZE (pips970-cups-2.6.2.tar.gz) = 4588945
diff --git a/print/pips970/Makefile b/print/pips970/Makefile
index d8a4cf7..0ab29d1 100644
--- a/print/pips970/Makefile
+++ b/print/pips970/Makefile
@@ -6,6 +6,7 @@
 #
 
 PORTVERSION=	2.6.2
+PORTREVISION=	1
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON PM-970C (for LPR)
 
diff --git a/print/pips970/distinfo b/print/pips970/distinfo
index 99e40bb..9ac7d00 100644
--- a/print/pips970/distinfo
+++ b/print/pips970/distinfo
@@ -1,2 +1,2 @@
-MD5 (pips970-2.6.2.tar.gz) = 1c3ffe9f19f6bbb70c3810fe058a65b5
-SIZE (pips970-2.6.2.tar.gz) = 6943730
+MD5 (pips970-2.6.2.tar.gz) = 7221c98f2c000e5d163f28314f614682
+SIZE (pips970-2.6.2.tar.gz) = 6949339
diff --git a/print/pipsg700/Makefile b/print/pipsg700/Makefile
index f395231..17dc25a 100644
--- a/print/pipsg700/Makefile
+++ b/print/pipsg700/Makefile
@@ -6,6 +6,7 @@
 #
 
 PORTVERSION=	2.6.2
+PORTREVISION=	1
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON PM-G700
 
diff --git a/print/pipsg700/distinfo b/print/pipsg700/distinfo
index 65257a4..f9c6d26 100644
--- a/print/pipsg700/distinfo
+++ b/print/pipsg700/distinfo
@@ -1,2 +1,2 @@
-MD5 (pipsg700-2.6.2.tar.gz) = d9e435917ba8208a3add4e90b8a373b2
-SIZE (pipsg700-2.6.2.tar.gz) = 4577350
+MD5 (pipsg700-2.6.2.tar.gz) = efec5f30b71dd753e340bc6a8f2e5a6d
+SIZE (pipsg700-2.6.2.tar.gz) = 4580483
diff --git a/print/pipsg800/Makefile b/print/pipsg800/Makefile
index fd0fcbf..1238cf5 100644
--- a/print/pipsg800/Makefile
+++ b/print/pipsg800/Makefile
@@ -6,6 +6,7 @@
 #
 
 PORTVERSION=	2.6.2
+PORTREVISION=	1
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON PM-G800
 
diff --git a/print/pipsg800/distinfo b/print/pipsg800/distinfo
index ad287d3..0d65722 100644
--- a/print/pipsg800/distinfo
+++ b/print/pipsg800/distinfo
@@ -1,2 +1,2 @@
-MD5 (pipsg800-2.6.2.tar.gz) = c5e72841ef4cc8f213aba993ddf2e63c
-SIZE (pipsg800-2.6.2.tar.gz) = 3804453
+MD5 (pipsg800-2.6.2.tar.gz) = a540903bbe0e9468dc21d83acc19af08
+SIZE (pipsg800-2.6.2.tar.gz) = 3805594
diff --git a/print/pipsg900/Makefile b/print/pipsg900/Makefile
index db81d71..d172652 100644
--- a/print/pipsg900/Makefile
+++ b/print/pipsg900/Makefile
@@ -6,6 +6,7 @@
 #
 
 PORTVERSION=	2.6.2
+PORTREVISION=	1
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON PX-G900
 
diff --git a/print/pipsg900/distinfo b/print/pipsg900/distinfo
index ab06d9e..f631ed4 100644
--- a/print/pipsg900/distinfo
+++ b/print/pipsg900/distinfo
@@ -1,2 +1,2 @@
-MD5 (pipsg900-2.6.2.tar.gz) = 6e0ac07322a188ae4d5ccafe848e2f7b
-SIZE (pipsg900-2.6.2.tar.gz) = 3805702
+MD5 (pipsg900-2.6.2.tar.gz) = 833f96596e20ed750acb18e854344b1e
+SIZE (pipsg900-2.6.2.tar.gz) = 3808719
diff --git a/print/pipsv500/Makefile b/print/pipsv500/Makefile
index 3cd9614..9dfb482 100644
--- a/print/pipsv500/Makefile
+++ b/print/pipsv500/Makefile
@@ -6,6 +6,7 @@
 #
 
 PORTVERSION=	2.6.2
+PORTREVISION=	1
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON PX-V500
 
diff --git a/print/pipsv500/distinfo b/print/pipsv500/distinfo
index 654ea3e..a448b38 100644
--- a/print/pipsv500/distinfo
+++ b/print/pipsv500/distinfo
@@ -1,2 +1,2 @@
-MD5 (pipsv500-2.6.2.tar.gz) = f282132d547b76711e8148492571fc05
-SIZE (pipsv500-2.6.2.tar.gz) = 2526093
+MD5 (pipsv500-2.6.2.tar.gz) = 11ac598c6d99d91284ada3d9d991da07
+SIZE (pipsv500-2.6.2.tar.gz) = 2533982
diff --git a/print/pipsv600/Makefile b/print/pipsv600/Makefile
index a7f5328..0ed0b45 100644
--- a/print/pipsv600/Makefile
+++ b/print/pipsv600/Makefile
@@ -6,6 +6,7 @@
 #
 
 PORTVERSION=	2.6.2
+PORTREVISION=	1
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON PX-V600
 
diff --git a/print/pipsv600/distinfo b/print/pipsv600/distinfo
index 2052428..2b9d376 100644
--- a/print/pipsv600/distinfo
+++ b/print/pipsv600/distinfo
@@ -1,2 +1,2 @@
-MD5 (pipsv600-2.6.2.tar.gz) = fd627bd21d6a3f7e14b810fc50d79a70
-SIZE (pipsv600-2.6.2.tar.gz) = 2551262
+MD5 (pipsv600-2.6.2.tar.gz) = 7702b8b5ec5b3c5d1813a77c0803dd5f
+SIZE (pipsv600-2.6.2.tar.gz) = 2552007
diff --git a/print/pipsv700-cups/Makefile b/print/pipsv700-cups/Makefile
index c4ce7d4..56a15ce 100644
--- a/print/pipsv700-cups/Makefile
+++ b/print/pipsv700-cups/Makefile
@@ -6,6 +6,7 @@
 #
 
 PORTVERSION=	2.6.2
+PORTREVISION=	1
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON PX-V700 (for CUPS)
 
diff --git a/print/pipsv700-cups/distinfo b/print/pipsv700-cups/distinfo
index 0636ef5..6b0a593 100644
--- a/print/pipsv700-cups/distinfo
+++ b/print/pipsv700-cups/distinfo
@@ -1,2 +1,2 @@
-MD5 (pipsv700-cups-2.6.2.tar.gz) = 52a0d29eaf5849655cd26f42eb9918bc
-SIZE (pipsv700-cups-2.6.2.tar.gz) = 2459449
+MD5 (pipsv700-cups-2.6.2.tar.gz) = f7a7bcf62c25ac079033f325313ba28d
+SIZE (pipsv700-cups-2.6.2.tar.gz) = 2462876
diff --git a/print/pipsv700/Makefile b/print/pipsv700/Makefile
index bba3834..4fe1da7 100644
--- a/print/pipsv700/Makefile
+++ b/print/pipsv700/Makefile
@@ -6,6 +6,7 @@
 #
 
 PORTVERSION=	2.6.2
+PORTREVISION=	1
 MASTERDIR=	${.CURDIR}/../pips800
 COMMENT=	Photo Image Print System for Linux --- EPSON PX-V700 (for LPR)
 
diff --git a/print/pipsv700/distinfo b/print/pipsv700/distinfo
index f7a6222..30c39ed 100644
--- a/print/pipsv700/distinfo
+++ b/print/pipsv700/distinfo
@@ -1,2 +1,2 @@
-MD5 (pipsv700-2.6.2.tar.gz) = 7f9b058cac3159d24d6f0307c3d68250
-SIZE (pipsv700-2.6.2.tar.gz) = 3122277
+MD5 (pipsv700-2.6.2.tar.gz) = fdd531ca6dfe6c9229787b1429ab39b4
+SIZE (pipsv700-2.6.2.tar.gz) = 3122897