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
cvs diff -r1.2 -r1.2.6.1 pkgsrc/net/ndpi/Makefile (expand / switch to unified diff)

--- 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,27 +1,33 @@ @@ -1,27 +1,33 @@
1# $NetBSD: Makefile,v 1.2 2016/07/01 04:51:15 adam Exp $ 1# $NetBSD: Makefile,v 1.2.6.1 2017/06/21 18:39:02 bsiegert Exp $
2 2
3DISTNAME= ntopng-2.4-stable 3DISTNAME= ntopng-2.4-stable
4PKGNAME= ndpi-1.8.0 4PKGNAME= ndpi-1.8.0
5CATEGORIES= net 5CATEGORIES= net
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ntop/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ntop/}
7 7
8MAINTAINER= adam@NetBSD.org 8MAINTAINER= adam@NetBSD.org
9HOMEPAGE= http://www.ntop.org/ 9HOMEPAGE= http://www.ntop.org/
10COMMENT= Library for deep-packet inspection 10COMMENT= Library for deep-packet inspection
11LICENSE= gnu-lgpl-v3 11LICENSE= gnu-lgpl-v3
12 12
13USE_LANGUAGES= c c++ 13USE_LANGUAGES= c c++
14USE_LIBTOOL= yes 14USE_LIBTOOL= yes
15USE_TOOLS+= autoconf automake gmake pkg-config 15USE_TOOLS+= autoconf automake gmake pkg-config
16GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
17PKGCONFIG_OVERRIDE= libndpi.pc.in 17PKGCONFIG_OVERRIDE= libndpi.pc.in
18 18
19EXTRACT_ELEMENTS= ${DISTNAME}/nDPI 19EXTRACT_ELEMENTS= ${DISTNAME}/nDPI
20WRKSRC= ${WRKDIR}/${DISTNAME}/nDPI 20WRKSRC= ${WRKDIR}/${DISTNAME}/nDPI
21 21
 22# Portable types
 23CFLAGS.SunOS+= -Du_int8_t=uint8_t
 24CFLAGS.SunOS+= -Du_int16_t=uint16_t
 25CFLAGS.SunOS+= -Du_int32_t=uint32_t
 26CFLAGS.SunOS+= -Du_int64_t=uint64_t
 27
22pre-configure: 28pre-configure:
23 cd ${WRKSRC} && autoreconf -fiv 29 cd ${WRKSRC} && autoreconf -fiv
24 30
25.include "../../net/libpcap/buildlink3.mk" 31.include "../../net/libpcap/buildlink3.mk"
26.include "../../textproc/json-c/buildlink3.mk" 32.include "../../textproc/json-c/buildlink3.mk"
27.include "../../mk/bsd.pkg.mk" 33.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.2.6.1 pkgsrc/net/ndpi/distinfo (expand / switch to unified diff)

--- 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 @@ @@ -1,7 +1,8 @@
1$NetBSD: distinfo,v 1.2 2016/07/01 04:51:15 adam Exp $ 1$NetBSD: distinfo,v 1.2.6.1 2017/06/21 18:39:02 bsiegert Exp $
2 2
3SHA1 (ntopng-2.4-stable.tar.gz) = ceb08377f98e8d149e39f5546a62e2f6ca980a31 3SHA1 (ntopng-2.4-stable.tar.gz) = ceb08377f98e8d149e39f5546a62e2f6ca980a31
4RMD160 (ntopng-2.4-stable.tar.gz) = 14940d0ea398cd43d7c31868f34b833b214386e7 4RMD160 (ntopng-2.4-stable.tar.gz) = 14940d0ea398cd43d7c31868f34b833b214386e7
5SHA512 (ntopng-2.4-stable.tar.gz) = 515dd7889ae3aaf2482371bb2c55ab7300cf4207fe07f37029b7529bfb710379c19a54f58cf6df87e42454c0c99d15291af334adff676252301d9edd0acf3c7a 5SHA512 (ntopng-2.4-stable.tar.gz) = 515dd7889ae3aaf2482371bb2c55ab7300cf4207fe07f37029b7529bfb710379c19a54f58cf6df87e42454c0c99d15291af334adff676252301d9edd0acf3c7a
6Size (ntopng-2.4-stable.tar.gz) = 134074662 bytes 6Size (ntopng-2.4-stable.tar.gz) = 134074662 bytes
7SHA1 (patch-configure.ac) = 4f509a80de16094e7e9df50bfd4ba9505f4b73ff 7SHA1 (patch-configure.ac) = 4f509a80de16094e7e9df50bfd4ba9505f4b73ff
 8SHA1 (patch-src_include_ndpi__includes.h) = db5da9ca24ecf32fd8c264e193af280814dc74c6
File Added: pkgsrc/net/ndpi/patches/patch-src_include_ndpi__includes.h
$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>