diff options
| author | hans <hans@pkgsrc.org> | 2012-03-08 10:35:24 +0000 |
|---|---|---|
| committer | hans <hans@pkgsrc.org> | 2012-03-08 10:35:24 +0000 |
| commit | 5e033e8623c0ce550d4144b1e45e1b546a1a3ab4 (patch) | |
| tree | 1055d69b1b7e93865af44ee5b5ae60915e280594 /net/cia | |
| parent | 5d74cfb7262f499ac8c01baede4b5aa32413e135 (diff) | |
| download | pkgsrc-5e033e8623c0ce550d4144b1e45e1b546a1a3ab4.tar.gz | |
Fix build on SunOS.
Diffstat (limited to 'net/cia')
| -rw-r--r-- | net/cia/Makefile | 6 | ||||
| -rw-r--r-- | net/cia/distinfo | 4 | ||||
| -rw-r--r-- | net/cia/patches/patch-ad | 24 |
3 files changed, 29 insertions, 5 deletions
diff --git a/net/cia/Makefile b/net/cia/Makefile index 66e1249732f..a1605a923c1 100644 --- a/net/cia/Makefile +++ b/net/cia/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2010/02/11 20:27:45 joerg Exp $ +# $NetBSD: Makefile,v 1.14 2012/03/08 10:35:24 hans Exp $ DISTNAME= cia-20030922 CATEGORIES= net @@ -13,6 +13,10 @@ PKG_DESTDIR_SUPPORT= user-destdir DOC_DIR= ${PREFIX}/share/doc/cia EXAMPLES_DIR= ${PREFIX}/share/examples/cia +CFLAGS.SunOS+= -DETHERTYPE_PPPOE=ETHERTYPE_PPPOES +CFLAGS.SunOS+= -Du_int64_t=uint64_t -Du_int32_t=uint32_t +CFLAGS.SunOS+= -Du_int16_t=uint16_t -Du_int8_t=uint8_t + USE_BSD_MAKEFILE= yes INSTALLATION_DIRS+= bin ${DOC_DIR} ${EXAMPLES_DIR} diff --git a/net/cia/distinfo b/net/cia/distinfo index 677c72c6306..42fe6545b90 100644 --- a/net/cia/distinfo +++ b/net/cia/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.9 2006/03/14 02:10:10 joerg Exp $ +$NetBSD: distinfo,v 1.10 2012/03/08 10:35:24 hans Exp $ SHA1 (cia-20030922.tar.bz2) = 9d0b06c99c6943493ff47412bcb36efde67e40ca RMD160 (cia-20030922.tar.bz2) = 9f41f8ff057b3f022f5678cca7401ac9e7fe478a @@ -6,4 +6,4 @@ Size (cia-20030922.tar.bz2) = 7645 bytes SHA1 (patch-aa) = 6b56f84481813df9dc0bd8044d51d2f857cbaf5a SHA1 (patch-ab) = da697a1a5222bd0241ea43e7ce5d071b7932af89 SHA1 (patch-ac) = 17e2a2bc343a980149b26340a43994474473f186 -SHA1 (patch-ad) = 166b0b6c8c8167122ccab4c9b14dcb01bb1d7d21 +SHA1 (patch-ad) = 09f3c65638aacabc0e47040b3b9925f10ffdea64 diff --git a/net/cia/patches/patch-ad b/net/cia/patches/patch-ad index 8df0855cec3..84d68c09350 100644 --- a/net/cia/patches/patch-ad +++ b/net/cia/patches/patch-ad @@ -1,14 +1,18 @@ -$NetBSD: patch-ad,v 1.1 2006/03/14 02:10:10 joerg Exp $ +$NetBSD: patch-ad,v 1.2 2012/03/08 10:35:24 hans Exp $ --- pcap2ipstat/pcap2ipstat.c.orig 2006-03-14 02:07:53.000000000 +0000 +++ pcap2ipstat/pcap2ipstat.c -@@ -7,9 +7,14 @@ +@@ -7,9 +7,18 @@ #include "checksum.h" #include <net/if.h> +#if defined(__DragonFly__) +#include <net/ethernet.h> +#include <net/ppp_layer/ppp_defs.h> ++#elif defined(__sun) ++#include <sys/ethernet.h> ++#include <netinet/if_ether.h> ++#include <net/ppp_defs.h> +#else #include <net/if_ether.h> #include <net/ethertypes.h> @@ -17,3 +21,19 @@ $NetBSD: patch-ad,v 1.1 2006/03/14 02:10:10 joerg Exp $ #include <netinet/tcp.h> #include <netinet/udp.h> +@@ -184,7 +193,6 @@ void FilterPPPoE(u_char *Ptr, + + { + const u_char *PH; +- bpf_u_int32 Length; + struct pcap_pkthdr NewPktHdr; + u_char *NewPktData; + +@@ -196,7 +204,6 @@ void FilterPPPoE(u_char *Ptr, + /* No data packet */ + if (PH[1]!=0) return; + +- Length=(PH[4]<<8)+PH[5]; + if ((NewPktData=StripPkt(PktHdr, + PktData, + PPPOE_HEADERLEN, |