Ticket #4400: libpcap-0.9.3.diff

Portfile

@@ -2 +2 @@
 
 PortSystem 1.0
 name            libpcap
-version         0.8.3
+version         0.9.3
 revision        3
 categories      net
 maintainers     ricci@opendarwin.org
@@ -13 +13 @@
 homepage        http://www.tcpdump.org/
 platforms       darwin
 master_sites    ${homepage}release/
-checksums       md5 56a9d4615d8354fcfe8cff8c8443c77b
+checksums       md5 0ad921c881fdd3d278046afcd352a151
 configure.args  --mandir=${prefix}/share/man
 configure.env   CFLAGS="-I. -dynamic -fno-common -DHAVE_CONFIG_H"
 patchfiles      patch-Makefile.in
@@ -36 +36 @@
 }
 
 platform darwin 8 {
-        patchfiles-append patch-nametoaddr.c
+        patchfiles-append
 }

files/patch-Makefile.in

@@ -1 @@
---- Makefile.in.orig    Tue Jun  1 23:07:11 2004
-+++ Makefile.in Tue Jun  1 23:08:09 2004
-@@ -94,15 +94,19 @@
+--- Makefile.in.orig    2005-08-11 22:37:20.000000000 -0700
++++ Makefile.in 2005-08-11 22:44:59.000000000 -0700
+@@ -95,9 +95,9 @@ TAGHDR = \
  TAGFILES = \
         $(SRC) $(HDR) $(TAGHDR)
  
@@ -12 +12 @@
  
  libpcap.a: $(OBJ)
         @rm -f $@
-        ar rc $@ $(OBJ) $(LIBS)
-        $(RANLIB) $@
+@@ -116,11 +116,12 @@ libpcap.so: $(OBJ)
  
-+libpcap.dylib: $(OBJ)
+ # the following rule succeeds, but the result is untested.
+ libpcap.dylib: $(OBJ)
+-       rm -f libpcap*.dylib
+-       $(CC) -dynamiclib -undefined error -o libpcap.`cat VERSION`.dylib $(OBJ) \
+-               -install_name $(libdir)/libpcap.0.dylib -compatibility_version `cat VERSION` \
+-               -current_version `cat VERSION`
+-
++#      rm -f libpcap*.dylib
++#      $(CC) -dynamiclib -undefined error -o libpcap.`cat VERSION`.dylib $(OBJ) \
++#              -install_name $(libdir)/libpcap.0.dylib -compatibility_version `cat VERSION` \
++#              -current_version `cat VERSION`
 +       @rm -f $@
 +       $(CC) -dynamiclib -install_name $(DESTDIR)$(libdir)/libpcap.DP.dylib COMPAT_INFO -o $@ $(OBJ) $(LIBS)
-+
+ 
  scanner.c: $(srcdir)/scanner.l
         @rm -f $@
-        $(LEX) -t $< > $$$$.$@; mv $$$$.$@ $@
-@@ -156,6 +160,8 @@
-            (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir))
-        $(INSTALL_DATA) libpcap.a $(DESTDIR)$(libdir)/libpcap.a
-        $(RANLIB) $(DESTDIR)$(libdir)/libpcap.a
-+       $(INSTALL_DATA) libpcap.dylib $(DESTDIR)$(libdir)/libpcap.DP.dylib
-+       (cd $(DESTDIR)$(libdir) && ln -s libpcap.DP.dylib libpcap.dylib)
-        [ -d $(DESTDIR)$(includedir) ] || \
-            (mkdir -p $(DESTDIR)$(includedir); chmod 755 $(DESTDIR)$(includedir))
-        $(INSTALL_DATA) $(srcdir)/pcap.h $(DESTDIR)$(includedir)/pcap.h

files/patch-nametoaddr.c

@@ -1 @@
---- nametoaddr.c.orig   2005-04-03 08:33:42.000000000 -0400
-+++ nametoaddr.c        2005-04-03 08:35:24.000000000 -0400
-@@ -390,7 +390,7 @@
-  * compile on one of 3.x or 4.x).
-  */
- #if !defined(sgi) && !defined(__NetBSD__) && !defined(__FreeBSD__) && \
--       !defined(_UNICOSMP)
-+       !defined(_UNICOSMP) && !defined(__APPLE__)
- extern int ether_hostton(char *, struct ether_addr *);
- #endif
-