*: switch from cups15 to cups like all of pkgsrc.

[Thomas Klausner <wiz%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Fri Jun 9 11:33:10 2017 +0200
Changeset:	ff27f73ffbe8d1f49cdf5ac9862aa3e0217f6cc0

Modified Files:
	qt5-qtbase-git/options.mk
	splix/Makefile
	wine-devel/options.mk

Log Message:
*: switch from cups15 to cups like all of pkgsrc.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=ff27f73ffbe8d1f49cdf5ac9862aa3e0217f6cc0

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 qt5-qtbase-git/options.mk | 2 +-
 splix/Makefile            | 3 +--
 wine-devel/options.mk     | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diffs:
diff --git a/qt5-qtbase-git/options.mk b/qt5-qtbase-git/options.mk
index 1cc7ee6641..875523ad6d 100644
--- a/qt5-qtbase-git/options.mk
+++ b/qt5-qtbase-git/options.mk
@@ -8,7 +8,7 @@ PKG_SUPPORTED_OPTIONS=	cups debug gtk2
 PLIST_VARS+=		cups gtk2
 
 .if !empty(PKG_OPTIONS:Mcups)
-.  include "../../print/cups15/buildlink3.mk"
+.  include "../../print/cups/buildlink3.mk"
 CONFIGURE_ARGS+=	-cups
 PLIST.cups=		yes
 .else
diff --git a/splix/Makefile b/splix/Makefile
index a8f55733dc..8ca41ccc91 100644
--- a/splix/Makefile
+++ b/splix/Makefile
@@ -1,5 +1,4 @@
 # $NetBSD: Makefile,v 1.7 2012/10/07 16:23:16 asau Exp $
-#
 
 DISTNAME=	splix-2.0.0
 PKGREVISION=	3
@@ -18,5 +17,5 @@ MAKE_ENV+=	rastertoqpdl_CXXFLAGS=-pthread
 USE_LANGUAGES=	c++
 USE_TOOLS+=	gmake
 
-.include "../../print/cups15/buildlink3.mk"
+.include "../../print/cups/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wine-devel/options.mk b/wine-devel/options.mk
index 40ef0fe160..8421f0bb93 100755
--- a/wine-devel/options.mk
+++ b/wine-devel/options.mk
@@ -9,7 +9,7 @@ PKG_SUGGESTED_OPTIONS=	opengl ssl x11
 PLIST_VARS+=		esd opengl x11 pulseaudio
 
 .if !empty(PKG_OPTIONS:Mcups)
-.include "../../print/cups15/buildlink3.mk"
+.include "../../print/cups/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--without-cups
 .endif