aboutsummaryrefslogtreecommitdiffstats
path: root/print
diff options
context:
space:
mode:
authoramdmi3 <amdmi3@FreeBSD.org>2009-08-05 09:04:25 +0800
committeramdmi3 <amdmi3@FreeBSD.org>2009-08-05 09:04:25 +0800
commit5d52467f3e1215b4521d0d4bf281aa8afbf075f3 (patch)
tree5b9c87350533b6b43095c6c332ad9366fddfa1b7 /print
parent1dca13172c02516a4152cba25058924aedbd62bb (diff)
downloadfreebsd-ports-gnome-5d52467f3e1215b4521d0d4bf281aa8afbf075f3.tar.gz
freebsd-ports-gnome-5d52467f3e1215b4521d0d4bf281aa8afbf075f3.tar.zst
freebsd-ports-gnome-5d52467f3e1215b4521d0d4bf281aa8afbf075f3.zip
- Connect print/hplip3 to build
- Add mutual CONFLICTS for hpijs, hplip and hplip3
Diffstat (limited to 'print')
-rw-r--r--print/Makefile1
-rw-r--r--print/hpijs/Makefile2
-rw-r--r--print/hplip/Makefile2
-rw-r--r--print/hplip3/Makefile2
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 \