19 files changed, 46 insertions, 49 deletions
diff --git a/print/bjfilter360/distinfo b/print/bjfilter360/distinfo
index d83ff64..dd150cd 100644
--- a/print/bjfilter360/distinfo
+++ b/print/bjfilter360/distinfo
@@ -1,2 +1,2 @@
-MD5 (bjfilter/bjfilter360-1.3-0.i386.rpm) = 3386ca30f32e2461f855e51a3c67d7b1
-SIZE (bjfilter/bjfilter360-1.3-0.i386.rpm) = 328044
+MD5 (bjfilter/bjfilter360-1.3-1.i386.rpm) = 698ee8d079ff90f9babda14ebaf0737a
+SIZE (bjfilter/bjfilter360-1.3-1.i386.rpm) = 328043
diff --git a/print/bjfilter360/pkg-plist b/print/bjfilter360/pkg-plist
index 6b738585..7bad862 100644
--- a/print/bjfilter360/pkg-plist
+++ b/print/bjfilter360/pkg-plist
@@ -11,6 +11,6 @@ libexec/bjfilter360/scripts/ja.lc
 usr/lib/bjlib/cnb_0980.tbl
 usr/lib/libcnbpo098.so
 usr/lib/libcnbpo098.so.1.0.0
-@dirrm usr/lib/bjlib
+@unexec rmdir %D/usr/lib/bjlib 2>/dev/null || true
 @exec /compat/linux/sbin/ldconfig ; true
 @unexec /compat/linux/sbin/ldconfig ; true
diff --git a/print/bjfilter850/distinfo b/print/bjfilter850/distinfo
index 43ca96a..e122102 100644
--- a/print/bjfilter850/distinfo
+++ b/print/bjfilter850/distinfo
@@ -1,2 +1,2 @@
-MD5 (bjfilter/bjfilter850-1.3-0.i386.rpm) = f466cd588bdcd98021660450b338c71d
-SIZE (bjfilter/bjfilter850-1.3-0.i386.rpm) = 270804
+MD5 (bjfilter/bjfilter850-1.3-1.i386.rpm) = 0a3cd23ab337f5ea7172ddd68e8d0147
+SIZE (bjfilter/bjfilter850-1.3-1.i386.rpm) = 270800
diff --git a/print/bjfilter850/pkg-plist b/print/bjfilter850/pkg-plist
index c2336f8..a9badf9 100644
--- a/print/bjfilter850/pkg-plist
+++ b/print/bjfilter850/pkg-plist
@@ -11,6 +11,6 @@ libexec/bjfilter850/scripts/ja.lc
 usr/lib/bjlib/cnb_0740.tbl
 usr/lib/libcnbpo074.so
 usr/lib/libcnbpo074.so.1.0.0
-@dirrm usr/lib/bjlib
+@unexec rmdir %D/usr/lib/bjlib 2>/dev/null || true
 @exec /compat/linux/sbin/ldconfig ; true
 @unexec /compat/linux/sbin/ldconfig ; true
diff --git a/print/bjfilter850ug/distinfo b/print/bjfilter850ug/distinfo
index 6ce5adf..4a4f859 100644
--- a/print/bjfilter850ug/distinfo
+++ b/print/bjfilter850ug/distinfo
@@ -1,2 +1,2 @@
-MD5 (bjfilter/bjfilter850ug-1.3-0.i386.rpm) = 0506e13beb910da1267ca6990202dee3
-SIZE (bjfilter/bjfilter850ug-1.3-0.i386.rpm) = 239227
+MD5 (bjfilter/bjfilter850ug-1.3-1.i386.rpm) = 67efa80877f6d10e05ea3c4b45bbf9d3
+SIZE (bjfilter/bjfilter850ug-1.3-1.i386.rpm) = 239229
diff --git a/print/bjfilter850ug/pkg-plist b/print/bjfilter850ug/pkg-plist
index d10e03b..9471536 100644
--- a/print/bjfilter850ug/pkg-plist
+++ b/print/bjfilter850ug/pkg-plist
@@ -11,6 +11,6 @@ libexec/bjfilter850ug/scripts/ja.lc
 usr/lib/bjlib/cnb_0740.tbl
 usr/lib/libcnbpo074.so
 usr/lib/libcnbpo074.so.1.0.0
-@dirrm usr/lib/bjlib
+@unexec rmdir %D/usr/lib/bjlib 2>/dev/null || true
 @exec /compat/linux/sbin/ldconfig ; true
 @unexec /compat/linux/sbin/ldconfig ; true
diff --git a/print/bjfilter860/distinfo b/print/bjfilter860/distinfo
index cef57f5..82c5ecf 100644
--- a/print/bjfilter860/distinfo
+++ b/print/bjfilter860/distinfo
@@ -1,2 +1,2 @@
-MD5 (bjfilter/bjfilter860-1.3-0.i386.rpm) = 710447c2cd76034ac9d12f28a4b43bde
-SIZE (bjfilter/bjfilter860-1.3-0.i386.rpm) = 215916
+MD5 (bjfilter/bjfilter860-1.3-1.i386.rpm) = 426c357ce9f7d2ad2c00879825393050
+SIZE (bjfilter/bjfilter860-1.3-1.i386.rpm) = 215910
diff --git a/print/bjfilter860/pkg-plist b/print/bjfilter860/pkg-plist
index 338f575..1d5c5d9 100644
--- a/print/bjfilter860/pkg-plist
+++ b/print/bjfilter860/pkg-plist
@@ -11,6 +11,6 @@ libexec/bjfilter860/scripts/ja.lc
 usr/lib/bjlib/cnb_1050.tbl
 usr/lib/libcnbpo105.so
 usr/lib/libcnbpo105.so.1.0.0
-@dirrm usr/lib/bjlib
+@unexec rmdir %D/usr/lib/bjlib 2>/dev/null || true
 @exec /compat/linux/sbin/ldconfig ; true
 @unexec /compat/linux/sbin/ldconfig ; true
diff --git a/print/bjfilter870/distinfo b/print/bjfilter870/distinfo
index 79e2539..a21481b 100644
--- a/print/bjfilter870/distinfo
+++ b/print/bjfilter870/distinfo
@@ -1,2 +1,2 @@
-MD5 (bjfilter/bjfilter870-1.3-0.i386.rpm) = 621dede7191228df73f75027a8e6d0cb
-SIZE (bjfilter/bjfilter870-1.3-0.i386.rpm) = 266733
+MD5 (bjfilter/bjfilter870-1.3-1.i386.rpm) = d809c3f98678fd62c68049a245a60138
+SIZE (bjfilter/bjfilter870-1.3-1.i386.rpm) = 266728
diff --git a/print/bjfilter870/pkg-plist b/print/bjfilter870/pkg-plist
index 955818c..60893b6 100644
--- a/print/bjfilter870/pkg-plist
+++ b/print/bjfilter870/pkg-plist
@@ -11,6 +11,6 @@ libexec/bjfilter870/scripts/ja.lc
 usr/lib/bjlib/cnb_1020.tbl
 usr/lib/libcnbpo102.so
 usr/lib/libcnbpo102.so.1.0.0
-@dirrm usr/lib/bjlib
+@unexec rmdir %D/usr/lib/bjlib 2>/dev/null || true
 @exec /compat/linux/sbin/ldconfig ; true
 @unexec /compat/linux/sbin/ldconfig ; true
diff --git a/print/bjfiltercom/Makefile b/print/bjfiltercom/Makefile
index 6c7e2ba..04773b6 100644
--- a/print/bjfiltercom/Makefile
+++ b/print/bjfiltercom/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	bjfiltercom
 PORTVERSION?=	1.3
-#PORTREVISION=	1
+PORTREVISION=	1
 CATEGORIES=	print linux
 MASTER_SITES=	ftp://download.canon.jp/pub/driver/bj/linux/
 DISTFILES=	${RPMFILE}
@@ -16,13 +16,9 @@ DISTFILES+=	${DOC_DISTFILES}
 .endif
 EXTRACT_ONLY=	${RPMFILE}
 
-MAINTAINER=	taoka@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT?=	Canon Bubble Jet Print Filter for Linux -- Common files
 
-BROKEN=		"Checksum mismatch"
-EXPIRATION_DATE=2004-08-20
-DEPRECATED=	${BROKEN}
-
 EXTRACT_DEPENDS=	rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio
 .if defined(SLAVE_PORT)
 RUN_DEPENDS=	stsmon:${PORTSDIR}/print/bjfiltercom \
@@ -50,7 +46,7 @@ MD5_FILE=	${.CURDIR}/distinfo
 ONLY_FOR_ARCHS=	i386
 NO_FILTER_SHLIBS=	yes
 NO_MTREE=	yes
-RPMREVISION=	0
+RPMREVISION=	1
 .if defined(SLAVE_PORT)
 PAPERSIZE?=	a4
 .else
diff --git a/print/bjfiltercom/distinfo b/print/bjfiltercom/distinfo
index fae4dff..49aee57 100644
--- a/print/bjfiltercom/distinfo
+++ b/print/bjfiltercom/distinfo
@@ -1,8 +1,8 @@
-MD5 (bjfilter/bjfiltercom-1.3-0.i386.rpm) = 8e2f08b58df239be77679a0382c8ce95
-SIZE (bjfilter/bjfiltercom-1.3-0.i386.rpm) = 240853
-MD5 (bjfilter/readme-1.3-0.tar.gz) = aac580333d8ba5de006f29db688c361a
-SIZE (bjfilter/readme-1.3-0.tar.gz) = 2757
-MD5 (bjfilter/instruction-1.3-0.tar.gz) = 2f3cb20970cb12b5046ba1966326b267
-SIZE (bjfilter/instruction-1.3-0.tar.gz) = 147258
-MD5 (bjfilter/faq-1.3-0.tar.gz) = c14d507c62b84853fc10946cac9ff385
-SIZE (bjfilter/faq-1.3-0.tar.gz) = 5562
+MD5 (bjfilter/bjfiltercom-1.3-1.i386.rpm) = 910d416561699b710db3645683934996
+SIZE (bjfilter/bjfiltercom-1.3-1.i386.rpm) = 240824
+MD5 (bjfilter/readme-1.3-1.tar.gz) = a5e7d111b1254e11f9cca8da5c9939c2
+SIZE (bjfilter/readme-1.3-1.tar.gz) = 2745
+MD5 (bjfilter/instruction-1.3-1.tar.gz) = e501189ed0f2215d9b23c04ed34cff60
+SIZE (bjfilter/instruction-1.3-1.tar.gz) = 147292
+MD5 (bjfilter/faq-1.3-1.tar.gz) = 2c597242ab59827c46199ff64883f292
+SIZE (bjfilter/faq-1.3-1.tar.gz) = 5576
diff --git a/print/bjfiltercom/pkg-plist b/print/bjfiltercom/pkg-plist
index 375edea..c143e36 100644
--- a/print/bjfiltercom/pkg-plist
+++ b/print/bjfiltercom/pkg-plist
@@ -22,10 +22,11 @@ share/doc/bjfiltercom-%%PORTVERSION%%/html/IMAGE016.JPG
 share/doc/bjfiltercom-%%PORTVERSION%%/html/INDEX.HTM
 share/doc/bjfiltercom-%%PORTVERSION%%/html/NOTE.HTM
 share/doc/bjfiltercom-%%PORTVERSION%%/html/PRINT.HTM
-share/doc/bjfiltercom-%%PORTVERSION%%/html/README.HTM
 share/doc/bjfiltercom-%%PORTVERSION%%/html/SWITCHES.HTM
 share/doc/bjfiltercom-%%PORTVERSION%%/html/UTILITY.HTM
 share/doc/bjfiltercom-%%PORTVERSION%%/html/WELCOME.HTM
+share/doc/bjfiltercom-%%PORTVERSION%%/html/readme-1.3-1/README.HTM
+@dirrm share/doc/bjfiltercom-%%PORTVERSION%%/html/readme-1.3-1
 @dirrm share/doc/bjfiltercom-%%PORTVERSION%%/html
 @dirrm share/doc/bjfiltercom-%%PORTVERSION%%
 @cwd /compat/linux
@@ -82,16 +83,16 @@ usr/local/share/stsmon/pixmaps/Inkg_pc.xpm
 usr/local/share/stsmon/pixmaps/Inkg_pm.xpm
 usr/local/share/stsmon/pixmaps/Inkg_sp.xpm
 usr/local/share/stsmon/pixmaps/Inkg_ye.xpm
-@dirrm usr/local/share/printui
-@dirrm usr/local/share/locale/ja/LC_MESSAGES
-@dirrm usr/local/share/locale/ja
-@dirrm usr/local/share/locale
 @dirrm usr/local/share/stsmon/pixmaps
 @dirrm usr/local/share/stsmon
-@dirrm usr/local/share
-@dirrm usr/local
-@dirrm usr/lib/bjlib
-@dirrm usr/lib
-@dirrm usr
+@unexec rmdir %D/usr/local/share/printui 2>/dev/null || true
+@unexec rmdir %D/usr/local/share/locale/ja/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/local/share/locale/ja 2>/dev/null || true
+@unexec rmdir %D/usr/local/share/locale 2>/dev/null || true
+@unexec rmdir %D/usr/local/share 2>/dev/null || true
+@unexec rmdir %D/usr/local 2>/dev/null || true
+@unexec rmdir %D/usr/lib/bjlib 2>/dev/null || true
+@unexec rmdir %D/usr/lib 2>/dev/null || true
+@unexec rmdir %D/usr 2>/dev/null || true
 @exec /compat/linux/sbin/ldconfig ; true
 @unexec /compat/linux/sbin/ldconfig ; true
diff --git a/print/bjfilters600/distinfo b/print/bjfilters600/distinfo
index 6c5f6d3..9d95781 100644
--- a/print/bjfilters600/distinfo
+++ b/print/bjfilters600/distinfo
@@ -1,2 +1,2 @@
-MD5 (bjfilter/bjfilters600-1.3-0.i386.rpm) = ff929c40dbd69a98757fdb6c7e4893de
-SIZE (bjfilter/bjfilters600-1.3-0.i386.rpm) = 289814
+MD5 (bjfilter/bjfilters600-1.3-1.i386.rpm) = 4396a209ce09f0867e051682d2c2868b
+SIZE (bjfilter/bjfilters600-1.3-1.i386.rpm) = 289816
diff --git a/print/bjfilters600/pkg-plist b/print/bjfilters600/pkg-plist
index e6f5dd2..e683fd9 100644
--- a/print/bjfilters600/pkg-plist
+++ b/print/bjfilters600/pkg-plist
@@ -11,6 +11,6 @@ libexec/bjfilters600/scripts/ja.lc
 usr/lib/bjlib/cnb_1040.tbl
 usr/lib/libcnbpo104.so
 usr/lib/libcnbpo104.so.1.0.0
-@dirrm usr/lib/bjlib
+@unexec rmdir %D/usr/lib/bjlib 2>/dev/null || true
 @exec /compat/linux/sbin/ldconfig ; true
 @unexec /compat/linux/sbin/ldconfig ; true
diff --git a/print/bjfilters630/distinfo b/print/bjfilters630/distinfo
index 7c48daa..a547520 100644
--- a/print/bjfilters630/distinfo
+++ b/print/bjfilters630/distinfo
@@ -1,2 +1,2 @@
-MD5 (bjfilter/bjfilters630-1.3-0.i386.rpm) = c96e3b4446e12ec946475a582c954a59
-SIZE (bjfilter/bjfilters630-1.3-0.i386.rpm) = 289421
+MD5 (bjfilter/bjfilters630-1.3-1.i386.rpm) = 16df6df1c412ca37f4c9b0c302ec2dca
+SIZE (bjfilter/bjfilters630-1.3-1.i386.rpm) = 289415
diff --git a/print/bjfilters630/pkg-plist b/print/bjfilters630/pkg-plist
index f0154f6..c1cbcff 100644
--- a/print/bjfilters630/pkg-plist
+++ b/print/bjfilters630/pkg-plist
@@ -11,6 +11,6 @@ libexec/bjfilters630/scripts/ja.lc
 usr/lib/bjlib/cnb_1230.tbl
 usr/lib/libcnbpo123.so
 usr/lib/libcnbpo123.so.1.0.0
-@dirrm usr/lib/bjlib
+@unexec rmdir %D/usr/lib/bjlib 2>/dev/null || true
 @exec /compat/linux/sbin/ldconfig ; true
 @unexec /compat/linux/sbin/ldconfig ; true
diff --git a/print/bjfilters6300/distinfo b/print/bjfilters6300/distinfo
index 593e01a..6dd7954 100644
--- a/print/bjfilters6300/distinfo
+++ b/print/bjfilters6300/distinfo
@@ -1,2 +1,2 @@
-MD5 (bjfilter/bjfilters6300-1.3-0.i386.rpm) = 29337250bab26822f15bb9b5d82eb1fd
-SIZE (bjfilter/bjfilters6300-1.3-0.i386.rpm) = 299923
+MD5 (bjfilter/bjfilters6300-1.3-1.i386.rpm) = 4a86369962fb2eacd3f345ad61711f26
+SIZE (bjfilter/bjfilters6300-1.3-1.i386.rpm) = 299925
diff --git a/print/bjfilters6300/pkg-plist b/print/bjfilters6300/pkg-plist
index 9c57e6a..0bd4845 100644
--- a/print/bjfilters6300/pkg-plist
+++ b/print/bjfilters6300/pkg-plist
@@ -11,6 +11,6 @@ libexec/bjfilters6300/scripts/ja.lc
 usr/lib/bjlib/cnb_1130.tbl
 usr/lib/libcnbpo113.so
 usr/lib/libcnbpo113.so.1.0.0
-@dirrm usr/lib/bjlib
+@unexec rmdir %D/usr/lib/bjlib 2>/dev/null || true
 @exec /compat/linux/sbin/ldconfig ; true
 @unexec /compat/linux/sbin/ldconfig ; true