diff options
| author | nobutaka <nobutaka@FreeBSD.org> | 2006-02-05 00:42:14 +0800 |
|---|---|---|
| committer | nobutaka <nobutaka@FreeBSD.org> | 2006-02-05 00:42:14 +0800 |
| commit | d5a68935c118b9ab0e6c53df5bf2b9c712250b16 (patch) | |
| tree | 159b57d4b4f26ed29525b310d88d7ee4b96567d7 | |
| parent | 1d627628044271d61128e7dfb485339aaffdf63d (diff) | |
| download | freebsd-ports-gnome-d5a68935c118b9ab0e6c53df5bf2b9c712250b16.tar.gz freebsd-ports-gnome-d5a68935c118b9ab0e6c53df5bf2b9c712250b16.tar.zst freebsd-ports-gnome-d5a68935c118b9ab0e6c53df5bf2b9c712250b16.zip | |
Fix build error on 4-stable.
Reported by: pointyhat via kris
| -rw-r--r-- | net/tcpxtract/Makefile | 9 | ||||
| -rw-r--r-- | net/tcpxtract/files/extra-patch-sessionlist.c | 17 | ||||
| -rw-r--r-- | net/tcpxtract/files/extra-patch-tcpxtract.c | 11 |
3 files changed, 36 insertions, 1 deletions
diff --git a/net/tcpxtract/Makefile b/net/tcpxtract/Makefile index bf9f76985e0f..2bd13fcc3c1b 100644 --- a/net/tcpxtract/Makefile +++ b/net/tcpxtract/Makefile @@ -20,4 +20,11 @@ MAN1= tcpxtract.1 PLIST_FILES= bin/tcpxtract etc/tcpxtract.conf -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +.if ${OSVERSION} < 500000 +EXTRA_PATCHES= ${PATCHDIR}/extra-patch-tcpxtract.c ${PATCHDIR}/extra-patch-sessionlist.c +.endif + +.include <bsd.port.post.mk> + diff --git a/net/tcpxtract/files/extra-patch-sessionlist.c b/net/tcpxtract/files/extra-patch-sessionlist.c new file mode 100644 index 000000000000..f8ac06f895fd --- /dev/null +++ b/net/tcpxtract/files/extra-patch-sessionlist.c @@ -0,0 +1,17 @@ +--- sessionlist.c.orig Sun Feb 5 00:00:42 2006 ++++ sessionlist.c Sun Feb 5 00:01:48 2006 +@@ -21,13 +21,13 @@ + */ + + #include <inttypes.h> ++#include <sys/types.h> + #include <sys/socket.h> + #include <netinet/in.h> + #include <arpa/inet.h> + #include <net/if.h> + #include <netinet/if_ether.h> + #include <netinet/tcp.h> +-#include <sys/types.h> + #include <sys/stat.h> + #include <time.h> + #include <string.h> diff --git a/net/tcpxtract/files/extra-patch-tcpxtract.c b/net/tcpxtract/files/extra-patch-tcpxtract.c new file mode 100644 index 000000000000..0ac5e7c213e3 --- /dev/null +++ b/net/tcpxtract/files/extra-patch-tcpxtract.c @@ -0,0 +1,11 @@ +--- tcpxtract.c.orig Sat Feb 4 23:57:57 2006 ++++ tcpxtract.c Sat Feb 4 23:58:07 2006 +@@ -68,7 +68,7 @@ + + slist_t *sessions; + +-static uintmax_t num_packets; /* the running total of packets */ ++static uint64_t num_packets; /* the running total of packets */ + + enum protos { + TCP_PROTO = 6, |