From 76a9b6e9fff6ed702c533547e4601380ad424e60 Mon Sep 17 00:00:00 2001 From: Dmitry Marakasov Date: Wed, 5 Aug 2009 01:04:25 +0000 Subject: [PATCH] - Connect print/hplip3 to build - Add mutual CONFLICTS for hpijs, hplip and hplip3 --- print/Makefile | 1 + print/hpijs/Makefile | 2 ++ print/hplip/Makefile | 2 +- print/hplip3/Makefile | 2 +- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/print/Makefile b/print/Makefile index 5809aa5d48a7..b624e4c44759 100644 --- a/print/Makefile +++ b/print/Makefile @@ -118,6 +118,7 @@ SUBDIR += hp2xx SUBDIR += hpijs SUBDIR += hplip + SUBDIR += hplip3 SUBDIR += hs-hscolour SUBDIR += hs-hscolour-docs SUBDIR += html2latex diff --git a/print/hpijs/Makefile b/print/hpijs/Makefile index b1d1ac79046e..94627d8271a7 100644 --- a/print/hpijs/Makefile +++ b/print/hpijs/Makefile @@ -17,6 +17,8 @@ COMMENT= Drivers and support resources for HP Inkjet Printers LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg +CONFLICTS= hplip-[0-9]* + GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-dependency-tracking USE_GHOSTSCRIPT_RUN= yes diff --git a/print/hplip/Makefile b/print/hplip/Makefile index a8629e452bc8..39bd09ac929a 100644 --- a/print/hplip/Makefile +++ b/print/hplip/Makefile @@ -23,7 +23,7 @@ LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/reportlab/__init__.py:${PORTSDIR}/print/py-reportlab2 \ foomatic-rip:${PORTSDIR}/print/foomatic-filters -CONFLICTS= hpijs-* +CONFLICTS= hpijs-[0-9]* hplip-[3-9]* GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-dependency-tracking \ diff --git a/print/hplip3/Makefile b/print/hplip3/Makefile index d7d9025476c8..46e29118eda8 100644 --- a/print/hplip3/Makefile +++ b/print/hplip3/Makefile @@ -25,7 +25,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/reportlab/__init__.py:${PORTSDIR}/print/py-rep espgs:${PORTSDIR}/print/cups-pstoraster \ foomatic-rip:${PORTSDIR}/print/foomatic-filters -CONFLICTS= hpijs-[0-9]* hplip-[0-9]* +CONFLICTS= hpijs-[0-9]* hplip-2* GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-dependency-tracking \