Mon Jul 20 19:46:18 2020 UTC ()
Define PATH_MAX on Illumos. Respect CFLAGS.


(schmonz)
diff -r1.2 -r1.3 pkgsrc/devel/leahneukirchen-redo/Makefile
diff -r1.2 -r1.3 pkgsrc/devel/leahneukirchen-redo/distinfo
diff -r1.1 -r1.2 pkgsrc/devel/leahneukirchen-redo/patches/patch-redo.c
cvs diff -r1.2 -r1.3 pkgsrc/devel/leahneukirchen-redo/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/leahneukirchen-redo/Makefile 2020/07/06 16:48:50 1.2
+++ pkgsrc/devel/leahneukirchen-redo/Makefile 2020/07/20 19:46:18 1.3
@@ -1,28 +1,28 @@ @@ -1,28 +1,28 @@
1# $NetBSD: Makefile,v 1.2 2020/07/06 16:48:50 schmonz Exp $ 1# $NetBSD: Makefile,v 1.3 2020/07/20 19:46:18 schmonz Exp $
2 2
3DISTNAME= leahneukirchen-redo-0.2 3DISTNAME= leahneukirchen-redo-0.2
4CATEGORIES= devel 4CATEGORIES= devel
5MASTER_SITES= ${MASTER_SITE_GITHUB:=leahneukirchen/} 5MASTER_SITES= ${MASTER_SITE_GITHUB:=leahneukirchen/}
6GITHUB_PROJECT= redo-c 6GITHUB_PROJECT= redo-c
7GITHUB_TAG= v${PKGVERSION_NOREV} 7GITHUB_TAG= v${PKGVERSION_NOREV}
8 8
9MAINTAINER= schmonz@NetBSD.org 9MAINTAINER= schmonz@NetBSD.org
10HOMEPAGE= https://github.com/leahneukirchen/redo-c/ 10HOMEPAGE= https://github.com/leahneukirchen/redo-c/
11COMMENT= Redo build system implemented in portable C 11COMMENT= Redo build system implemented in portable C
12LICENSE= public-domain 12LICENSE= public-domain
13 13
14WRKSRC= ${WRKDIR}/${GITHUB_PROJECT}-${PKGVERSION_NOREV} 14WRKSRC= ${WRKDIR}/${GITHUB_PROJECT}-${PKGVERSION_NOREV}
15 15
16INSTALLATION_DIRS= bin share/doc/${PKGBASE} 16INSTALLATION_DIRS= bin share/doc/${PKGBASE}
17 17
18do-build: 18do-build:
19 cd ${WRKSRC}; \ 19 cd ${WRKSRC}; \
20 cc -Wall -Wextra -Wwrite-strings -o redo redo.c 20 cc ${CFLAGS} -Wall -Wextra -Wwrite-strings -o redo redo.c
21 21
22do-install: 22do-install:
23 ${INSTALL_PROGRAM} ${WRKSRC}/redo ${DESTDIR}${PREFIX}/bin 23 ${INSTALL_PROGRAM} ${WRKSRC}/redo ${DESTDIR}${PREFIX}/bin
24 cd ${DESTDIR}${PREFIX}/bin; sh ${WRKSRC}/links.do; \ 24 cd ${DESTDIR}${PREFIX}/bin; sh ${WRKSRC}/links.do; \
25 for i in *; do mv $${i} leahneukirchen-$${i}; done 25 for i in *; do mv $${i} leahneukirchen-$${i}; done
26 ${INSTALL_DATA} ${WRKSRC}/NOTES ${DESTDIR}${PREFIX}/share/doc/${PKGBASE} 26 ${INSTALL_DATA} ${WRKSRC}/NOTES ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
27 27
28.include "../../mk/bsd.pkg.mk" 28.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/devel/leahneukirchen-redo/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/leahneukirchen-redo/distinfo 2020/07/06 16:48:50 1.2
+++ pkgsrc/devel/leahneukirchen-redo/distinfo 2020/07/20 19:46:18 1.3
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.2 2020/07/06 16:48:50 schmonz Exp $ 1$NetBSD: distinfo,v 1.3 2020/07/20 19:46:18 schmonz Exp $
2 2
3SHA1 (leahneukirchen-redo-0.2.tar.gz) = 1c7ea152b8839abde63b32b39aaa76aeb16aa7d3 3SHA1 (leahneukirchen-redo-0.2.tar.gz) = 1c7ea152b8839abde63b32b39aaa76aeb16aa7d3
4RMD160 (leahneukirchen-redo-0.2.tar.gz) = 40f2ef804d31fdba636eaf3e2ce55b81561d8d76 4RMD160 (leahneukirchen-redo-0.2.tar.gz) = 40f2ef804d31fdba636eaf3e2ce55b81561d8d76
5SHA512 (leahneukirchen-redo-0.2.tar.gz) = 7547625d3536bf875b34f05acdbed825d3a6915e62f4d504360c4bfcfd41506f197712f7bbc90fa7d5d50e87eddb6cb37bf27e39e105238406abe617600e0c4f 5SHA512 (leahneukirchen-redo-0.2.tar.gz) = 7547625d3536bf875b34f05acdbed825d3a6915e62f4d504360c4bfcfd41506f197712f7bbc90fa7d5d50e87eddb6cb37bf27e39e105238406abe617600e0c4f
6Size (leahneukirchen-redo-0.2.tar.gz) = 7673 bytes 6Size (leahneukirchen-redo-0.2.tar.gz) = 7673 bytes
7SHA1 (patch-redo.c) = 96e794071dc06bfc6efae27fc955b00c1b39326f 7SHA1 (patch-redo.c) = 19e57d151fe72907a894f27792ac504ffb5be8fc
cvs diff -r1.1 -r1.2 pkgsrc/devel/leahneukirchen-redo/patches/patch-redo.c (expand / switch to unified diff)

--- pkgsrc/devel/leahneukirchen-redo/patches/patch-redo.c 2020/07/06 15:27:19 1.1
+++ pkgsrc/devel/leahneukirchen-redo/patches/patch-redo.c 2020/07/20 19:46:18 1.2
@@ -1,20 +1,29 @@ @@ -1,20 +1,29 @@
1$NetBSD: patch-redo.c,v 1.1 2020/07/06 15:27:19 schmonz Exp $ 1$NetBSD: patch-redo.c,v 1.2 2020/07/20 19:46:18 schmonz Exp $
2 2
3Avoid CONFLICTS with other redo implementations. 3Avoid CONFLICTS with other redo implementations.
 4Define PATH_MAX on Illumos.
4 5
5--- redo.c.orig 2018-07-08 21:49:57.000000000 +0000 6--- redo.c.orig 2020-06-26 21:46:40.000000000 +0000
6+++ redo.c 7+++ redo.c
7@@ -974,20 +974,25 @@ main(int argc, char *argv[]) 8@@ -34,6 +34,7 @@ todo:
 9 #include <errno.h>
 10 #include <fcntl.h>
 11 #include <inttypes.h>
 12+#include <limits.h>
 13 #include <stdarg.h>
 14 #include <stdint.h>
 15 #include <stdio.h>
 16@@ -968,20 +969,25 @@ main(int argc, char *argv[])
8  17
9 dir_fd = keepdir(); 18 dir_fd = keepdir();
10  19
11- if (strcmp(program, "redo") == 0) { 20- if (strcmp(program, "redo") == 0) {
12+ if (strcmp(program, "redo") == 0 21+ if (strcmp(program, "redo") == 0
13+ || strcmp(program, "leahneukirchen-redo") == 0) { 22+ || strcmp(program, "leahneukirchen-redo") == 0) {
14 fflag = 1; 23 fflag = 1;
15 redo_ifchange(argc, argv); 24 redo_ifchange(argc, argv);
16 procure(); 25 procure();
17- } else if (strcmp(program, "redo-ifchange") == 0) { 26- } else if (strcmp(program, "redo-ifchange") == 0) {
18+ } else if (strcmp(program, "redo-ifchange") == 0 27+ } else if (strcmp(program, "redo-ifchange") == 0
19+ || strcmp(program, "leahneukirchen-redo-ifchange") == 0) { 28+ || strcmp(program, "leahneukirchen-redo-ifchange") == 0) {
20 redo_ifchange(argc, argv); 29 redo_ifchange(argc, argv);