From e4b21591d217b02f8aa50e0b464542d1f748b233 Mon Sep 17 00:00:00 2001
From: jperkin <jperkin@pkgsrc.org>
Date: Thu, 21 Sep 2017 09:48:56 +0000
Subject: e2fsprogs: Fix build on SunOS.

Patches provided by Matteo Cypriani in PR#52563.
---
 sysutils/e2fsprogs/Makefile                           |  3 ++-
 sysutils/e2fsprogs/distinfo                           |  5 ++++-
 sysutils/e2fsprogs/patches/patch-debugfs_debugfs.c    | 16 ++++++++++++++++
 sysutils/e2fsprogs/patches/patch-lib_uuid_gen__uuid.c | 15 +++++++++++++++
 sysutils/e2fsprogs/patches/patch-misc_create__inode.c | 16 ++++++++++++++++
 5 files changed, 53 insertions(+), 2 deletions(-)
 create mode 100644 sysutils/e2fsprogs/patches/patch-debugfs_debugfs.c
 create mode 100644 sysutils/e2fsprogs/patches/patch-lib_uuid_gen__uuid.c
 create mode 100644 sysutils/e2fsprogs/patches/patch-misc_create__inode.c

diff --git a/sysutils/e2fsprogs/Makefile b/sysutils/e2fsprogs/Makefile
index 0f3ecc90e58..a45a02d4acc 100644
--- a/sysutils/e2fsprogs/Makefile
+++ b/sysutils/e2fsprogs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2017/02/11 15:10:33 tron Exp $
+# $NetBSD: Makefile,v 1.25 2017/09/21 09:48:56 jperkin Exp $
 
 DISTNAME=	e2fsprogs-1.43.4
 CATEGORIES=	sysutils
@@ -12,6 +12,7 @@ COMMENT=	Second extended file system (ext2fs) management programs
 LICENSE=	gnu-gpl-v2 AND gnu-lgpl-v2 AND modified-bsd AND mit
 
 GNU_CONFIGURE=	yes
+USE_LANGUAGES=	c99
 USE_TOOLS+=	makeinfo gmake
 INFO_FILES=	yes
 
diff --git a/sysutils/e2fsprogs/distinfo b/sysutils/e2fsprogs/distinfo
index 13d29ab9e02..00c7d6f05a5 100644
--- a/sysutils/e2fsprogs/distinfo
+++ b/sysutils/e2fsprogs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.22 2017/02/11 15:10:33 tron Exp $
+$NetBSD: distinfo,v 1.23 2017/09/21 09:48:56 jperkin Exp $
 
 SHA1 (e2fsprogs-1.43.4.tar.xz) = 3073dfe3d67075d3ae68e41e78120f14a18ac9ba
 RMD160 (e2fsprogs-1.43.4.tar.xz) = cb6fb31aa7242d3e72f0427aac0271848d467ffe
@@ -11,8 +11,11 @@ SHA1 (patch-an) = 1199b17c4e65b8825b78fc02f7b2c9164eee56ef
 SHA1 (patch-ao) = a8fcacf506b003bf40ecadd5260ff0a6628ad2e6
 SHA1 (patch-as) = be316e404840a47422edbee65177bf6a9c94b335
 SHA1 (patch-aw) = 544634d6603762dabaeffe950440f533c6495b32
+SHA1 (patch-debugfs_debugfs.c) = 6092c8e61fcdda2e5b669dad26b6c335cc45c4c5
 SHA1 (patch-e2fsck_jfs__user.h) = 2fd21cedabc4356a0d76a6caa1dbf73461750800
 SHA1 (patch-lib_ext2fs_bitops.c) = 0ca90ee35d255b8f590a216554a22b738c6083bc
 SHA1 (patch-lib_ext2fs_bitops.h) = 8eec77c83bf85423a1420b18405e9ba655131528
 SHA1 (patch-lib_ext2fs_ext2fs.h) = 2811fd3eff03dd4fb7f72df4c854d2c33b37846f
 SHA1 (patch-lib_ext2fs_tdb.c) = dd50993cd0beba0451cfb3422ca9f54700ee0e38
+SHA1 (patch-lib_uuid_gen__uuid.c) = 083ac45a8d2d30a5c272720fb9a6a1785c97eee2
+SHA1 (patch-misc_create__inode.c) = 7b9b49bc6bdcf5845bb81414faed987c74228940
diff --git a/sysutils/e2fsprogs/patches/patch-debugfs_debugfs.c b/sysutils/e2fsprogs/patches/patch-debugfs_debugfs.c
new file mode 100644
index 00000000000..8a5ab783afa
--- /dev/null
+++ b/sysutils/e2fsprogs/patches/patch-debugfs_debugfs.c
@@ -0,0 +1,16 @@
+$NetBSD: patch-debugfs_debugfs.c,v 1.1 2017/09/21 09:48:56 jperkin Exp $
+
+Fix build on SunOS.
+
+--- debugfs/debugfs.c.orig	2016-09-02 04:17:32.000000000 +0000
++++ debugfs/debugfs.c
+@@ -26,6 +26,9 @@ extern char *optarg;
+ #include <errno.h>
+ #endif
+ #include <fcntl.h>
++#ifdef __sun
++#include <sys/mkdev.h>
++#endif
+ 
+ #include "debugfs.h"
+ #include "uuid/uuid.h"
diff --git a/sysutils/e2fsprogs/patches/patch-lib_uuid_gen__uuid.c b/sysutils/e2fsprogs/patches/patch-lib_uuid_gen__uuid.c
new file mode 100644
index 00000000000..108cc6bcfea
--- /dev/null
+++ b/sysutils/e2fsprogs/patches/patch-lib_uuid_gen__uuid.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-lib_uuid_gen__uuid.c,v 1.1 2017/09/21 09:48:56 jperkin Exp $
+
+Fix build on SunOS.
+
+--- lib/uuid/gen_uuid.c.orig	2016-09-02 04:17:32.000000000 +0000
++++ lib/uuid/gen_uuid.c
+@@ -267,7 +267,7 @@ static int get_node_id(unsigned char *no
+ 	for (i = 0; i < n; i+= ifreq_size(*ifrp) ) {
+ 		ifrp = (struct ifreq *)((char *) ifc.ifc_buf+i);
+ 		strncpy(ifr.ifr_name, ifrp->ifr_name, IFNAMSIZ);
+-#ifdef SIOCGIFHWADDR
++#if defined(SIOCGIFHWADDR) && !defined(__sun)
+ 		if (ioctl(sd, SIOCGIFHWADDR, &ifr) < 0)
+ 			continue;
+ 		a = (unsigned char *) &ifr.ifr_hwaddr.sa_data;
diff --git a/sysutils/e2fsprogs/patches/patch-misc_create__inode.c b/sysutils/e2fsprogs/patches/patch-misc_create__inode.c
new file mode 100644
index 00000000000..96f7ef818ba
--- /dev/null
+++ b/sysutils/e2fsprogs/patches/patch-misc_create__inode.c
@@ -0,0 +1,16 @@
+$NetBSD: patch-misc_create__inode.c,v 1.1 2017/09/21 09:48:56 jperkin Exp $
+
+Fix build on SunOS.
+
+--- misc/create_inode.c.orig	2017-01-31 06:08:02.000000000 +0000
++++ misc/create_inode.c
+@@ -22,6 +22,9 @@
+ #include <attr/xattr.h>
+ #endif
+ #include <sys/ioctl.h>
++#ifdef __sun
++#include <sys/mkdev.h>
++#endif
+ #include <ext2fs/ext2fs.h>
+ #include <ext2fs/ext2_types.h>
+ #include <ext2fs/fiemap.h>
-- 
cgit v1.2.3