Wed Jun 21 18:39:02 2017 UTC ()
Pullup ticket #5483 - requested by sevan
net/ndpi: SunOS build fix
Revisions pulled up:
- net/ndpi/Makefile 1.3
- net/ndpi/distinfo 1.3
- net/ndpi/patches/patch-src_include_ndpi__includes.h 1.1
---
Module Name: pkgsrc
Committed By: fhajny
Date: Thu Jun 15 10:06:39 UTC 2017
Modified Files:
pkgsrc/net/ndpi: Makefile distinfo
Added Files:
pkgsrc/net/ndpi/patches: patch-src_include_ndpi__includes.h
Log Message:
Fix ndpi build on SunOS.
(bsiegert)
diff -r1.2 -r1.2.6.1 pkgsrc/net/ndpi/Makefile
diff -r1.2 -r1.2.6.1 pkgsrc/net/ndpi/distinfo
diff -r0 -r1.1.2.2 pkgsrc/net/ndpi/patches/patch-src_include_ndpi__includes.h
--- pkgsrc/net/ndpi/Makefile 2016/07/01 04:51:15 1.2
+++ pkgsrc/net/ndpi/Makefile 2017/06/21 18:39:02 1.2.6.1
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/07/01 04:51:15 adam Exp $
+# $NetBSD: Makefile,v 1.2.6.1 2017/06/21 18:39:02 bsiegert Exp $
DISTNAME= ntopng-2.4-stable
PKGNAME= ndpi-1.8.0
@@ -18,6 +18,12 @@
EXTRACT_ELEMENTS= ${DISTNAME}/nDPI
WRKSRC= ${WRKDIR}/${DISTNAME}/nDPI
+
+# Portable types
+CFLAGS.SunOS+= -Du_int8_t=uint8_t
+CFLAGS.SunOS+= -Du_int16_t=uint16_t
+CFLAGS.SunOS+= -Du_int32_t=uint32_t
+CFLAGS.SunOS+= -Du_int64_t=uint64_t
pre-configure:
cd ${WRKSRC} && autoreconf -fiv
--- pkgsrc/net/ndpi/distinfo 2016/07/01 04:51:15 1.2
+++ pkgsrc/net/ndpi/distinfo 2017/06/21 18:39:02 1.2.6.1
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.2 2016/07/01 04:51:15 adam Exp $
+$NetBSD: distinfo,v 1.2.6.1 2017/06/21 18:39:02 bsiegert Exp $
SHA1 (ntopng-2.4-stable.tar.gz) = ceb08377f98e8d149e39f5546a62e2f6ca980a31
RMD160 (ntopng-2.4-stable.tar.gz) = 14940d0ea398cd43d7c31868f34b833b214386e7
SHA512 (ntopng-2.4-stable.tar.gz) = 515dd7889ae3aaf2482371bb2c55ab7300cf4207fe07f37029b7529bfb710379c19a54f58cf6df87e42454c0c99d15291af334adff676252301d9edd0acf3c7a
Size (ntopng-2.4-stable.tar.gz) = 134074662 bytes
SHA1 (patch-configure.ac) = 4f509a80de16094e7e9df50bfd4ba9505f4b73ff
+SHA1 (patch-src_include_ndpi__includes.h) = db5da9ca24ecf32fd8c264e193af280814dc74c6
$NetBSD: patch-src_include_ndpi__includes.h,v 1.1.2.2 2017/06/21 18:39:02 bsiegert Exp $
Same case with SunOS.
--- src/include/ndpi_includes.h.orig 2016-06-27 19:31:24.000000000 +0000
+++ src/include/ndpi_includes.h
@@ -46,7 +46,7 @@
#include <netinet/tcp.h>
#include <netinet/udp.h>
-#if !defined __APPLE__ && !defined __FreeBSD__ && !defined __NetBSD__ && !defined __OpenBSD__
+#if !defined __APPLE__ && !defined __FreeBSD__ && !defined __NetBSD__ && !defined __OpenBSD__ && !defined __sun
#include <endian.h>
#include <byteswap.h>