CVS commit: pkgsrc/archivers/pax

[Frédéric Fauberteau <triaxx%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Mon Oct 29 20:18:02 UTC 2018

Modified Files:
        pkgsrc/archivers/pax: Makefile
        pkgsrc/archivers/pax/files: pax.h

Log Message:
pax: add <sys/sysmacros.h> for Linux

* On Arch Linux, the build failed, makedev(3) indicates
  #include <sys/sysmacros.h>
* On Debian Buster, the build succeed but a big warning is displayed:
    warning: In the GNU C Library, "minor" is defined
    by <sys/sysmacros.h>. For historical compatibility, it is
    currently defined by <sys/types.h> as well, but we plan to
    remove this soon. To use "minor", include <sys/sysmacros.h>
    directly. If you did not intend to use a system-defined macro
    "minor", you should undefine it after including <sys/types.h>.


To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 pkgsrc/archivers/pax/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/archivers/pax/files/pax.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/pax/Makefile
diff -u pkgsrc/archivers/pax/Makefile:1.52 pkgsrc/archivers/pax/Makefile:1.53
--- pkgsrc/archivers/pax/Makefile:1.52  Sat Apr  7 08:57:01 2018
+++ pkgsrc/archivers/pax/Makefile       Mon Oct 29 20:18:02 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.52 2018/04/07 08:57:01 jperkin Exp $
+# $NetBSD: Makefile,v 1.53 2018/10/29 20:18:02 triaxx Exp $
 
 DISTNAME=              pax-20080110
-PKGREVISION=           3
+PKGREVISION=           4
 CATEGORIES=            archivers
 MASTER_SITES=          # empty
 DISTFILES=             # empty

Index: pkgsrc/archivers/pax/files/pax.h
diff -u pkgsrc/archivers/pax/files/pax.h:1.13 pkgsrc/archivers/pax/files/pax.h:1.14
--- pkgsrc/archivers/pax/files/pax.h:1.13       Fri Mar 14 22:16:50 2014
+++ pkgsrc/archivers/pax/files/pax.h    Mon Oct 29 20:18:02 2018
@@ -1,4 +1,4 @@
-/*     $NetBSD: pax.h,v 1.13 2014/03/14 22:16:50 ryoon Exp $   */
+/*     $NetBSD: pax.h,v 1.14 2018/10/29 20:18:02 triaxx Exp $  */
 
 /*-
  * Copyright (c) 1992 Keith Muller.
@@ -265,7 +265,7 @@ typedef struct oplist {
 #  define major(x)             ((int)(0x00ff & ((x) >> 8)))
 #  define minor(x)             ((int)(0xffff00ff & (x)))
 #  define makedev(maj,min)     ((0xff00 & ((maj)<<8))|(0xffff00ff & (min)))
-# elif defined(_SCO_DS)
+# elif defined(_SCO_DS) || defined(__linux__)
 #  include <sys/sysmacros.h>
 # endif
 # define MAJOR(x)      major(x)