From 9d90ae57f6cdbb81a38e2ddac7e7be9aa49e1d47 Mon Sep 17 00:00:00 2001
From: jschauma <jschauma@pkgsrc.org>
Date: Thu, 12 Jun 2003 15:46:03 +0000
Subject: make this work on IRIX

---
 x11/Xaw3d/Makefile         |  8 ++++++--
 x11/Xaw3d/distinfo         |  4 ++--
 x11/Xaw3d/patches/patch-aa | 14 +++++++++-----
 3 files changed, 17 insertions(+), 9 deletions(-)

(limited to 'x11')

diff --git a/x11/Xaw3d/Makefile b/x11/Xaw3d/Makefile
index 63f3ce8e118..b8c5970a192 100644
--- a/x11/Xaw3d/Makefile
+++ b/x11/Xaw3d/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2003/06/02 01:15:47 jschauma Exp $
+# $NetBSD: Makefile,v 1.33 2003/06/12 15:46:03 jschauma Exp $
 #
 
 DISTNAME=	Xaw3d-1.5
@@ -16,7 +16,7 @@ PLIST_SRC=	${WRKDIR}/PLIST-src
 
 .include "../../mk/bsd.prefs.mk"
 
-.if !empty(X11BASE:M*openwin)
+.if !empty(X11BASE:M*openwin) #|| ${OPSYS} == "IRIX"
 PLIST_SUBST+=	INCDIR=include/X11/X11
 .else
 PLIST_SUBST+=	INCDIR=include/X11
@@ -29,6 +29,10 @@ post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/Xaw3d
 	${INSTALL_DATA} ${WRKSRC}/README.XAW3D ${PREFIX}/share/doc/Xaw3d
 	${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
+.if ${OPSYS} == "IRIX"
+	${INSTALL_DATA} /usr/lib${ABI}/libXaw3d* ${PREFIX}/lib/
+	${RM} -f /usr/lib${ABI}/libXaw3d*
+.endif
 	cd ${PREFIX} && ${LS} lib/libXaw3d* >>${PLIST_SRC}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/Xaw3d/distinfo b/x11/Xaw3d/distinfo
index 3dfa82ff33d..73375ea50db 100644
--- a/x11/Xaw3d/distinfo
+++ b/x11/Xaw3d/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2001/06/13 15:47:28 tron Exp $
+$NetBSD: distinfo,v 1.4 2003/06/12 15:46:03 jschauma Exp $
 
 SHA1 (Xaw3d-1.5.tar.gz) = ba10e9f9a376932eed9696006e34d4618a6f588d
 Size (Xaw3d-1.5.tar.gz) = 284420 bytes
-SHA1 (patch-aa) = 49e023e78fddf3f52a6243733f68734deb71f2b8
+SHA1 (patch-aa) = 03401df288a0658399d475d59e6f8f8cd01ab520
 SHA1 (patch-ab) = 0233ff209e06c8a699c23907be3af442ed099ff1
diff --git a/x11/Xaw3d/patches/patch-aa b/x11/Xaw3d/patches/patch-aa
index 3b5c2df082e..b5d186ffef7 100644
--- a/x11/Xaw3d/patches/patch-aa
+++ b/x11/Xaw3d/patches/patch-aa
@@ -1,21 +1,25 @@
-$NetBSD: patch-aa,v 1.7 2001/06/13 15:47:29 tron Exp $
+$NetBSD: patch-aa,v 1.8 2003/06/12 15:46:03 jschauma Exp $
 
---- Imakefile.orig	Tue Oct 15 16:41:19 1996
-+++ Imakefile	Wed Jun 13 17:20:45 2001
-@@ -7,8 +7,12 @@
+--- Imakefile.orig	Tue Oct 15 07:41:19 1996
++++ Imakefile	Wed Jun 11 10:43:33 2003
+@@ -7,8 +7,16 @@
  #define HasSharedData YES
  #define LibName Xaw3d
  #define SoRev SOXAWREV
 +#ifdef SunArchitecture
 +#define IncSubdir X11/Xaw3d
++#else
++#ifdef SGIArchitecture
++#define IncSubdir Xaw3d
 +#else
  #define IncSubdir X11
  #define IncSubSubdir Xaw3d
++#endif
 +#endif
  
  #ifdef LinuxArchitecture
  JUMP_ROOT_Xaw3d = $(AWIDGETSRC)3d
-@@ -39,9 +43,9 @@
+@@ -39,9 +47,9 @@
  
         LINTLIBS = $(LINTXLIB) $(LINTXTOOL)
  
-- 
cgit v1.2.3