From 13ea409fa178b22be9c35bea63c9dc3bddd4d756 Mon Sep 17 00:00:00 2001
From: schwarz <schwarz@pkgsrc.org>
Date: Sat, 9 Sep 2006 20:31:46 +0000
Subject: improve support for IRIX 5 working around some bad default settings

---
 pkgtools/xpkgwedge/Makefile          |  6 ++++-
 pkgtools/xpkgwedge/PLIST             |  3 ++-
 pkgtools/xpkgwedge/files/irix5.patch | 43 +++++++++++++++++++++++++++++++-----
 3 files changed, 44 insertions(+), 8 deletions(-)

(limited to 'pkgtools/xpkgwedge')

diff --git a/pkgtools/xpkgwedge/Makefile b/pkgtools/xpkgwedge/Makefile
index 4bad795c034..331787b57f7 100644
--- a/pkgtools/xpkgwedge/Makefile
+++ b/pkgtools/xpkgwedge/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2006/08/03 17:35:12 tv Exp $
+# $NetBSD: Makefile,v 1.69 2006/09/09 20:31:46 schwarz Exp $
 
 DISTNAME=	xpkgwedge-1.16
 CATEGORIES=	pkgtools devel x11
@@ -53,12 +53,15 @@ PLIST_SUBST+=		IS_DARWIN="@comment "
 PLIST_SUBST+=		IS_IRIX=
 USE_TOOLS+=		patch
 . if !empty(OS_VERSION:M6*)
+PLIST_SUBST+=		IS_IRIX5="@comment "
 PLIST_SUBST+=		IS_IRIX6=
 . else
+PLIST_SUBST+=		IS_IRIX5=
 PLIST_SUBST+=		IS_IRIX6="@comment "
 . endif
 .else
 PLIST_SUBST+=		IS_IRIX="@comment "
+PLIST_SUBST+=		IS_IRIX5="@comment "
 PLIST_SUBST+=		IS_IRIX6="@comment "
 .endif
 
@@ -105,6 +108,7 @@ do-install:
 		${INSTALL_DATA} ${X11BASE}/lib/X11/config/X11.rules ${PREFIX}/lib/X11/config; \
 		cd ${PREFIX}/lib/X11/config && patch ${PATCH_STRIP} < ${FILESDIR}/irix6.patch; \
 	else \
+		${INSTALL_DATA} ${X11BASE}/lib/X11/config/sgiLib.rules ${PREFIX}/lib/X11/config; \
 		cd ${PREFIX}/lib/X11/config && patch ${PATCH_STRIP} < ${FILESDIR}/irix5.patch; \
 	fi; \
 	;; \
diff --git a/pkgtools/xpkgwedge/PLIST b/pkgtools/xpkgwedge/PLIST
index d2f7792d66a..adfbe44ebbd 100644
--- a/pkgtools/xpkgwedge/PLIST
+++ b/pkgtools/xpkgwedge/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.5 2006/04/10 13:38:36 schwarz Exp $
+@comment $NetBSD: PLIST,v 1.6 2006/09/09 20:31:46 schwarz Exp $
 bin/pkgxmkmf
 lib/X11/config/xpkgwedge.def
 ${IS_DARWIN}lib/X11/config/darwin.cf
 ${IS_IRIX}lib/X11/config/sgi.cf
+${IS_IRIX5}lib/X11/config/sgiLib.rules
 ${IS_IRIX6}lib/X11/config/X11.rules
diff --git a/pkgtools/xpkgwedge/files/irix5.patch b/pkgtools/xpkgwedge/files/irix5.patch
index 1067de364d7..172aa3d7a81 100644
--- a/pkgtools/xpkgwedge/files/irix5.patch
+++ b/pkgtools/xpkgwedge/files/irix5.patch
@@ -1,8 +1,19 @@
-$NetBSD: irix5.patch,v 1.1 2006/04/10 13:38:36 schwarz Exp $
+$NetBSD: irix5.patch,v 1.2 2006/09/09 20:31:46 schwarz Exp $
 
---- sgi.cf.orig	2005-12-05 16:32:49.000000000 +0100
-+++ sgi.cf	2005-12-05 16:31:59.000000000 +0100
-@@ -188,7 +188,7 @@
+--- sgi.cf.orig	2006-09-09 17:13:25.000000000 +0200
++++ sgi.cf	2006-09-09 17:52:40.000000000 +0200
+@@ -178,8 +178,10 @@
+ #define AsCmd $(TOOLROOT)/usr/bin/as
+ #define CcCmd $(TOOLROOT)/usr/bin/cc
+ #ifdef UseInstalled
++#ifndef InstallCmd
+ #define InstallCmd bsdinst
+ #endif
++#endif
+ #ifndef LdCmd
+ #define LdCmd $(TOOLROOT)/usr/bin/ld
+ #endif
+@@ -188,12 +190,14 @@
   * Actually, it doesn't matter what MakeCmd is, since we don't use it.
   * We assume that $(MAKE) gets set for us by make.
   */
@@ -11,7 +22,14 @@ $NetBSD: irix5.patch,v 1.1 2006/04/10 13:38:36 schwarz Exp $
  #define TroffCmd psroff -t
  
  #define StandardIncludes -nostdinc -I$(ROOT)/usr/include
-@@ -252,23 +252,25 @@
+ 
++#ifndef ExtraLibraries
+ #define ExtraLibraries /**/
++#endif
+ 
+ /*
+  * If we specify -nostdlib, we must supply the complete library
+@@ -252,23 +256,25 @@
  #define ManSuffix	1
  #define LibManSuffix	3
  
@@ -44,7 +62,7 @@ $NetBSD: irix5.patch,v 1.1 2006/04/10 13:38:36 schwarz Exp $
  
  /*
   * MANPACKAGE is the directory inside of cat? or man? that man pages should
-@@ -281,22 +283,22 @@
+@@ -281,22 +287,22 @@
   * InstallManPageLong - misc changes for sgi.
   */
  #define InstallManPageLong(file,destdir,dest)				@@\
@@ -73,3 +91,16 @@ $NetBSD: irix5.patch,v 1.1 2006/04/10 13:38:36 schwarz Exp $
  
  /*
   * 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
+@@ -97,8 +97,8 @@
+ 	$(INSTALL) -c $(INSTLIBFLAGS) Concat4(lib,libname,.so,rev) \	@@\
+ 		$(DESTDIR)dest ; \					@@\
+ 	STR=rev; if [ -n "$${STR}" ]; then \				@@\
+-	    $(INSTALL) -c -l Concat4(lib,libname,.so,rev)  \		@@\
+-		Concat3(lib,libname,.so) $(DESTDIR)dest ; \		@@\
++	    $(LN) Concat4(lib,libname,.so,rev)  \			@@\
++		$(DESTDIR)dest/Concat3(lib,libname,.so) ; \		@@\
+ 	fi
+ 
+ /*
-- 
cgit v1.2.3