3 files changed, 59 insertions, 9 deletions

diff --git a/print/foomatic-db/Makefile b/print/foomatic-db/Makefile
index 43fa5a7516d4..c516cf1b5917 100644
--- a/print/foomatic-db/Makefile
+++ b/print/foomatic-db/Makefile
@@ -1,10 +1,8 @@
 # Created by: Dima Dorfman <dima@unixfreak.org>
 
 PORTNAME=	foomatic-db
-PORTVERSION=	20210822
+PORTVERSION=	20220113
 CATEGORIES=	print
-MASTER_SITES=	LOCAL/danilo
-DISTNAME=	${PORTNAME}-${FOOMATICVER}-${PORTVERSION}
 
 MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	Database for integrating printer drivers with common spoolers
@@ -12,12 +10,14 @@ COMMENT=	Database for integrating printer drivers with common spoolers
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		gmake tar:xz
+USES=		gmake tar:xz autoreconf
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	OpenPrinting
+GH_TAGNAME=	adb5812707743c4645efbacfb8cf682bd1d7ce3d
 
 GNU_CONFIGURE=	yes
 
-FOOMATICVER=	4.0
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/print/foomatic-db/distinfo b/print/foomatic-db/distinfo
index cce360a05d22..6763fcdc3677 100644
--- a/print/foomatic-db/distinfo
+++ b/print/foomatic-db/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1629652986
-SHA256 (foomatic-db-4.0-20210822.tar.xz) = a1a0b6d5257c80713ae5fb40fe540254b553c4e75d98ff40c02602702e59268b
-SIZE (foomatic-db-4.0-20210822.tar.xz) = 7495228
+TIMESTAMP = 1643055677
+SHA256 (OpenPrinting-foomatic-db-20220113-adb5812707743c4645efbacfb8cf682bd1d7ce3d_GH0.tar.gz) = a2542afb3b66802647220a9a1b4c094d4b6141e986767c8c583ab79e145acc62
+SIZE (OpenPrinting-foomatic-db-20220113-adb5812707743c4645efbacfb8cf682bd1d7ce3d_GH0.tar.gz) = 79736214
diff --git a/print/foomatic-db/pkg-plist b/print/foomatic-db/pkg-plist
index 07d280297851..a26d311384da 100644
--- a/print/foomatic-db/pkg-plist
+++ b/print/foomatic-db/pkg-plist
@@ -4515,19 +4515,24 @@ share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-DDP_70_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-DDP_92_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-EMP_156_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-FAX5510L_5510NF_PS.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-IM_2500_JPN.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-IM_2500_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-IM_2509J_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-IM_2702_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-IM_3000_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-IM_3009J_PS.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-IM_3500_JPN.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-IM_3500_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-IM_3509J_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-IM_350_PS.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-IM_4000_JPN.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-IM_4000_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-IM_430F.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-IM_430_PS.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-IM_5000_JPN.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-IM_5000_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-IM_550_PS.ppd.gz
+share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-IM_6000_JPN.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-IM_6000_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-IM_600SR_PS.ppd.gz
 share/foomatic/db/source/PPD/Ricoh/PS/Ricoh-IM_600_PS.ppd.gz
@@ -6292,6 +6297,45 @@ share/foomatic/db/source/PPD/Toshiba/TOSHIBA_EST4511_451c_CUPS.ppd.gz
 share/foomatic/db/source/PPD/Toshiba/TOSHIBA_EST850_CUPS.ppd.gz
 share/foomatic/db/source/PPD/Toshiba/Toshiba_GL1010_CUPS.ppd.gz
 share/foomatic/db/source/PPD/Toshiba/Toshiba_GL1020_CUPS.ppd.gz
+share/foomatic/db/source/PPD/Utax/TA300ci
+share/foomatic/db/source/PPD/Utax/TA350ci/EU/English/TA300ci.ppd.gz
+share/foomatic/db/source/PPD/Utax/TA350ci/EU/English/TA350ci.ppd.gz
+share/foomatic/db/source/PPD/Utax/TA350ci/EU/English/TA400ci.ppd.gz
+share/foomatic/db/source/PPD/Utax/TA350ci/EU/French/TA300ci.ppd.gz
+share/foomatic/db/source/PPD/Utax/TA350ci/EU/French/TA350ci.ppd.gz
+share/foomatic/db/source/PPD/Utax/TA350ci/EU/French/TA400ci.ppd.gz
+share/foomatic/db/source/PPD/Utax/TA350ci/EU/German/TA300ci.ppd.gz
+share/foomatic/db/source/PPD/Utax/TA350ci/EU/German/TA350ci.ppd.gz
+share/foomatic/db/source/PPD/Utax/TA350ci/EU/German/TA400ci.ppd.gz
+share/foomatic/db/source/PPD/Utax/TA350ci/EU/Italian/TA300ci.ppd.gz
+share/foomatic/db/source/PPD/Utax/TA350ci/EU/Italian/TA350ci.ppd.gz
+share/foomatic/db/source/PPD/Utax/TA350ci/EU/Italian/TA400ci.ppd.gz
+share/foomatic/db/source/PPD/Utax/TA350ci/EU/Portuguese/TA300ci.ppd.gz
+share/foomatic/db/source/PPD/Utax/TA350ci/EU/Portuguese/TA350ci.ppd.gz
+share/foomatic/db/source/PPD/Utax/TA350ci/EU/Portuguese/TA400ci.ppd.gz
+share/foomatic/db/source/PPD/Utax/TA350ci/EU/Spanish/TA300ci.ppd.gz
+share/foomatic/db/source/PPD/Utax/TA350ci/EU/Spanish/TA350ci.ppd.gz
+share/foomatic/db/source/PPD/Utax/TA350ci/EU/Spanish/TA400ci.ppd.gz
+share/foomatic/db/source/PPD/Utax/TA350ci/Global/English/TA300ci.ppd.gz
+share/foomatic/db/source/PPD/Utax/TA350ci/Global/English/TA350ci.ppd.gz
+share/foomatic/db/source/PPD/Utax/TA350ci/Global/English/TA400ci.ppd.gz
+share/foomatic/db/source/PPD/Utax/TA350ci/Global/French/TA300ci.ppd.gz
+share/foomatic/db/source/PPD/Utax/TA350ci/Global/French/TA350ci.ppd.gz
+share/foomatic/db/source/PPD/Utax/TA350ci/Global/French/TA400ci.ppd.gz
+share/foomatic/db/source/PPD/Utax/TA350ci/Global/German/TA300ci.ppd.gz
+share/foomatic/db/source/PPD/Utax/TA350ci/Global/German/TA350ci.ppd.gz
+share/foomatic/db/source/PPD/Utax/TA350ci/Global/German/TA400ci.ppd.gz
+share/foomatic/db/source/PPD/Utax/TA350ci/Global/Italian/TA300ci.ppd.gz
+share/foomatic/db/source/PPD/Utax/TA350ci/Global/Italian/TA350ci.ppd.gz
+share/foomatic/db/source/PPD/Utax/TA350ci/Global/Italian/TA400ci.ppd.gz
+share/foomatic/db/source/PPD/Utax/TA350ci/Global/Portuguese/TA300ci.ppd.gz
+share/foomatic/db/source/PPD/Utax/TA350ci/Global/Portuguese/TA350ci.ppd.gz
+share/foomatic/db/source/PPD/Utax/TA350ci/Global/Portuguese/TA400ci.ppd.gz
+share/foomatic/db/source/PPD/Utax/TA350ci/Global/Spanish/TA300ci.ppd.gz
+share/foomatic/db/source/PPD/Utax/TA350ci/Global/Spanish/TA350ci.ppd.gz
+share/foomatic/db/source/PPD/Utax/TA350ci/Global/Spanish/TA400ci.ppd.gz
+share/foomatic/db/source/PPD/Utax/TA350ci/ReadMe.htm
+share/foomatic/db/source/PPD/Utax/TA400ci
 share/foomatic/db/source/driver/PDF-Gestetner.xml
 share/foomatic/db/source/driver/PDF-Infotec.xml
 share/foomatic/db/source/driver/PDF-Lanier.xml
@@ -6955,6 +6999,7 @@ share/foomatic/db/source/printer/Brother-HL-2035.xml
 share/foomatic/db/source/printer/Brother-HL-2040.xml
 share/foomatic/db/source/printer/Brother-HL-2060.xml
 share/foomatic/db/source/printer/Brother-HL-2070N.xml
+share/foomatic/db/source/printer/Brother-HL-2130.xml
 share/foomatic/db/source/printer/Brother-HL-2135.xml
 share/foomatic/db/source/printer/Brother-HL-2140.xml
 share/foomatic/db/source/printer/Brother-HL-2142.xml
@@ -11267,20 +11312,25 @@ share/foomatic/db/source/printer/Ricoh-GX_5050N.xml
 share/foomatic/db/source/printer/Ricoh-GX_E3350N.xml
 share/foomatic/db/source/printer/Ricoh-GX_E5550N.xml
 share/foomatic/db/source/printer/Ricoh-IM_2500.xml
+share/foomatic/db/source/printer/Ricoh-IM_2500_JPN.xml
 share/foomatic/db/source/printer/Ricoh-IM_2509J.xml
 share/foomatic/db/source/printer/Ricoh-IM_2702.xml
 share/foomatic/db/source/printer/Ricoh-IM_3000.xml
 share/foomatic/db/source/printer/Ricoh-IM_3009J.xml
 share/foomatic/db/source/printer/Ricoh-IM_350.xml
 share/foomatic/db/source/printer/Ricoh-IM_3500.xml
+share/foomatic/db/source/printer/Ricoh-IM_3500_JPN.xml
 share/foomatic/db/source/printer/Ricoh-IM_3509J.xml
 share/foomatic/db/source/printer/Ricoh-IM_4000.xml
+share/foomatic/db/source/printer/Ricoh-IM_4000_JPN.xml
 share/foomatic/db/source/printer/Ricoh-IM_430.xml
 share/foomatic/db/source/printer/Ricoh-IM_430F.xml
 share/foomatic/db/source/printer/Ricoh-IM_5000.xml
+share/foomatic/db/source/printer/Ricoh-IM_5000_JPN.xml
 share/foomatic/db/source/printer/Ricoh-IM_550.xml
 share/foomatic/db/source/printer/Ricoh-IM_600.xml
 share/foomatic/db/source/printer/Ricoh-IM_6000.xml
+share/foomatic/db/source/printer/Ricoh-IM_6000_JPN.xml
 share/foomatic/db/source/printer/Ricoh-IM_600SR.xml
 share/foomatic/db/source/printer/Ricoh-IM_7000.xml
 share/foomatic/db/source/printer/Ricoh-IM_7000_JPN.xml