4 files changed, 18 insertions, 45 deletions

diff --git a/print/foomatic-db/Makefile b/print/foomatic-db/Makefile
index af53e2c42aa6..6db6632f9b68 100644
--- a/print/foomatic-db/Makefile
+++ b/print/foomatic-db/Makefile
@@ -5,11 +5,14 @@
 # $FreeBSD$
 #
 
-PORTNAME=	foomatic-db
-PORTVERSION=	20060506
+PORTNAME=	db
+PORTVERSION=	20060531
 CATEGORIES=	print
-MASTER_SITES=	# custom fetch
-NO_CHECKSUM=	${DISTFILES}
+MASTER_SITES=	${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR=	pav
+PKGNAMEPREFIX=	foomatic-
+DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${FOOMATICVER}-${PORTVERSION}
+DIST_SUBDIR=	foomatic
 
 MAINTAINER=	acardenas@bsd.org.pe
 COMMENT=	Foomatic database
@@ -19,50 +22,15 @@ LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2 \
 
 USE_GMAKE=	yes
 USE_PERL5=	yes
-USE_BZIP2=	yes
 USE_AUTOTOOLS=	automake:15:env autoconf:259
 
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
-.include <bsd.port.pre.mk>
-CVS_CMD?=	cvs -z3
-CVS_DATE=	${PORTVERSION}
-CVS_SITES?=	pserver:anonymous@cvs.linuxprinting.org:/var/lib/cvs
-CVS_BRANCH=	foomatic-3_0-branch	# STABLE
-CVS_MODULE=	foomatic-db
-
-#
-# CVS checkout stuff mostly stolen from security/openssh-askpass port by
-# kris@freebsd.org
-#
-do-fetch:
-	@if test ! -f ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ; then \
-		${MKDIR} ${DISTDIR}/${DISTNAME} && \
-		cd ${DISTDIR}/${DISTNAME}; \
-		for CVS_SITE in ${CVS_SITES}; do \
-			${ECHO_MSG} ">> Attempting to check out from $${CVS_SITE}."; \
-			if ${CVS_CMD} -d:$${CVS_SITE} co -D "${CVS_DATE}" -r ${CVS_BRANCH} ${CVS_MODULE}; \
-			    then \
-				cd ${DISTDIR}; \
-				${ECHO_MSG} ">> Creating dist tarball in ${DISTDIR}"; \
-				${ECHO_MSG} ">> \"${DISTNAME}${EXTRACT_SUFX}\"."; \
-				${MV} ${DISTNAME}/${CVS_MODULE} \
-					${DISTNAME}/${CVS_MODULE:H}/${DISTNAME}; \
-				${TAR} -cj \
-					-X ${FILESDIR}/tarignore \
-					-f ${DISTNAME}${EXTRACT_SUFX} \
-					-C ${DISTNAME}/${CVS_MODULE:H} \
-					${DISTNAME}; \
-				exit; \
-			fi \
-		done; \
-		${RMDIR} ${DISTDIR}/${DISTNAME}; \
-		${ECHO_MSG} ">> CVS checkout failed."; \
-		exit 1; \
-	fi
+FOOMATICVER=	3.0
+WRKSRC=	${WRKDIR}/${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
 
 pre-configure:
 	@cd ${WRKSRC} && ${ACLOCAL} && ${AUTOCONF}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/print/foomatic-db/distinfo b/print/foomatic-db/distinfo
index 909a246d04e3..51c38bf1e832 100644
--- a/print/foomatic-db/distinfo
+++ b/print/foomatic-db/distinfo
@@ -1 +1,3 @@
-Data is retrieved via CVS
+MD5 (foomatic/foomatic-db-3.0-20060531.tar.gz) = 96c431f959320ad85dd230a416f9874a
+SHA256 (foomatic/foomatic-db-3.0-20060531.tar.gz) = 259bf41fa737dc9d5613b70db88456d7a430664cfbd48b999e80cfc97c0eea4b
+SIZE (foomatic/foomatic-db-3.0-20060531.tar.gz) = 12273229
diff --git a/print/foomatic-db/files/tarignore b/print/foomatic-db/files/tarignore
deleted file mode 100644
index 7ac83b287f2f..000000000000
--- a/print/foomatic-db/files/tarignore
+++ /dev/null
@@ -1 +0,0 @@
-CVS
diff --git a/print/foomatic-db/pkg-plist b/print/foomatic-db/pkg-plist
index 4190707e146f..b994b32c0010 100644
--- a/print/foomatic-db/pkg-plist
+++ b/print/foomatic-db/pkg-plist
@@ -1540,6 +1540,7 @@ share/foomatic/db/source/driver/ras3.upp.xml
 share/foomatic/db/source/driver/ras32.upp.xml
 share/foomatic/db/source/driver/ras4.upp.xml
 share/foomatic/db/source/driver/ras8m.upp.xml
+share/foomatic/db/source/driver/rastertokmXXXXdl.xml
 share/foomatic/db/source/driver/rpdl.xml
 share/foomatic/db/source/driver/s400a1.upp.xml
 share/foomatic/db/source/driver/s400b1.upp.xml
@@ -3183,6 +3184,10 @@ share/foomatic/db/source/printer/Infotec-IS_2235.xml
 share/foomatic/db/source/printer/Infotec-IS_2245.xml
 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_5430_DL.xml
+share/foomatic/db/source/printer/KonicaMinolta-magicolor_5440_DL.xml
 share/foomatic/db/source/printer/Kyocera-F-1000.xml
 share/foomatic/db/source/printer/Kyocera-F-1010.xml
 share/foomatic/db/source/printer/Kyocera-F-1200.xml
@@ -3400,7 +3405,6 @@ share/foomatic/db/source/printer/Minolta-magicolor_2200_DL.xml
 share/foomatic/db/source/printer/Minolta-magicolor_2300W.xml
 share/foomatic/db/source/printer/Minolta-magicolor_2300_DL.xml
 share/foomatic/db/source/printer/Minolta-magicolor_2400W.xml
-share/foomatic/db/source/printer/Minolta-magicolor_2430_DL.xml
 share/foomatic/db/source/printer/Minolta-magicolor_3100.xml
 share/foomatic/db/source/printer/Mitsubishi-CP50_Color_Printer.xml
 share/foomatic/db/source/printer/NEC-MultiWriter.xml