From 1348e3ff59552fef1dca022dffb19f56bf70093e Mon Sep 17 00:00:00 2001
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Mon, 1 Sep 2008 17:56:05 +0000
Subject: Fix build on FreeBSD/i386 8-CURRENT.  (7.0 building with GCC 4.2)

---
 security/pgp6/files/patch-aj | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

(limited to 'security/pgp6/files/patch-aj')

diff --git a/security/pgp6/files/patch-aj b/security/pgp6/files/patch-aj
index 60ebe9025049..2e5852c1065b 100644
--- a/security/pgp6/files/patch-aj
+++ b/security/pgp6/files/patch-aj
@@ -1,15 +1,11 @@
-*** libs/pgpcdk/pub/include/pgpSockets.h	2000/01/26 03:10:46	1.1.1.1
---- libs/pgpcdk/pub/include/pgpSockets.h	2000/01/26 03:13:58	1.1.1.2
-***************
-*** 30,35 ****
---- 30,39 ----
-  # include <netdb.h>
-  #endif
-  
-+ #ifdef __FreeBSD__
-+ # include <sys/ioctl.h>		/* Need FIONREAD */
-+ #endif
-+ 
-  #if PGP_WIN32
-  # include <winsock.h>
-  #endif
+--- libs/pgpcdk/pub/include/pgpSockets.h.orig	1999-08-04 11:36:04.000000000 -0700
++++ libs/pgpcdk/pub/include/pgpSockets.h	2008-08-31 00:37:11.000000000 -0700
+@@ -20,7 +20,7 @@ ________________________________________
+ #if PGP_UNIX
+ # include <sys/types.h>
+ # include <sys/socket.h>
+-#if PGP_UNIX_LINUX
++#if PGP_UNIX_LINUX || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+ # include <sys/time.h>		/* Needed for unknown reason */
+ # include <sys/ioctl.h>		/* Need FIONREAD */
+ #elif PGP_UNIX_SOLARIS
-- 
cgit v1.2.3