From 2392e213b6b43df808f234208e5eee1bd182ea35 Mon Sep 17 00:00:00 2001
From: "David W. Chapman Jr." <dwcjr@FreeBSD.org>
Date: Sat, 24 Nov 2001 19:49:18 +0000
Subject: [PATCH] Fix transparent proxy with ipf

PR:		29954
Submitted by:	nottebrock@crosswinds.net
No response:	maintainer
---
 irc/tircproxy/Makefile       |  1 +
 irc/tircproxy/files/patch-ad | 59 ++++++++++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+)
 create mode 100644 irc/tircproxy/files/patch-ad

diff --git a/irc/tircproxy/Makefile b/irc/tircproxy/Makefile
index 973fe4d16cd5..6ec0310c3015 100644
--- a/irc/tircproxy/Makefile
+++ b/irc/tircproxy/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tircproxy
 PORTVERSION=	0.4.5
+PORTREVISION=	1
 CATEGORIES=	irc
 MASTER_SITES=	http://bre.klaki.net/programs/tircproxy/
 
diff --git a/irc/tircproxy/files/patch-ad b/irc/tircproxy/files/patch-ad
new file mode 100644
index 000000000000..f37ddbba3403
--- /dev/null
+++ b/irc/tircproxy/files/patch-ad
@@ -0,0 +1,59 @@
+*** tircproxy.c.orig	Thu May  4 22:53:30 2000
+--- tircproxy.c	Wed Aug 22 13:42:46 2001
+***************
+*** 1065,1074 ****
+  {
+  	struct sockaddr_in			to_addr;
+  	int					to_len;
+  #if IPF
+! 	struct sockaddr_in			socketin, sloc;
+! 	natlookup_t     			natlook;
+! 	int					fd;
+  #endif
+     
+     	/* Give this thing 10 minutes to get started (paranoia).
+--- 1065,1084 ----
+  {
+  	struct sockaddr_in			to_addr;
+  	int					to_len;
++ 
+  #if IPF
+!         struct sockaddr_in                      socketin, sloc;
+!         natlookup_t                             natlook;
+!  
+! #if __FreeBSD__ >= 2
+! #include <osreldate.h>
+!  #if __FreeBSD_version >= 430000
+! 
+!         natlookup_t                             *natlookp = &natlook;
+! 
+!  #endif
+! #endif
+!         int                                     fd;
+  #endif
+     
+     	/* Give this thing 10 minutes to get started (paranoia).
+***************
+*** 1152,1158 ****
+                  natlook.nl_inport = sloc.sin_port;
+  
+                  fd = open(IPL_NAT, O_RDONLY);
+!                 if (ioctl(fd, SIOCGNATL, &natlook) == -1)
+  	     	{
+                  	perror("ioctl");
+                  	exit(-1);
+--- 1162,1175 ----
+                  natlook.nl_inport = sloc.sin_port;
+  
+                  fd = open(IPL_NAT, O_RDONLY);
+! #if __FreeBSD__ >= 2
+! #include <osreldate.h>
+!  #if __FreeBSD_version >= 430000
+!                  if (ioctl(fd, SIOCGNATL, &natlookp) == -1)
+!  #else
+!                  if (ioctl(fd, SIOCGNATL, &natlook) == -1)
+!  #endif
+! #endif               
+  	     	{
+                  	perror("ioctl");
+                  	exit(-1);