summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authorwiz <wiz>2014-06-18 09:26:09 +0000
committerwiz <wiz>2014-06-18 09:26:09 +0000
commit79371ef1e14a4e57371578832acf8b4fbc794ccb (patch)
treee43f406f820b5cac99b4b26eba17f44ef355542c /misc
parented3efa269d21ebcc89ca8841f47554ceccc7215d (diff)
downloadpkgsrc-79371ef1e14a4e57371578832acf8b4fbc794ccb.tar.gz
Switch all cups packages to use cups15.
Diffstat (limited to 'misc')
-rw-r--r--misc/libreoffice/Makefile4
-rw-r--r--misc/libreoffice4/Makefile4
-rw-r--r--misc/openoffice3/options.mk4
3 files changed, 6 insertions, 6 deletions
diff --git a/misc/libreoffice/Makefile b/misc/libreoffice/Makefile
index b35f55fd143..44ffa31061b 100644
--- a/misc/libreoffice/Makefile
+++ b/misc/libreoffice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2014/05/29 23:36:58 wiz Exp $
+# $NetBSD: Makefile,v 1.50 2014/06/18 09:26:10 wiz Exp $
VER= 3.5.6.2
DISTNAME= libreoffice-${VER}
@@ -191,7 +191,7 @@ post-install:
.include "../../math/lp_solve/buildlink3.mk"
.include "../../multimedia/gstreamer0.10/buildlink3.mk"
.include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
-.include "../../print/cups/buildlink3.mk"
+.include "../../print/cups15/buildlink3.mk"
.include "../../print/poppler-cpp/buildlink3.mk"
.include "../../print/poppler-includes/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
diff --git a/misc/libreoffice4/Makefile b/misc/libreoffice4/Makefile
index 04756d15e08..ec45a1de001 100644
--- a/misc/libreoffice4/Makefile
+++ b/misc/libreoffice4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2014/06/10 14:21:37 joerg Exp $
+# $NetBSD: Makefile,v 1.30 2014/06/18 09:26:10 wiz Exp $
VER= 4.2.4.2
DISTNAME= libreoffice-${VER}
@@ -266,7 +266,7 @@ post-install:
.include "../../multimedia/gstreamer1/buildlink3.mk"
.include "../../multimedia/gst-plugins1-base/buildlink3.mk"
.include "../../net/libcmis/buildlink3.mk"
-.include "../../print/cups/buildlink3.mk"
+.include "../../print/cups15/buildlink3.mk"
.include "../../print/poppler-cpp/buildlink3.mk"
.include "../../print/poppler-includes/buildlink3.mk"
.include "../../sysutils/dbus/buildlink3.mk"
diff --git a/misc/openoffice3/options.mk b/misc/openoffice3/options.mk
index 5fe319e4413..1fb209827ce 100644
--- a/misc/openoffice3/options.mk
+++ b/misc/openoffice3/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.24 2013/05/25 11:11:14 ryoon Exp $
+# $NetBSD: options.mk,v 1.25 2014/06/18 09:26:10 wiz Exp $
#
PKG_OPTIONS_VAR= PKG_OPTIONS.openoffice3
@@ -67,7 +67,7 @@ CONFIGURE_ARGS+= --with-system-libwpd
.if !empty(PKG_OPTIONS:Mcups)
CONFIGURE_ARGS+= --enable-cups
-.include "../../print/cups/buildlink3.mk"
+.include "../../print/cups15/buildlink3.mk"
.else
CONFIGURE_ARGS+= --disable-cups
.endif