head	1.2;
access;
symbols;
locks; strict;
comment	@# @;


1.2
date	2004.03.12.13.05.17;	author grant;	state dead;
branches;
next	1.1;

1.1
date	2003.06.12.16.36.52;	author jschauma;	state Exp;
branches;
next	;


desc
@@


1.2
log
@remove; bootstrap-pkgsrc has been moved to pkgsrc/bootstrap/ now.
@
text
@$NetBSD: irix.patch,v 1.1 2003/06/12 16:36:52 jschauma Exp $

--- /usr/lib/X11/config/X11.rules.orig	Thu Jun 12 09:12:20 2003
+++ /usr/lib/X11/config/X11.rules	Sun Jun  8 10:31:35 2003
@@@@ -79,7 +79,7 @@@@
 #if UseInstalledX11 
 #if defined(X11ProjectRoot)
 # define X11BuildLibPath	$(XPROJECTROOT)/lib
-else
+#else
 # define X11BuildLibPath        $(USRLIBDIR)
 #endif
 #elif ImportX11
--- /usr/lib/X11/config/sgi.cf.orig	Thu Jun 12 09:12:20 2003
+++ /usr/lib/X11/config/sgi.cf		Sun Jun  8 12:55:50 2003
@@@@ -241,7 +241,9 @@@@
  * Actually, it doesn't matter what MakeCmd is, since we don't use it.
  * We assume that $(MAKE) gets set for us by make.
  */
+#ifndef MakeCmd
 #define MakeCmd $(TOOLROOTSAFE) $(TOOLROOT)/sbin/make
+#endif
 #define TroffCmd psroff -t
 
 #define StandardIncludes -nostdinc -I$(ROOT)/usr/include
@@@@ -320,10 +322,14 @@@@
 #define NroffFilemanDir $(MAN4DIR)$(MANPACKAGE)
 #define NroffMiscmanDir $(MAN5DIR)$(MANPACKAGE)
 
+#ifndef ManUsr
 #ifdef UseInstalled
            MANUSR = /usr/share/local
 #else
            MANUSR = /usr/share
+#endif
+#else
+           MANUSR = ManUsr
 #endif
 
        CATMAN1DIR = $(MANUSR)/catman/u_man/cat1
@


1.1
log
@We need to patch two files for X on Irix.
@
text
@d1 1
a1 1
$NetBSD: $
@