CVS commit: pkgsrc/devel/py-mercurial

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Mon Jun 24 09:05:18 UTC 2024

Modified Files:
        pkgsrc/devel/py-mercurial: Makefile distinfo
Added Files:
        pkgsrc/devel/py-mercurial/patches: patch-contrib_chg_hgclient.c

Log Message:
py-mercurial: Fix build regressions.


To generate a diff of this commit:
cvs rdiff -u -r1.97 -r1.98 pkgsrc/devel/py-mercurial/Makefile
cvs rdiff -u -r1.148 -r1.149 pkgsrc/devel/py-mercurial/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/py-mercurial/patches/patch-contrib_chg_hgclient.c

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

Modified files:

Index: pkgsrc/devel/py-mercurial/Makefile
diff -u pkgsrc/devel/py-mercurial/Makefile:1.97 pkgsrc/devel/py-mercurial/Makefile:1.98
--- pkgsrc/devel/py-mercurial/Makefile:1.97     Fri Jun 21 19:04:50 2024
+++ pkgsrc/devel/py-mercurial/Makefile  Mon Jun 24 09:05:18 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.97 2024/06/21 19:04:50 joerg Exp $
+# $NetBSD: Makefile,v 1.98 2024/06/24 09:05:18 jperkin Exp $
 #
 # Changelog sometimes at: https://www.mercurial-scm.org/wiki/WhatsNew
 
@@ -17,6 +17,9 @@ TOOL_DEPENDS+=        ${PYPKGPREFIX}-wheel-[0-9
 
 USE_TOOLS+=    gmake msgfmt
 
+CPPFLAGS.SunOS+=       -D_XOPEN_SOURCE=600     # msg_control
+LDFLAGS.SunOS+=                -lsocket
+
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5
 INSTALLATION_DIRS+=    share/doc/mercurial
 

Index: pkgsrc/devel/py-mercurial/distinfo
diff -u pkgsrc/devel/py-mercurial/distinfo:1.148 pkgsrc/devel/py-mercurial/distinfo:1.149
--- pkgsrc/devel/py-mercurial/distinfo:1.148    Fri Jun 21 19:04:50 2024
+++ pkgsrc/devel/py-mercurial/distinfo  Mon Jun 24 09:05:18 2024
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.148 2024/06/21 19:04:50 joerg Exp $
+$NetBSD: distinfo,v 1.149 2024/06/24 09:05:18 jperkin Exp $
 
 BLAKE2s (mercurial-6.7.4.tar.gz) = d368991bc499e21093278fb462a80af5e69707639029ef05ea370a74364298d0
 SHA512 (mercurial-6.7.4.tar.gz) = d2668750b4b86bf31323f103095a47cc963820f37769384f00b763b0cb2810ca660bce985a2d0b35b2617b57d6ecb61c97e7698198e89bb69c183bc91eeab96f
 Size (mercurial-6.7.4.tar.gz) = 8310726 bytes
+SHA1 (patch-contrib_chg_hgclient.c) = f82b13256ddc07f10af6fa9e1857563a4dba5388
 SHA1 (patch-mercurial_bundle2.py) = f4612a08effe11fb4b345ea213a148f6fba7118d
 SHA1 (patch-mercurial_exchange.py) = af7ac4719d74d1de731250fe8f5443931e7a15a9
 SHA1 (patch-mercurial_obsolete.py) = c55272b1ff013c8685fe8a57a43d1d486265f767

Added files:

Index: pkgsrc/devel/py-mercurial/patches/patch-contrib_chg_hgclient.c
diff -u /dev/null pkgsrc/devel/py-mercurial/patches/patch-contrib_chg_hgclient.c:1.1
--- /dev/null   Mon Jun 24 09:05:18 2024
+++ pkgsrc/devel/py-mercurial/patches/patch-contrib_chg_hgclient.c      Mon Jun 24 09:05:18 2024
@@ -0,0 +1,17 @@
+$NetBSD: patch-contrib_chg_hgclient.c,v 1.1 2024/06/24 09:05:18 jperkin Exp $
+
+Support systems that lack O_DIRECTORY.
+
+--- contrib/chg/hgclient.c.orig        2024-06-24 09:00:13.361836008 +0000
++++ contrib/chg/hgclient.c
+@@ -26,6 +26,10 @@
+ #include "procutil.h"
+ #include "util.h"
+ 
++#ifndef O_DIRECTORY
++#define O_DIRECTORY   O_RDONLY
++#endif
++
+ enum {
+       CAP_GETENCODING = 0x0001,
+       CAP_RUNCOMMAND = 0x0002,