Initiate support for X11 apps under IRIX.

We introduce two new variables: ABI and IMAKEOPTS
ABI determines the correct ABI to use and is set during bootstrapping
from /etc/compiler.defaults.
IMAKEOPTS are the options passed to imake to allow it to set the right
definitions and find the right paths etc.  Use IMAKEOPTS with SunOS, too.

IRIX will always require xpkgwedge, since it's got a bogus X11BASE.

When linking against libXaw, make sure we get the right ABI.

6 files changed, 639 insertions, 25 deletions

diff --git a/mk/IRIX.x11.dist b/mk/IRIX.x11.dist
new file mode 100644
index 00000000000..dd04240b4fc
--- /dev/null
+++ b/mk/IRIX.x11.dist
@@ -0,0 +1,569 @@
+#     $NetBSD: IRIX.x11.dist,v 1.1 2003/06/12 15:27:08 jschauma Exp $
+#     FreeBSD Id: BSD.x11.dist,v 1.2 1997/06/10 07:55:10 asami Exp
+#
+
+/set type=dir uname=root gname=sys mode=0755
+.
+    bin
+    ..
+    catman
+        u_man
+            cat1
+            ..
+            cat2
+            ..
+            cat3
+            ..
+            cat4
+            ..
+            cat5
+            ..
+        ..
+        p_man
+            cat1
+            ..
+            cat2
+            ..
+            cat3
+            ..
+            cat4
+            ..
+            cat5
+            ..
+        ..
+    ..
+    etc
+        rc.d
+        ..
+    ..
+    include
+        X11
+            ICE
+            ..
+            PEX5
+            ..
+            PM
+            ..
+            SM
+            ..
+            Xaw
+            ..
+            Xmu
+            ..
+            bitmaps
+            ..
+            extensions
+            ..
+            fonts
+            ..
+            pixmaps
+            ..
+        ..
+    ..
+    info
+    ..
+    lib
+        X11
+            XF86Setup
+                pics
+                ..
+                scripts
+                ..
+                tcllib
+                ..
+            ..
+            app-defaults
+            ..
+            config
+            ..
+            doc
+            ..
+            etc
+            ..
+            fonts
+                100dpi
+                ..
+                75dpi
+                ..
+                PEX
+                ..
+                Speedo
+                ..
+                Type1
+                ..
+                cyrillic
+                ..
+                local
+                ..
+                misc
+                ..
+            ..
+            fs
+            ..
+            lbxproxy
+            ..
+            locale
+                C
+                ..
+                en_US.utf
+                ..
+                iso8859-1
+                ..
+                iso8859-2
+                ..
+                iso8859-3
+                ..
+                iso8859-4
+                ..
+                iso8859-5
+                ..
+                iso8859-6
+                ..
+                iso8859-7
+                ..
+                iso8859-8
+                ..
+                iso8859-9
+                ..
+                ja
+                ..
+                ja.JIS
+                ..
+                ja.SJIS
+                ..
+                ko
+                ..
+                koi8-r
+                ..
+                tbl_data
+                ..
+                th_TH.TACTIS
+                ..
+                zh
+                ..
+                zh_TW
+                ..
+            ..
+            proxymngr
+            ..
+            rstart
+                commands
+                    x11r6
+                    ..
+                ..
+                contexts
+                ..
+            ..
+            twm
+            ..
+            x11perfcomp
+            ..
+            xdm
+            ..
+            xinit
+            ..
+            xkb
+                compat
+                ..
+                compiled
+                ..
+                geometry
+                    digital
+                    ..
+                    sgi
+                    ..
+                ..
+                keycodes
+                    digital
+                    ..
+                    sgi
+                    ..
+                ..
+                keymap
+                    digital
+                    ..
+                    sgi
+                    ..
+                    sun
+                    ..
+                ..
+                rules
+                ..
+                semantics
+                ..
+                symbols
+                    digital
+                    ..
+                    fujitsu
+                    ..
+                    nec
+                    ..
+                    sony
+                    ..
+                    sun
+                    ..
+                ..
+            ..
+            xserver
+            ..
+            xsm
+            ..
+        ..
+        modules
+        ..
+    ..
+    libexec
+    ..
+    man
+        u_man
+            man1
+            ..
+            man2
+            ..
+            man3
+            ..
+            man4
+            ..
+            man5
+            ..
+            man6
+            ..
+            man7
+            ..
+            man8
+            ..
+            man9
+            ..
+        ..
+        p_man
+            man1
+            ..
+            man2
+            ..
+            man3
+            ..
+            man4
+            ..
+            man5
+            ..
+            man6
+            ..
+            man7
+            ..
+            man8
+            ..
+            man9
+            ..
+        ..
+    ..
+    share
+        doc
+            html
+            ..
+        ..
+        examples
+        ..
+	fonts
+	..
+	locale
+            am
+                LC_MESSAGES
+                ..
+            ..
+            ar
+                LC_MESSAGES
+                ..
+            ..
+            az
+                LC_MESSAGES
+                ..
+            ..
+            be
+                LC_MESSAGES
+                ..
+            ..
+            bg
+                LC_MESSAGES
+                ..
+            ..
+            bg_BG.cp1251
+                LC_MESSAGES
+                ..
+            ..
+            bs
+                LC_MESSAGES
+                ..
+            ..
+            ca
+                LC_MESSAGES
+                ..
+            ..
+            cs
+                LC_MESSAGES
+                ..
+            ..
+            da
+                LC_MESSAGES
+                ..
+            ..
+            de
+                LC_MESSAGES
+                ..
+            ..
+            de_DE
+                LC_MESSAGES
+                ..
+            ..
+            dk
+                LC_MESSAGES
+                ..
+            ..
+            ee
+                LC_MESSAGES
+                ..
+            ..
+            el
+                LC_MESSAGES
+                ..
+            ..
+            en
+                LC_MESSAGES
+                ..
+            ..
+            en_AU
+                LC_MESSAGES
+                ..
+            ..
+            en_GB
+                LC_MESSAGES
+                ..
+            ..
+            en_US
+                LC_MESSAGES
+                ..
+            ..
+            eo
+                LC_MESSAGES
+                ..
+            ..
+            es
+                LC_MESSAGES
+                ..
+            ..
+            es_AR
+                LC_MESSAGES
+                ..
+            ..
+            es_MX
+                LC_MESSAGES
+                ..
+            ..
+            et
+                LC_MESSAGES
+                ..
+            ..
+            eu
+                LC_MESSAGES
+                ..
+            ..
+            fi
+                LC_MESSAGES
+                ..
+            ..
+            fr
+                LC_MESSAGES
+                ..
+            ..
+            ga
+                LC_MESSAGES
+                ..
+            ..
+            gd
+                LC_MESSAGES
+                ..
+            ..
+            gl
+                LC_MESSAGES
+                ..
+            ..
+            hi
+                LC_MESSAGES
+                ..
+            ..
+            hr
+                LC_MESSAGES
+                ..
+            ..
+            hu
+                LC_MESSAGES
+                ..
+            ..
+            id
+                LC_MESSAGES
+                ..
+            ..
+            is
+                LC_MESSAGES
+                ..
+            ..
+            it
+                LC_MESSAGES
+                ..
+            ..
+            ja
+                LC_MESSAGES
+                ..
+            ..
+            ja_JP
+                LC_MESSAGES
+                ..
+            ..
+            kn
+                LC_MESSAGES
+                ..
+            ..
+            ko
+                LC_MESSAGES
+                ..
+            ..
+            lt
+                LC_MESSAGES
+                ..
+            ..
+            lv
+                LC_MESSAGES
+                ..
+            ..
+            ml
+                LC_MESSAGES
+                ..
+            ..
+            ms
+                LC_MESSAGES
+                ..
+            ..
+            nl
+                LC_MESSAGES
+                ..
+            ..
+            nl_NL
+                LC_MESSAGES
+                ..
+            ..
+            nn
+                LC_MESSAGES
+                ..
+            ..
+            no
+                LC_MESSAGES
+                ..
+            ..
+            no@nynorsk
+                LC_MESSAGES
+                ..
+            ..
+            pl
+                LC_MESSAGES
+                ..
+            ..
+            pt
+                LC_MESSAGES
+                ..
+            ..
+            pt_BR
+                LC_MESSAGES
+                ..
+            ..
+            pt_PT
+                LC_MESSAGES
+                ..
+            ..
+            ro
+                LC_MESSAGES
+                ..
+            ..
+            ru
+                LC_MESSAGES
+                ..
+            ..
+            se
+                LC_MESSAGES
+                ..
+            ..
+            sk
+                LC_MESSAGES
+                ..
+            ..
+            sl
+                LC_MESSAGES
+                ..
+            ..
+            sp
+                LC_MESSAGES
+                ..
+            ..
+            sr
+                LC_MESSAGES
+                ..
+            ..
+            sr@Latn
+                LC_MESSAGES
+                ..
+            ..
+            sv
+                LC_MESSAGES
+                ..
+            ..
+            ta
+                LC_MESSAGES
+                ..
+            ..
+            th
+                LC_MESSAGES
+                ..
+            ..
+            tr
+                LC_MESSAGES
+                ..
+            ..
+            uk
+                LC_MESSAGES
+                ..
+            ..
+            vi
+                LC_MESSAGES
+                ..
+            ..
+            wa
+                LC_MESSAGES
+                ..
+            ..
+            yi
+                LC_MESSAGES
+                ..
+            ..
+            zh
+                LC_MESSAGES
+                ..
+            ..
+            zh_CN
+                LC_MESSAGES
+                ..
+            ..
+            zh_CN.GB2312
+                LC_MESSAGES
+                ..
+            ..
+            zh_TW
+                LC_MESSAGES
+                ..
+            ..
+            zh_TW.Big5
+                LC_MESSAGES
+                ..
+            ..
+        ..
+	pixmaps
+	..
+    ..
+..
diff --git a/mk/bsd.pkg.defaults.mk b/mk/bsd.pkg.defaults.mk
index 0ddf9189650..814bdf80573 100644
--- a/mk/bsd.pkg.defaults.mk
+++ b/mk/bsd.pkg.defaults.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.defaults.mk,v 1.153 2003/06/05 12:13:34 markd Exp $
+# $NetBSD: bsd.pkg.defaults.mk,v 1.154 2003/06/12 15:27:08 jschauma Exp $
 #
 
 # A file providing defaults for pkgsrc and the packages collection.
@@ -66,6 +66,14 @@ PKGSRC_SLEEPSECS?= 5
 # The following values are used to manage the packages collection as a whole.
 #
 
+#ABI=	
+# The ABI to be used, if supported by the Operating System and/or compiler.
+# Currently only used under IRIX and explicitly set during bootstrapping
+# Onlye change this if you really know what you're doing -- libraries of
+# one ABI can not be linked with libraries of another!
+# Possible: 64 (64 bit ABI), 32 (SGI's N32 ABI), undefined (SGI's old o32 ABI)
+# Default: determined during bootstrapping
+
 #PKG_DEVELOPER=	yes
 # Run a sanity check that package developers want:
 #  * run check-shlibs to see that all binaries will find their libs
@@ -101,7 +109,7 @@ CROSSBASE?=	${LOCALBASE}/cross
 # Where X11 is installed on the system.
 # (and the default install path of X11 pkgs)
 # Possible: any path
-# Default: /usr/X11R6, or /usr/openwin for Solaris
+# Default: /usr/X11R6, /usr/openwin for Solaris
 
 #MOTIFBASE?=	/usr/X11R6
 # Where Motif-2.0-compatible headers and libraries are installed
@@ -351,13 +359,38 @@ PATCH_FUZZ_FACTOR?= -F0
 # Possible: any Fortran compiler
 # Default: none
 
-.if ${OPSYS} == "SunOS"
-#IMAKE?=	${X11BASE}/bin/imake -DHasGcc2=YES -DHasGcc2ForCplusplus=YES
-# Sun ONE Studio (formerly known as WorkShop and Forte) compliers can be used
-# with:
-#IMAKE?=	${X11BASE}/bin/imake
-# Possible: any path and valid flags
-# Default: ${X11BASE}/bin/imake -DHasGcc2=YES -DHasGcc2ForCplusplus=YES
+#IMAKE?=	${X11BASE}/bin/imake ${IMAKEOPTS}
+# The imake binary to invoke.
+# Possible: any path followed by any valid flags
+# Default: ${X11BASE}/bin/imake ${IMAKEOPTS}
+
+#IMAKEOPTS=
+# Options passed to imake(1).  The defaults ensure that imake finds the
+# correct commands.
+# Possible: any valid flags
+# Default:
+#  for SunOS:
+#          -DHasGcc2=YES -DHasGcc2ForCplusplus=YES
+#  for IRIX:
+#          -DMakeCmd=${PREFIX}/bin/bmake -DProjectRoot=${X11BASE} \
+#          -DManUsr=${PREFIX}
+.if ${OPSYS} == "IRIX"
+#IMAKEOPTS?=	-DMakeCmd=${PREFIX}/bin/bmake -DProjectRoot=${X11BASE} \
+#               -DManUsr=${PREFIX}
+# ABI specific flags may be added during bootstrapping process or by hand:
+.  if defined(ABI)
+.    if ${ABI} == "32"
+#IMAKEOPTS+=	-DBuildN32
+.    else
+#IMAKEOPTS+=	-DBuild64bit
+.    endif
+.  endif
+# you may also wish to add ISA specific flags, such as "-DSgiISA32=4" if
+# you are compiling for mips4.
+.elif ${OPSYS} == "SunOS"
+#IMAKEOPTS?=	-DHasGcc2=YES -DHasGcc2ForCplusplus=YES
+# To use Sun ONE Studio (formerly known as WorkShop and Forte) compliers
+# set IMAKEOPTS tp the empty string
 .endif
 
 PRE_ROOT_CMD?=	${TRUE}
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index c9674765b90..55be08d831a 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.1194 2003/06/10 06:01:12 grant Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.1195 2003/06/12 15:27:08 jschauma Exp $
 #
 # This file is in the public domain.
 #
@@ -79,8 +79,10 @@ PLIST_SUBST+=          IMAKE_MAN_SOURCE_PATH=${IMAKE_MAN_SOURCE_PATH}  \
 USE_X11?=		implied
 .endif
 
+# IRIX *always* needs xpkgwedge
 .if defined(USE_X11BASE)
-.  if exists(${LOCALBASE}/lib/X11/config/xpkgwedge.def) || \
+.  if ${OPSYS} == "IRIX" ||						\
+      exists(${LOCALBASE}/lib/X11/config/xpkgwedge.def) ||		\
       exists(${X11BASE}/lib/X11/config/xpkgwedge.def)
 BUILD_DEPENDS+=		xpkgwedge>=1.5:../../pkgtools/xpkgwedge
 BUILDLINK_X11PKG_DIR=	${LOCALBASE}
diff --git a/mk/defs.IRIX.mk b/mk/defs.IRIX.mk
index 1412bf360e1..c960057df41 100644
--- a/mk/defs.IRIX.mk
+++ b/mk/defs.IRIX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.IRIX.mk,v 1.25 2003/04/15 14:07:54 jschauma Exp $
+# $NetBSD: defs.IRIX.mk,v 1.26 2003/06/12 15:27:09 jschauma Exp $
 #
 # Variable definitions for the IRIX operating system.
 
@@ -36,10 +36,13 @@ GZCAT?=		${LOCALBASE}/bin/zcat
 GZIP?=		-9
 GZIP_CMD?=	${LOCALBASE}/bin/gzip -nf ${GZIP}
 .endif
-LDCONFIG?=	/usr/bin/true
 HEAD?=		/usr/bsd/head
 HOSTNAME_CMD?=	/usr/bsd/hostname
 ID?=		/usr/bin/id
+IMAKE?=		/usr/bin/X11/imake ${IMAKEOPTS}
+IMAKEOPTS+=	-DMakeCmd=${PREFIX}/bin/bmake -DProjectRoot=${X11BASE}
+IMAKEOPTS+=	-DManUsr=${PREFIX}
+LDCONFIG?=	/usr/bin/true
 LN?=		/sbin/ln
 LS?=		/sbin/ls
 M4?=		/usr/bin/m4
@@ -93,15 +96,14 @@ ULIMIT_CMD_memorysize?=	ulimit -v `ulimit -H -v`
 USERADD?=		${FALSE}
 
 # imake installs manpages in weird places
-# XXX: assume NetBSD defaults until somebody determines correct values
-IMAKE_MAN_SOURCE_PATH=	man/cat
+IMAKE_MAN_SOURCE_PATH=	catman/u_man/cat
 IMAKE_MAN_SUFFIX=	1
 IMAKE_LIBMAN_SUFFIX=	3
 IMAKE_FILEMAN_SUFFIX=	5
-IMAKE_MAN_DIR=		${IMAKE_MAN_SOURCE_PATH}1
-IMAKE_LIBMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}3
-IMAKE_FILEMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}5
-IMAKE_MANNEWSUFFIX=	0
+IMAKE_MAN_DIR=		${IMAKE_MAN_SOURCE_PATH}1/X11
+IMAKE_LIBMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}3/X11
+IMAKE_FILEMAN_DIR=	${IMAKE_MAN_SOURCE_PATH}5/X11
+IMAKE_MANNEWSUFFIX=	z
 
 _DO_SHLIB_CHECKS=	yes		# fixup PLIST for shared libs
 _IMAKE_MAKE=		${MAKE}		# program which gets invoked by imake
@@ -130,6 +132,10 @@ _USE_RPATH=		yes		# add rpath to LDFLAGS
 _OPSYS_WHOLE_ARCHIVE_FLAG=	-Wl,-all
 _OPSYS_NO_WHOLE_ARCHIVE_FLAG=	-Wl,-notall
 
+# IRIX has /usr/include/iconv.h, but it's not GNU iconv, so mark it
+# incompatible.
+_INCOMPAT_ICONV=       IRIX-*-*
+
 .if !defined(DEBUG_FLAGS)
 _STRIPFLAG_CC?=		-s	# cc(1) option to strip
 _STRIPFLAG_INSTALL?=	-s	# install(1) option to strip
diff --git a/mk/x11.buildlink2.mk b/mk/x11.buildlink2.mk
index cc682d89d79..163b44cec4e 100644
--- a/mk/x11.buildlink2.mk
+++ b/mk/x11.buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: x11.buildlink2.mk,v 1.3 2002/10/22 22:54:08 jlam Exp $
+# $NetBSD: x11.buildlink2.mk,v 1.4 2003/06/12 15:27:09 jschauma Exp $
 #
 # This file is for internal use by bsd.buildlink2.mk and should _not_ be
 # include by package Makefiles.
@@ -11,10 +11,14 @@ USE_X11_LINKS=	no
 
 .include "../../mk/bsd.prefs.mk"
 
-.if !empty(X11BASE:M*openwin)
-.  include "../../pkgtools/x11-links/openwin.buildlink2.mk"
+.if ${OPSYS} == "IRIX"
+.  include "../../pkgtools/x11-links/xsgi.buildlink2.mk"
 .else
-.  include "../../pkgtools/x11-links/xfree.buildlink2.mk"
+.  if !empty(X11BASE:M*openwin)
+.    include "../../pkgtools/x11-links/openwin.buildlink2.mk"
+.  else
+.    include "../../pkgtools/x11-links/xfree.buildlink2.mk"
+.  endif
 .endif
 
 .endif	# X11_BUILDLINK2_MK
diff --git a/mk/xaw.buildlink2.mk b/mk/xaw.buildlink2.mk
index bbd5ee946fc..b0a9044f6f0 100644
--- a/mk/xaw.buildlink2.mk
+++ b/mk/xaw.buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: xaw.buildlink2.mk,v 1.9 2003/06/08 22:47:28 jschauma Exp $
+# $NetBSD: xaw.buildlink2.mk,v 1.10 2003/06/12 15:27:09 jschauma Exp $
 
 .if !defined(XAW_BUILDLINK2_MK)
 XAW_BUILDLINK2_MK=	# defined
@@ -19,7 +19,7 @@ BUILDLINK_PREFIX.Xaw?=	${BUILDLINK_PREFIX.Xaw3d}
 BUILDLINK_PREFIX.Xaw?=	${BUILDLINK_PREFIX.neXtaw}
 .else
 BUILDLINK_PREFIX.Xaw?=	${X11BASE}
-LIBXAW?=		-L${X11BASE}/lib -Wl,${RPATH_FLAG}${X11BASE}/lib -lXaw
+LIBXAW?=		-L${X11BASE}/lib${ABI} -Wl,${RPATH_FLAG}${X11BASE}/lib${ABI} -lXaw
 .endif
 
 MAKE_ENV+=	LIBXAW="${LIBXAW}"