Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 4BEBB84D0E for ; Fri, 23 Jun 2023 06:46:49 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id M0QzeLb2vGRe for ; Fri, 23 Jun 2023 06:46:48 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 7AB7384CC9 for ; Fri, 23 Jun 2023 06:46:48 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 74384FA89; Fri, 23 Jun 2023 06:46:48 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1687502808120320" MIME-Version: 1.0 Date: Fri, 23 Jun 2023 06:46:48 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/print To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20230623064648.74384FA89@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_1687502808120320 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiz Date: Fri Jun 23 06:46:48 UTC 2023 Modified Files: pkgsrc/print/cups-base: distinfo pkgsrc/print/cups-base/patches: patch-scheduler-main.c pkgsrc/print/libcups: Makefile PLIST Added Files: pkgsrc/print/cups-base/patches: patch-config-scripts_cups-common.m4 Log Message: libcups: restore installing libcupsimagebase Bump PKGREVISION. To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 pkgsrc/print/cups-base/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/print/cups-base/patches/patch-config-scripts_cups-common.m4 cvs rdiff -u -r1.3 -r1.4 \ pkgsrc/print/cups-base/patches/patch-scheduler-main.c cvs rdiff -u -r1.26 -r1.27 pkgsrc/print/libcups/Makefile cvs rdiff -u -r1.3 -r1.4 pkgsrc/print/libcups/PLIST Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1687502808120320 Content-Disposition: inline Content-Length: 5216 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/print/cups-base/distinfo diff -u pkgsrc/print/cups-base/distinfo:1.36 pkgsrc/print/cups-base/distinfo:1.37 --- pkgsrc/print/cups-base/distinfo:1.36 Thu Jun 22 11:47:07 2023 +++ pkgsrc/print/cups-base/distinfo Fri Jun 23 06:46:47 2023 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.36 2023/06/22 11:47:07 wiz Exp $ +$NetBSD: distinfo,v 1.37 2023/06/23 06:46:47 wiz Exp $ BLAKE2s (cups-2.4.6-source.tar.gz) = 13ca31ed9c99078833444c544adc98f84bcab95453953cb8884dd3f9b527800d SHA512 (cups-2.4.6-source.tar.gz) = eb748680a748f599e4826c17054a24259d190e6c8e8339f6a7a37ee2a3f4c3fd1829e856b25a854cfdbee1b51279c70a0e847f6142225b8b68f1cd10c4ce4ce4 @@ -8,6 +8,7 @@ SHA1 (patch-ai) = d4aa1b59c77fa2cbf614eb SHA1 (patch-at) = 9517bff0bf2c892f0723a25f243ba188f7781393 SHA1 (patch-conf-cups-files.conf.in) = b2eccf54e108d8c9e70094acfd9618a66779a84a SHA1 (patch-conf_Makefile) = ba1c6f9e5c1bb8074038f65f4d17bf55e556738e +SHA1 (patch-config-scripts_cups-common.m4) = f0f35ce3d995569331b6d1c90117fdbbb3f389fb SHA1 (patch-config-scripts_cups-compiler.m4) = 5446340c9b4976b0814a72e680025f5cab5da54a SHA1 (patch-config-scripts_cups-directories.m4) = 272a10e2ae70c589a65d73fe788f62fcbb2392b0 SHA1 (patch-config-scripts_cups-gssapi.m4) = 79de7d8c7bb8b2071817f505412d23fa8df5f68f @@ -18,7 +19,7 @@ SHA1 (patch-doc-help-man-cups-files.conf SHA1 (patch-man_cups-files.conf.5) = 51c06d39e20bf8c39c784fec1f32f6c8100cf821 SHA1 (patch-scheduler-conf.c) = 3e8dda2dc04c31a58a902c70161724a57bdc3e43 SHA1 (patch-scheduler-conf.h) = cd5c49579795c69b50abbff2b0f9604ffe8bfa5a -SHA1 (patch-scheduler-main.c) = 808cf0ee64e76c1be7eb0b20290a4ca6151250ac +SHA1 (patch-scheduler-main.c) = 347df789f10b77e4594a3e1a6d586a4c5e7d3749 SHA1 (patch-scheduler_auth.c) = 686b26286b7ad88363ddc7b394aefbfb3ad26c2d SHA1 (patch-scheduler_dirsvc.c) = 1dba98dc171df733acb99e5f31ad838845a917bc SHA1 (patch-tools_ippfind.c) = f0774fcf5ece380fd6fa09adb3c068910ddfa367 Index: pkgsrc/print/cups-base/patches/patch-scheduler-main.c diff -u pkgsrc/print/cups-base/patches/patch-scheduler-main.c:1.3 pkgsrc/print/cups-base/patches/patch-scheduler-main.c:1.4 --- pkgsrc/print/cups-base/patches/patch-scheduler-main.c:1.3 Mon Jun 19 19:28:36 2023 +++ pkgsrc/print/cups-base/patches/patch-scheduler-main.c Fri Jun 23 06:46:48 2023 @@ -1,8 +1,8 @@ -$NetBSD: patch-scheduler-main.c,v 1.3 2023/06/19 19:28:36 schmonz Exp $ +$NetBSD: patch-scheduler-main.c,v 1.4 2023/06/23 06:46:48 wiz Exp $ Add a PidFile configuration directive to write a PID file. ---- scheduler/main.c.orig 2023-06-06 12:55:36.000000000 +0000 +--- scheduler/main.c.orig 2023-06-22 10:17:14.000000000 +0000 +++ scheduler/main.c @@ -63,6 +63,7 @@ * Local functions... @@ -47,11 +47,10 @@ Add a PidFile configuration directive to #ifdef __APPLE__ /* -@@ -2126,6 +2141,36 @@ service_checkout(int shutdown) - } +@@ -2127,6 +2142,36 @@ service_checkout(int shutdown) -+/* + /* + * 'create_pidfile()' - Create PID file. + */ +static int @@ -81,6 +80,7 @@ Add a PidFile configuration directive to +} + + - /* ++/* * 'usage()' - Show scheduler usage. */ + Index: pkgsrc/print/libcups/Makefile diff -u pkgsrc/print/libcups/Makefile:1.26 pkgsrc/print/libcups/Makefile:1.27 --- pkgsrc/print/libcups/Makefile:1.26 Mon Jun 19 19:28:36 2023 +++ pkgsrc/print/libcups/Makefile Fri Jun 23 06:46:48 2023 @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.26 2023/06/19 19:28:36 schmonz Exp $ +# $NetBSD: Makefile,v 1.27 2023/06/23 06:46:48 wiz Exp $ .include "../../print/cups/Makefile.common" PKGNAME= libcups-${CUPS_VERS} +PKGREVISION= 1 MASTER_SITES= ${MASTER_SITE_GITHUB:=OpenPrinting/} MAINTAINER= sbd@NetBSD.org Index: pkgsrc/print/libcups/PLIST diff -u pkgsrc/print/libcups/PLIST:1.3 pkgsrc/print/libcups/PLIST:1.4 --- pkgsrc/print/libcups/PLIST:1.3 Fri Jun 16 23:42:21 2023 +++ pkgsrc/print/libcups/PLIST Fri Jun 23 06:46:48 2023 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2023/06/16 23:42:21 wiz Exp $ +@comment $NetBSD: PLIST,v 1.4 2023/06/23 06:46:48 wiz Exp $ bin/cups-config include/cups/adminutil.h include/cups/array.h @@ -17,6 +17,8 @@ include/cups/transcode.h include/cups/versioning.h lib/libcups.so lib/libcups.so.2 +lib/libcupsimage.so +lib/libcupsimage.so.2 lib/pkgconfig/cups.pc share/locale/ca/cups_ca.po share/locale/cs/cups_cs.po Added files: Index: pkgsrc/print/cups-base/patches/patch-config-scripts_cups-common.m4 diff -u /dev/null pkgsrc/print/cups-base/patches/patch-config-scripts_cups-common.m4:1.1 --- /dev/null Fri Jun 23 06:46:48 2023 +++ pkgsrc/print/cups-base/patches/patch-config-scripts_cups-common.m4 Fri Jun 23 06:46:48 2023 @@ -0,0 +1,14 @@ +$NetBSD: patch-config-scripts_cups-common.m4,v 1.1 2023/06/23 06:46:48 wiz Exp $ + +Build libcupsimage with libcups, like in older versions of cups. + +--- config-scripts/cups-common.m4.orig 2023-06-22 10:17:14.000000000 +0000 ++++ config-scripts/cups-common.m4 +@@ -474,7 +474,6 @@ AS_CASE(["$COMPONENTS"], [all], [ + LIBHEADERSPRIV="\$(COREHEADERSPRIV)" + ], [libcups], [ + BUILDDIRS="locale" +- cupsimagebase="" + ], [libcupslite], [ + AC_DEFINE([CUPS_LITE], [1], [Building CUPS without driver support?]) + BUILDDIRS="locale" --_----------=_1687502808120320--