pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/archivers gtar: fix build on SunOS



details:   https://anonhg.NetBSD.org/pkgsrc/rev/8daf326ee83a
branches:  trunk
changeset: 395246:8daf326ee83a
user:      wiedi <wiedi%pkgsrc.org@localhost>
date:      Thu May 02 20:27:42 2019 +0000

description:
gtar: fix build on SunOS

resolve conflict with sys/limits.h

diffstat:

 archivers/gtar-base/distinfo                       |   3 ++-
 archivers/gtar-base/patches/patch-gnu_sys-limits.h |  17 +++++++++++++++++
 archivers/gtar/Makefile.common                     |   3 ++-
 3 files changed, 21 insertions(+), 2 deletions(-)

diffs (53 lines):

diff -r c58b781f60b6 -r 8daf326ee83a archivers/gtar-base/distinfo
--- a/archivers/gtar-base/distinfo      Thu May 02 19:08:52 2019 +0000
+++ b/archivers/gtar-base/distinfo      Thu May 02 20:27:42 2019 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.43 2019/02/24 15:18:45 wiz Exp $
+$NetBSD: distinfo,v 1.44 2019/05/02 20:27:42 wiedi Exp $
 
 SHA1 (tar-1.32.tar.bz2) = d0b0259689062d7700480f74c547f62f18e7412d
 RMD160 (tar-1.32.tar.bz2) = b83c063c4eea4f36bf70c6be67a1c7fc74e5e82f
@@ -6,5 +6,6 @@
 Size (tar-1.32.tar.bz2) = 2947264 bytes
 SHA1 (patch-Makefile.in) = 78cc142b9370317c52215c106ea1e7217e71f9b5
 SHA1 (patch-gnu_readlinkat.c) = ce9869bfcd75005bb4ddac4e3223df01a26a2b29
+SHA1 (patch-gnu_sys-limits.h) = b644d4f7915cac5757cb197966ec5f37553f3237
 SHA1 (patch-lib_xattr-at.c) = c69631c118558c0c056feb5b55188b2b4c92cc19
 SHA1 (patch-src_system.c) = cd9f7358fa93ed0ba4a1b3fffdae5d7f84ef4791
diff -r c58b781f60b6 -r 8daf326ee83a archivers/gtar-base/patches/patch-gnu_sys-limits.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/archivers/gtar-base/patches/patch-gnu_sys-limits.h        Thu May 02 20:27:42 2019 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-gnu_sys-limits.h,v 1.1 2019/05/02 20:27:43 wiedi Exp $
+
+Don't conflict with sys/limits.h on SunOS
+
+--- gnu/sys-limits.h.orig      2019-01-02 18:16:01.000000000 +0000
++++ gnu/sys-limits.h
+@@ -15,8 +15,8 @@
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, see <https://www.gnu.org/licenses/>.  */
+ 
+-#ifndef _SYS_LIMITS_H
+-#define _SYS_LIMITS_H
++#ifndef _SYS__LIMITS_H
++#define _SYS__LIMITS_H
+ 
+ #include <limits.h>
+ 
diff -r c58b781f60b6 -r 8daf326ee83a archivers/gtar/Makefile.common
--- a/archivers/gtar/Makefile.common    Thu May 02 19:08:52 2019 +0000
+++ b/archivers/gtar/Makefile.common    Thu May 02 20:27:42 2019 +0000
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile.common,v 1.5 2019/02/24 15:18:45 wiz Exp $
+# $NetBSD: Makefile.common,v 1.6 2019/05/02 20:27:43 wiedi Exp $
 #
 # used by archivers/gtar-base/Makefile
 # used by archivers/gtar-info/Makefile
 # used by archivers/gtar/Makefile
 
 DISTNAME=      tar-1.32
+PKGREVISION=   1
 CATEGORIES=    archivers
 MASTER_SITES=  ${MASTER_SITE_GNU:=tar/}
 EXTRACT_SUFX=  .tar.bz2



Home | Main Index | Thread Index | Old Index