[pkgsrc/trunk]: pkgsrc improve imake support on IRIX 5

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0f064816d494
branches:  trunk
changeset: 518465:0f064816d494
user:      schwarz <schwarz%pkgsrc.org@localhost>
date:      Sun Sep 10 13:44:58 2006 +0000

description:
improve imake support on IRIX 5

diffstat:

 mk/platform/IRIX.mk                  |   6 ++----
 pkgtools/xpkgwedge/files/irix5.patch |  22 +++++++++-------------
 2 files changed, 11 insertions(+), 17 deletions(-)

diffs (91 lines):

diff -r bbbb56f088a9 -r 0f064816d494 mk/platform/IRIX.mk
--- a/mk/platform/IRIX.mk       Sun Sep 10 13:44:28 2006 +0000
+++ b/mk/platform/IRIX.mk       Sun Sep 10 13:44:58 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: IRIX.mk,v 1.26 2006/07/20 20:02:23 jlam Exp $
+# $NetBSD: IRIX.mk,v 1.27 2006/09/10 13:44:58 schwarz Exp $
 #
 # Variable definitions for the IRIX operating system.
 
@@ -9,9 +9,6 @@
 .if empty(OS_VERSION:M6*)
 IMAKEOPTS+=    -DShLibDir=${X11BASE}/lib
 IMAKEOPTS+=    -DOptimizerLevel="${CFLAGS}"
-IMAKEOPTS+=    -DManDir=${PREFIX}/${IMAKE_MAN_DIR}
-IMAKEOPTS+=    -DLibmanDir=${PREFIX}/${IMAKE_LIBMAN_DIR}
-IMAKEOPTS+=    -DFileManDir=${PREFIX}/${IMAKE_FILEMAN_DIR}
 IMAKEOPTS+=    -DManPath=${PREFIX}/man
 .endif
 PKGLOCALEDIR?= share
@@ -62,6 +59,7 @@
 MAKE_ENV+=             GZIP_CMD="${GZIP_CMD}"
 USE_TOOLS+=            gzip
 MANCOMPRESSED=         yes
+MANZ=                  yes
 . endif
 .endif
 
diff -r bbbb56f088a9 -r 0f064816d494 pkgtools/xpkgwedge/files/irix5.patch
--- a/pkgtools/xpkgwedge/files/irix5.patch      Sun Sep 10 13:44:28 2006 +0000
+++ b/pkgtools/xpkgwedge/files/irix5.patch      Sun Sep 10 13:44:58 2006 +0000
@@ -1,7 +1,7 @@
-$NetBSD: irix5.patch,v 1.2 2006/09/09 20:31:46 schwarz Exp $
+$NetBSD: irix5.patch,v 1.3 2006/09/10 13:44:58 schwarz Exp $
 
 --- sgi.cf.orig        2006-09-09 17:13:25.000000000 +0200
-+++ sgi.cf     2006-09-09 17:52:40.000000000 +0200
++++ sgi.cf     2006-09-10 10:15:18.000000000 +0200
 @@ -178,8 +178,10 @@
  #define AsCmd $(TOOLROOT)/usr/bin/as
  #define CcCmd $(TOOLROOT)/usr/bin/cc
@@ -29,18 +29,14 @@
  
  /*
   * If we specify -nostdlib, we must supply the complete library
-@@ -252,23 +256,25 @@
+@@ -252,23 +256,19 @@
  #define ManSuffix     1
  #define LibManSuffix  3
  
 -#undef ManDir
 -#undef LibmanDir
-+#ifndef ManDir
- #define ManDir $(CATMAN1DIR)$(MANPACKAGE)
-+#endif
-+#ifndef LibmanDir
- #define LibmanDir $(CATMAN3DIR)$(MANPACKAGE)
-+#endif
+-#define ManDir $(CATMAN1DIR)$(MANPACKAGE)
+-#define LibmanDir $(CATMAN3DIR)$(MANPACKAGE)
  #define NroffManDir $(MAN1DIR)$(MANPACKAGE)
  #define NroffLibmanDir $(MAN3DIR)$(MANPACKAGE)
  
@@ -62,7 +58,7 @@
  
  /*
   * MANPACKAGE is the directory inside of cat? or man? that man pages should
-@@ -281,22 +287,22 @@
+@@ -281,22 +281,22 @@
   * InstallManPageLong - misc changes for sgi.
   */
  #define InstallManPageLong(file,destdir,dest)                         @@\
@@ -82,7 +78,7 @@
        if [ -f file.man ]; then \                                      @@\
                $(INSTALL) -c $(INSTMANFLAGS) \                         @@\
 -                      file.nr.z $(DESTDIR)destdir/dest.z; \           @@\
-+                      file.nr.gz $(DESTDIR)destdir/dest.1.gz;  \      @@\
++                      file.nr.gz $(DESTDIR)destdir/dest.$(MANSUFFIX).gz; \    @@\
        fi                                                              @@\
                                                                        @@\
  clean::                                                                       @@\
@@ -91,8 +87,8 @@
  
  /*
   * InstallManPageAliases - generate rules to install manual page aliases.
---- sgiLib.rules.orig  2006-09-09 20:47:39.000000000 +0200
-+++ sgiLib.rules       2006-09-09 20:49:47.000000000 +0200
+--- sgiLib.rules.orig  2006-09-10 10:29:23.000000000 +0200
++++ sgiLib.rules       2006-09-09 21:06:23.000000000 +0200
 @@ -97,8 +97,8 @@
        $(INSTALL) -c $(INSTLIBFLAGS) Concat4(lib,libname,.so,rev) \    @@\
                $(DESTDIR)dest ; \                                      @@\