CVS commit: pkgsrc/archivers/star

["Michael Baeuerle" <micha%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   micha
Date:           Wed May 13 08:21:49 UTC 2020

Modified Files:
        pkgsrc/archivers/star: distinfo
Added Files:
        pkgsrc/archivers/star/patches: patch-star_acl__unix.c patch-star_star.h

Log Message:
archivers/star: Add build fix for SmartOS

The second patch silence a warning on NetBSD.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/archivers/star/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/archivers/star/patches/patch-star_acl__unix.c \
    pkgsrc/archivers/star/patches/patch-star_star.h

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

Modified files:

Index: pkgsrc/archivers/star/distinfo
diff -u pkgsrc/archivers/star/distinfo:1.21 pkgsrc/archivers/star/distinfo:1.22
--- pkgsrc/archivers/star/distinfo:1.21 Mon May 11 14:07:49 2020
+++ pkgsrc/archivers/star/distinfo      Wed May 13 08:21:49 2020
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.21 2020/05/11 14:07:49 micha Exp $
+$NetBSD: distinfo,v 1.22 2020/05/13 08:21:49 micha Exp $
 
 SHA1 (schily-2020-05-11.tar.bz2) = 1992e23344880fb58443c5b89b24fded4039f7a7
 RMD160 (schily-2020-05-11.tar.bz2) = bdf3ac0349f00095d7e17f1b14a07f6dcb94a0e2
 SHA512 (schily-2020-05-11.tar.bz2) = a12f0a3caa14c35af150afb4354fbe7c5b1d6ad301d24efbed6f0ec7c38919fe2bf863a117d46107178d11f60b9dd93f72f173c722e2e129d86d348b01fc56ee
 Size (schily-2020-05-11.tar.bz2) = 4783976 bytes
+SHA1 (patch-star_acl__unix.c) = 15d8fbf73af6646e19b0488cf3c0226f7b854332
+SHA1 (patch-star_star.h) = 6ced8f4c2aac4fbcee4ea452e5d207e7b4bad064

Added files:

Index: pkgsrc/archivers/star/patches/patch-star_acl__unix.c
diff -u /dev/null pkgsrc/archivers/star/patches/patch-star_acl__unix.c:1.1
--- /dev/null   Wed May 13 08:21:49 2020
+++ pkgsrc/archivers/star/patches/patch-star_acl__unix.c        Wed May 13 08:21:49 2020
@@ -0,0 +1,20 @@
+$NetBSD: patch-star_acl__unix.c,v 1.1 2020/05/13 08:21:49 micha Exp $
+
+Fix for error below on SmartOS (patch proposed by upstream).
+
+In file included from acl_unix.c:81:
+/usr/include/iso/ctype_iso.h:94:12:
+   error: expected identifier or '(' before 'int'
+   94 | extern int isdigit(int);
+      |            ^~~~~~~
+
+--- star/acl_unix.c.orig       2020-05-12 16:31:51.262856675 +0000
++++ star/acl_unix.c
+@@ -78,6 +78,7 @@ static       UConst char sccsid[] =
+ 
+ #include <schily/stdio.h>
+ #include <schily/errno.h>
++#include <schily/ctype.h>
+ #include "star.h"
+ #include "props.h"
+ #include "table.h"
Index: pkgsrc/archivers/star/patches/patch-star_star.h
diff -u /dev/null pkgsrc/archivers/star/patches/patch-star_star.h:1.1
--- /dev/null   Wed May 13 08:21:49 2020
+++ pkgsrc/archivers/star/patches/patch-star_star.h     Wed May 13 08:21:49 2020
@@ -0,0 +1,30 @@
+$NetBSD: patch-star_star.h,v 1.1 2020/05/13 08:21:49 micha Exp $
+
+Fix for warning below on NetBSD (patch proposed by upstream).
+
+|         ==> COMPILING "OBJ/x86_64-netbsd-gcc/acl_unix.o"
+| In file included from acl_unix.c:82:0:
+| star.h:850:0: warning: "toupper" redefined
+|  #define toupper(c) (isupper(c) ? (c) : (c) - ('a' - 'A'))
+| 
+| In file included from /usr/include/ctype.h:97:0,
+|                  from ../include/schily/ctype.h:33,
+|                  from acl_unix.c:81:
+| /usr/include/sys/ctype_inline.h:60:0: note: this is the location of the previous definition
+|  #define toupper(c) ((int)((_toupper_tab_ + 1)[(c)]))
+
+--- star/star.h.orig   2020-05-13 08:04:00.370176996 +0000
++++ star/star.h
+@@ -841,6 +841,12 @@ typedef struct {
+ #ifdef        isdigit
+ #undef        isdigit         /* Needed for HP-UX */
+ #endif
++#ifdef        isoctal
++#undef        isoctal         /* Needed if aclutils.h is present */
++#endif
++#ifdef        toupper
++#undef        toupper         /* Needed if aclutils.h is present */
++#endif
+ #define       isdigit(c)      ((c) >= '0' && (c) <= '9')
+ #define       isoctal(c)      ((c) >= '0' && (c) <= '7')
+ #ifdef        isupper