18 files changed, 108 insertions, 18 deletions

diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile
index a5be0f6722e7..2459afd32e60 100644
--- a/editors/openoffice-3-devel/Makefile
+++ b/editors/openoffice-3-devel/Makefile
@@ -129,7 +129,6 @@ BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf #i85469#
 
 BUILD_DEPENDS+=	ant:${PORTSDIR}/devel/apache-ant
-LIB_DEPENDS+=	cups.2:${PORTSDIR}/print/cups-base
 .if !defined(WITH_GPC)
 LIB_DEPENDS+=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl
 .endif
@@ -146,7 +145,6 @@ MAXMODULES?=	1
 CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp		\
 			--with-gnu-patch=${LOCALBASE}/bin/gpatch	\
 			--enable-crashdump=yes				\
-			--enable-cups=yes				\
 			--with-system-zlib
 .if ${ARCH} == amd64
 WITHOUT_MOZILLA=	yes
diff --git a/editors/openoffice-3-devel/files/Makefile.knobs b/editors/openoffice-3-devel/files/Makefile.knobs
index 27ed04f87275..6370fb721b04 100644
--- a/editors/openoffice-3-devel/files/Makefile.knobs
+++ b/editors/openoffice-3-devel/files/Makefile.knobs
@@ -13,6 +13,13 @@ CONFIGURE_ARGS+=	--with-vba-package-format="builtin"
 CONFIGURE_ARGS+=	--enable-kde QTDIR="${QT_PREFIX}"
 .endif
 
+.if defined(WITHOUT_CUPS)
+CONFIGURE_ARGS+=	--enable-cups=no
+.else
+LIB_DEPENDS+=		cups.2:${PORTSDIR}/print/cups-base
+CONFIGURE_ARGS+=	--enable-cups=yes
+.endif
+
 .if defined(WITHOUT_MOZILLA)
 CONFIGURE_ARGS+=	--disable-mozilla
 .else
@@ -94,6 +101,11 @@ pre-fetch:
 	@${ECHO} "See http://www.freetype.org/patents.html for details"
 .endif
 .endif
+.if !defined(WITHOUT_CUPS)
+	@${ECHO}
+	@${ECHO} "You can compile OOo without CUPS support with"
+	@${ECHO} "make -DWITHOUT_CUPS"
+.endif
 .if !defined(WITH_KDE)
 	@${ECHO}
 	@${ECHO} "You can compile OOo to use Qt/KDE vclplug with"
diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index d64639881a40..1ff8da786317 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -126,7 +126,6 @@ BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		bash:${PORTSDIR}/shells/bash \
 		imake:${X_IMAKE_PORT}
 BUILD_DEPENDS+=	ant:${PORTSDIR}/devel/apache-ant
-LIB_DEPENDS+=	cups.2:${PORTSDIR}/print/cups-base
 .if !defined(WITH_GPC)
 LIB_DEPENDS+=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl
 .endif
@@ -142,7 +141,6 @@ NUMOFPROCESSES?=	1
 CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp		\
 			--with-gnu-patch=${LOCALBASE}/bin/gpatch	\
 			--enable-crashdump=yes				\
-			--enable-cups=yes				\
 			--with-system-zlib
 .if ${ARCH} == amd64
 WITHOUT_MOZILLA=	yes
diff --git a/editors/openoffice-3/files/Makefile.knobs b/editors/openoffice-3/files/Makefile.knobs
index d6e7257fec39..a0926318a1c6 100644
--- a/editors/openoffice-3/files/Makefile.knobs
+++ b/editors/openoffice-3/files/Makefile.knobs
@@ -10,6 +10,13 @@ CONFIGURE_ARGS+=	--with-vba-package-format="builtin"
 CONFIGURE_ARGS+=	--enable-kde QTDIR="${QT_PREFIX}"
 .endif
 
+.if defined(WITHOUT_CUPS)
+CONFIGURE_ARGS+=	--enable-cups=no
+.else
+LIB_DEPENDS+=		cups.2:${PORTSDIR}/print/cups-base
+CONFIGURE_ARGS+=	--enable-cups=yes
+.endif
+
 .if defined(WITHOUT_MOZILLA)
 CONFIGURE_ARGS+=	--disable-mozilla
 .else
@@ -91,6 +98,11 @@ pre-fetch:
 	@${ECHO} "See http://www.freetype.org/patents.html for details"
 .endif
 .endif
+.if !defined(WITHOUT_CUPS)
+	@${ECHO}
+	@${ECHO} "You can compile OOo without CUPS support with"
+	@${ECHO} "make -DWITHOUT_CUPS"
+.endif
 .if !defined(WITH_KDE)
 	@${ECHO}
 	@${ECHO} "You can compile OOo to use Qt/KDE vclplug with"
diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile
index 4b5bd11d4d30..c61303901bc0 100644
--- a/editors/openoffice.org-2-RC/Makefile
+++ b/editors/openoffice.org-2-RC/Makefile
@@ -126,7 +126,6 @@ BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		bash:${PORTSDIR}/shells/bash \
 		imake:${X_IMAKE_PORT}
 BUILD_DEPENDS+=	ant:${PORTSDIR}/devel/apache-ant
-LIB_DEPENDS+=	cups.2:${PORTSDIR}/print/cups-base
 .if !defined(WITH_GPC)
 LIB_DEPENDS+=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl
 .endif
@@ -142,7 +141,6 @@ NUMOFPROCESSES?=	1
 CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp		\
 			--with-gnu-patch=${LOCALBASE}/bin/gpatch	\
 			--enable-crashdump=yes				\
-			--enable-cups=yes				\
 			--with-system-zlib
 .if ${ARCH} == amd64
 WITHOUT_MOZILLA=	yes
diff --git a/editors/openoffice.org-2-RC/files/Makefile.knobs b/editors/openoffice.org-2-RC/files/Makefile.knobs
index d6e7257fec39..a0926318a1c6 100644
--- a/editors/openoffice.org-2-RC/files/Makefile.knobs
+++ b/editors/openoffice.org-2-RC/files/Makefile.knobs
@@ -10,6 +10,13 @@ CONFIGURE_ARGS+=	--with-vba-package-format="builtin"
 CONFIGURE_ARGS+=	--enable-kde QTDIR="${QT_PREFIX}"
 .endif
 
+.if defined(WITHOUT_CUPS)
+CONFIGURE_ARGS+=	--enable-cups=no
+.else
+LIB_DEPENDS+=		cups.2:${PORTSDIR}/print/cups-base
+CONFIGURE_ARGS+=	--enable-cups=yes
+.endif
+
 .if defined(WITHOUT_MOZILLA)
 CONFIGURE_ARGS+=	--disable-mozilla
 .else
@@ -91,6 +98,11 @@ pre-fetch:
 	@${ECHO} "See http://www.freetype.org/patents.html for details"
 .endif
 .endif
+.if !defined(WITHOUT_CUPS)
+	@${ECHO}
+	@${ECHO} "You can compile OOo without CUPS support with"
+	@${ECHO} "make -DWITHOUT_CUPS"
+.endif
 .if !defined(WITH_KDE)
 	@${ECHO}
 	@${ECHO} "You can compile OOo to use Qt/KDE vclplug with"
diff --git a/editors/openoffice.org-2-devel/Makefile b/editors/openoffice.org-2-devel/Makefile
index 271541c2ca9b..0a283e19b81d 100644
--- a/editors/openoffice.org-2-devel/Makefile
+++ b/editors/openoffice.org-2-devel/Makefile
@@ -130,7 +130,6 @@ BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf #i85469#
 
 BUILD_DEPENDS+=	ant:${PORTSDIR}/devel/apache-ant
-LIB_DEPENDS+=	cups.2:${PORTSDIR}/print/cups-base
 .if !defined(WITH_GPC)
 LIB_DEPENDS+=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl
 .endif
@@ -147,7 +146,6 @@ MAXMODULES?=	1
 CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp		\
 			--with-gnu-patch=${LOCALBASE}/bin/gpatch	\
 			--enable-crashdump=yes				\
-			--enable-cups=yes				\
 			--with-system-zlib
 .if ${ARCH} == amd64
 WITHOUT_MOZILLA=	yes
diff --git a/editors/openoffice.org-2-devel/files/Makefile.knobs b/editors/openoffice.org-2-devel/files/Makefile.knobs
index d6e7257fec39..a0926318a1c6 100644
--- a/editors/openoffice.org-2-devel/files/Makefile.knobs
+++ b/editors/openoffice.org-2-devel/files/Makefile.knobs
@@ -10,6 +10,13 @@ CONFIGURE_ARGS+=	--with-vba-package-format="builtin"
 CONFIGURE_ARGS+=	--enable-kde QTDIR="${QT_PREFIX}"
 .endif
 
+.if defined(WITHOUT_CUPS)
+CONFIGURE_ARGS+=	--enable-cups=no
+.else
+LIB_DEPENDS+=		cups.2:${PORTSDIR}/print/cups-base
+CONFIGURE_ARGS+=	--enable-cups=yes
+.endif
+
 .if defined(WITHOUT_MOZILLA)
 CONFIGURE_ARGS+=	--disable-mozilla
 .else
@@ -91,6 +98,11 @@ pre-fetch:
 	@${ECHO} "See http://www.freetype.org/patents.html for details"
 .endif
 .endif
+.if !defined(WITHOUT_CUPS)
+	@${ECHO}
+	@${ECHO} "You can compile OOo without CUPS support with"
+	@${ECHO} "make -DWITHOUT_CUPS"
+.endif
 .if !defined(WITH_KDE)
 	@${ECHO}
 	@${ECHO} "You can compile OOo to use Qt/KDE vclplug with"
diff --git a/editors/openoffice.org-2/Makefile b/editors/openoffice.org-2/Makefile
index d64639881a40..1ff8da786317 100644
--- a/editors/openoffice.org-2/Makefile
+++ b/editors/openoffice.org-2/Makefile
@@ -126,7 +126,6 @@ BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		bash:${PORTSDIR}/shells/bash \
 		imake:${X_IMAKE_PORT}
 BUILD_DEPENDS+=	ant:${PORTSDIR}/devel/apache-ant
-LIB_DEPENDS+=	cups.2:${PORTSDIR}/print/cups-base
 .if !defined(WITH_GPC)
 LIB_DEPENDS+=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl
 .endif
@@ -142,7 +141,6 @@ NUMOFPROCESSES?=	1
 CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp		\
 			--with-gnu-patch=${LOCALBASE}/bin/gpatch	\
 			--enable-crashdump=yes				\
-			--enable-cups=yes				\
 			--with-system-zlib
 .if ${ARCH} == amd64
 WITHOUT_MOZILLA=	yes
diff --git a/editors/openoffice.org-2/files/Makefile.knobs b/editors/openoffice.org-2/files/Makefile.knobs
index d6e7257fec39..a0926318a1c6 100644
--- a/editors/openoffice.org-2/files/Makefile.knobs
+++ b/editors/openoffice.org-2/files/Makefile.knobs
@@ -10,6 +10,13 @@ CONFIGURE_ARGS+=	--with-vba-package-format="builtin"
 CONFIGURE_ARGS+=	--enable-kde QTDIR="${QT_PREFIX}"
 .endif
 
+.if defined(WITHOUT_CUPS)
+CONFIGURE_ARGS+=	--enable-cups=no
+.else
+LIB_DEPENDS+=		cups.2:${PORTSDIR}/print/cups-base
+CONFIGURE_ARGS+=	--enable-cups=yes
+.endif
+
 .if defined(WITHOUT_MOZILLA)
 CONFIGURE_ARGS+=	--disable-mozilla
 .else
@@ -91,6 +98,11 @@ pre-fetch:
 	@${ECHO} "See http://www.freetype.org/patents.html for details"
 .endif
 .endif
+.if !defined(WITHOUT_CUPS)
+	@${ECHO}
+	@${ECHO} "You can compile OOo without CUPS support with"
+	@${ECHO} "make -DWITHOUT_CUPS"
+.endif
 .if !defined(WITH_KDE)
 	@${ECHO}
 	@${ECHO} "You can compile OOo to use Qt/KDE vclplug with"
diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile
index 4b5bd11d4d30..c61303901bc0 100644
--- a/editors/openoffice.org-3-RC/Makefile
+++ b/editors/openoffice.org-3-RC/Makefile
@@ -126,7 +126,6 @@ BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		bash:${PORTSDIR}/shells/bash \
 		imake:${X_IMAKE_PORT}
 BUILD_DEPENDS+=	ant:${PORTSDIR}/devel/apache-ant
-LIB_DEPENDS+=	cups.2:${PORTSDIR}/print/cups-base
 .if !defined(WITH_GPC)
 LIB_DEPENDS+=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl
 .endif
@@ -142,7 +141,6 @@ NUMOFPROCESSES?=	1
 CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp		\
 			--with-gnu-patch=${LOCALBASE}/bin/gpatch	\
 			--enable-crashdump=yes				\
-			--enable-cups=yes				\
 			--with-system-zlib
 .if ${ARCH} == amd64
 WITHOUT_MOZILLA=	yes
diff --git a/editors/openoffice.org-3-RC/files/Makefile.knobs b/editors/openoffice.org-3-RC/files/Makefile.knobs
index d6e7257fec39..a0926318a1c6 100644
--- a/editors/openoffice.org-3-RC/files/Makefile.knobs
+++ b/editors/openoffice.org-3-RC/files/Makefile.knobs
@@ -10,6 +10,13 @@ CONFIGURE_ARGS+=	--with-vba-package-format="builtin"
 CONFIGURE_ARGS+=	--enable-kde QTDIR="${QT_PREFIX}"
 .endif
 
+.if defined(WITHOUT_CUPS)
+CONFIGURE_ARGS+=	--enable-cups=no
+.else
+LIB_DEPENDS+=		cups.2:${PORTSDIR}/print/cups-base
+CONFIGURE_ARGS+=	--enable-cups=yes
+.endif
+
 .if defined(WITHOUT_MOZILLA)
 CONFIGURE_ARGS+=	--disable-mozilla
 .else
@@ -91,6 +98,11 @@ pre-fetch:
 	@${ECHO} "See http://www.freetype.org/patents.html for details"
 .endif
 .endif
+.if !defined(WITHOUT_CUPS)
+	@${ECHO}
+	@${ECHO} "You can compile OOo without CUPS support with"
+	@${ECHO} "make -DWITHOUT_CUPS"
+.endif
 .if !defined(WITH_KDE)
 	@${ECHO}
 	@${ECHO} "You can compile OOo to use Qt/KDE vclplug with"
diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile
index a5be0f6722e7..2459afd32e60 100644
--- a/editors/openoffice.org-3-devel/Makefile
+++ b/editors/openoffice.org-3-devel/Makefile
@@ -129,7 +129,6 @@ BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf #i85469#
 
 BUILD_DEPENDS+=	ant:${PORTSDIR}/devel/apache-ant
-LIB_DEPENDS+=	cups.2:${PORTSDIR}/print/cups-base
 .if !defined(WITH_GPC)
 LIB_DEPENDS+=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl
 .endif
@@ -146,7 +145,6 @@ MAXMODULES?=	1
 CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp		\
 			--with-gnu-patch=${LOCALBASE}/bin/gpatch	\
 			--enable-crashdump=yes				\
-			--enable-cups=yes				\
 			--with-system-zlib
 .if ${ARCH} == amd64
 WITHOUT_MOZILLA=	yes
diff --git a/editors/openoffice.org-3-devel/files/Makefile.knobs b/editors/openoffice.org-3-devel/files/Makefile.knobs
index 27ed04f87275..6370fb721b04 100644
--- a/editors/openoffice.org-3-devel/files/Makefile.knobs
+++ b/editors/openoffice.org-3-devel/files/Makefile.knobs
@@ -13,6 +13,13 @@ CONFIGURE_ARGS+=	--with-vba-package-format="builtin"
 CONFIGURE_ARGS+=	--enable-kde QTDIR="${QT_PREFIX}"
 .endif
 
+.if defined(WITHOUT_CUPS)
+CONFIGURE_ARGS+=	--enable-cups=no
+.else
+LIB_DEPENDS+=		cups.2:${PORTSDIR}/print/cups-base
+CONFIGURE_ARGS+=	--enable-cups=yes
+.endif
+
 .if defined(WITHOUT_MOZILLA)
 CONFIGURE_ARGS+=	--disable-mozilla
 .else
@@ -94,6 +101,11 @@ pre-fetch:
 	@${ECHO} "See http://www.freetype.org/patents.html for details"
 .endif
 .endif
+.if !defined(WITHOUT_CUPS)
+	@${ECHO}
+	@${ECHO} "You can compile OOo without CUPS support with"
+	@${ECHO} "make -DWITHOUT_CUPS"
+.endif
 .if !defined(WITH_KDE)
 	@${ECHO}
 	@${ECHO} "You can compile OOo to use Qt/KDE vclplug with"
diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile
index d64639881a40..1ff8da786317 100644
--- a/editors/openoffice.org-3/Makefile
+++ b/editors/openoffice.org-3/Makefile
@@ -126,7 +126,6 @@ BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		bash:${PORTSDIR}/shells/bash \
 		imake:${X_IMAKE_PORT}
 BUILD_DEPENDS+=	ant:${PORTSDIR}/devel/apache-ant
-LIB_DEPENDS+=	cups.2:${PORTSDIR}/print/cups-base
 .if !defined(WITH_GPC)
 LIB_DEPENDS+=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl
 .endif
@@ -142,7 +141,6 @@ NUMOFPROCESSES?=	1
 CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp		\
 			--with-gnu-patch=${LOCALBASE}/bin/gpatch	\
 			--enable-crashdump=yes				\
-			--enable-cups=yes				\
 			--with-system-zlib
 .if ${ARCH} == amd64
 WITHOUT_MOZILLA=	yes
diff --git a/editors/openoffice.org-3/files/Makefile.knobs b/editors/openoffice.org-3/files/Makefile.knobs
index d6e7257fec39..a0926318a1c6 100644
--- a/editors/openoffice.org-3/files/Makefile.knobs
+++ b/editors/openoffice.org-3/files/Makefile.knobs
@@ -10,6 +10,13 @@ CONFIGURE_ARGS+=	--with-vba-package-format="builtin"
 CONFIGURE_ARGS+=	--enable-kde QTDIR="${QT_PREFIX}"
 .endif
 
+.if defined(WITHOUT_CUPS)
+CONFIGURE_ARGS+=	--enable-cups=no
+.else
+LIB_DEPENDS+=		cups.2:${PORTSDIR}/print/cups-base
+CONFIGURE_ARGS+=	--enable-cups=yes
+.endif
+
 .if defined(WITHOUT_MOZILLA)
 CONFIGURE_ARGS+=	--disable-mozilla
 .else
@@ -91,6 +98,11 @@ pre-fetch:
 	@${ECHO} "See http://www.freetype.org/patents.html for details"
 .endif
 .endif
+.if !defined(WITHOUT_CUPS)
+	@${ECHO}
+	@${ECHO} "You can compile OOo without CUPS support with"
+	@${ECHO} "make -DWITHOUT_CUPS"
+.endif
 .if !defined(WITH_KDE)
 	@${ECHO}
 	@${ECHO} "You can compile OOo to use Qt/KDE vclplug with"
diff --git a/editors/openoffice.org-vcltesttool/Makefile b/editors/openoffice.org-vcltesttool/Makefile
index 271541c2ca9b..0a283e19b81d 100644
--- a/editors/openoffice.org-vcltesttool/Makefile
+++ b/editors/openoffice.org-vcltesttool/Makefile
@@ -130,7 +130,6 @@ BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf #i85469#
 
 BUILD_DEPENDS+=	ant:${PORTSDIR}/devel/apache-ant
-LIB_DEPENDS+=	cups.2:${PORTSDIR}/print/cups-base
 .if !defined(WITH_GPC)
 LIB_DEPENDS+=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl
 .endif
@@ -147,7 +146,6 @@ MAXMODULES?=	1
 CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp		\
 			--with-gnu-patch=${LOCALBASE}/bin/gpatch	\
 			--enable-crashdump=yes				\
-			--enable-cups=yes				\
 			--with-system-zlib
 .if ${ARCH} == amd64
 WITHOUT_MOZILLA=	yes
diff --git a/editors/openoffice.org-vcltesttool/files/Makefile.knobs b/editors/openoffice.org-vcltesttool/files/Makefile.knobs
index d6e7257fec39..a0926318a1c6 100644
--- a/editors/openoffice.org-vcltesttool/files/Makefile.knobs
+++ b/editors/openoffice.org-vcltesttool/files/Makefile.knobs
@@ -10,6 +10,13 @@ CONFIGURE_ARGS+=	--with-vba-package-format="builtin"
 CONFIGURE_ARGS+=	--enable-kde QTDIR="${QT_PREFIX}"
 .endif
 
+.if defined(WITHOUT_CUPS)
+CONFIGURE_ARGS+=	--enable-cups=no
+.else
+LIB_DEPENDS+=		cups.2:${PORTSDIR}/print/cups-base
+CONFIGURE_ARGS+=	--enable-cups=yes
+.endif
+
 .if defined(WITHOUT_MOZILLA)
 CONFIGURE_ARGS+=	--disable-mozilla
 .else
@@ -91,6 +98,11 @@ pre-fetch:
 	@${ECHO} "See http://www.freetype.org/patents.html for details"
 .endif
 .endif
+.if !defined(WITHOUT_CUPS)
+	@${ECHO}
+	@${ECHO} "You can compile OOo without CUPS support with"
+	@${ECHO} "make -DWITHOUT_CUPS"
+.endif
 .if !defined(WITH_KDE)
 	@${ECHO}
 	@${ECHO} "You can compile OOo to use Qt/KDE vclplug with"