CVS commit: pkgsrc/sysutils/xe

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Jan 23 21:37:07 UTC 2022

Modified Files:
        pkgsrc/sysutils/xe: Makefile distinfo
Added Files:
        pkgsrc/sysutils/xe/patches: patch-xe.c

Log Message:
xe: simplify, and fix build on NetBSD


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/xe/Makefile \
    pkgsrc/sysutils/xe/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/xe/patches/patch-xe.c

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

Modified files:

Index: pkgsrc/sysutils/xe/Makefile
diff -u pkgsrc/sysutils/xe/Makefile:1.1 pkgsrc/sysutils/xe/Makefile:1.2
--- pkgsrc/sysutils/xe/Makefile:1.1     Sun Jan 23 19:42:33 2022
+++ pkgsrc/sysutils/xe/Makefile Sun Jan 23 21:37:07 2022
@@ -1,17 +1,15 @@
-# $NetBSD: Makefile,v 1.1 2022/01/23 19:42:33 schmonz Exp $
+# $NetBSD: Makefile,v 1.2 2022/01/23 21:37:07 wiz Exp $
 
-GITHUB_TAG=    refs/tags/v${PKGVERSION_NOREV}
 DISTNAME=      xe-0.11
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=leahneukirchen/}
+GITHUB_TAG=    v${PKGVERSION_NOREV}
 
 MAINTAINER=    schmonz%NetBSD.org@localhost
 HOMEPAGE=      https://github.com/leahneukirchen/xe/
 COMMENT=       Simple xargs and apply replacement
 LICENSE=       public-domain
 
-WRKSRC=                ${WRKDIR}/${DISTNAME}
-
 MAKE_FLAGS+=   PREFIX=${PREFIX:Q}
 MAKE_FLAGS+=   MANDIR=${PREFIX:Q}/${PKGMANDIR:Q}
 
Index: pkgsrc/sysutils/xe/distinfo
diff -u pkgsrc/sysutils/xe/distinfo:1.1 pkgsrc/sysutils/xe/distinfo:1.2
--- pkgsrc/sysutils/xe/distinfo:1.1     Sun Jan 23 19:42:33 2022
+++ pkgsrc/sysutils/xe/distinfo Sun Jan 23 21:37:07 2022
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1 2022/01/23 19:42:33 schmonz Exp $
+$NetBSD: distinfo,v 1.2 2022/01/23 21:37:07 wiz Exp $
 
 BLAKE2s (xe-0.11.tar.gz) = 8f8e522dc2155d2a5f000206dc04637467725302d56e7779bdc733dae4db8829
 SHA512 (xe-0.11.tar.gz) = 848b35f31e480f386cc48feaca60d59159eaaca95213039d5474c26e5d0c87092905029f32770c3b356d29822027cee9fc14b46e0127754ce2135cb825928bf6
 Size (xe-0.11.tar.gz) = 13578 bytes
+SHA1 (patch-xe.c) = 82ef058d88155a21a8242740124ec507c6acb9e9

Added files:

Index: pkgsrc/sysutils/xe/patches/patch-xe.c
diff -u /dev/null pkgsrc/sysutils/xe/patches/patch-xe.c:1.1
--- /dev/null   Sun Jan 23 21:37:07 2022
+++ pkgsrc/sysutils/xe/patches/patch-xe.c       Sun Jan 23 21:37:07 2022
@@ -0,0 +1,24 @@
+$NetBSD: patch-xe.c,v 1.1 2022/01/23 21:37:07 wiz Exp $
+
+Avoid conflict with NetBSD's shquote.
+
+--- xe.c.orig  2017-11-05 20:03:12.000000000 +0000
++++ xe.c
+@@ -130,7 +130,7 @@ my_child:
+ }
+ 
+ static void
+-shquote(const char *s)
++xe_shquote(const char *s)
+ {
+       if (*s &&
+           !strpbrk(s, "\001\002\003\004\005\006\007\010"
+@@ -159,7 +159,7 @@ trace()
+       for (i = 0; i < argslen; i++) {
+               if (i > 0)
+                       fprintf(traceout, " ");
+-              shquote(args[i]);
++              xe_shquote(args[i]);
+       }
+       fprintf(traceout, "\n");
+       fflush(traceout);