Revision: 32376 http://trac.macosforge.org/projects/macports/changeset/32376 Author: pmq@macports.org Date: 2007-12-28 11:48:18 -0800 (Fri, 28 Dec 2007) Log Message: ----------- Linted. Modified Paths: -------------- trunk/dports/net/hping3/Portfile Added Paths: ----------- trunk/dports/net/hping3/files/patch-Makefile.in.diff trunk/dports/net/hping3/files/patch-ars.c.diff trunk/dports/net/hping3/files/patch-libpcap_stuff.c.diff trunk/dports/net/hping3/files/patch-script.c.diff trunk/dports/net/hping3/files/patch-sendip.c.diff Removed Paths: ------------- trunk/dports/net/hping3/files/patch-Makefile.in trunk/dports/net/hping3/files/patch-ars.c trunk/dports/net/hping3/files/patch-libpcap_stuff.c trunk/dports/net/hping3/files/patch-script.c trunk/dports/net/hping3/files/patch-sendip.c Modified: trunk/dports/net/hping3/Portfile =================================================================== --- trunk/dports/net/hping3/Portfile 2007-12-28 19:46:06 UTC (rev 32375) +++ trunk/dports/net/hping3/Portfile 2007-12-28 19:48:18 UTC (rev 32376) @@ -28,8 +28,8 @@ depends_lib port:tcl -patchfiles patch-Makefile.in patch-libpcap_stuff.c \ - patch-script.c patch-sendip.c patch-ars.c +patchfiles patch-Makefile.in.diff patch-libpcap_stuff.c.diff \ + patch-script.c.diff patch-sendip.c.diff patch-ars.c.diff post-configure { reinplace "s#/usr/local#${prefix}#g" ${worksrcpath}/Makefile @@ -39,8 +39,8 @@ ${worksrcpath}/Makefile } -post-build { - system "cd ${worksrcpath} && make strip" +post-build { + system "cd ${worksrcpath} && make strip" } post-destroot { Deleted: trunk/dports/net/hping3/files/patch-Makefile.in =================================================================== --- trunk/dports/net/hping3/files/patch-Makefile.in 2007-12-28 19:46:06 UTC (rev 32375) +++ trunk/dports/net/hping3/files/patch-Makefile.in 2007-12-28 19:48:18 UTC (rev 32376) @@ -1,27 +0,0 @@ ---- Makefile.in.org Fri Nov 19 14:11:38 2004 -+++ Makefile.in Fri Nov 19 14:12:33 2004 -@@ -14,7 +14,8 @@ - #uncomment the following if you need libpcap based build under linux - #(not raccomanded) - COMPILE_TIME= --INSTALL_MANPATH=@MANPATH@ -+INSTALL_PATH= -+INSTALL_MANPATH= - @PCAP@ - - ARSOBJ = ars.o apd.o split.o rapd.o -@@ -72,10 +73,10 @@ - rm -rf hping3 *.o byteorder byteorder.h systype.h Makefile libars.a .depend - - install: hping3 -- cp -f hping3 /usr/sbin/ -- chmod 755 /usr/sbin/hping3 -- ln -s /usr/sbin/hping3 /usr/sbin/hping -- ln -s /usr/sbin/hping3 /usr/sbin/hping2 -+ cp -f hping3 ${INSTALL_PATH}/sbin/ -+ chmod 755 ${INSTALL_PATH}/sbin/hping3 -+ ln -s ${INSTALL_PATH}/sbin/hping3 ${INSTALL_PATH}/sbin/hping -+ ln -s ${INSTALL_PATH}/sbin/hping3 ${INSTALL_PATH}/sbin/hping2 - @if [ -d ${INSTALL_MANPATH}/man8 ]; then \ - cp ./docs/hping3.8 ${INSTALL_MANPATH}/man8; \ - chmod 644 ${INSTALL_MANPATH}/man8/hping3.8; \ Copied: trunk/dports/net/hping3/files/patch-Makefile.in.diff (from rev 32372, trunk/dports/net/hping3/files/patch-Makefile.in) =================================================================== --- trunk/dports/net/hping3/files/patch-Makefile.in.diff (rev 0) +++ trunk/dports/net/hping3/files/patch-Makefile.in.diff 2007-12-28 19:48:18 UTC (rev 32376) @@ -0,0 +1,27 @@ +--- Makefile.in.org Fri Nov 19 14:11:38 2004 ++++ Makefile.in Fri Nov 19 14:12:33 2004 +@@ -14,7 +14,8 @@ + #uncomment the following if you need libpcap based build under linux + #(not raccomanded) + COMPILE_TIME= +-INSTALL_MANPATH=@MANPATH@ ++INSTALL_PATH= ++INSTALL_MANPATH= + @PCAP@ + + ARSOBJ = ars.o apd.o split.o rapd.o +@@ -72,10 +73,10 @@ + rm -rf hping3 *.o byteorder byteorder.h systype.h Makefile libars.a .depend + + install: hping3 +- cp -f hping3 /usr/sbin/ +- chmod 755 /usr/sbin/hping3 +- ln -s /usr/sbin/hping3 /usr/sbin/hping +- ln -s /usr/sbin/hping3 /usr/sbin/hping2 ++ cp -f hping3 ${INSTALL_PATH}/sbin/ ++ chmod 755 ${INSTALL_PATH}/sbin/hping3 ++ ln -s ${INSTALL_PATH}/sbin/hping3 ${INSTALL_PATH}/sbin/hping ++ ln -s ${INSTALL_PATH}/sbin/hping3 ${INSTALL_PATH}/sbin/hping2 + @if [ -d ${INSTALL_MANPATH}/man8 ]; then \ + cp ./docs/hping3.8 ${INSTALL_MANPATH}/man8; \ + chmod 644 ${INSTALL_MANPATH}/man8/hping3.8; \ Deleted: trunk/dports/net/hping3/files/patch-ars.c =================================================================== --- trunk/dports/net/hping3/files/patch-ars.c 2007-12-28 19:46:06 UTC (rev 32375) +++ trunk/dports/net/hping3/files/patch-ars.c 2007-12-28 19:48:18 UTC (rev 32376) @@ -1,11 +0,0 @@ ---- ars.c.orig 2004-04-14 14:30:18.000000000 +0200 -+++ ars.c 2007-04-05 21:05:19.000000000 +0200 -@@ -914,7 +914,7 @@ - return -ARS_INVALID; - } - ip = (struct ars_iphdr*) packet; --#if defined OSTYPE_FREEBSD || defined OSTYPE_NETBSD || defined OSTYPE_BSDI -+#if defined OSTYPE_DARWIN || OSTYPE_FREEBSD || defined OSTYPE_NETBSD || defined OSTYPE_BSDI - ip->tot_len = ntohs(ip->tot_len); - ip->frag_off = ntohs(ip->frag_off); - #endif Copied: trunk/dports/net/hping3/files/patch-ars.c.diff (from rev 32372, trunk/dports/net/hping3/files/patch-ars.c) =================================================================== --- trunk/dports/net/hping3/files/patch-ars.c.diff (rev 0) +++ trunk/dports/net/hping3/files/patch-ars.c.diff 2007-12-28 19:48:18 UTC (rev 32376) @@ -0,0 +1,11 @@ +--- ars.c.orig 2004-04-14 14:30:18.000000000 +0200 ++++ ars.c 2007-04-05 21:05:19.000000000 +0200 +@@ -914,7 +914,7 @@ + return -ARS_INVALID; + } + ip = (struct ars_iphdr*) packet; +-#if defined OSTYPE_FREEBSD || defined OSTYPE_NETBSD || defined OSTYPE_BSDI ++#if defined OSTYPE_DARWIN || OSTYPE_FREEBSD || defined OSTYPE_NETBSD || defined OSTYPE_BSDI + ip->tot_len = ntohs(ip->tot_len); + ip->frag_off = ntohs(ip->frag_off); + #endif Deleted: trunk/dports/net/hping3/files/patch-libpcap_stuff.c =================================================================== --- trunk/dports/net/hping3/files/patch-libpcap_stuff.c 2007-12-28 19:46:06 UTC (rev 32375) +++ trunk/dports/net/hping3/files/patch-libpcap_stuff.c 2007-12-28 19:48:18 UTC (rev 32376) @@ -1,13 +0,0 @@ ---- libpcap_stuff.c.orig Sat Apr 10 06:38:56 2004 -+++ libpcap_stuff.c Tue Apr 12 20:21:56 2005 -@@ -16,8 +16,8 @@ - #include <string.h> - #include <stdlib.h> - #include <sys/ioctl.h> --#include <pcap.h> - #include <net/bpf.h> -+#include <pcap.h> - - #include "globals.h" - - Copied: trunk/dports/net/hping3/files/patch-libpcap_stuff.c.diff (from rev 32372, trunk/dports/net/hping3/files/patch-libpcap_stuff.c) =================================================================== --- trunk/dports/net/hping3/files/patch-libpcap_stuff.c.diff (rev 0) +++ trunk/dports/net/hping3/files/patch-libpcap_stuff.c.diff 2007-12-28 19:48:18 UTC (rev 32376) @@ -0,0 +1,13 @@ +--- libpcap_stuff.c.orig Sat Apr 10 06:38:56 2004 ++++ libpcap_stuff.c Tue Apr 12 20:21:56 2005 +@@ -16,8 +16,8 @@ + #include <string.h> + #include <stdlib.h> + #include <sys/ioctl.h> +-#include <pcap.h> + #include <net/bpf.h> ++#include <pcap.h> + + #include "globals.h" + + Deleted: trunk/dports/net/hping3/files/patch-script.c =================================================================== --- trunk/dports/net/hping3/files/patch-script.c 2007-12-28 19:46:06 UTC (rev 32375) +++ trunk/dports/net/hping3/files/patch-script.c 2007-12-28 19:48:18 UTC (rev 32376) @@ -1,12 +0,0 @@ ---- script.c.~1.20.~ 2004-05-29 08:48:13.000000000 +0200 -+++ script.c 2006-09-26 21:49:11.000000000 +0200 -@@ -23,8 +23,8 @@ - #include <sched.h> - - #include <sys/ioctl.h> --#include <pcap.h> - #include <net/bpf.h> -+#include <pcap.h> - - #include "release.h" - #include "hping2.h" Copied: trunk/dports/net/hping3/files/patch-script.c.diff (from rev 32372, trunk/dports/net/hping3/files/patch-script.c) =================================================================== --- trunk/dports/net/hping3/files/patch-script.c.diff (rev 0) +++ trunk/dports/net/hping3/files/patch-script.c.diff 2007-12-28 19:48:18 UTC (rev 32376) @@ -0,0 +1,12 @@ +--- script.c.~1.20.~ 2004-05-29 08:48:13.000000000 +0200 ++++ script.c 2006-09-26 21:49:11.000000000 +0200 +@@ -23,8 +23,8 @@ + #include <sched.h> + + #include <sys/ioctl.h> +-#include <pcap.h> + #include <net/bpf.h> ++#include <pcap.h> + + #include "release.h" + #include "hping2.h" Deleted: trunk/dports/net/hping3/files/patch-sendip.c =================================================================== --- trunk/dports/net/hping3/files/patch-sendip.c 2007-12-28 19:46:06 UTC (rev 32375) +++ trunk/dports/net/hping3/files/patch-sendip.c 2007-12-28 19:48:18 UTC (rev 32376) @@ -1,20 +0,0 @@ ---- sendip.c.orig 2004-04-10 01:38:56.000000000 +0200 -+++ sendip.c 2007-04-05 21:05:10.000000000 +0200 -@@ -48,7 +48,7 @@ - ip->ihl = (IPHDR_SIZE + optlen + 3) >> 2; - ip->tos = ip_tos; - --#if defined OSTYPE_FREEBSD || defined OSTYPE_NETBSD || defined OSTYPE_BSDI -+#if defined OSTYPE_DARWIN || OSTYPE_FREEBSD || defined OSTYPE_NETBSD || defined OSTYPE_BSDI - /* FreeBSD */ - /* NetBSD */ - ip->tot_len = packetsize; -@@ -73,7 +73,7 @@ - htons((unsigned short) src_id); - } - --#if defined OSTYPE_FREEBSD || defined OSTYPE_NETBSD | defined OSTYPE_BSDI -+#if defined OSTYPE_DARWIN || OSTYPE_FREEBSD || defined OSTYPE_NETBSD | defined OSTYPE_BSDI - /* FreeBSD */ - /* NetBSD */ - ip->frag_off |= more_fragments; Copied: trunk/dports/net/hping3/files/patch-sendip.c.diff (from rev 32372, trunk/dports/net/hping3/files/patch-sendip.c) =================================================================== --- trunk/dports/net/hping3/files/patch-sendip.c.diff (rev 0) +++ trunk/dports/net/hping3/files/patch-sendip.c.diff 2007-12-28 19:48:18 UTC (rev 32376) @@ -0,0 +1,20 @@ +--- sendip.c.orig 2004-04-10 01:38:56.000000000 +0200 ++++ sendip.c 2007-04-05 21:05:10.000000000 +0200 +@@ -48,7 +48,7 @@ + ip->ihl = (IPHDR_SIZE + optlen + 3) >> 2; + ip->tos = ip_tos; + +-#if defined OSTYPE_FREEBSD || defined OSTYPE_NETBSD || defined OSTYPE_BSDI ++#if defined OSTYPE_DARWIN || OSTYPE_FREEBSD || defined OSTYPE_NETBSD || defined OSTYPE_BSDI + /* FreeBSD */ + /* NetBSD */ + ip->tot_len = packetsize; +@@ -73,7 +73,7 @@ + htons((unsigned short) src_id); + } + +-#if defined OSTYPE_FREEBSD || defined OSTYPE_NETBSD | defined OSTYPE_BSDI ++#if defined OSTYPE_DARWIN || OSTYPE_FREEBSD || defined OSTYPE_NETBSD | defined OSTYPE_BSDI + /* FreeBSD */ + /* NetBSD */ + ip->frag_off |= more_fragments;