pkg/40203: pkgsrc/net/tcpdump fix build on solaris

[zingelman%fnal.gov@localhost]

>Number:         40203
>Category:       pkg
>Synopsis:       pkgsrc/net/tcpdump fix build on solaris
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Wed Dec 17 00:10:01 +0000 2008
>Originator:     Tim
>Release:        pkgsrc current
>Organization:
Fermilab
>Environment:
SunOS hostname 5.10 Generic_137111-05 sun4u sparc SUNW,Sun-Fire-V440 Solaris
>Description:
Build fails with:
gcc -O2 -O -D_POSIX_PTHREAD_SEMANTICS -I/usr/pkg/include 
-I/usr/pkg/gcc34/include 
-I/usr/pkg/gcc34/lib/gcc/sparc-sun-solaris2.10/3.4.6/include -I/usr/include 
-DHAVE_CONFIG_H -I/usr/pkg/include -I/usr/pkg/gcc34/include 
-I/usr/pkg/gcc34/lib/gcc/sparc-sun-solaris2.10/3.4.6/include -I/usr/include  
-I/usr/pkg/include -I./missing  -D_U_="__attribute__((unused))" -I.  
-I/usr/pkg/include -I./missing -c ./addrtoname.c
In file included from ./addrtoname.c:72:
./ether.h:37:1: warning: "ETHERMTU" redefined
In file included from /usr/include/netinet/if_ether.h:24,
                 from ./addrtoname.c:40:
/usr/include/sys/ethernet.h:76:1: warning: this is the location of the previous 
definition
In file included from ./addrtoname.c:72:
./ether.h:47: error: redefinition of `struct ether_header'
*** Error code 1

>How-To-Repeat:
cd pkgsrc/net/tcpdump
bmake

>Fix:
The following patch causes the default ether.h which is part of the tcpdump 
distribution to be skipped.  Solaris include files define everything else that 
is needed, except these two items.


Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/net/tcpdump/Makefile,v
retrieving revision 1.27
diff -u -r1.27 Makefile
--- Makefile    20 Jun 2008 01:09:31 -0000      1.27
+++ Makefile    17 Dec 2008 00:06:11 -0000
@@ -13,6 +13,9 @@
 
 GNU_CONFIGURE=         YES
 
+CFLAGS.SunOS+=         -DETHER_ADDR_LEN=6
+CFLAGS.SunOS+=         -DETHER_HDRLEN=14
+
 .include "options.mk"
 
 # not strictly needed