[pkgsrc/trunk]: pkgsrc/x11/Xaw3d One more try at getting this right on solari...

[dmcmahill <dmcmahill%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a0172585564d
branches:  trunk
changeset: 492494:a0172585564d
user:      dmcmahill <dmcmahill%pkgsrc.org@localhost>
date:      Thu Apr 14 01:41:27 2005 +0000

description:
One more try at getting this right on solaris.  The last patches fixed
things when X is openwin but broke the pkg for XFree86 and probably Xorg.
So conditionalize things on X being openwin for SunArchitecture.

diffstat:

 x11/Xaw3d/Makefile         |   6 +++++-
 x11/Xaw3d/distinfo         |   4 ++--
 x11/Xaw3d/patches/patch-aa |  12 ++++++++----
 3 files changed, 15 insertions(+), 7 deletions(-)

diffs (66 lines):

diff -r ccf6ea7a30d1 -r a0172585564d x11/Xaw3d/Makefile
--- a/x11/Xaw3d/Makefile        Wed Apr 13 23:29:35 2005 +0000
+++ b/x11/Xaw3d/Makefile        Thu Apr 14 01:41:27 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2005/04/11 21:48:04 tv Exp $
+# $NetBSD: Makefile,v 1.43 2005/04/14 01:41:27 dmcmahill Exp $
 #
 
 DISTNAME=      Xaw3d-1.5E
@@ -22,8 +22,12 @@
 .if empty(X11BASE:M*openwin)
 post-extract:
        @(cd ${WRKSRC}; ${LN} -s .. X11)
+.else
+IMAKE_FLAGS+=  -DXISOPENWIN
 .endif
 
+XMKMF+=        ${IMAKE_FLAGS}
+
 PLIST_SUBST+=  INCDIR=include/X11
 
 post-install:
diff -r ccf6ea7a30d1 -r a0172585564d x11/Xaw3d/distinfo
--- a/x11/Xaw3d/distinfo        Wed Apr 13 23:29:35 2005 +0000
+++ b/x11/Xaw3d/distinfo        Thu Apr 14 01:41:27 2005 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.7 2005/03/01 22:55:26 dmcmahill Exp $
+$NetBSD: distinfo,v 1.8 2005/04/14 01:41:27 dmcmahill Exp $
 
 SHA1 (Xaw3d-1.5E.tar.gz) = efc5b923feda52866c859c59a5b553cb675a69d1
 RMD160 (Xaw3d-1.5E.tar.gz) = 086cbabaa45ce5c110815aea24eebcbb54613118
 Size (Xaw3d-1.5E.tar.gz) = 309264 bytes
-SHA1 (patch-aa) = 1f9fbc5c21ea0658b95332e0fc951a407fc0e8a7
+SHA1 (patch-aa) = 7729cfe83671f482670350ead9ccf1bfe3e932e3
 SHA1 (patch-ab) = 9bbe44041708b2d01b728638ac07e32addc01cff
diff -r ccf6ea7a30d1 -r a0172585564d x11/Xaw3d/patches/patch-aa
--- a/x11/Xaw3d/patches/patch-aa        Wed Apr 13 23:29:35 2005 +0000
+++ b/x11/Xaw3d/patches/patch-aa        Thu Apr 14 01:41:27 2005 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.10 2005/03/01 22:55:26 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.11 2005/04/14 01:41:27 dmcmahill Exp $
 
---- Imakefile.orig     2003-03-08 15:55:18.000000000 +0100
+--- Imakefile.orig     2003-03-08 09:55:18.000000000 -0500
 +++ Imakefile
 @@ -9,7 +9,7 @@ XCOMM For color pixmaps, define MULTIPLA
  XCOMM For grayed stipple shadows, define GRAY_BLKWHT_STIPPLES:
@@ -11,12 +11,16 @@
  
  #define DoNormalLib NormalLibXaw
  #define DoSharedLib SharedLibXaw
-@@ -18,11 +18,19 @@ XCOMM For scrollbars with arrows, define
+@@ -18,11 +18,23 @@ XCOMM For scrollbars with arrows, define
  #define HasSharedData YES
  #define LibName Xaw3d
  #define SoRev SOXAWREV
 +#ifdef SunArchitecture
-+#define IncSubdir Xaw3d
++#  ifdef XISOPENWIN
++#    define IncSubdir Xaw3d
++#  else
++#    define IncSubdir X11/Xaw3d
++#  endif
 +#else
 +#ifdef SGIArchitecture
 +#define IncSubdir Xaw3d