CVS commit: pkgsrc/pkgtools/pkg

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/pkgtools/pkg
From: "Thomas Klausner" <wiz%netbsd.org@localhost>
Date: Mon, 10 Feb 2025 13:13:27 +0000

Module Name:    pkgsrc
Committed By:   wiz
Date:           Mon Feb 10 13:13:27 UTC 2025

Modified Files:
        pkgsrc/pkgtools/pkg: PLIST distinfo
        pkgsrc/pkgtools/pkg/patches: patch-scripts_periodic_411.pkg-backup
Added Files:
        pkgsrc/pkgtools/pkg/patches: patch-configure patch-libpkg_pkg__elf.c
            patch-src_main.c patch-src_pkgcli.h

Log Message:
pkg: fix build on NetBSD.

Stop building and installing pkg-static, it's not needed and causes
additional link errors.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/pkgtools/pkg/PLIST
cvs rdiff -u -r1.18 -r1.19 pkgsrc/pkgtools/pkg/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/pkgtools/pkg/patches/patch-configure \
    pkgsrc/pkgtools/pkg/patches/patch-src_main.c \
    pkgsrc/pkgtools/pkg/patches/patch-src_pkgcli.h
cvs rdiff -u -r0 -r1.3 pkgsrc/pkgtools/pkg/patches/patch-libpkg_pkg__elf.c
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/pkgtools/pkg/patches/patch-scripts_periodic_411.pkg-backup

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

Modified files:

Index: pkgsrc/pkgtools/pkg/PLIST
diff -u pkgsrc/pkgtools/pkg/PLIST:1.8 pkgsrc/pkgtools/pkg/PLIST:1.9
--- pkgsrc/pkgtools/pkg/PLIST:1.8       Mon Sep 21 03:03:55 2020
+++ pkgsrc/pkgtools/pkg/PLIST   Mon Feb 10 13:13:26 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2020/09/21 03:03:55 khorben Exp $
+@comment $NetBSD: PLIST,v 1.9 2025/02/10 13:13:26 wiz Exp $
 include/pkg.h
 lib/libpkg.la
 lib/libpkg_static.la
@@ -42,7 +42,6 @@ man/man8/pkg-version.8
 man/man8/pkg-which.8
 man/man8/pkg.8
 sbin/pkg
-sbin/pkg-static
 share/examples/pkg/bash_completion.d/_pkg.bash
 share/examples/pkg/periodic/daily/411.pkg-backup
 share/examples/pkg/periodic/daily/490.status-pkg-changes

Index: pkgsrc/pkgtools/pkg/distinfo
diff -u pkgsrc/pkgtools/pkg/distinfo:1.18 pkgsrc/pkgtools/pkg/distinfo:1.19
--- pkgsrc/pkgtools/pkg/distinfo:1.18   Thu Jan 23 07:08:51 2025
+++ pkgsrc/pkgtools/pkg/distinfo        Mon Feb 10 13:13:26 2025
@@ -1,7 +1,11 @@
-$NetBSD: distinfo,v 1.18 2025/01/23 07:08:51 wiz Exp $
+$NetBSD: distinfo,v 1.19 2025/02/10 13:13:26 wiz Exp $
 
 BLAKE2s (pkg-1.10.99.7.tar.xz) = 61884e04f4a8283925b53d388d19e3e56a0744459230f8d2c66ccd31e1b78ffb
 SHA512 (pkg-1.10.99.7.tar.xz) = 32bfb919da140bb7b75427ea6351aee3a4a297a0e13b5c722bdd5a0b8f488085883df36929fb97ff6fd944b901fa0fc95174b1474a9a4422047ffc626869e43b
 Size (pkg-1.10.99.7.tar.xz) = 2217824 bytes
-SHA1 (patch-scripts_periodic_411.pkg-backup) = 7f5f27b58629a17f1f3a197c9f02bd6f068585a9
+SHA1 (patch-configure) = b9897af770d89b07652d5a2fbc7116b758b5e80c
+SHA1 (patch-libpkg_pkg__elf.c) = a73e90e8a5048b5327a1192d066852ad63c0e094
+SHA1 (patch-scripts_periodic_411.pkg-backup) = cba8a752c07616e7efa2b775363f91446b570ff3
 SHA1 (patch-scripts_periodic_411.pkg-backup.in) = 4dbeee9b07d7a7795a02219f4d2f12a039c58aaa
+SHA1 (patch-src_main.c) = c161270714a62110f9a42585ff960a2c5f5b4157
+SHA1 (patch-src_pkgcli.h) = 5df652de38bab147bc7f245db340dd5811f81d23

Index: pkgsrc/pkgtools/pkg/patches/patch-scripts_periodic_411.pkg-backup
diff -u pkgsrc/pkgtools/pkg/patches/patch-scripts_periodic_411.pkg-backup:1.1 pkgsrc/pkgtools/pkg/patches/patch-scripts_periodic_411.pkg-backup:1.2
--- pkgsrc/pkgtools/pkg/patches/patch-scripts_periodic_411.pkg-backup:1.1       Thu Jan 23 07:08:51 2025
+++ pkgsrc/pkgtools/pkg/patches/patch-scripts_periodic_411.pkg-backup   Mon Feb 10 13:13:27 2025
@@ -1,8 +1,8 @@
-$NetBSD: patch-scripts_periodic_411.pkg-backup,v 1.1 2025/01/23 07:08:51 wiz Exp $
+$NetBSD: patch-scripts_periodic_411.pkg-backup,v 1.2 2025/02/10 13:13:27 wiz Exp $
 
 Fix unportable test(1) operator.
 
---- scripts/periodic/411.pkg-backup.orig       2025-01-22 22:06:00.034056538 +0000
+--- scripts/periodic/411.pkg-backup.orig       2018-01-06 22:54:19.000000000 +0000
 +++ scripts/periodic/411.pkg-backup
 @@ -25,7 +25,7 @@ backup_pkg() {
        for i in $(jot ${count} ${lower} 0); do

Added files:

Index: pkgsrc/pkgtools/pkg/patches/patch-configure
diff -u /dev/null pkgsrc/pkgtools/pkg/patches/patch-configure:1.1
--- /dev/null   Mon Feb 10 13:13:27 2025
+++ pkgsrc/pkgtools/pkg/patches/patch-configure Mon Feb 10 13:13:27 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure,v 1.1 2025/02/10 13:13:27 wiz Exp $
+
+Do not build static pkg binary.
+(Fails to link, is not needed.)
+
+--- configure.orig     2025-02-10 12:32:31.342030901 +0000
++++ configure
+@@ -13073,6 +13073,7 @@ case $host_os in
+         ;;
+ esac
+ 
++OS_STATIC="false"
+ 
+ 
+ 
Index: pkgsrc/pkgtools/pkg/patches/patch-src_main.c
diff -u /dev/null pkgsrc/pkgtools/pkg/patches/patch-src_main.c:1.1
--- /dev/null   Mon Feb 10 13:13:27 2025
+++ pkgsrc/pkgtools/pkg/patches/patch-src_main.c        Mon Feb 10 13:13:27 2025
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_main.c,v 1.1 2025/02/10 13:13:27 wiz Exp $
+
+Do not define variables in a header file.
+
+--- src/main.c.orig    2018-01-06 22:53:49.000000000 +0000
++++ src/main.c
+@@ -33,6 +33,10 @@
+ #include "pkg_config.h"
+ #endif
+ 
++int nbactions;
++int nbdone;
++int nbtodl;
++
+ #include <sys/param.h>
+ 
+ #include <sys/stat.h>
Index: pkgsrc/pkgtools/pkg/patches/patch-src_pkgcli.h
diff -u /dev/null pkgsrc/pkgtools/pkg/patches/patch-src_pkgcli.h:1.1
--- /dev/null   Mon Feb 10 13:13:27 2025
+++ pkgsrc/pkgtools/pkg/patches/patch-src_pkgcli.h      Mon Feb 10 13:13:27 2025
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_pkgcli.h,v 1.1 2025/02/10 13:13:27 wiz Exp $
+
+Do not define variables in a header file.
+
+--- src/pkgcli.h.orig  2025-02-10 11:59:02.231352508 +0000
++++ src/pkgcli.h
+@@ -37,12 +37,9 @@
+ 
+ extern bool quiet;
+ extern int nbactions;
+-int nbactions;
+ extern int nbdone;
+-int nbdone;
+ extern bool newpkgversion;
+ extern int nbtodl;
+-int nbtodl;
+ 
+ /* pkg add */
+ int exec_add(int, char **);

Index: pkgsrc/pkgtools/pkg/patches/patch-libpkg_pkg__elf.c
diff -u /dev/null pkgsrc/pkgtools/pkg/patches/patch-libpkg_pkg__elf.c:1.3
--- /dev/null   Mon Feb 10 13:13:27 2025
+++ pkgsrc/pkgtools/pkg/patches/patch-libpkg_pkg__elf.c Mon Feb 10 13:13:27 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-libpkg_pkg__elf.c,v 1.3 2025/02/10 13:13:27 wiz Exp $
+
+Avoid symbol conflicts on NetBSD due to libelf.h vs. exec_elf.h.
+
+--- libpkg/pkg_elf.c.orig      2018-01-06 22:53:49.000000000 +0000
++++ libpkg/pkg_elf.c
+@@ -48,7 +48,7 @@
+ #include <fcntl.h>
+ #include <gelf.h>
+ #include <libgen.h>
+-#if defined(HAVE_LINK_H) && !defined(__DragonFly__) && defined(HAVE_LIBELF)
++#if defined(HAVE_LINK_H) && !defined(__DragonFly__) && !defined(HAVE_LIBELF)
+ #include <link.h>
+ #endif
+ #include <paths.h>

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/licenses
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/licenses
Indexes:

Home | Main Index | Thread Index | Old Index