Now CUPS is default.

8 files changed, 8 insertions, 48 deletions

diff --git a/editors/openoffice.org-2-RC/Makefile b/editors/openoffice.org-2-RC/Makefile
index c61303901bc0..4b5bd11d4d30 100644
--- a/editors/openoffice.org-2-RC/Makefile
+++ b/editors/openoffice.org-2-RC/Makefile
@@ -126,6 +126,7 @@ 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
@@ -141,6 +142,7 @@ 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 e9a84ffd26d1..fc443d04a8d1 100644
--- a/editors/openoffice.org-2-RC/files/Makefile.knobs
+++ b/editors/openoffice.org-2-RC/files/Makefile.knobs
@@ -10,13 +10,6 @@ CONFIGURE_ARGS+=	--with-vba-package-format="builtin"
 CONFIGURE_ARGS+=	--enable-kde QTDIR="${QT_PREFIX}"
 .endif
 
-.if defined(WITH_CUPS)
-LIB_DEPENDS+=		cups.2:${PORTSDIR}/print/cups-base
-CONFIGURE_ARGS+=	--enable-cups=yes
-.else
-CONFIGURE_ARGS+=	--enable-cups=no
-.endif
-
 .if defined(WITHOUT_MOZILLA)
 CONFIGURE_ARGS+=	--disable-mozilla
 .else
@@ -112,11 +105,6 @@ pre-fetch:
 	@${ECHO} "zh-CN zh-TW zu"
 	@${ECHO} "Default: en-US"
 .endif
-.if !defined(WITH_CUPS)
-	@${ECHO}
-	@${ECHO} "You can compile OOo with CUPS support with"
-	@${ECHO} "make -DWITH_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 0a283e19b81d..271541c2ca9b 100644
--- a/editors/openoffice.org-2-devel/Makefile
+++ b/editors/openoffice.org-2-devel/Makefile
@@ -130,6 +130,7 @@ 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,6 +147,7 @@ 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 e9a84ffd26d1..fc443d04a8d1 100644
--- a/editors/openoffice.org-2-devel/files/Makefile.knobs
+++ b/editors/openoffice.org-2-devel/files/Makefile.knobs
@@ -10,13 +10,6 @@ CONFIGURE_ARGS+=	--with-vba-package-format="builtin"
 CONFIGURE_ARGS+=	--enable-kde QTDIR="${QT_PREFIX}"
 .endif
 
-.if defined(WITH_CUPS)
-LIB_DEPENDS+=		cups.2:${PORTSDIR}/print/cups-base
-CONFIGURE_ARGS+=	--enable-cups=yes
-.else
-CONFIGURE_ARGS+=	--enable-cups=no
-.endif
-
 .if defined(WITHOUT_MOZILLA)
 CONFIGURE_ARGS+=	--disable-mozilla
 .else
@@ -112,11 +105,6 @@ pre-fetch:
 	@${ECHO} "zh-CN zh-TW zu"
 	@${ECHO} "Default: en-US"
 .endif
-.if !defined(WITH_CUPS)
-	@${ECHO}
-	@${ECHO} "You can compile OOo with CUPS support with"
-	@${ECHO} "make -DWITH_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 c61303901bc0..4b5bd11d4d30 100644
--- a/editors/openoffice.org-3-RC/Makefile
+++ b/editors/openoffice.org-3-RC/Makefile
@@ -126,6 +126,7 @@ 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
@@ -141,6 +142,7 @@ 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 e9a84ffd26d1..fc443d04a8d1 100644
--- a/editors/openoffice.org-3-RC/files/Makefile.knobs
+++ b/editors/openoffice.org-3-RC/files/Makefile.knobs
@@ -10,13 +10,6 @@ CONFIGURE_ARGS+=	--with-vba-package-format="builtin"
 CONFIGURE_ARGS+=	--enable-kde QTDIR="${QT_PREFIX}"
 .endif
 
-.if defined(WITH_CUPS)
-LIB_DEPENDS+=		cups.2:${PORTSDIR}/print/cups-base
-CONFIGURE_ARGS+=	--enable-cups=yes
-.else
-CONFIGURE_ARGS+=	--enable-cups=no
-.endif
-
 .if defined(WITHOUT_MOZILLA)
 CONFIGURE_ARGS+=	--disable-mozilla
 .else
@@ -112,11 +105,6 @@ pre-fetch:
 	@${ECHO} "zh-CN zh-TW zu"
 	@${ECHO} "Default: en-US"
 .endif
-.if !defined(WITH_CUPS)
-	@${ECHO}
-	@${ECHO} "You can compile OOo with CUPS support with"
-	@${ECHO} "make -DWITH_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 0a283e19b81d..271541c2ca9b 100644
--- a/editors/openoffice.org-vcltesttool/Makefile
+++ b/editors/openoffice.org-vcltesttool/Makefile
@@ -130,6 +130,7 @@ 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,6 +147,7 @@ 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 e9a84ffd26d1..fc443d04a8d1 100644
--- a/editors/openoffice.org-vcltesttool/files/Makefile.knobs
+++ b/editors/openoffice.org-vcltesttool/files/Makefile.knobs
@@ -10,13 +10,6 @@ CONFIGURE_ARGS+=	--with-vba-package-format="builtin"
 CONFIGURE_ARGS+=	--enable-kde QTDIR="${QT_PREFIX}"
 .endif
 
-.if defined(WITH_CUPS)
-LIB_DEPENDS+=		cups.2:${PORTSDIR}/print/cups-base
-CONFIGURE_ARGS+=	--enable-cups=yes
-.else
-CONFIGURE_ARGS+=	--enable-cups=no
-.endif
-
 .if defined(WITHOUT_MOZILLA)
 CONFIGURE_ARGS+=	--disable-mozilla
 .else
@@ -112,11 +105,6 @@ pre-fetch:
 	@${ECHO} "zh-CN zh-TW zu"
 	@${ECHO} "Default: en-US"
 .endif
-.if !defined(WITH_CUPS)
-	@${ECHO}
-	@${ECHO} "You can compile OOo with CUPS support with"
-	@${ECHO} "make -DWITH_CUPS"
-.endif
 .if !defined(WITH_KDE)
 	@${ECHO}
 	@${ECHO} "You can compile OOo to use Qt/KDE vclplug with"