[93526] trunk/dports/net/arpd

[jmr at macports.org]

Revision: 93526
          https://trac.macports.org/changeset/93526
Author:   jmr at macports.org
Date:     2012-05-25 12:59:31 -0700 (Fri, 25 May 2012)
Log Message:
-----------
arpd: remove use of internal libevent symbols (#31166), fix mtree violation

Modified Paths:
--------------
    trunk/dports/net/arpd/Portfile
    trunk/dports/net/arpd/files/patch-arpd.c

Modified: trunk/dports/net/arpd/Portfile
===================================================================
--- trunk/dports/net/arpd/Portfile	2012-05-25 18:33:53 UTC (rev 93525)
+++ trunk/dports/net/arpd/Portfile	2012-05-25 19:59:31 UTC (rev 93526)
@@ -1,9 +1,10 @@
 # $Id$
 
 PortSystem 1.0
+
 name		arpd
 version		0.2
-revision	3
+revision	4
 categories	net security
 maintainers	nomaintainer
 description	user space ARP (Address Resolution Protocol) daemon
@@ -19,3 +20,5 @@
                     port:libpcap
 
 worksrcdir	${name}
+
+configure.args  --mandir=${prefix}/share/man

Modified: trunk/dports/net/arpd/files/patch-arpd.c
===================================================================
--- trunk/dports/net/arpd/files/patch-arpd.c	2012-05-25 18:33:53 UTC (rev 93525)
+++ trunk/dports/net/arpd/files/patch-arpd.c	2012-05-25 19:59:31 UTC (rev 93526)
@@ -1,6 +1,6 @@
---- arpd.c.orig	Sun Feb  9 05:20:40 2003
-+++ arpd.c	Wed Sep  1 13:38:11 2004
-@@ -265,7 +265,7 @@
+--- arpd.c.orig	2003-02-09 15:20:40.000000000 +1100
++++ arpd.c	2012-05-26 05:44:37.000000000 +1000
+@@ -265,7 +265,7 @@ arpd_send(eth_t *eth, int op,
  	    spa->addr_ip, tha->addr_eth, tpa->addr_ip);
  	
  	if (op == ARP_OP_REQUEST) {
@@ -9,7 +9,7 @@
  		    addr_ntoa(tpa), addr_ntoa(spa));
  	} else if (op == ARP_OP_REPLY) {
  		syslog(LOG_INFO, "arp reply %s is-at %s",
-@@ -282,7 +282,7 @@
+@@ -282,7 +282,7 @@ arpd_lookup(struct addr *addr)
  	int error;
  
  	if (addr_cmp(addr, &arpd_ifent.intf_addr) == 0) {
@@ -18,7 +18,7 @@
  		    addr_ntoa(addr), addr_ntoa(&arpd_ifent.intf_link_addr));
  		return (0);
  	}
-@@ -291,10 +291,10 @@
+@@ -291,10 +291,10 @@ arpd_lookup(struct addr *addr)
  	error = arp_get(arpd_arp, &arpent);
  	
  	if (error == -1) {
@@ -31,7 +31,7 @@
  		    addr_ntoa(addr), addr_ntoa(&arpent.arp_ha));
  	}
  	return (error);
-@@ -423,7 +423,7 @@
+@@ -423,7 +423,7 @@ arpd_recv_cb(u_char *u, const struct pca
  		if ((req = SPLAY_FIND(tree, &arpd_reqs, &tmp)) != NULL) {
  			addr_pack(&src.arp_ha, ADDR_TYPE_ETH, ETH_ADDR_BITS,
  			    ethip->ar_sha, ETH_ADDR_LEN);
@@ -40,4 +40,29 @@
  			    addr_ntoa(&req->pa), addr_ntoa(&src.arp_ha));
  			
  			/* This address is claimed */
-
+@@ -445,9 +445,6 @@ arpd_recv(int fd, short type, void *ev)
+ void
+ terminate_handler(int sig)
+ {
+-	extern int event_gotsig;
+-
+-	event_gotsig = 1;
+ 	arpd_sig = sig;
+ }
+ 
+@@ -464,7 +461,6 @@ int
+ main(int argc, char *argv[])
+ {
+ 	struct event recv_ev;
+-	extern int (*event_sigcb)(void);
+ 	char *dev;
+ 	int c, debug;
+ 	FILE *fp;
+@@ -524,7 +520,6 @@ main(int argc, char *argv[])
+ 		perror("signal");
+ 		return (-1);
+ 	}
+-	event_sigcb = arpd_signal;
+ 	
+ 	event_dispatch();
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120525/2a147a81/attachment-0001.html>