CVS commit: pkgsrc

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc
From: "Patrick Welche" <prlw1%netbsd.org@localhost>
Date: Fri, 19 May 2017 13:18:20 +0000

Module Name:    pkgsrc
Committed By:   prlw1
Date:           Fri May 19 13:18:20 UTC 2017

Modified Files:
        pkgsrc/emulators/wine: options.mk
        pkgsrc/emulators/wine-devel: options.mk
        pkgsrc/meta-pkgs/desktop-gnome: Makefile
        pkgsrc/net/netatalk3: options.mk
        pkgsrc/net/netatalk30: options.mk
        pkgsrc/net/samba: options.mk
        pkgsrc/print/adobeps-win: Makefile
        pkgsrc/print/cups-drivers-Magicolor5440DL: Makefile
        pkgsrc/print/cups-pdf: Makefile
        pkgsrc/print/epdfview: options.mk
        pkgsrc/print/foomatic-filters: Makefile
        pkgsrc/print/foomatic-filters-cups: Makefile
        pkgsrc/print/foomatic-ppds-cups: Makefile
        pkgsrc/print/foomatic4-filters: Makefile
        pkgsrc/print/ghostscript-agpl: buildlink3.mk
        pkgsrc/print/ghostscript-gpl: buildlink3.mk options.mk
        pkgsrc/print/gtklp: Makefile
        pkgsrc/print/gutenprint-lib: Makefile
        pkgsrc/print/hplip: Makefile
        pkgsrc/print/libgnomecups: Makefile buildlink3.mk
        pkgsrc/print/p5-Net-CUPS: Makefile
        pkgsrc/print/py-cups: Makefile buildlink3.mk
        pkgsrc/print/qpdfview: Makefile
        pkgsrc/print/scribus: Makefile
        pkgsrc/print/scribus-qt4: Makefile
        pkgsrc/x11/gtk2: options.mk
        pkgsrc/x11/gtk3: options.mk
        pkgsrc/x11/kdelibs3: buildlink3.mk options.mk
        pkgsrc/x11/qt3-libs: Makefile.common
        pkgsrc/x11/qt4-libs: options.mk
        pkgsrc/x11/qt5-qtbase: options.mk

Log Message:
Switch all cups15 packages to use cups.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/emulators/wine/options.mk
cvs rdiff -u -r1.9 -r1.10 pkgsrc/emulators/wine-devel/options.mk
cvs rdiff -u -r1.11 -r1.12 pkgsrc/meta-pkgs/desktop-gnome/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/netatalk3/options.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/netatalk30/options.mk
cvs rdiff -u -r1.36 -r1.37 pkgsrc/net/samba/options.mk
cvs rdiff -u -r1.14 -r1.15 pkgsrc/print/adobeps-win/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/print/cups-drivers-Magicolor5440DL/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/print/cups-pdf/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/print/epdfview/options.mk
cvs rdiff -u -r1.32 -r1.33 pkgsrc/print/foomatic-filters/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/print/foomatic-filters-cups/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/print/foomatic-ppds-cups/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/print/foomatic4-filters/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/print/ghostscript-agpl/buildlink3.mk
cvs rdiff -u -r1.7 -r1.8 pkgsrc/print/ghostscript-gpl/buildlink3.mk
cvs rdiff -u -r1.6 -r1.7 pkgsrc/print/ghostscript-gpl/options.mk
cvs rdiff -u -r1.40 -r1.41 pkgsrc/print/gtklp/Makefile
cvs rdiff -u -r1.66 -r1.67 pkgsrc/print/gutenprint-lib/Makefile
cvs rdiff -u -r1.57 -r1.58 pkgsrc/print/hplip/Makefile
cvs rdiff -u -r1.38 -r1.39 pkgsrc/print/libgnomecups/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/print/libgnomecups/buildlink3.mk
cvs rdiff -u -r1.21 -r1.22 pkgsrc/print/p5-Net-CUPS/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/print/py-cups/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/print/py-cups/buildlink3.mk
cvs rdiff -u -r1.41 -r1.42 pkgsrc/print/qpdfview/Makefile
cvs rdiff -u -r1.108 -r1.109 pkgsrc/print/scribus/Makefile
cvs rdiff -u -r1.43 -r1.44 pkgsrc/print/scribus-qt4/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/x11/gtk2/options.mk
cvs rdiff -u -r1.8 -r1.9 pkgsrc/x11/gtk3/options.mk
cvs rdiff -u -r1.60 -r1.61 pkgsrc/x11/kdelibs3/buildlink3.mk
cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/kdelibs3/options.mk
cvs rdiff -u -r1.79 -r1.80 pkgsrc/x11/qt3-libs/Makefile.common
cvs rdiff -u -r1.8 -r1.9 pkgsrc/x11/qt4-libs/options.mk
cvs rdiff -u -r1.7 -r1.8 pkgsrc/x11/qt5-qtbase/options.mk

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

Modified files:

Index: pkgsrc/emulators/wine/options.mk
diff -u pkgsrc/emulators/wine/options.mk:1.15 pkgsrc/emulators/wine/options.mk:1.16
--- pkgsrc/emulators/wine/options.mk:1.15       Wed Jun 18 09:26:10 2014
+++ pkgsrc/emulators/wine/options.mk    Fri May 19 13:18:17 2017
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.15 2014/06/18 09:26:10 wiz Exp $
+# $NetBSD: options.mk,v 1.16 2017/05/19 13:18:17 prlw1 Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.wine
 PKG_SUPPORTED_OPTIONS= cups dbus esound hal ldap opengl sane ssl x11
@@ -9,7 +9,7 @@ PKG_SUGGESTED_OPTIONS=  opengl ssl x11
 PLIST_VARS+=           esd opengl x11
 
 .if !empty(PKG_OPTIONS:Mcups)
-.include "../../print/cups15/buildlink3.mk"
+.include "../../print/cups/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=       --without-cups
 .endif

Index: pkgsrc/emulators/wine-devel/options.mk
diff -u pkgsrc/emulators/wine-devel/options.mk:1.9 pkgsrc/emulators/wine-devel/options.mk:1.10
--- pkgsrc/emulators/wine-devel/options.mk:1.9  Sun Sep 18 17:53:41 2016
+++ pkgsrc/emulators/wine-devel/options.mk      Fri May 19 13:18:17 2017
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.9 2016/09/18 17:53:41 maya Exp $
+# $NetBSD: options.mk,v 1.10 2017/05/19 13:18:17 prlw1 Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.wine
 PKG_SUPPORTED_OPTIONS= cups dbus esound hal ldap opengl sane ssl x11 pulseaudio
@@ -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

Index: pkgsrc/meta-pkgs/desktop-gnome/Makefile
diff -u pkgsrc/meta-pkgs/desktop-gnome/Makefile:1.11 pkgsrc/meta-pkgs/desktop-gnome/Makefile:1.12
--- pkgsrc/meta-pkgs/desktop-gnome/Makefile:1.11        Wed Aug  6 12:21:03 2014
+++ pkgsrc/meta-pkgs/desktop-gnome/Makefile     Fri May 19 13:18:17 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2014/08/06 12:21:03 obache Exp $
+# $NetBSD: Makefile,v 1.12 2017/05/19 13:18:17 prlw1 Exp $
 #
 
 DISTNAME=      desktop-gnome-0.5
@@ -15,7 +15,7 @@ META_PACKAGE= yes
 # implements http://wiki.netbsd.se/Desktop_Phase_1
 #
 DEPENDS+=      pkgin-[0-9]*:../../pkgtools/pkgin
-DEPENDS+=      cups-[0-9]*:../../print/cups15
+DEPENDS+=      cups-[0-9]*:../../print/cups
 DEPENDS+=      firefox-[0-9]*:../../www/firefox
 DEPENDS+=      gnome-[0-9]*:../../meta-pkgs/gnome
 DEPENDS+=      gimp-[0-9]*:../../graphics/gimp

Index: pkgsrc/net/netatalk3/options.mk
diff -u pkgsrc/net/netatalk3/options.mk:1.1 pkgsrc/net/netatalk3/options.mk:1.2
--- pkgsrc/net/netatalk3/options.mk:1.1 Mon Nov  7 00:45:30 2016
+++ pkgsrc/net/netatalk3/options.mk     Fri May 19 13:18:17 2017
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2016/11/07 00:45:30 christos Exp $
+# $NetBSD: options.mk,v 1.2 2017/05/19 13:18:17 prlw1 Exp $
 #
 PKG_OPTIONS_VAR=       PKG_OPTIONS.netatalk
 PKG_SUPPORTED_OPTIONS= cups debug dnssd kerberos ldap pam
@@ -6,7 +6,7 @@ PKG_SUPPORTED_OPTIONS=  cups debug dnssd 
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mcups)
-.include "../../print/cups15/buildlink3.mk"
+.include "../../print/cups/buildlink3.mk"
 CONFIGURE_ARGS+=       --enable-cups
 .else
 CONFIGURE_ARGS+=       --disable-cups

Index: pkgsrc/net/netatalk30/options.mk
diff -u pkgsrc/net/netatalk30/options.mk:1.3 pkgsrc/net/netatalk30/options.mk:1.4
--- pkgsrc/net/netatalk30/options.mk:1.3        Sun Feb  7 20:34:54 2016
+++ pkgsrc/net/netatalk30/options.mk    Fri May 19 13:18:17 2017
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2016/02/07 20:34:54 szptvlfn Exp $
+# $NetBSD: options.mk,v 1.4 2017/05/19 13:18:17 prlw1 Exp $
 #
 PKG_OPTIONS_VAR=       PKG_OPTIONS.netatalk
 PKG_SUPPORTED_OPTIONS= cups debug dnssd kerberos ldap pam
@@ -6,7 +6,7 @@ PKG_SUPPORTED_OPTIONS=  cups debug dnssd 
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mcups)
-.include "../../print/cups15/buildlink3.mk"
+.include "../../print/cups/buildlink3.mk"
 CONFIGURE_ARGS+=       --enable-cups
 .else
 CONFIGURE_ARGS+=       --disable-cups

Index: pkgsrc/net/samba/options.mk
diff -u pkgsrc/net/samba/options.mk:1.36 pkgsrc/net/samba/options.mk:1.37
--- pkgsrc/net/samba/options.mk:1.36    Fri Mar 18 12:28:21 2016
+++ pkgsrc/net/samba/options.mk Fri May 19 13:18:18 2017
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.36 2016/03/18 12:28:21 jperkin Exp $
+# $NetBSD: options.mk,v 1.37 2017/05/19 13:18:18 prlw1 Exp $
 
 # Recommended package options for various setups:
 #
@@ -59,7 +59,7 @@ CONFIGURE_ARGS+=      --with-acl-support
 ###
 PLIST_VARS+=           cups
 .if !empty(PKG_OPTIONS:Mcups)
-.  include "../../print/cups15/buildlink3.mk"
+.  include "../../print/cups/buildlink3.mk"
 CONFIGURE_ARGS+=       --enable-cups
 PLIST.cups=            yes
 INSTALLATION_DIRS+=    libexec/cups/backend

Index: pkgsrc/print/adobeps-win/Makefile
diff -u pkgsrc/print/adobeps-win/Makefile:1.14 pkgsrc/print/adobeps-win/Makefile:1.15
--- pkgsrc/print/adobeps-win/Makefile:1.14      Sat Aug 29 23:04:38 2015
+++ pkgsrc/print/adobeps-win/Makefile   Fri May 19 13:18:18 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2015/08/29 23:04:38 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2017/05/19 13:18:18 prlw1 Exp $
 
 DISTNAME=      winsteng
 PKGNAME=       adobeps-win-1.0.6
@@ -12,7 +12,7 @@ HOMEPAGE=     http://www.adobe.com/products/
 COMMENT=       Adobe PostScript MS Windows drivers for CUPS/Samba
 
 BUILD_DEPENDS+=        cabextract-[0-9]*:../../archivers/cabextract
-DEPENDS+=      cups>=1.1.15<1.7:../../print/cups15
+DEPENDS+=      cups>=1.1.15:../../print/cups
 
 DIST_SUBDIR=   ${PKGNAME_NOREV}
 WRKSRC=                ${WRKDIR}

Index: pkgsrc/print/cups-drivers-Magicolor5440DL/Makefile
diff -u pkgsrc/print/cups-drivers-Magicolor5440DL/Makefile:1.17 pkgsrc/print/cups-drivers-Magicolor5440DL/Makefile:1.18
--- pkgsrc/print/cups-drivers-Magicolor5440DL/Makefile:1.17     Sat Mar  5 11:29:16 2016
+++ pkgsrc/print/cups-drivers-Magicolor5440DL/Makefile  Fri May 19 13:18:18 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2016/03/05 11:29:16 jperkin Exp $
+# $NetBSD: Makefile,v 1.18 2017/05/19 13:18:18 prlw1 Exp $
 #
 
 DISTNAME=      5440DL_lin64bit_1_2_1
@@ -33,5 +33,5 @@ post-extract:
 
 .include "../../graphics/lcms/buildlink3.mk"
 .include "../../graphics/jbigkit/buildlink3.mk"
-.include "../../print/cups15/buildlink3.mk"
+.include "../../print/cups/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/cups-pdf/Makefile
diff -u pkgsrc/print/cups-pdf/Makefile:1.11 pkgsrc/print/cups-pdf/Makefile:1.12
--- pkgsrc/print/cups-pdf/Makefile:1.11 Sat Jul  9 06:38:50 2016
+++ pkgsrc/print/cups-pdf/Makefile      Fri May 19 13:18:18 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2016/07/09 06:38:50 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2017/05/19 13:18:18 prlw1 Exp $
 
 COMMENT=               PDF backend for CUPS
 
@@ -11,7 +11,7 @@ MASTER_SITES=         ${HOMEPAGE}src/
 DISTFILES=             ${DISTNAME:S/pdf-/pdf_/}.tar.gz
 LICENSE=               gnu-gpl-v2
 
-DEPENDS+=              cups-[0-9]*:../../print/cups15
+DEPENDS+=              cups-[0-9]*:../../print/cups
 
 USE_TOOLS+=            perl:run
 REPLACE_PERL+=         contrib/cups-pdf-dispatch-0.1/cups-pdf-dispatch

Index: pkgsrc/print/epdfview/options.mk
diff -u pkgsrc/print/epdfview/options.mk:1.2 pkgsrc/print/epdfview/options.mk:1.3
--- pkgsrc/print/epdfview/options.mk:1.2        Wed Jun 18 09:26:10 2014
+++ pkgsrc/print/epdfview/options.mk    Fri May 19 13:18:18 2017
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2014/06/18 09:26:10 wiz Exp $
+# $NetBSD: options.mk,v 1.3 2017/05/19 13:18:18 prlw1 Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.epdfview
 PKG_SUPPORTED_OPTIONS= cups
@@ -6,7 +6,7 @@ PKG_SUPPORTED_OPTIONS=  cups
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mcups)
-.include "../../print/cups15/buildlink3.mk"
+.include "../../print/cups/buildlink3.mk"
 CONFIGURE_ARGS+=       --with-cups
 .else
 CONFIGURE_ARGS+=       --without-cups

Index: pkgsrc/print/foomatic-filters/Makefile
diff -u pkgsrc/print/foomatic-filters/Makefile:1.32 pkgsrc/print/foomatic-filters/Makefile:1.33
--- pkgsrc/print/foomatic-filters/Makefile:1.32 Sat Sep  3 14:21:25 2016
+++ pkgsrc/print/foomatic-filters/Makefile      Fri May 19 13:18:18 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2016/09/03 14:21:25 mef Exp $
+# $NetBSD: Makefile,v 1.33 2017/05/19 13:18:18 prlw1 Exp $
 
 .include "Makefile.common"
 
@@ -42,7 +42,7 @@ INSTALL_TARGET=       install-bin install-man
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mcups)
-DEPENDS+=      {cups>=1.0,${TEXTTOPS_DEPENDS}}:../../print/cups15
+DEPENDS+=      {cups>=1.0,${TEXTTOPS_DEPENDS}}:../../print/cups
 .else
 DEPENDS+=      ${TEXTTOPS_DEPENDS}:../../print/mpage
 .endif

Index: pkgsrc/print/foomatic-filters-cups/Makefile
diff -u pkgsrc/print/foomatic-filters-cups/Makefile:1.13 pkgsrc/print/foomatic-filters-cups/Makefile:1.14
--- pkgsrc/print/foomatic-filters-cups/Makefile:1.13    Wed Nov 25 12:53:09 2015
+++ pkgsrc/print/foomatic-filters-cups/Makefile Fri May 19 13:18:18 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2015/11/25 12:53:09 jperkin Exp $
+# $NetBSD: Makefile,v 1.14 2017/05/19 13:18:18 prlw1 Exp $
 
 META_PACKAGE=  yes
 
@@ -10,7 +10,7 @@ PKGREVISION=  2
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Foomatic support for CUPS
 
-DEPENDS+=      cups>=1.0:../../print/cups15
+DEPENDS+=      cups>=1.0:../../print/cups
 DEPENDS+=      foomatic-filters-${FOOMATIC_FILTERS_VERSION}{,nb[0-9]*}:../../print/foomatic-filters
 
 WRKSRC=                ${WRKDIR}

Index: pkgsrc/print/foomatic-ppds-cups/Makefile
diff -u pkgsrc/print/foomatic-ppds-cups/Makefile:1.14 pkgsrc/print/foomatic-ppds-cups/Makefile:1.15
--- pkgsrc/print/foomatic-ppds-cups/Makefile:1.14       Wed Nov 25 12:53:09 2015
+++ pkgsrc/print/foomatic-ppds-cups/Makefile    Fri May 19 13:18:18 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2015/11/25 12:53:09 jperkin Exp $
+# $NetBSD: Makefile,v 1.15 2017/05/19 13:18:18 prlw1 Exp $
 
 META_PACKAGE=  yes
 
@@ -10,7 +10,7 @@ PKGREVISION=  1
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Foomatic PPD collection for CUPS servers
 
-DEPENDS+=      cups>=1.0:../../print/cups15
+DEPENDS+=      cups>=1.0:../../print/cups
 DEPENDS+=      foomatic-ppds-${FOOMATIC_PPDS_VERSION}{,nb[0-9]*}:../../print/foomatic-ppds
 
 WRKSRC=                ${WRKDIR}

Index: pkgsrc/print/foomatic4-filters/Makefile
diff -u pkgsrc/print/foomatic4-filters/Makefile:1.30 pkgsrc/print/foomatic4-filters/Makefile:1.31
--- pkgsrc/print/foomatic4-filters/Makefile:1.30        Sat Jul  9 06:38:50 2016
+++ pkgsrc/print/foomatic4-filters/Makefile     Fri May 19 13:18:18 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2016/07/09 06:38:50 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2017/05/19 13:18:18 prlw1 Exp $
 
 DISTNAME=      foomatic-filters-4.0.17
 PKGREVISION=   9
@@ -36,7 +36,7 @@ INSTALL_TARGET=       install-bin install-man
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mcups)
-DEPENDS+=      cups>=1.0:../../print/cups15
+DEPENDS+=      cups>=1.0:../../print/cups
 CUPS_FILTERDIR=        ${LOCALBASE}/libexec/cups/filter
 CONFIGURE_ENV+=        CUPS_FILTERS=${CUPS_FILTERDIR}
 FILES_SUBST+=  CUPS_FILTERDIR=${CUPS_FILTERDIR}

Index: pkgsrc/print/ghostscript-agpl/buildlink3.mk
diff -u pkgsrc/print/ghostscript-agpl/buildlink3.mk:1.7 pkgsrc/print/ghostscript-agpl/buildlink3.mk:1.8
--- pkgsrc/print/ghostscript-agpl/buildlink3.mk:1.7     Wed Aug 12 22:27:10 2015
+++ pkgsrc/print/ghostscript-agpl/buildlink3.mk Fri May 19 13:18:18 2017
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2015/08/12 22:27:10 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2017/05/19 13:18:18 prlw1 Exp $
 
 BUILDLINK_TREE+=       ghostscript-agpl
 
@@ -16,7 +16,7 @@ pkgbase := ghostscript-agpl
 .include "../../mk/pkg-build-options.mk"
 
 #.if !empty(PKG_BUILD_OPTIONS.ghostscript-agpl:Mcups)
-#.include "../../print/cups15/buildlink3.mk"
+#.include "../../print/cups/buildlink3.mk"
 #.endif
 
 .if !empty(PKG_BUILD_OPTIONS.ghostscript-agpl:Mfontconfig)

Index: pkgsrc/print/ghostscript-gpl/buildlink3.mk
diff -u pkgsrc/print/ghostscript-gpl/buildlink3.mk:1.7 pkgsrc/print/ghostscript-gpl/buildlink3.mk:1.8
--- pkgsrc/print/ghostscript-gpl/buildlink3.mk:1.7      Sat Mar  5 11:27:53 2016
+++ pkgsrc/print/ghostscript-gpl/buildlink3.mk  Fri May 19 13:18:18 2017
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2016/03/05 11:27:53 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2017/05/19 13:18:18 prlw1 Exp $
 
 BUILDLINK_TREE+=       ghostscript-gpl
 
@@ -16,7 +16,7 @@ pkgbase := ghostscript-gpl
 .include "../../mk/pkg-build-options.mk"
 
 .if !empty(PKG_BUILD_OPTIONS.ghostscript-gpl:Mcups)
-.include "../../print/cups15/buildlink3.mk"
+.include "../../print/cups/buildlink3.mk"
 .endif
 
 .if !empty(PKG_BUILD_OPTIONS.ghostscript-gpl:Mfontconfig)

Index: pkgsrc/print/ghostscript-gpl/options.mk
diff -u pkgsrc/print/ghostscript-gpl/options.mk:1.6 pkgsrc/print/ghostscript-gpl/options.mk:1.7
--- pkgsrc/print/ghostscript-gpl/options.mk:1.6 Wed Jun 18 09:26:11 2014
+++ pkgsrc/print/ghostscript-gpl/options.mk     Fri May 19 13:18:18 2017
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2014/06/18 09:26:11 wiz Exp $
+# $NetBSD: options.mk,v 1.7 2017/05/19 13:18:18 prlw1 Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.ghostscript
 PKG_SUPPORTED_OPTIONS= x11 cups debug fontconfig disable-compile-inits utf8
@@ -42,7 +42,7 @@ SUBST_MESSAGE.cupsetc=        Fixing CUPS etc d
 SUBST_FILES.cupsetc=   cups/cups.mak
 SUBST_SED.cupsetc=     -e 's|$$(CUPSSERVERROOT)|${CUPS_EGDIR}|g'
 
-.include "../../print/cups15/buildlink3.mk"
+.include "../../print/cups/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .else
 CONFIGURE_ARGS+=       --disable-cups

Index: pkgsrc/print/gtklp/Makefile
diff -u pkgsrc/print/gtklp/Makefile:1.40 pkgsrc/print/gtklp/Makefile:1.41
--- pkgsrc/print/gtklp/Makefile:1.40    Sun Feb 12 06:25:56 2017
+++ pkgsrc/print/gtklp/Makefile Fri May 19 13:18:18 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2017/02/12 06:25:56 ryoon Exp $
+# $NetBSD: Makefile,v 1.41 2017/05/19 13:18:18 prlw1 Exp $
 #
 
 DISTNAME=      gtklp-1.2.7
@@ -19,5 +19,5 @@ MAKE_FLAGS+=          install_sh=${WRKSRC}/insta
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
-.include "../../print/cups15/buildlink3.mk"
+.include "../../print/cups/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/gutenprint-lib/Makefile
diff -u pkgsrc/print/gutenprint-lib/Makefile:1.66 pkgsrc/print/gutenprint-lib/Makefile:1.67
--- pkgsrc/print/gutenprint-lib/Makefile:1.66   Thu Mar 16 13:17:54 2017
+++ pkgsrc/print/gutenprint-lib/Makefile        Fri May 19 13:18:19 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.66 2017/03/16 13:17:54 gdt Exp $
+# $NetBSD: Makefile,v 1.67 2017/05/19 13:18:19 prlw1 Exp $
 
 VERSION=       5.2.12
 DISTNAME=      gutenprint-${VERSION}
@@ -96,6 +96,6 @@ TEST_TARGET=          check
 .include "../../x11/gtk2/buildlink3.mk"
 
 # gutenprint-cups: cups support
-.include "../../print/cups15/buildlink3.mk"
+.include "../../print/cups/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/hplip/Makefile
diff -u pkgsrc/print/hplip/Makefile:1.57 pkgsrc/print/hplip/Makefile:1.58
--- pkgsrc/print/hplip/Makefile:1.57    Wed Nov 30 18:00:08 2016
+++ pkgsrc/print/hplip/Makefile Fri May 19 13:18:19 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2016/11/30 18:00:08 schnoebe Exp $
+# $NetBSD: Makefile,v 1.58 2017/05/19 13:18:19 prlw1 Exp $
 
 DISTNAME=      hplip-3.16.11
 CATEGORIES=    print
@@ -176,7 +176,7 @@ post-install:
 .include "../../lang/python/extension.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../net/net-snmp/buildlink3.mk"
-.include "../../print/cups15/buildlink3.mk"
+.include "../../print/cups/buildlink3.mk"
 .include "../../print/ghostscript/buildlink3.mk"
 .include "../../devel/libusb1/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"

Index: pkgsrc/print/libgnomecups/Makefile
diff -u pkgsrc/print/libgnomecups/Makefile:1.38 pkgsrc/print/libgnomecups/Makefile:1.39
--- pkgsrc/print/libgnomecups/Makefile:1.38     Sat Mar  5 11:27:53 2016
+++ pkgsrc/print/libgnomecups/Makefile  Fri May 19 13:18:19 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2016/03/05 11:27:53 jperkin Exp $
+# $NetBSD: Makefile,v 1.39 2017/05/19 13:18:19 prlw1 Exp $
 #
 
 DISTNAME=      libgnomecups-0.2.3
@@ -19,5 +19,5 @@ PKGCONFIG_OVERRIDE=   libgnomecups-1.0.pc.
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../print/cups15/buildlink3.mk"
+.include "../../print/cups/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/libgnomecups/buildlink3.mk
diff -u pkgsrc/print/libgnomecups/buildlink3.mk:1.28 pkgsrc/print/libgnomecups/buildlink3.mk:1.29
--- pkgsrc/print/libgnomecups/buildlink3.mk:1.28        Sat Mar  5 11:27:53 2016
+++ pkgsrc/print/libgnomecups/buildlink3.mk     Fri May 19 13:18:19 2017
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.28 2016/03/05 11:27:53 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.29 2017/05/19 13:18:19 prlw1 Exp $
 
 BUILDLINK_TREE+=       libgnomecups
 
@@ -11,7 +11,7 @@ BUILDLINK_PKGSRCDIR.libgnomecups?=    ../..
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../print/cups15/buildlink3.mk"
+.include "../../print/cups/buildlink3.mk"
 .endif # LIBGNOMECUPS_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -libgnomecups

Index: pkgsrc/print/p5-Net-CUPS/Makefile
diff -u pkgsrc/print/p5-Net-CUPS/Makefile:1.21 pkgsrc/print/p5-Net-CUPS/Makefile:1.22
--- pkgsrc/print/p5-Net-CUPS/Makefile:1.21      Wed Jun  8 19:24:17 2016
+++ pkgsrc/print/p5-Net-CUPS/Makefile   Fri May 19 13:18:19 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2016/06/08 19:24:17 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2017/05/19 13:18:19 prlw1 Exp $
 
 DISTNAME=      Net-CUPS-0.61
 PKGNAME=       p5-${DISTNAME}
@@ -17,6 +17,6 @@ PERL5_PACKLIST=       auto/Net/CUPS/.packlist
 
 .include "../../converters/libiconv/buildlink3.mk"
 BUILDLINK_API_DEPENDS.cups+=   cups>=1.2.2<2.0
-.include "../../print/cups15/buildlink3.mk"
+.include "../../print/cups/buildlink3.mk"
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/py-cups/Makefile
diff -u pkgsrc/print/py-cups/Makefile:1.26 pkgsrc/print/py-cups/Makefile:1.27
--- pkgsrc/print/py-cups/Makefile:1.26  Sat Mar  5 11:29:17 2016
+++ pkgsrc/print/py-cups/Makefile       Fri May 19 13:18:19 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2016/03/05 11:29:17 jperkin Exp $
+# $NetBSD: Makefile,v 1.27 2017/05/19 13:18:19 prlw1 Exp $
 
 DISTNAME=      pycups-${VERSION}
 PKGNAME=       ${PYPKGPREFIX}-cups-${VERSION}
@@ -22,5 +22,5 @@ SUBST_SED.paths=      -e 's:"/usr/share/cups"
 SUBST_STAGE.paths=     post-patch
 
 .include "../../lang/python/distutils.mk"
-.include "../../print/cups15/buildlink3.mk"
+.include "../../print/cups/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/print/py-cups/buildlink3.mk
diff -u pkgsrc/print/py-cups/buildlink3.mk:1.15 pkgsrc/print/py-cups/buildlink3.mk:1.16
--- pkgsrc/print/py-cups/buildlink3.mk:1.15     Wed Jun 18 09:26:11 2014
+++ pkgsrc/print/py-cups/buildlink3.mk  Fri May 19 13:18:19 2017
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2014/06/18 09:26:11 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2017/05/19 13:18:19 prlw1 Exp $
 
 BUILDLINK_TREE+=       py-cups
 
@@ -11,7 +11,7 @@ BUILDLINK_API_DEPENDS.py-cups+=       ${PYPKGP
 BUILDLINK_ABI_DEPENDS.py-cups+=        ${PYPKGPREFIX}-cups>=1.9.61nb3
 BUILDLINK_PKGSRCDIR.py-cups?=  ../../print/py-cups
 
-#.include "../../print/cups15/buildlink3.mk"
+#.include "../../print/cups/buildlink3.mk"
 .endif # PY_CUPS_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -py-cups

Index: pkgsrc/print/qpdfview/Makefile
diff -u pkgsrc/print/qpdfview/Makefile:1.41 pkgsrc/print/qpdfview/Makefile:1.42
--- pkgsrc/print/qpdfview/Makefile:1.41 Tue May  2 13:37:32 2017
+++ pkgsrc/print/qpdfview/Makefile      Fri May 19 13:18:19 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2017/05/02 13:37:32 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2017/05/19 13:18:19 prlw1 Exp $
 
 VER=           0.4.16
 DISTNAME=      qpdfview-${VER}
@@ -27,7 +27,7 @@ do-configure:
 .include "../../graphics/djvulibre-lib/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/librsvg/buildlink3.mk"
-.include "../../print/cups15/buildlink3.mk"
+.include "../../print/cups/buildlink3.mk"
 .include "../../print/libspectre/buildlink3.mk"
 .include "../../print/poppler-qt4/buildlink3.mk"
 .include "../../x11/qt4-libs/buildlink3.mk"

Index: pkgsrc/print/scribus/Makefile
diff -u pkgsrc/print/scribus/Makefile:1.108 pkgsrc/print/scribus/Makefile:1.109
--- pkgsrc/print/scribus/Makefile:1.108 Tue Feb 21 16:01:36 2017
+++ pkgsrc/print/scribus/Makefile       Fri May 19 13:18:19 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.108 2017/02/21 16:01:36 joerg Exp $
+# $NetBSD: Makefile,v 1.109 2017/05/19 13:18:19 prlw1 Exp $
 
 DISTNAME=              scribus-1.3.3.14
 PKGREVISION=           27
@@ -39,7 +39,7 @@ post-install:
        ${INSTALL_DATA} ${WRKSRC}/scribus/icons/scribus.png \
                ${DESTDIR}${PREFIX}/share/pixmaps
 
-.include "../../print/cups15/buildlink3.mk"
+.include "../../print/cups/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 BUILDLINK_API_DEPENDS.libart+= libart>=2.3.19nb1

Index: pkgsrc/print/scribus-qt4/Makefile
diff -u pkgsrc/print/scribus-qt4/Makefile:1.43 pkgsrc/print/scribus-qt4/Makefile:1.44
--- pkgsrc/print/scribus-qt4/Makefile:1.43      Sun Jan  1 14:43:54 2017
+++ pkgsrc/print/scribus-qt4/Makefile   Fri May 19 13:18:19 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2017/01/01 14:43:54 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2017/05/19 13:18:19 prlw1 Exp $
 
 DISTNAME=              scribus-1.4.3
 PKGREVISION=           8
@@ -34,7 +34,7 @@ post-install:
                ${DESTDIR}${PREFIX}/share/pixmaps
 
 .include "../../devel/boost-headers/buildlink3.mk"
-.include "../../print/cups15/buildlink3.mk"
+.include "../../print/cups/buildlink3.mk"
 .include "../../print/podofo/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"

Index: pkgsrc/x11/gtk2/options.mk
diff -u pkgsrc/x11/gtk2/options.mk:1.14 pkgsrc/x11/gtk2/options.mk:1.15
--- pkgsrc/x11/gtk2/options.mk:1.14     Wed Jun 18 09:26:12 2014
+++ pkgsrc/x11/gtk2/options.mk  Fri May 19 13:18:19 2017
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.14 2014/06/18 09:26:12 wiz Exp $
+# $NetBSD: options.mk,v 1.15 2017/05/19 13:18:19 prlw1 Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.gtk2
 PKG_SUPPORTED_OPTIONS= cups debug
@@ -13,7 +13,7 @@ PKG_SUGGESTED_OPTIONS=                x11
 
 PLIST_VARS+=           cups
 .if !empty(PKG_OPTIONS:Mcups)
-.include "../../print/cups15/buildlink3.mk"
+.include "../../print/cups/buildlink3.mk"
 PLIST.cups=            yes
 .else
 CONFIGURE_ENV+=                ac_cv_path_CUPS_CONFIG=no

Index: pkgsrc/x11/gtk3/options.mk
diff -u pkgsrc/x11/gtk3/options.mk:1.8 pkgsrc/x11/gtk3/options.mk:1.9
--- pkgsrc/x11/gtk3/options.mk:1.8      Wed Jun 18 09:26:12 2014
+++ pkgsrc/x11/gtk3/options.mk  Fri May 19 13:18:19 2017
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.8 2014/06/18 09:26:12 wiz Exp $
+# $NetBSD: options.mk,v 1.9 2017/05/19 13:18:19 prlw1 Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.gtk3
 PKG_SUPPORTED_OPTIONS= gtk3-atk-bridge cups debug
@@ -13,7 +13,7 @@ PKG_SUGGESTED_OPTIONS=                gtk3-atk-bridge 
 
 PLIST_VARS+=           cups
 .if !empty(PKG_OPTIONS:Mcups)
-.include "../../print/cups15/buildlink3.mk"
+.include "../../print/cups/buildlink3.mk"
 PLIST.cups=            yes
 .else
 CONFIGURE_ENV+=                ac_cv_path_CUPS_CONFIG=no

Index: pkgsrc/x11/kdelibs3/buildlink3.mk
diff -u pkgsrc/x11/kdelibs3/buildlink3.mk:1.60 pkgsrc/x11/kdelibs3/buildlink3.mk:1.61
--- pkgsrc/x11/kdelibs3/buildlink3.mk:1.60      Sat Mar  5 11:27:59 2016
+++ pkgsrc/x11/kdelibs3/buildlink3.mk   Fri May 19 13:18:19 2017
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.60 2016/03/05 11:27:59 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.61 2017/05/19 13:18:19 prlw1 Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -15,7 +15,7 @@ pkgbase := kdelibs
 .include "../../mk/pkg-build-options.mk"
 
 .if !empty(PKG_BUILD_OPTIONS.kdelibs:Mcups)
-.  include "../../print/cups15/buildlink3.mk"
+.  include "../../print/cups/buildlink3.mk"
 .endif
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../audio/arts/buildlink3.mk"

Index: pkgsrc/x11/kdelibs3/options.mk
diff -u pkgsrc/x11/kdelibs3/options.mk:1.3 pkgsrc/x11/kdelibs3/options.mk:1.4
--- pkgsrc/x11/kdelibs3/options.mk:1.3  Wed Jun 18 09:26:12 2014
+++ pkgsrc/x11/kdelibs3/options.mk      Fri May 19 13:18:19 2017
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2014/06/18 09:26:12 wiz Exp $
+# $NetBSD: options.mk,v 1.4 2017/05/19 13:18:19 prlw1 Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.kdelibs
 PKG_SUPPORTED_OPTIONS= cups debug
@@ -7,7 +7,7 @@ PKG_SUPPORTED_OPTIONS=  cups debug
 
 PLIST_VARS+=           cups
 .if !empty(PKG_OPTIONS:Mcups)
-.include "../../print/cups15/buildlink3.mk"
+.include "../../print/cups/buildlink3.mk"
 PLIST.cups=            yes
 .else
 CONFIGURE_ARGS+=       --disable-cups

Index: pkgsrc/x11/qt3-libs/Makefile.common
diff -u pkgsrc/x11/qt3-libs/Makefile.common:1.79 pkgsrc/x11/qt3-libs/Makefile.common:1.80
--- pkgsrc/x11/qt3-libs/Makefile.common:1.79    Thu Jan 19 18:52:30 2017
+++ pkgsrc/x11/qt3-libs/Makefile.common Fri May 19 13:18:19 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.79 2017/01/19 18:52:30 agc Exp $
+# $NetBSD: Makefile.common,v 1.80 2017/05/19 13:18:19 prlw1 Exp $
 # used by x11/qt3-docs/Makefile
 # used by x11/qt3-libs/Makefile
 # used by x11/qt3-tools/Makefile
@@ -102,7 +102,7 @@ CONFIGURE_ARGS+=    -no-ipv6
 .endif
 
 .if !empty(PKG_OPTIONS:Mcups)
-.  include "../../print/cups15/buildlink3.mk"
+.  include "../../print/cups/buildlink3.mk"
 CONFIGURE_ARGS+=       -cups
 .else
 CONFIGURE_ARGS+=       -no-cups

Index: pkgsrc/x11/qt4-libs/options.mk
diff -u pkgsrc/x11/qt4-libs/options.mk:1.8 pkgsrc/x11/qt4-libs/options.mk:1.9
--- pkgsrc/x11/qt4-libs/options.mk:1.8  Tue Aug 30 08:00:14 2016
+++ pkgsrc/x11/qt4-libs/options.mk      Fri May 19 13:18:20 2017
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.8 2016/08/30 08:00:14 richard Exp $
+# $NetBSD: options.mk,v 1.9 2017/05/19 13:18:20 prlw1 Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.qt4
 PKG_SUPPORTED_OPTIONS= cups debug gtk2
@@ -6,7 +6,7 @@ PKG_SUPPORTED_OPTIONS=  cups debug gtk2
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mcups)
-.  include "../../print/cups15/buildlink3.mk"
+.  include "../../print/cups/buildlink3.mk"
 CONFIGURE_ARGS+=       -cups
 .else
 CONFIGURE_ARGS+=       -no-cups

Index: pkgsrc/x11/qt5-qtbase/options.mk
diff -u pkgsrc/x11/qt5-qtbase/options.mk:1.7 pkgsrc/x11/qt5-qtbase/options.mk:1.8
--- pkgsrc/x11/qt5-qtbase/options.mk:1.7        Mon Jan 18 20:52:43 2016
+++ pkgsrc/x11/qt5-qtbase/options.mk    Fri May 19 13:18:20 2017
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.7 2016/01/18 20:52:43 nros Exp $
+# $NetBSD: options.mk,v 1.8 2017/05/19 13:18:20 prlw1 Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.qt5
 PKG_SUPPORTED_OPTIONS= cups debug gtk2
@@ -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

Prev by Date: CVS commit: pkgsrc/print
Next by Date: Re: CVS commit: pkgsrc/devel/libatomic_ops
Previous by Thread: CVS commit: pkgsrc/print
Next by Thread: CVS commit: pkgsrc
Indexes:

Home | Main Index | Thread Index | Old Index