From a21716b7e0e6274c9ae480c063beb14da6b1064b Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Sun, 6 Nov 2011 17:25:51 +0000 Subject: [PATCH] Resolve conflict with foo2zjs. --- print/foomatic-db/Makefile | 5 ++++- print/foomatic-db/pkg/PLIST | 3 +-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/print/foomatic-db/Makefile b/print/foomatic-db/Makefile index dc0b21d10ae..eb3ee3f4e0a 100644 --- a/print/foomatic-db/Makefile +++ b/print/foomatic-db/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.18 2011/07/08 23:28:17 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.19 2011/11/06 17:25:51 ajacoutot Exp $ PKG_ARCH= * @@ -9,6 +9,8 @@ DISTNAME= foomatic-db-4.0-${V} PKGNAME= foomatic-db-4.0.${V} CATEGORIES= print +REVISION= 0 + HOMEPAGE= http://www.linux-foundation.org/en/OpenPrinting/Database/Foomatic MAINTAINER= Antoine Jacoutot @@ -42,6 +44,7 @@ pre-configure: rm -f ${WRKSRC}/db/source/driver/foo2${x}.xml \ ${WRKSRC}/db/source/opt/foo2${x}-* .endfor + rm ${WRKSRC}/db/source/printer/KONICA_MINOLTA-magicolor_2430_DL.xml .for i in Xerox-Phaser_6110 Samsung-CLP-300 Samsung-CLP-310 Samsung-CLP-315 mv ${WRKSRC}/db/source/printer/${i}.xml \ ${WRKSRC}/db/source/printer/${i}-splix.xml diff --git a/print/foomatic-db/pkg/PLIST b/print/foomatic-db/pkg/PLIST index 065c4b5fa8b..5194b975799 100644 --- a/print/foomatic-db/pkg/PLIST +++ b/print/foomatic-db/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.10 2011/07/08 23:28:17 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.11 2011/11/06 17:25:51 ajacoutot Exp $ share/foomatic/ share/foomatic/db/ share/foomatic/db/oldprinterids @@ -5132,7 +5132,6 @@ share/foomatic/db/source/printer/KONICA_MINOLTA-bizhub_C450P.xml share/foomatic/db/source/printer/KONICA_MINOLTA-bizhub_C451.xml share/foomatic/db/source/printer/KONICA_MINOLTA-bizhub_C550.xml share/foomatic/db/source/printer/KONICA_MINOLTA-magicolor_2300_DL.xml -share/foomatic/db/source/printer/KONICA_MINOLTA-magicolor_2430_DL.xml share/foomatic/db/source/printer/KONICA_MINOLTA-magicolor_5430_DL.xml share/foomatic/db/source/printer/KONICA_MINOLTA-magicolor_5440_DL.xml share/foomatic/db/source/printer/Kodak-DigiSource_9110.xml