summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwiedi <wiedi@pkgsrc.org>2019-05-02 20:27:42 +0000
committerwiedi <wiedi@pkgsrc.org>2019-05-02 20:27:42 +0000
commit72065a1141538abf0b962f2f62b11661a3398aaf (patch)
treedf299b1548c0ab4cbf9b66bd161b900e8e645f50
parent386a9b777249e37107dec830e4080dc81e824b8d (diff)
downloadpkgsrc-72065a1141538abf0b962f2f62b11661a3398aaf.tar.gz
gtar: fix build on SunOS
resolve conflict with sys/limits.h
-rw-r--r--archivers/gtar-base/distinfo3
-rw-r--r--archivers/gtar-base/patches/patch-gnu_sys-limits.h17
-rw-r--r--archivers/gtar/Makefile.common3
3 files changed, 21 insertions, 2 deletions
diff --git a/archivers/gtar-base/distinfo b/archivers/gtar-base/distinfo
index 76015229e15..442d49f027e 100644
--- a/archivers/gtar-base/distinfo
+++ b/archivers/gtar-base/distinfo
@@ -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 @@ SHA512 (tar-1.32.tar.bz2) = 3139e87112123269ee0600243b3ea081687cc93667bef5832bfe
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 --git a/archivers/gtar-base/patches/patch-gnu_sys-limits.h b/archivers/gtar-base/patches/patch-gnu_sys-limits.h
new file mode 100644
index 00000000000..4fdd8de1319
--- /dev/null
+++ b/archivers/gtar-base/patches/patch-gnu_sys-limits.h
@@ -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 --git a/archivers/gtar/Makefile.common b/archivers/gtar/Makefile.common
index 1841ad3789d..7a8d43eacd2 100644
--- a/archivers/gtar/Makefile.common
+++ b/archivers/gtar/Makefile.common
@@ -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