5 files changed, 78 insertions, 84 deletions

diff --git a/print/foomatic-db-engine/Makefile b/print/foomatic-db-engine/Makefile
index 97e4d630f46e..9026fd7f2b36 100644
--- a/print/foomatic-db-engine/Makefile
+++ b/print/foomatic-db-engine/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	engine
-PORTVERSION=	20061214
+PORTVERSION=	20070124
 PORTEPOCH=	1
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_LOCAL:S,$,acm/foomatic/,} \
diff --git a/print/foomatic-db-engine/distinfo b/print/foomatic-db-engine/distinfo
index 6c4dd3a6914b..f091346ab4e9 100644
--- a/print/foomatic-db-engine/distinfo
+++ b/print/foomatic-db-engine/distinfo
@@ -1,3 +1,3 @@
-MD5 (foomatic/foomatic-db-engine-3.0-20061214.tar.gz) = 934af77749a26cc8803b34b600ffcbb7
-SHA256 (foomatic/foomatic-db-engine-3.0-20061214.tar.gz) = e432e795d6886c7444e90016c794c5edf7738815389535d6a62c5c0450a67918
-SIZE (foomatic/foomatic-db-engine-3.0-20061214.tar.gz) = 317307
+MD5 (foomatic/foomatic-db-engine-3.0-20070124.tar.gz) = cfdbb13c0b96ec918f31e6c8da9b6e48
+SHA256 (foomatic/foomatic-db-engine-3.0-20070124.tar.gz) = 70cdf5c004311e0bd161f1957bc3240f726bf08b812c247b1469e489a0a264c9
+SIZE (foomatic/foomatic-db-engine-3.0-20070124.tar.gz) = 317389
diff --git a/print/foomatic-db/Makefile b/print/foomatic-db/Makefile
index 793311ce1a1e..89b7417ebc91 100644
--- a/print/foomatic-db/Makefile
+++ b/print/foomatic-db/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	db
-PORTVERSION=	20061214
+PORTVERSION=	20070124
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_LOCAL:S,$,acm/foomatic/,} \
 		http://freebsd.unixfreunde.de/sources/
diff --git a/print/foomatic-db/distinfo b/print/foomatic-db/distinfo
index 10f92037411b..03f76585bbdd 100644
--- a/print/foomatic-db/distinfo
+++ b/print/foomatic-db/distinfo
@@ -1,3 +1,3 @@
-MD5 (foomatic/foomatic-db-3.0-20061214.tar.gz) = e8d24707f98e2f29611f852a1f5af1cb
-SHA256 (foomatic/foomatic-db-3.0-20061214.tar.gz) = be3368e38c4ab2a82a5444a1c8ec908090ee304b0121423241cd46899aec6e00
-SIZE (foomatic/foomatic-db-3.0-20061214.tar.gz) = 14600065
+MD5 (foomatic/foomatic-db-3.0-20070124.tar.gz) = 33f8aca744789c19da6488613364e178
+SHA256 (foomatic/foomatic-db-3.0-20070124.tar.gz) = b054dab44212796cbfe05d7366ec2db7a26fe36bd53f718c5f3a64bd8c44f1ad
+SIZE (foomatic/foomatic-db-3.0-20070124.tar.gz) = 15035470
diff --git a/print/foomatic-db/pkg-plist b/print/foomatic-db/pkg-plist
index a0fe8ee4630b..c9b5a7bde293 100644
--- a/print/foomatic-db/pkg-plist
+++ b/print/foomatic-db/pkg-plist
@@ -124,6 +124,8 @@ share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MP9000_DSm790_PS.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MPC1500_GS106_PS.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MPC2500_DSc525_PS.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MPC3000_DSc530_PS.ppd.gz
+share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MPC3500_DSc535_PS.ppd.gz
+share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-MPC4500_DSc545_PS.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-P7026_PS.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-P7026n_PS.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-P7032_PS.ppd.gz
@@ -131,6 +133,7 @@ share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-P7126_PS.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-P7126n_PS.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-P7132n_PS.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-P7145_PS.ppd.gz
+share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-P7245_PS.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-P7325_PS.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-P7325n_PS.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PS/Gestetner-P7431cn_PS.ppd.gz
@@ -183,6 +186,8 @@ share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MP9000_DSm790_PXL.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MPC1500_GS106_PXL.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MPC2500_DSc525_PXL.ppd.gz
 share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MPC3000_DSc530_PXL.ppd.gz
+share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MPC3500_DSc535_PXL.ppd.gz
+share/foomatic/db/source/PPD/Gestetner/PXL/Gestetner-MPC4500_DSc545_PXL.ppd.gz
 share/foomatic/db/source/PPD/HP/all_in_one/hp_officejet_9100_series.ppd.gz
 share/foomatic/db/source/PPD/HP/business_inkjet/HP_Business_Inkjet_2250.ppd.gz
 share/foomatic/db/source/PPD/HP/business_inkjet/HP_Business_Inkjet_2280.ppd.gz
@@ -193,6 +198,7 @@ share/foomatic/db/source/PPD/HP/business_inkjet/hp_business_inkjet_2300.ppd.gz
 share/foomatic/db/source/PPD/HP/color_laser/HP_Color_LaserJet.ppd.gz
 share/foomatic/db/source/PPD/HP/color_laser/HP_Color_LaserJet_2550.ppd.gz
 share/foomatic/db/source/PPD/HP/color_laser/HP_Color_LaserJet_2605.ppd.gz
+share/foomatic/db/source/PPD/HP/color_laser/HP_Color_LaserJet_2700.ppd.gz
 share/foomatic/db/source/PPD/HP/color_laser/HP_Color_LaserJet_2800.ppd.gz
 share/foomatic/db/source/PPD/HP/color_laser/HP_Color_LaserJet_3000.ppd.gz
 share/foomatic/db/source/PPD/HP/color_laser/HP_Color_LaserJet_3800.ppd.gz
@@ -204,6 +210,8 @@ share/foomatic/db/source/PPD/HP/color_laser/HP_Color_LaserJet_5550.ppd.gz
 share/foomatic/db/source/PPD/HP/color_laser/HP_Color_LaserJet_5M.ppd.gz
 share/foomatic/db/source/PPD/HP/color_laser/HP_Color_LaserJet_8500.ppd.gz
 share/foomatic/db/source/PPD/HP/color_laser/HP_Color_LaserJet_8550.ppd.gz
+share/foomatic/db/source/PPD/HP/color_laser/HP_Color_LaserJet_CM1015.ppd.gz
+share/foomatic/db/source/PPD/HP/color_laser/HP_Color_LaserJet_CP4005.ppd.gz
 share/foomatic/db/source/PPD/HP/color_laser/hp_color_LaserJet_2500.ppd.gz
 share/foomatic/db/source/PPD/HP/color_laser/hp_color_LaserJet_3700.ppd.gz
 share/foomatic/db/source/PPD/HP/color_laser/hp_color_LaserJet_4600.ppd.gz
@@ -264,6 +272,14 @@ share/foomatic/db/source/PPD/HP/mono_laser/HP_LaserJet_9040.ppd.gz
 share/foomatic/db/source/PPD/HP/mono_laser/HP_LaserJet_9040_9050_MFP.ppd.gz
 share/foomatic/db/source/PPD/HP/mono_laser/HP_LaserJet_9050.ppd.gz
 share/foomatic/db/source/PPD/HP/mono_laser/HP_LaserJet_9055_9065_MFP.ppd.gz
+share/foomatic/db/source/PPD/HP/mono_laser/HP_LaserJet_M3027_MFP.ppd.gz
+share/foomatic/db/source/PPD/HP/mono_laser/HP_LaserJet_M3035_MFP.ppd.gz
+share/foomatic/db/source/PPD/HP/mono_laser/HP_LaserJet_M4345_MFP.ppd.gz
+share/foomatic/db/source/PPD/HP/mono_laser/HP_LaserJet_M5025_MFP.ppd.gz
+share/foomatic/db/source/PPD/HP/mono_laser/HP_LaserJet_M5035_MFP.ppd.gz
+share/foomatic/db/source/PPD/HP/mono_laser/HP_LaserJet_P2015.ppd.gz
+share/foomatic/db/source/PPD/HP/mono_laser/HP_LaserJet_P3004.ppd.gz
+share/foomatic/db/source/PPD/HP/mono_laser/HP_LaserJet_P3005.ppd.gz
 share/foomatic/db/source/PPD/HP/mono_laser/HP_Mopier_240.ppd.gz
 share/foomatic/db/source/PPD/HP/mono_laser/HP_Mopier_320.ppd.gz
 share/foomatic/db/source/PPD/HP/mono_laser/hp_LaserJet_1300_series.ppd.gz
@@ -301,7 +317,9 @@ share/foomatic/db/source/PPD/Infotec/PS/Infotec-ISC_2525_PS.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PS/Infotec-ISC_2835_PS.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PS/Infotec-ISC_2838_PS.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PS/Infotec-ISC_3030_PS.ppd.gz
+share/foomatic/db/source/PPD/Infotec/PS/Infotec-ISC_3535_PS.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PS/Infotec-ISC_3545_PS.ppd.gz
+share/foomatic/db/source/PPD/Infotec/PS/Infotec-ISC_4045_PS.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PS/Infotec-ISC_4560_PS.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PS/Infotec-ISC_5560_PS.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PS/Infotec-ISC_615G_PS.ppd.gz
@@ -347,7 +365,9 @@ share/foomatic/db/source/PPD/Infotec/PXL/Infotec-ISC_2428_PXL.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PXL/Infotec-ISC_2525_PXL.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PXL/Infotec-ISC_2835_PXL.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PXL/Infotec-ISC_3030_PXL.ppd.gz
+share/foomatic/db/source/PPD/Infotec/PXL/Infotec-ISC_3535_PXL.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PXL/Infotec-ISC_3545_PXL.ppd.gz
+share/foomatic/db/source/PPD/Infotec/PXL/Infotec-ISC_4045_PXL.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PXL/Infotec-ISC_4560_PXL.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PXL/Infotec-ISC_5560_PXL.ppd.gz
 share/foomatic/db/source/PPD/Infotec/PXL/Infotec-ISC_615G_PXL.ppd.gz
@@ -934,6 +954,7 @@ share/foomatic/db/source/PPD/Lanier/PS/Lanier-LP127n_LP128n_PS.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PS/Lanier-LP128_PS.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PS/Lanier-LP135n_PS.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PS/Lanier-LP138c_PS.ppd.gz
+share/foomatic/db/source/PPD/Lanier/PS/Lanier-LP145n_SP_8100DN_PS.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PS/Lanier-LP175_LP175hdn_PS.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PS/Lanier-LP222cn_LP221c_PS.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PS/Lanier-LP226c_SP_C410_PS.ppd.gz
@@ -952,6 +973,8 @@ share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_7500_LD275_PS.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_9000_LD190_PS.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_C2500_LD425c_PS.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_C3000_LD430c_PS.ppd.gz
+share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_C3500_LD435c_PS.ppd.gz
+share/foomatic/db/source/PPD/Lanier/PS/Lanier-MP_C4500_LD445c_PS.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PXL/Lanier-5622_PXL.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PXL/Lanier-5627_PXL.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PXL/Lanier-5632_PXL.ppd.gz
@@ -998,6 +1021,8 @@ share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_7500_LD275_PXL.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_9000_LD190_PXL.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_C2500_LD425c_PXL.ppd.gz
 share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_C3000_LD430c_PXL.ppd.gz
+share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_C3500_LD435c_PXL.ppd.gz
+share/foomatic/db/source/PPD/Lanier/PXL/Lanier-MP_C4500_LD445c_PXL.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-10515_10518_10512_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-2205_2238_2212_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-2705_2738_2712_PS.ppd.gz
@@ -1061,6 +1086,8 @@ share/foomatic/db/source/PPD/NRG/PS/NRG-MP_9000_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-MP_C1500sp_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-MP_C2500_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-MP_C3000_PS.ppd.gz
+share/foomatic/db/source/PPD/NRG/PS/NRG-MP_C3500_PS.ppd.gz
+share/foomatic/db/source/PPD/NRG/PS/NRG-MP_C4500_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-P7026N_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-P7026_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-P7032_PS.ppd.gz
@@ -1075,6 +1102,7 @@ share/foomatic/db/source/PPD/NRG/PS/NRG-P7527_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-P7527n_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-P7535n_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-P7575_PS.ppd.gz
+share/foomatic/db/source/PPD/NRG/PS/NRG-SP_8100DN_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-SP_C410DN_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PS/NRG-SP_C411DN_PS.ppd.gz
 share/foomatic/db/source/PPD/NRG/PXL/NRG-10515_10518_10512_PXL.ppd.gz
@@ -1123,6 +1151,8 @@ share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_9000_PXL.ppd.gz
 share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_C1500sp_PXL.ppd.gz
 share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_C2500_PXL.ppd.gz
 share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_C3000_PXL.ppd.gz
+share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_C3500_PXL.ppd.gz
+share/foomatic/db/source/PPD/NRG/PXL/NRG-MP_C4500_PXL.ppd.gz
 share/foomatic/db/source/PPD/Oce/Oce-3145PS/1/OC3145_3.ppd.gz
 share/foomatic/db/source/PPD/Oce/Oce-3155PS/1/OC3155_3.ppd.gz
 share/foomatic/db/source/PPD/Oce/Oce-3165PS/1/OC3165_3.ppd.gz
@@ -1259,6 +1289,9 @@ share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_7500_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_9000_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_C2500_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_C3000_PS.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_C3500_PS.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_MP_C4500_PS.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_8100DN_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_C410DN_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-Aficio_SP_C411DN_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-ColorLaser_AP828_PS.ppd.gz
@@ -1316,6 +1349,8 @@ share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_7500_PXL.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_9000_PXL.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_C2500_PXL.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_C3000_PXL.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_C3500_PXL.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-Aficio_MP_C4500_PXL.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PXL/Ricoh-MP_C1500_615C_PXL.ppd.gz
 share/foomatic/db/source/PPD/Savin/PS/Savin-2522_PS.ppd.gz
 share/foomatic/db/source/PPD/Savin/PS/Savin-2527_PS.ppd.gz
@@ -1364,8 +1399,10 @@ share/foomatic/db/source/PPD/Savin/PS/Savin-C3210_PS.ppd.gz
 share/foomatic/db/source/PPD/Savin/PS/Savin-C3210e_PS.ppd.gz
 share/foomatic/db/source/PPD/Savin/PS/Savin-C3224_PS.ppd.gz
 share/foomatic/db/source/PPD/Savin/PS/Savin-C3528_PS.ppd.gz
+share/foomatic/db/source/PPD/Savin/PS/Savin-C3535_PS.ppd.gz
 share/foomatic/db/source/PPD/Savin/PS/Savin-C3828_PS.ppd.gz
 share/foomatic/db/source/PPD/Savin/PS/Savin-C4535_PS.ppd.gz
+share/foomatic/db/source/PPD/Savin/PS/Savin-C4540_PS.ppd.gz
 share/foomatic/db/source/PPD/Savin/PS/Savin-C6045_PS.ppd.gz
 share/foomatic/db/source/PPD/Savin/PS/Savin-CLP1036_PS.ppd.gz
 share/foomatic/db/source/PPD/Savin/PS/Savin-CLP128_PS.ppd.gz
@@ -1381,6 +1418,7 @@ share/foomatic/db/source/PPD/Savin/PS/Savin-CLP31DN_PS.ppd.gz
 share/foomatic/db/source/PPD/Savin/PS/Savin-CLP35_PS.ppd.gz
 share/foomatic/db/source/PPD/Savin/PS/Savin-CLP831_PS.ppd.gz
 share/foomatic/db/source/PPD/Savin/PS/Savin-FAX3799_3799nf_PS.ppd.gz
+share/foomatic/db/source/PPD/Savin/PS/Savin-MLP145_PS.ppd.gz
 share/foomatic/db/source/PPD/Savin/PS/Savin-MLP25_PS.ppd.gz
 share/foomatic/db/source/PPD/Savin/PS/Savin-MLP25n_PS.ppd.gz
 share/foomatic/db/source/PPD/Savin/PS/Savin-MLP26_PS.ppd.gz
@@ -1438,7 +1476,9 @@ share/foomatic/db/source/PPD/Savin/PXL/Savin-C2824_PXL.ppd.gz
 share/foomatic/db/source/PPD/Savin/PXL/Savin-C3030_PXL.ppd.gz
 share/foomatic/db/source/PPD/Savin/PXL/Savin-C3210e_PXL.ppd.gz
 share/foomatic/db/source/PPD/Savin/PXL/Savin-C3528_PXL.ppd.gz
+share/foomatic/db/source/PPD/Savin/PXL/Savin-C3535_PXL.ppd.gz
 share/foomatic/db/source/PPD/Savin/PXL/Savin-C4535_PXL.ppd.gz
+share/foomatic/db/source/PPD/Savin/PXL/Savin-C4540_PXL.ppd.gz
 share/foomatic/db/source/PPD/Savin/PXL/Savin-C6045_PXL.ppd.gz
 share/foomatic/db/source/PPD/Savin/PXL/Savin-SDC555_PXL.ppd.gz
 share/foomatic/db/source/PPD/Savin/PXL/Savin-SGC_1506_PXL.ppd.gz
@@ -1620,24 +1660,20 @@ share/foomatic/db/source/driver/dj505j.xml
 share/foomatic/db/source/driver/djet500.xml
 share/foomatic/db/source/driver/dnj650c.xml
 share/foomatic/db/source/driver/drv_x125.xml
-share/foomatic/db/source/driver/drv_z42.xml
-share/foomatic/db/source/driver/epl5700l.xml
-share/foomatic/db/source/driver/epl5800l.xml
-share/foomatic/db/source/driver/epl5900l.xml
-share/foomatic/db/source/driver/epl6100l.xml
-share/foomatic/db/source/driver/epl6200l.xml
 share/foomatic/db/source/driver/eplaser-jp.xml
 share/foomatic/db/source/driver/eplaser.xml
 share/foomatic/db/source/driver/eps9high.xml
 share/foomatic/db/source/driver/eps9mid.xml
 share/foomatic/db/source/driver/epson.xml
 share/foomatic/db/source/driver/epsonc.xml
+share/foomatic/db/source/driver/epsonepl.xml
 share/foomatic/db/source/driver/escpage.xml
 share/foomatic/db/source/driver/fmlbp.xml
 share/foomatic/db/source/driver/fmpr.xml
 share/foomatic/db/source/driver/foo2hp.xml
 share/foomatic/db/source/driver/foo2kyo.xml
-share/foomatic/db/source/driver/foo2oak.xml
+share/foomatic/db/source/driver/foo2lava.xml
+share/foomatic/db/source/driver/foo2xqx.xml
 share/foomatic/db/source/driver/foo2zjs.xml
 share/foomatic/db/source/driver/gdi.xml
 share/foomatic/db/source/driver/gutenprint.xml
@@ -1718,8 +1754,6 @@ share/foomatic/db/source/driver/paintjet.xml
 share/foomatic/db/source/driver/pbm2l2030.xml
 share/foomatic/db/source/driver/pbm2l7k.xml
 share/foomatic/db/source/driver/pbm2lwxl.xml
-share/foomatic/db/source/driver/pbm2ppa.xml
-share/foomatic/db/source/driver/pbmtozjs.xml
 share/foomatic/db/source/driver/pcl3.xml
 share/foomatic/db/source/driver/pegg.xml
 share/foomatic/db/source/driver/pentaxpj.xml
@@ -1729,13 +1763,12 @@ share/foomatic/db/source/driver/pjetxl.xml
 share/foomatic/db/source/driver/pjxl.xml
 share/foomatic/db/source/driver/pjxl300.xml
 share/foomatic/db/source/driver/pnm2ppa.xml
-share/foomatic/db/source/driver/ppmtocpva.xml
 share/foomatic/db/source/driver/ppmtomd.xml
 share/foomatic/db/source/driver/pr150.xml
 share/foomatic/db/source/driver/pr201.xml
 share/foomatic/db/source/driver/ptouch.xml
-share/foomatic/db/source/driver/pxl1010.xml
 share/foomatic/db/source/driver/pxlcolor.xml
+share/foomatic/db/source/driver/pxljr.xml
 share/foomatic/db/source/driver/pxlmono.xml
 share/foomatic/db/source/driver/r4081.xml
 share/foomatic/db/source/driver/ras1.upp.xml
@@ -1983,25 +2016,6 @@ share/foomatic/db/source/opt/97.xml
 share/foomatic/db/source/opt/98.xml
 share/foomatic/db/source/opt/99.xml
 share/foomatic/db/source/opt/Brother-MediaType.xml
-share/foomatic/db/source/opt/Brother-Ptouch-AdvanceDistance.xml
-share/foomatic/db/source/opt/Brother-Ptouch-AdvanceMedia.xml
-share/foomatic/db/source/opt/Brother-Ptouch-Align.xml
-share/foomatic/db/source/opt/Brother-Ptouch-BytesPerLine.xml
-share/foomatic/db/source/opt/Brother-Ptouch-ConcatPages.xml
-share/foomatic/db/source/opt/Brother-Ptouch-CutMark.xml
-share/foomatic/db/source/opt/Brother-Ptouch-CutMedia.xml
-share/foomatic/db/source/opt/Brother-Ptouch-HalfCut.xml
-share/foomatic/db/source/opt/Brother-Ptouch-LabelPreamble.xml
-share/foomatic/db/source/opt/Brother-Ptouch-MirrorPrint.xml
-share/foomatic/db/source/opt/Brother-Ptouch-NegativePrint.xml
-share/foomatic/db/source/opt/Brother-Ptouch-PageSize.xml
-share/foomatic/db/source/opt/Brother-Ptouch-PixelTransfer.xml
-share/foomatic/db/source/opt/Brother-Ptouch-PrintDensity.xml
-share/foomatic/db/source/opt/Brother-Ptouch-PrintQuality.xml
-share/foomatic/db/source/opt/Brother-Ptouch-Resolution.xml
-share/foomatic/db/source/opt/Brother-Ptouch-RollFedMedia.xml
-share/foomatic/db/source/opt/Brother-Ptouch-SoftwareMirror.xml
-share/foomatic/db/source/opt/Brother-Ptouch-TransferMode.xml
 share/foomatic/db/source/opt/GS-HalftoningAlgorithm-Gray.xml
 share/foomatic/db/source/opt/Minolta-PCL600.xml
 share/foomatic/db/source/opt/PCL-4-5-InputSlot.xml
@@ -2063,45 +2077,6 @@ share/foomatic/db/source/opt/eplaser-NumCopies.xml
 share/foomatic/db/source/opt/eplaser-RITOff.xml
 share/foomatic/db/source/opt/eplaser-TonerSaving.xml
 share/foomatic/db/source/opt/eplaser-jp-Model.xml
-share/foomatic/db/source/opt/epsonepl-Density.xml
-share/foomatic/db/source/opt/epsonepl-Dpi.xml
-share/foomatic/db/source/opt/epsonepl-FlowControl.xml
-share/foomatic/db/source/opt/epsonepl-PageSize.xml
-share/foomatic/db/source/opt/epsonepl-PrintoutMode.xml
-share/foomatic/db/source/opt/epsonepl-Ritech.xml
-share/foomatic/db/source/opt/epsonepl-TonerSave.xml
-share/foomatic/db/source/opt/foo2hp-BitsPerPlane.xml
-share/foomatic/db/source/opt/foo2hp-ColorMode.xml
-share/foomatic/db/source/opt/foo2hp-Duplex.xml
-share/foomatic/db/source/opt/foo2hp-ICM.xml
-share/foomatic/db/source/opt/foo2hp-InputSlot.xml
-share/foomatic/db/source/opt/foo2hp-MediaType.xml
-share/foomatic/db/source/opt/foo2hp-Quality.xml
-share/foomatic/db/source/opt/foo2kyo-Brightness.xml
-share/foomatic/db/source/opt/foo2kyo-Copies.xml
-share/foomatic/db/source/opt/foo2kyo-Eco.xml
-share/foomatic/db/source/opt/foo2kyo-MediaType.xml
-share/foomatic/db/source/opt/foo2kyo-Nup.xml
-share/foomatic/db/source/opt/foo2kyo-NupOrient.xml
-share/foomatic/db/source/opt/foo2kyo-PageSize.xml
-share/foomatic/db/source/opt/foo2oak-BitsPerPlane.xml
-share/foomatic/db/source/opt/foo2oak-ColorMode.xml
-share/foomatic/db/source/opt/foo2oak-ICM.xml
-share/foomatic/db/source/opt/foo2oak-InputSlot.xml
-share/foomatic/db/source/opt/foo2oak-MediaType.xml
-share/foomatic/db/source/opt/foo2zjs-ColorMode.xml
-share/foomatic/db/source/opt/foo2zjs-Copies.xml
-share/foomatic/db/source/opt/foo2zjs-Duplex.xml
-share/foomatic/db/source/opt/foo2zjs-ICM.xml
-share/foomatic/db/source/opt/foo2zjs-InputSlot.xml
-share/foomatic/db/source/opt/foo2zjs-Intent.xml
-share/foomatic/db/source/opt/foo2zjs-MediaType.xml
-share/foomatic/db/source/opt/foo2zjs-Nup.xml
-share/foomatic/db/source/opt/foo2zjs-NupOrient.xml
-share/foomatic/db/source/opt/foo2zjs-PageSize.xml
-share/foomatic/db/source/opt/foo2zjs-PrinterType.xml
-share/foomatic/db/source/opt/foo2zjs-Quality.xml
-share/foomatic/db/source/opt/foo2zjs-Resolution.xml
 share/foomatic/db/source/opt/gdi-Altitude.xml
 share/foomatic/db/source/opt/gdi-AllowReprint.xml
 share/foomatic/db/source/opt/gdi-Copies.xml
@@ -2129,12 +2104,6 @@ share/foomatic/db/source/opt/largeformat-PageSize.xml
 share/foomatic/db/source/opt/lm1100-Brightness.xml
 share/foomatic/db/source/opt/lxm3200-tweaked-Model.xml
 share/foomatic/db/source/opt/lxm3200-tweaked-Z31Margin.xml
-share/foomatic/db/source/opt/lz11-V2-CancelJob.xml
-share/foomatic/db/source/opt/lz11-V2-InkSaving.xml
-share/foomatic/db/source/opt/lz11-V2-InkType.xml
-share/foomatic/db/source/opt/lz11-V2-PageSize.xml
-share/foomatic/db/source/opt/lz11-V2-Resolution.xml
-share/foomatic/db/source/opt/lz11-V2-SkewAdjustment.xml
 share/foomatic/db/source/opt/m2300w-ColorMode.xml
 share/foomatic/db/source/opt/m2300w-ColorProfile.xml
 share/foomatic/db/source/opt/m2300w-MediaType.xml
@@ -2818,7 +2787,6 @@ share/foomatic/db/source/printer/Fujitsu-PrintPartner_8000.xml
 share/foomatic/db/source/printer/Generic-ESC_P_Dot_Matrix_Printer.xml
 share/foomatic/db/source/printer/Generic-GDI_Printer.xml
 share/foomatic/db/source/printer/Generic-IBM-Compatible_Dot_Matrix_Printer.xml
-share/foomatic/db/source/printer/Generic-OAKT_Printer.xml
 share/foomatic/db/source/printer/Generic-PCL_3_Printer.xml
 share/foomatic/db/source/printer/Generic-PCL_4_Printer.xml
 share/foomatic/db/source/printer/Generic-PCL_5_Printer.xml
@@ -2893,6 +2861,8 @@ share/foomatic/db/source/printer/Gestetner-MP9000_DSm790.xml
 share/foomatic/db/source/printer/Gestetner-MPC1500_GS106.xml
 share/foomatic/db/source/printer/Gestetner-MPC2500_DSc525.xml
 share/foomatic/db/source/printer/Gestetner-MPC3000_DSc530.xml
+share/foomatic/db/source/printer/Gestetner-MPC3500_DSc535.xml
+share/foomatic/db/source/printer/Gestetner-MPC4500_DSc545.xml
 share/foomatic/db/source/printer/Gestetner-P7026.xml
 share/foomatic/db/source/printer/Gestetner-P7026n.xml
 share/foomatic/db/source/printer/Gestetner-P7032.xml
@@ -2900,6 +2870,7 @@ share/foomatic/db/source/printer/Gestetner-P7126.xml
 share/foomatic/db/source/printer/Gestetner-P7126n.xml
 share/foomatic/db/source/printer/Gestetner-P7132n.xml
 share/foomatic/db/source/printer/Gestetner-P7145.xml
+share/foomatic/db/source/printer/Gestetner-P7245.xml
 share/foomatic/db/source/printer/Gestetner-P7325.xml
 share/foomatic/db/source/printer/Gestetner-P7325n.xml
 share/foomatic/db/source/printer/Gestetner-P7431cn.xml
@@ -2931,6 +2902,7 @@ share/foomatic/db/source/printer/HP-Color_LaserJet_2500.xml
 share/foomatic/db/source/printer/HP-Color_LaserJet_2550.xml
 share/foomatic/db/source/printer/HP-Color_LaserJet_2600n.xml
 share/foomatic/db/source/printer/HP-Color_LaserJet_2605.xml
+share/foomatic/db/source/printer/HP-Color_LaserJet_2700.xml
 share/foomatic/db/source/printer/HP-Color_LaserJet_2800.xml
 share/foomatic/db/source/printer/HP-Color_LaserJet_3000.xml
 share/foomatic/db/source/printer/HP-Color_LaserJet_3500.xml
@@ -2954,6 +2926,9 @@ share/foomatic/db/source/printer/HP-Color_LaserJet_8500.xml
 share/foomatic/db/source/printer/HP-Color_LaserJet_8550GN.xml
 share/foomatic/db/source/printer/HP-Color_LaserJet_9500.xml
 share/foomatic/db/source/printer/HP-Color_LaserJet_9500_MFP.xml
+share/foomatic/db/source/printer/HP-Color_LaserJet_CM1015.xml
+share/foomatic/db/source/printer/HP-Color_LaserJet_CM1017.xml
+share/foomatic/db/source/printer/HP-Color_LaserJet_CP4005.xml
 share/foomatic/db/source/printer/HP-DesignJet_100.xml
 share/foomatic/db/source/printer/HP-DesignJet_100plus.xml
 share/foomatic/db/source/printer/HP-DesignJet_230.xml
@@ -3214,8 +3189,11 @@ share/foomatic/db/source/printer/HP-LaserJet_9050.xml
 share/foomatic/db/source/printer/HP-LaserJet_9050_MFP.xml
 share/foomatic/db/source/printer/HP-LaserJet_9055_MFP.xml
 share/foomatic/db/source/printer/HP-LaserJet_9065_MFP.xml
+share/foomatic/db/source/printer/HP-LaserJet_M1005_MFP.xml
+share/foomatic/db/source/printer/HP-LaserJet_M3027_MFP.xml
 share/foomatic/db/source/printer/HP-LaserJet_M3035_MFP.xml
 share/foomatic/db/source/printer/HP-LaserJet_M4345_MFP.xml
+share/foomatic/db/source/printer/HP-LaserJet_M5025_MFP.xml
 share/foomatic/db/source/printer/HP-LaserJet_M5035_MFP.xml
 share/foomatic/db/source/printer/HP-LaserJet_P2015.xml
 share/foomatic/db/source/printer/HP-LaserJet_P3004.xml
@@ -3422,7 +3400,9 @@ share/foomatic/db/source/printer/Infotec-ISC_2525.xml
 share/foomatic/db/source/printer/Infotec-ISC_2835.xml
 share/foomatic/db/source/printer/Infotec-ISC_2838.xml
 share/foomatic/db/source/printer/Infotec-ISC_3030.xml
+share/foomatic/db/source/printer/Infotec-ISC_3535.xml
 share/foomatic/db/source/printer/Infotec-ISC_3545.xml
+share/foomatic/db/source/printer/Infotec-ISC_4045.xml
 share/foomatic/db/source/printer/Infotec-ISC_4560.xml
 share/foomatic/db/source/printer/Infotec-ISC_5560.xml
 share/foomatic/db/source/printer/Infotec-ISC_615G.xml
@@ -3457,6 +3437,8 @@ share/foomatic/db/source/printer/Kodak-DigiSource_9110.xml
 share/foomatic/db/source/printer/Kodak-IS_70_CPII.xml
 share/foomatic/db/source/printer/KonicaMinolta-magicolor_2300_DL.xml
 share/foomatic/db/source/printer/KonicaMinolta-magicolor_2430_DL.xml
+share/foomatic/db/source/printer/KonicaMinolta-magicolor_2490_MF.xml
+share/foomatic/db/source/printer/KonicaMinolta-magicolor_2530_DL.xml
 share/foomatic/db/source/printer/KonicaMinolta-magicolor_5430_DL.xml
 share/foomatic/db/source/printer/KonicaMinolta-magicolor_5440_DL.xml
 share/foomatic/db/source/printer/Kyocera-F-1000.xml
@@ -3588,6 +3570,7 @@ share/foomatic/db/source/printer/Lanier-LP127n_LP128n.xml
 share/foomatic/db/source/printer/Lanier-LP128.xml
 share/foomatic/db/source/printer/Lanier-LP135n.xml
 share/foomatic/db/source/printer/Lanier-LP138c.xml
+share/foomatic/db/source/printer/Lanier-LP145n_SP_8100DN.xml
 share/foomatic/db/source/printer/Lanier-LP175_LP175hdn.xml
 share/foomatic/db/source/printer/Lanier-LP222cn_LP221c.xml
 share/foomatic/db/source/printer/Lanier-LP226c_SP_C410.xml
@@ -3606,6 +3589,8 @@ share/foomatic/db/source/printer/Lanier-MP_7500_LD275.xml
 share/foomatic/db/source/printer/Lanier-MP_9000_LD190.xml
 share/foomatic/db/source/printer/Lanier-MP_C2500_LD425c.xml
 share/foomatic/db/source/printer/Lanier-MP_C3000_LD430c.xml
+share/foomatic/db/source/printer/Lanier-MP_C3500_LD435c.xml
+share/foomatic/db/source/printer/Lanier-MP_C4500_LD445c.xml
 share/foomatic/db/source/printer/LaserMaster-LM_1000.xml
 share/foomatic/db/source/printer/Lexmark-1000.xml
 share/foomatic/db/source/printer/Lexmark-1020.xml
@@ -3786,6 +3771,8 @@ share/foomatic/db/source/printer/NRG-MP_9000.xml
 share/foomatic/db/source/printer/NRG-MP_C1500sp.xml
 share/foomatic/db/source/printer/NRG-MP_C2500.xml
 share/foomatic/db/source/printer/NRG-MP_C3000.xml
+share/foomatic/db/source/printer/NRG-MP_C3500.xml
+share/foomatic/db/source/printer/NRG-MP_C4500.xml
 share/foomatic/db/source/printer/NRG-P7026.xml
 share/foomatic/db/source/printer/NRG-P7026N.xml
 share/foomatic/db/source/printer/NRG-P7032.xml
@@ -3800,6 +3787,7 @@ share/foomatic/db/source/printer/NRG-P7527.xml
 share/foomatic/db/source/printer/NRG-P7527n.xml
 share/foomatic/db/source/printer/NRG-P7535n.xml
 share/foomatic/db/source/printer/NRG-P7575.xml
+share/foomatic/db/source/printer/NRG-SP_8100DN.xml
 share/foomatic/db/source/printer/NRG-SP_C410DN.xml
 share/foomatic/db/source/printer/NRG-SP_C411DN.xml
 share/foomatic/db/source/printer/Oce-3145PS.xml
@@ -3996,6 +3984,9 @@ share/foomatic/db/source/printer/Ricoh-Aficio_MP_7500.xml
 share/foomatic/db/source/printer/Ricoh-Aficio_MP_9000.xml
 share/foomatic/db/source/printer/Ricoh-Aficio_MP_C2500.xml
 share/foomatic/db/source/printer/Ricoh-Aficio_MP_C3000.xml
+share/foomatic/db/source/printer/Ricoh-Aficio_MP_C3500.xml
+share/foomatic/db/source/printer/Ricoh-Aficio_MP_C4500.xml
+share/foomatic/db/source/printer/Ricoh-Aficio_SP_8100DN.xml
 share/foomatic/db/source/printer/Ricoh-Aficio_SP_C410DN.xml
 share/foomatic/db/source/printer/Ricoh-Aficio_SP_C411DN.xml
 share/foomatic/db/source/printer/Ricoh-Afico_FX10.xml
@@ -4118,8 +4109,10 @@ share/foomatic/db/source/printer/Savin-C3210.xml
 share/foomatic/db/source/printer/Savin-C3210e.xml
 share/foomatic/db/source/printer/Savin-C3224.xml
 share/foomatic/db/source/printer/Savin-C3528.xml
+share/foomatic/db/source/printer/Savin-C3535.xml
 share/foomatic/db/source/printer/Savin-C3828.xml
 share/foomatic/db/source/printer/Savin-C4535.xml
+share/foomatic/db/source/printer/Savin-C4540.xml
 share/foomatic/db/source/printer/Savin-C6045.xml
 share/foomatic/db/source/printer/Savin-CLP1036.xml
 share/foomatic/db/source/printer/Savin-CLP128.xml
@@ -4135,6 +4128,7 @@ share/foomatic/db/source/printer/Savin-CLP31DN.xml
 share/foomatic/db/source/printer/Savin-CLP35.xml
 share/foomatic/db/source/printer/Savin-CLP831.xml
 share/foomatic/db/source/printer/Savin-FAX3799_3799nf.xml
+share/foomatic/db/source/printer/Savin-MLP145.xml
 share/foomatic/db/source/printer/Savin-MLP25.xml
 share/foomatic/db/source/printer/Savin-MLP25n.xml
 share/foomatic/db/source/printer/Savin-MLP26.xml