From a489b6318ebf23bacbe3e6cc3bb7ccecd5654801 Mon Sep 17 00:00:00 2001
From: Kirill Ponomarev <krion@FreeBSD.org>
Date: Sat, 13 Dec 2003 09:30:17 +0000
Subject: - Unbreak on -current

PR:		60180
Submitted by:	Volker Stolz <stolz@i2.informatik.rwth-aachen.de>
---
 mail/xpbiff/files/patch-aa | 27 ++++++++-------------------
 1 file changed, 8 insertions(+), 19 deletions(-)

(limited to 'mail/xpbiff/files/patch-aa')

diff --git a/mail/xpbiff/files/patch-aa b/mail/xpbiff/files/patch-aa
index 40361f9db42b..0351c9e1df71 100644
--- a/mail/xpbiff/files/patch-aa
+++ b/mail/xpbiff/files/patch-aa
@@ -1,5 +1,5 @@
---- config.h.orig	Wed Oct 19 00:56:25 1994
-+++ config.h	Sun May 30 21:19:39 1999
+--- config.h.orig	Wed Oct 19 06:56:25 1994
++++ config.h	Fri Dec 12 13:16:55 2003
 @@ -8,7 +8,7 @@
  /*
   *	For X11R6
@@ -22,7 +22,7 @@
   *	For MH scan users
   */
  
-@@ -42,45 +48,71 @@
+@@ -42,12 +48,12 @@
   *	For Shape Extension
   */
  
@@ -37,18 +37,7 @@
  
  /*
   *	Set Local Spool pathname
-  */
- #undef SPOOLPATH	"/usr/mail"
- 
-+#ifndef SPOOLPATH
-+#ifdef __FreeBSD__
-+#include <paths.h>
-+#define SPOOLPATH	_PATH_MAILDIR
-+#else
-+#undef SPOOLPATH	"/usr/mail"
-+#endif
-+#endif
-+
+@@ -57,30 +63,47 @@
  /*
   *	For X pixmap
   */
@@ -57,11 +46,11 @@
 +#define XPM
 +
 +#ifdef XPM
-+#ifdef __FreeBSD__
++#ifdef FreeBSDArchitecture
 +#undef DepXpmLib
 +#else
 +#define DepXpmLib	/usr/local/lib/libXpm.a
-+#endif /* __FreeBSD__ */
++#endif /* FreeBSDArchitecture */
 +#endif /* XPM */
  
  /*
@@ -70,7 +59,7 @@
 -#undef XI18N
 -/* If you use X11R6, these settings below are not necessary */
 +#ifndef XI18N
-+#ifdef __FreeBSD__
++#ifdef FreeBSDArchitecture
 +#define XI18N
 +#endif
 +#endif
@@ -102,7 +91,7 @@
  
  /*
   *	For SUN Audio
-@@ -88,9 +120,19 @@
+@@ -88,9 +111,19 @@
  #undef SUN_AUDIO
  #undef AudioIncDir /usr/demo/SOUND
  
-- 
cgit v1.2.3