head 1.2; access; symbols pkgsrc-2024Q1:1.2.0.46 pkgsrc-2024Q1-base:1.2 pkgsrc-2023Q4:1.2.0.44 pkgsrc-2023Q4-base:1.2 pkgsrc-2023Q3:1.2.0.42 pkgsrc-2023Q3-base:1.2 pkgsrc-2023Q2:1.2.0.40 pkgsrc-2023Q2-base:1.2 pkgsrc-2023Q1:1.2.0.38 pkgsrc-2023Q1-base:1.2 pkgsrc-2022Q4:1.2.0.36 pkgsrc-2022Q4-base:1.2 pkgsrc-2022Q3:1.2.0.34 pkgsrc-2022Q3-base:1.2 pkgsrc-2022Q2:1.2.0.32 pkgsrc-2022Q2-base:1.2 pkgsrc-2022Q1:1.2.0.30 pkgsrc-2022Q1-base:1.2 pkgsrc-2021Q4:1.2.0.28 pkgsrc-2021Q4-base:1.2 pkgsrc-2021Q3:1.2.0.26 pkgsrc-2021Q3-base:1.2 pkgsrc-2021Q2:1.2.0.24 pkgsrc-2021Q2-base:1.2 pkgsrc-2021Q1:1.2.0.22 pkgsrc-2021Q1-base:1.2 pkgsrc-2020Q4:1.2.0.20 pkgsrc-2020Q4-base:1.2 pkgsrc-2020Q3:1.2.0.18 pkgsrc-2020Q3-base:1.2 pkgsrc-2020Q2:1.2.0.16 pkgsrc-2020Q2-base:1.2 pkgsrc-2020Q1:1.2.0.12 pkgsrc-2020Q1-base:1.2 pkgsrc-2019Q4:1.2.0.14 pkgsrc-2019Q4-base:1.2 pkgsrc-2019Q3:1.2.0.10 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.8 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.6 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.2.0.4 pkgsrc-2018Q4-base:1.2 pkgsrc-2018Q3:1.2.0.2 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.1.0.6 pkgsrc-2018Q2-base:1.1 pkgsrc-2018Q1:1.1.0.4 pkgsrc-2018Q1-base:1.1 pkgsrc-2017Q4:1.1.0.2 pkgsrc-2017Q4-base:1.1; locks; strict; comment @# @; 1.2 date 2018.09.07.20.21.20; author wiz; state Exp; branches; next 1.1; commitid lmMG1bpcCKo7ddRA; 1.1 date 2017.11.12.14.10.15; author khorben; state Exp; branches; next ; commitid itF6QcdEeR8hJKeA; desc @@ 1.2 log @cups-base: remove duplicated comment in patch. From Edgar Fuß. @ text @$NetBSD: patch-conf-cups-files.conf.in,v 1.1 2017/11/12 14:10:15 khorben Exp $ Add a PidFile configuration directive to write a PID file. --- conf/cups-files.conf.in.orig 2017-03-28 20:26:53.000000000 +0200 +++ conf/cups-files.conf.in 2017-07-17 17:25:02.000000000 +0200 @@@@ -40,6 +40,9 @@@@ # Location of data files used by the scheduler... #DataDir @@CUPS_DATADIR@@ +# Location of PID file written by the scheduler (set empty for no PID file)... +#PidFile @@CUPS_STATEDIR@@/cupsd.pid + # Location of the static web content served by the scheduler... #DocumentRoot @@CUPS_DOCROOT@@ @ 1.1 log @Rename print/cups to print/cups-base to depend on cups-filters This change: - renames print/cups to print/cups-base, - lets print/cups-filters depend on print/cups-base instead of cups, - adds a package print/cups depending on print/cups-base and print/cups-filters. This makes sure installing print/cups always installs print/cups-filters, as it is necessary for being able to print outside of Mac OS X since CUPS 1.6.0. You're welcome. I do not think superseding is necessary, since print/cups will also install print/cups-base, which really is the same as before. In practice it is like a new dependency. I do not want to risk a bad "cvs import" either, sorry. Bumps PKGREVISION for print/cups and print/cups-filters, since they have new dependencies now. This is also necessary for everything else currently depending on print/cups; I will try to commit this right after this one. Tested on NetBSD/amd64, as reviewed on tech-pkg@@. No breakage observed, apologies if anything goes wrong. @ text @d1 1 a1 1 $NetBSD: patch-conf-cups-files.conf.in,v 1.1 2017/07/27 08:54:26 wiz Exp $ d7 1 a7 1 @@@@ -40,6 +40,10 @@@@ a13 1 +# Location of the static web content served by the scheduler... @