From d77747b2611e3017b8da3d5095f689bd9b43760f Mon Sep 17 00:00:00 2001
From: rh <rh>
Date: Wed, 15 Jan 2003 07:11:43 +0000
Subject: Add patch provided by Masao Uebayashi that allows using xfig to be
 used with non-3d versions of Xaw. Bring back XAW_TYPE detection and Imakefile
 modification.

---
 graphics/xfig/Makefile         | 11 +++++++++--
 graphics/xfig/distinfo         |  3 ++-
 graphics/xfig/patches/patch-ad | 22 ++++++++++++++++++++++
 3 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 graphics/xfig/patches/patch-ad

(limited to 'graphics/xfig')

diff --git a/graphics/xfig/Makefile b/graphics/xfig/Makefile
index 2a7f2c91a4d..fd8cac11653 100644
--- a/graphics/xfig/Makefile
+++ b/graphics/xfig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2003/01/14 06:37:07 rh Exp $
+# $NetBSD: Makefile,v 1.35 2003/01/15 07:11:43 rh Exp $
 #
 
 DISTNAME=		xfig.3.2.4.full
@@ -23,6 +23,13 @@ CFLAGS+=		-I${X11PREFIX}/include/X11
 
 .include "../../mk/bsd.prefs.mk"
 
+.if defined(XAW_TYPE) && (${XAW_TYPE} != "3d" && ${XAW_TYPE} != "xpm")
+pre-configure:
+	cd ${WRKSRC} &&	\
+	  if [ ! -f Imakefile.bak ]; then ${MV} Imakefile Imakefile.bak; fi && \
+	  ${SED} 's/#define.XAW3D/XCOMM &/' Imakefile.bak > Imakefile
+.endif
+
 XFIGDOCDIR=		${PREFIX}/share/doc/xfig
 
 post-install:
@@ -31,6 +38,6 @@ post-install:
 .include "../../graphics/jpeg/buildlink2.mk"
 .include "../../graphics/png/buildlink2.mk"
 .include "../../graphics/xpm/buildlink2.mk"
-.include "../../x11/Xaw3d/buildlink2.mk"
+.include "../../mk/xaw.buildlink2.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/xfig/distinfo b/graphics/xfig/distinfo
index 7d88f932bd0..540f5dfe2bd 100644
--- a/graphics/xfig/distinfo
+++ b/graphics/xfig/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.8 2003/01/07 06:30:35 rh Exp $
+$NetBSD: distinfo,v 1.9 2003/01/15 07:11:43 rh Exp $
 
 SHA1 (xfig.3.2.4.full.tar.gz) = 723bf10355a92c079be08cd7be18b75baaccfbdc
 Size (xfig.3.2.4.full.tar.gz) = 5163150 bytes
 SHA1 (patch-aa) = 3ff914bd2ca913f7c4e2ea2a648a0776cd5098bf
 SHA1 (patch-ab) = 7f9006c8ea4151d6811e907eb91b77e1d1a9c7c6
 SHA1 (patch-ac) = 2c562f7956700d7382cb3576ecf15473bb750779
+SHA1 (patch-ad) = acf393046af68be92031895a06e76d3d86a2a4aa
diff --git a/graphics/xfig/patches/patch-ad b/graphics/xfig/patches/patch-ad
new file mode 100644
index 00000000000..e88bb2941bd
--- /dev/null
+++ b/graphics/xfig/patches/patch-ad
@@ -0,0 +1,22 @@
+$NetBSD: patch-ad,v 1.3 2003/01/15 07:11:44 rh Exp $
+
+--- SimpleMenu.c.orig	Sat Sep 21 05:28:45 2002
++++ SimpleMenu.c
+@@ -39,10 +39,17 @@
+ #include <X11/IntrinsicP.h>
+ #include <X11/StringDefs.h>
+ 
++#ifdef XAW3D
+ #include <X11/Xaw3d/XawInit.h>
+ #include <X11/Xaw3d/SimpleMenP.h>
+ #include <X11/Xaw3d/SmeBSB.h>
+ #include <X11/Xaw3d/Cardinals.h>
++#else
++#include <X11/Xaw/XawInit.h>
++#include <X11/Xaw/SimpleMenP.h>
++#include <X11/Xaw/SmeBSB.h>
++#include <X11/Xaw/Cardinals.h>
++#endif
+ 
+ #include <X11/Xmu/Initer.h>
+ #include <X11/Xmu/CharSet.h>
-- 
cgit v1.2.3