CVS commit: pkgsrc/print

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/print
From: "Amitai Schleier" <schmonz%netbsd.org@localhost>
Date: Mon, 19 Jun 2023 19:28:36 +0000

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Mon Jun 19 19:28:36 UTC 2023

Modified Files:
        pkgsrc/print/cups-base: distinfo
        pkgsrc/print/cups-base/patches: patch-ae patch-scheduler-main.c
        pkgsrc/print/libcups: Makefile

Log Message:
libcups: don't strip libraries on macOS. Fixes error seen in bulk build.

Still installs stripped (by default, anyway) on NetBSD.


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 pkgsrc/print/cups-base/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/print/cups-base/patches/patch-ae \
    pkgsrc/print/cups-base/patches/patch-scheduler-main.c
cvs rdiff -u -r1.25 -r1.26 pkgsrc/print/libcups/Makefile

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

Modified files:

Index: pkgsrc/print/cups-base/distinfo
diff -u pkgsrc/print/cups-base/distinfo:1.34 pkgsrc/print/cups-base/distinfo:1.35
--- pkgsrc/print/cups-base/distinfo:1.34        Fri Jun 16 21:12:11 2023
+++ pkgsrc/print/cups-base/distinfo     Mon Jun 19 19:28:36 2023
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.34 2023/06/16 21:12:11 wiz Exp $
+$NetBSD: distinfo,v 1.35 2023/06/19 19:28:36 schmonz Exp $
 
 BLAKE2s (cups-2.4.4-source.tar.gz) = 7cb3d822e48fa1b751b984d7eceb751d5503e23f1f6dc7d62a4abe2fd81a12e8
 SHA512 (cups-2.4.4-source.tar.gz) = 861b7d8e92b5ff2c2f693464f417ce1c22da74508acbfb2cb6a889154d4673f4b3f4dd87c53f8539a01b603d66546ebc6c121b88d483746e2f180d587ff3c675
 Size (cups-2.4.4-source.tar.gz) = 8135056 bytes
-SHA1 (patch-ae) = b81d7a2ce457f0d6994d6a084c63aa0a870bb881
+SHA1 (patch-ae) = 7f12aa886208f9e634d5c3fd3bc1fd4a385f22a6
 SHA1 (patch-ai) = d4aa1b59c77fa2cbf614eb661d9a791311b399c2
 SHA1 (patch-at) = 9517bff0bf2c892f0723a25f243ba188f7781393
 SHA1 (patch-conf-cups-files.conf.in) = b2eccf54e108d8c9e70094acfd9618a66779a84a
@@ -18,7 +18,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) = a5410c7f78756506d23d705dfa93a756fe3e513e
+SHA1 (patch-scheduler-main.c) = 808cf0ee64e76c1be7eb0b20290a4ca6151250ac
 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-ae
diff -u pkgsrc/print/cups-base/patches/patch-ae:1.2 pkgsrc/print/cups-base/patches/patch-ae:1.3
--- pkgsrc/print/cups-base/patches/patch-ae:1.2 Sun Nov 17 21:22:03 2019
+++ pkgsrc/print/cups-base/patches/patch-ae     Mon Jun 19 19:28:36 2023
@@ -1,11 +1,11 @@
-$NetBSD: patch-ae,v 1.2 2019/11/17 21:22:03 leot Exp $
+$NetBSD: patch-ae,v 1.3 2023/06/19 19:28:36 schmonz Exp $
 
 - Do not pass `-z' option to install(1)
 - Honor optimization flags.
 
---- Makedefs.in.orig   2019-08-23 15:19:38.000000000 +0000
+--- Makedefs.in.orig   2023-06-06 12:55:36.000000000 +0000
 +++ Makedefs.in
-@@ -46,7 +46,7 @@ SHELL                =       /bin/sh
+@@ -47,11 +47,12 @@ SHELL              =       /bin/sh
  #
  
  INSTALL_BIN   =       @LIBTOOL_INSTALL@ $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ @INSTALL_STRIP@
@@ -14,7 +14,13 @@ $NetBSD: patch-ae,v 1.2 2019/11/17 21:22
  INSTALL_CONFIG        =       $(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@
  INSTALL_DATA  =       $(INSTALL) -c -m 444
  INSTALL_DIR   =       $(INSTALL) -d
-@@ -167,7 +167,7 @@ CXXLIBS            =       @CXXLIBS@
+-INSTALL_LIB   =       @LIBTOOL_INSTALL@ $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ @INSTALL_STRIP@
++INSTALL_STRIP_LIB?=   @INSTALL_STRIP@
++INSTALL_LIB   =       @LIBTOOL_INSTALL@ $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ $(INSTALL_STRIP_LIB)
+ INSTALL_MAN   =       $(INSTALL) -c -m 444
+ INSTALL_SCRIPT        =       $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@
+ 
+@@ -168,7 +169,7 @@ CXXLIBS            =       @CXXLIBS@
  DBUS_NOTIFIER =       @DBUS_NOTIFIER@
  DBUS_NOTIFIERLIBS =   @DBUS_NOTIFIERLIBS@
  DNSSD_BACKEND =       @DNSSD_BACKEND@
Index: pkgsrc/print/cups-base/patches/patch-scheduler-main.c
diff -u pkgsrc/print/cups-base/patches/patch-scheduler-main.c:1.2 pkgsrc/print/cups-base/patches/patch-scheduler-main.c:1.3
--- pkgsrc/print/cups-base/patches/patch-scheduler-main.c:1.2   Tue May 26 08:36:56 2020
+++ pkgsrc/print/cups-base/patches/patch-scheduler-main.c       Mon Jun 19 19:28:36 2023
@@ -1,10 +1,10 @@
-$NetBSD: patch-scheduler-main.c,v 1.2 2020/05/26 08:36:56 triaxx Exp $
+$NetBSD: patch-scheduler-main.c,v 1.3 2023/06/19 19:28:36 schmonz Exp $
 
 Add a PidFile configuration directive to write a PID file.
 
---- scheduler/main.c.orig      2017-10-13 18:22:26.000000000 +0000
+--- scheduler/main.c.orig      2023-06-06 12:55:36.000000000 +0000
 +++ scheduler/main.c
-@@ -62,6 +62,7 @@
+@@ -63,6 +63,7 @@
   * Local functions...
   */
  
@@ -12,7 +12,7 @@ Add a PidFile configuration directive to
  static void           parent_handler(int sig);
  static void           process_children(void);
  static void           sigchld_handler(int sig);
-@@ -676,6 +677,13 @@ main(int  argc,                           /* I - Number of comm
+@@ -675,6 +676,13 @@ main(int  argc,                           /* I - Number of comm
  #endif /* __APPLE__ */
  
   /*
@@ -26,7 +26,7 @@ Add a PidFile configuration directive to
    * Send server-started event...
    */
  
-@@ -1158,6 +1166,7 @@ main(int  argc,                          /* I - Number of comm
+@@ -1166,6 +1174,7 @@ main(int  argc,                          /* I - Number of comm
                    "Scheduler shutting down due to program error.");
    }
  
@@ -34,7 +34,7 @@ Add a PidFile configuration directive to
   /*
    * Close all network clients...
    */
-@@ -1183,6 +1192,12 @@ main(int  argc,                         /* I - Number of comm
+@@ -1191,6 +1200,12 @@ main(int  argc,                         /* I - Number of comm
    */
  
    cupsdDeleteTemporaryPrinters(1);
@@ -47,10 +47,11 @@ Add a PidFile configuration directive to
  
  #ifdef __APPLE__
   /*
-@@ -2122,6 +2137,36 @@ service_checkout(int shutdown)          
+@@ -2126,6 +2141,36 @@ service_checkout(int shutdown)
+ }
  
  
- /*
++/*
 + * 'create_pidfile()' - Create PID file.
 + */
 +static int
@@ -80,7 +81,6 @@ Add a PidFile configuration directive to
 +}
 +
 +
-+/*
+ /*
   * 'usage()' - Show scheduler usage.
   */
- 

Index: pkgsrc/print/libcups/Makefile
diff -u pkgsrc/print/libcups/Makefile:1.25 pkgsrc/print/libcups/Makefile:1.26
--- pkgsrc/print/libcups/Makefile:1.25  Fri Jun 16 23:42:21 2023
+++ pkgsrc/print/libcups/Makefile       Mon Jun 19 19:28:36 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2023/06/16 23:42:21 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2023/06/19 19:28:36 schmonz Exp $
 
 .include "../../print/cups/Makefile.common"
 
@@ -70,6 +70,10 @@ AUTOCONF_REQD+=              2.71
 pre-configure:
        cd ${WRKSRC} && aclocal && autoconf
 
+.if ${OPSYS} == Darwin
+MAKE_ENV+=             INSTALL_STRIP_LIB=
+.endif
+
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"

Prev by Date: CVS commit: pkgsrc/security/heimdal
Next by Date: CVS commit: pkgsrc/shells/oh-my-posh
Previous by Thread: CVS commit: pkgsrc/security/heimdal
Next by Thread: CVS commit: pkgsrc/shells/oh-my-posh
Indexes:

Home | Main Index | Thread Index | Old Index