diff options
| author | dmcmahill <dmcmahill@pkgsrc.org> | 2005-04-14 01:41:27 +0000 |
|---|---|---|
| committer | dmcmahill <dmcmahill@pkgsrc.org> | 2005-04-14 01:41:27 +0000 |
| commit | d793fca5f9759a405e7ae57daa26f41619856cc1 (patch) | |
| tree | 74df5eb34cd799282c8335ebdfc43809ac611d52 /x11/Xaw3d/patches | |
| parent | d5c226cbda86e965d75099f65cf6cd55b8746a27 (diff) | |
| download | pkgsrc-d793fca5f9759a405e7ae57daa26f41619856cc1.tar.gz | |
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 (limited to 'x11/Xaw3d/patches')
| -rw-r--r-- | x11/Xaw3d/patches/patch-aa | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/x11/Xaw3d/patches/patch-aa b/x11/Xaw3d/patches/patch-aa index c3805add7e2..664fe1d559c 100644 --- a/x11/Xaw3d/patches/patch-aa +++ b/x11/Xaw3d/patches/patch-aa @@ -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 @@ $NetBSD: patch-aa,v 1.10 2005/03/01 22:55:26 dmcmahill Exp $ #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 |