CUPS support is now default.

Bump port revision.

6 files changed, 9 insertions, 39 deletions

diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index 2834de940220..d64639881a40 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	openoffice.org
 PORTVERSION?=	${OOOVERSION}
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES+=	editors java
 MASTER_SITES+=	http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		http://openoffice.lunarshells.com/sources/ \
@@ -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-3/files/Makefile.knobs b/editors/openoffice-3/files/Makefile.knobs
index 92761ae67e77..d6e7257fec39 100644
--- a/editors/openoffice-3/files/Makefile.knobs
+++ b/editors/openoffice-3/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
@@ -98,11 +91,6 @@ pre-fetch:
 	@${ECHO} "See http://www.freetype.org/patents.html for details"
 .endif
 .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/Makefile b/editors/openoffice.org-2/Makefile
index 2834de940220..d64639881a40 100644
--- a/editors/openoffice.org-2/Makefile
+++ b/editors/openoffice.org-2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	openoffice.org
 PORTVERSION?=	${OOOVERSION}
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES+=	editors java
 MASTER_SITES+=	http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		http://openoffice.lunarshells.com/sources/ \
@@ -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/files/Makefile.knobs b/editors/openoffice.org-2/files/Makefile.knobs
index 92761ae67e77..d6e7257fec39 100644
--- a/editors/openoffice.org-2/files/Makefile.knobs
+++ b/editors/openoffice.org-2/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
@@ -98,11 +91,6 @@ pre-fetch:
 	@${ECHO} "See http://www.freetype.org/patents.html for details"
 .endif
 .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/Makefile b/editors/openoffice.org-3/Makefile
index 2834de940220..d64639881a40 100644
--- a/editors/openoffice.org-3/Makefile
+++ b/editors/openoffice.org-3/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	openoffice.org
 PORTVERSION?=	${OOOVERSION}
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES+=	editors java
 MASTER_SITES+=	http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
 		http://openoffice.lunarshells.com/sources/ \
@@ -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/files/Makefile.knobs b/editors/openoffice.org-3/files/Makefile.knobs
index 92761ae67e77..d6e7257fec39 100644
--- a/editors/openoffice.org-3/files/Makefile.knobs
+++ b/editors/openoffice.org-3/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
@@ -98,11 +91,6 @@ pre-fetch:
 	@${ECHO} "See http://www.freetype.org/patents.html for details"
 .endif
 .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"