Fix on powerpc. Patches provided by Andrew Cagney <cagney@tpgi.com.au>

in PR pkg/12803 and integrated by me.  It also now compiles on alpha but
segfaults there so change the broken message accordingly.

6 files changed, 105 insertions, 75 deletions

diff --git a/x11/xview-config/distinfo b/x11/xview-config/distinfo
index ab22d390cde..a8947b8aca7 100644
--- a/x11/xview-config/distinfo
+++ b/x11/xview-config/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 11:08:01 skrll Exp $
+$NetBSD: distinfo,v 1.3 2001/05/02 21:46:07 dmcmahill Exp $
 
 SHA1 (xview3.2p1-X11R6.tar.gz) = 1cd04231b893c3e6c70b56791d527b498e21a27a
 Size (xview3.2p1-X11R6.tar.gz) = 3436814 bytes
-SHA1 (patch-aa) = ac4696201ea6f1e5d3922dbea92f8b495d315bbf
-SHA1 (patch-ab) = c26e77583048f9e09deacc2459cf66679166c45b
-SHA1 (patch-ac) = f33528a81d014669bb1796e24aab1cf135a5543d
-SHA1 (patch-ad) = c934333ca3a7c1de799bfd50836deea6569603b5
-SHA1 (patch-ae) = b84c6680fdf66a46a35b26c3edf97d603ba4f4e2
+SHA1 (patch-aa) = 631894d42809d81f091666892b42e1afe09001d4
+SHA1 (patch-ab) = f69576916876bb87af8f17c2ba01a3e4ae43c594
+SHA1 (patch-ac) = cf0359a8ed9873f3065e7af877e20d65b30ee6c9
+SHA1 (patch-ad) = 21ce28d4933bd24d62db0946aa7ace63efce73e3
+SHA1 (patch-ae) = a8b36ae8898bd236ed81b2ecec8a33c3e0ce5fda
diff --git a/x11/xview-config/patches/patch-aa b/x11/xview-config/patches/patch-aa
index f587f3bc226..cff7f7e7989 100644
--- a/x11/xview-config/patches/patch-aa
+++ b/x11/xview-config/patches/patch-aa
@@ -1,9 +1,8 @@
-$NetBSD: patch-aa,v 1.5 2000/10/23 18:02:56 jlam Exp $
-
---- Imakefile.orig	Tue Jun 29 01:13:19 1993
-+++ Imakefile
-@@ -8,10 +8,10 @@
- /**/# config directory
+$NetBSD: patch-aa,v 1.6 2001/05/02 21:46:08 dmcmahill Exp $
+ 
+--- ./Imakefile.orig	Tue Jun 29 01:13:19 1993
++++ ./Imakefile	Tue May  1 22:40:31 2001
+@@ -9,8 +9,8 @@
  /**/# @(#)Imakefile	1.9 28 Jun 1993 SMI
  
 -XVFILES = XView.cf XView.lib XView.obj XView.rules XView.tmpl library.tmpl
@@ -14,4 +13,3 @@ $NetBSD: patch-aa,v 1.5 2000/10/23 18:02:56 jlam Exp $
 +InstallMultipleDestFlags(install,$(CFFILES),$(PREFIX)/lib/X11/config,$(INSTDATFLAGS))
  
  depend::
- 
diff --git a/x11/xview-config/patches/patch-ab b/x11/xview-config/patches/patch-ab
index ddd54ad658f..14889792bf0 100644
--- a/x11/xview-config/patches/patch-ab
+++ b/x11/xview-config/patches/patch-ab
@@ -1,40 +1,53 @@
-$NetBSD: patch-ab,v 1.6 2000/10/23 18:02:56 jlam Exp $
-
---- XView.cf.orig	Sun Jun 26 22:09:19 1994
-+++ XView.cf
-@@ -101,7 +101,7 @@
-  *	the appropriate value.
+$NetBSD: patch-ab,v 1.7 2001/05/02 21:46:08 dmcmahill Exp $
+ 
+--- ./XView.cf.orig	Sun Jun 26 22:09:19 1994
++++ ./XView.cf	Tue May  1 22:40:31 2001
+@@ -102,5 +102,5 @@
   */
  #ifndef XVDestDir
 -#define XVDestDir /usr/X11/xview
 +#define XVDestDir ProjectRoot
  #endif
  /*
-  *	Command to add object modules to the library.
-@@ -139,7 +139,7 @@
-  *	installed in $(DESTDIR)/lib/X11/config (aka $(CONFIGDIR)).
+@@ -140,5 +140,5 @@
   */ 
  #ifndef OnlyNeedsNewXViewConfigInstalled 
 -#define OnlyNeedsNewXViewConfigInstalled NO 
 +#define OnlyNeedsNewXViewConfigInstalled YES 
  #endif 
  /*
-  *	If you would like the XView man pages to be installed in 
-@@ -305,7 +305,7 @@
-  *	malloc() and read() will be used instead.
+@@ -196,5 +196,5 @@
+ # define LibXViewDefines -DPRE_R4_ICCCM
+ # else
+-# define LibXViewDefines -DFULL_R5 -I$(OPENWINHOME)/include -DSUNOS41 -DX11R6
++# define LibXViewDefines -DNO_CAST_VATOAV -DFULL_R5 -I$(OPENWINHOME)/include -DSUNOS41 -DX11R6
+ # endif
+ #endif
+@@ -232,5 +232,5 @@
+  */
+ #ifndef DebugLibXView
+-#define DebugLibXView NO
++#define DebugLibXView NO
+ #endif
+ /*
+@@ -260,5 +260,5 @@
+  */
+ #ifndef InstallAllImages
+-#define InstallAllImages NO
++#define InstallAllImages YES
+ #endif
+ /*
+@@ -306,5 +306,5 @@
   */
  #ifndef OsHasMmap
 -#define OsHasMmap YES
 +#define OsHasMmap NO
  #endif
  /*
-  *	The implementation of internationalization support in XView depends
-@@ -360,7 +360,7 @@
-  *    	be defined as -PIC
+@@ -361,5 +361,5 @@
   */
  #ifndef PositionIndependentCodeFlag
 -#define PositionIndependentCodeFlag -PIC
 +#define PositionIndependentCodeFlag -fPIC
  #endif
  
- /*
diff --git a/x11/xview-config/patches/patch-ac b/x11/xview-config/patches/patch-ac
index 84a0d896b6e..d1763ba85a5 100644
--- a/x11/xview-config/patches/patch-ac
+++ b/x11/xview-config/patches/patch-ac
@@ -1,35 +1,29 @@
-$NetBSD: patch-ac,v 1.4 2000/09/13 20:21:54 jlam Exp $
-
---- XView.obj.orig	Tue Jun 29 01:13:20 1993
-+++ XView.obj
-@@ -15,7 +15,7 @@
-             STD_DEFINES = StandardDefines LibXViewDefines 
+$NetBSD: patch-ac,v 1.5 2001/05/02 21:46:08 dmcmahill Exp $
+ 
+--- ./XView.obj.orig	Tue Jun 29 01:13:20 1993
++++ ./XView.obj	Tue May  1 22:40:31 2001
+@@ -16,5 +16,5 @@
  #endif
  HEADERS= ${HDRSPUBLIC} ${HDRSPRIVATE}
 -INCLUDES= -I$(BUILDINCDIR)$(INCDIR) 
 +INCLUDES= -I$(BUILDINCDIR)/$(INCDIR) 
  OBJS = $(TEXT_OBJS) $(DATA_OBJS) $(SPECIAL_OBJS)
  #if !NotLibXView
- ALLFILES = $(SRCS) $(HEADERS)
-@@ -85,14 +85,14 @@
- 
+@@ -86,5 +86,5 @@
  #if SubdirHasPublicHeaders
  # if NotLibXView
 -BuildIncludes($(HDRSPUBLIC),$(PUB_INCDIR),/**/)
 +BuildIncludes($(HDRSPUBLIC),$(PUB_INCDIR),.)
  
  install::
- 	$(MKDIRHIER) $(PUB_HEADER_DEST)
- 
+@@ -93,5 +93,5 @@
  InstallMultiple($(HDRSPUBLIC),$(PUB_HEADER_DEST))
  # else
 -BuildIncludes($(HDRSPUBLIC),$(XVPUB_INCDIR),/**/)
 +BuildIncludes($(HDRSPUBLIC),$(XVPUB_INCDIR),.)
  
  install::
- 	$(MKDIRHIER) $(XVPUB_HEADER_DEST)
-@@ -103,9 +103,9 @@
- 
+@@ -104,7 +104,7 @@
  #if SubdirHasPrivateHeaders
  # if NotLibXView
 -BuildIncludes($(HDRSPRIVATE),$(PRI_INCDIR),/**/)
@@ -39,4 +33,3 @@ $NetBSD: patch-ac,v 1.4 2000/09/13 20:21:54 jlam Exp $
 +BuildIncludes($(HDRSPRIVATE),$(XVPRI_INCDIR),.)
  # endif
  # if InstallPrivateHeaders
- #  if NotLibXView
diff --git a/x11/xview-config/patches/patch-ad b/x11/xview-config/patches/patch-ad
index 20d5ec10373..be81b13e387 100644
--- a/x11/xview-config/patches/patch-ad
+++ b/x11/xview-config/patches/patch-ad
@@ -1,9 +1,8 @@
-$NetBSD: patch-ad,v 1.5 2000/09/13 20:21:54 jlam Exp $
-
---- XView.rules.orig	Tue Jun 29 01:13:20 1993
-+++ XView.rules
-@@ -141,6 +141,23 @@
-  * included in both the .so and the .sa parts of the library.
+$NetBSD: patch-ad,v 1.6 2001/05/02 21:46:08 dmcmahill Exp $
+ 
+--- ./XView.rules.orig	Tue Jun 29 01:13:20 1993
++++ ./XView.rules	Tue May  1 22:40:32 2001
+@@ -142,4 +142,21 @@
   */
  #ifndef SubdirBuildNormalSharedLibraryTarget
 +#if UseElfFormat == YES
@@ -25,17 +24,55 @@ $NetBSD: patch-ad,v 1.5 2000/09/13 20:21:54 jlam Exp $
 +#else
  #define SubdirBuildNormalSharedLibraryTarget(libname,rev,solist,sodir)		@@\
  AllTarget(lib/**/libname.so.rev)					@@\
- 									@@\
-@@ -156,6 +173,7 @@
- clean::									@@\
+@@ -157,4 +174,5 @@
  	$(RM) lib/**/libname.so.rev sodir/?*.o strings*
  
 +#endif
  #endif /* SubdirBuildNormalSharedLibraryTarget */
  
+@@ -246,6 +264,7 @@
+ .c.o:									@@\
+ 	$(RM) $@ shared/$@						@@\
+-	$(CC) $(PIC) $(SHAREDCODEDEF) $(SHLIBDEF) $(CFLAGS) $(STRCONST) -c $*.c \	@@\
+-		-o shared/$*.o						@@\
++	$(CC) -c $(PIC) $(SHAREDCODEDEF) \                              @@\
++		$(SHLIBDEF) $(CFLAGS) $(STRCONST) $*.c			@@\
++	$(CP) $*.o shared/$*.o						@@\
+ 									@@\
+ clean::									@@\
+@@ -257,22 +276,24 @@
+ 
  /*
-@@ -366,9 +384,9 @@
- #ifndef InstallSharedLibraryNoBuild
+- * SubdirSharedAndDebuggedLibraryObjectRule - generate make rules to build shared,
+- * debuggable, and "normal" object files.
++ * SubdirSharedAndDebuggedLibraryObjectRule - generate make rules to
++ * build shared, debuggable, and "normal" object files.
+  */
+ #ifndef SubdirSharedAndDebuggedLibraryObjectRule
+-#define SubdirSharedAndDebuggedLibraryObjectRule()				@@\
++#define SubdirSharedAndDebuggedLibraryObjectRule()			@@\
+ all::									@@\
+ 	-@if [ ! -d shared ]; then mkdir shared; else exit 0; fi	@@\
+ 	-@if [ ! -f $(XSTR_STRINGS_FILE) ]; then \                      @@\
+ 		touch $(XSTR_STRINGS_FILE);  else exit 0; fi            @@\
+-	-@if [ -f strings ]; then $(RM) strings; else exit 0; fi        @@\
+-	$(LN) $(XSTR_STRINGS_FILE) strings                              @@\
++	-@if [ ! -f strings ]; then \                                   @@\
++		$(LN) $(XSTR_STRINGS_FILE) strings; else exit 0; fi     @@\
+ 	-@if [ ! -d debugger ]; then mkdir debugger; else exit 0; fi	@@\
+ 									@@\
+ .c.o:									@@\
+ 	$(RM) $@ shared/$@ debugger/$@					@@\
+-	$(CC) -g -c $(SHLIBDEF) $(CFLAGS) $(STRCONST) $*.c		@@\
++	$(CC) -c -g $(SHLIBDEF) $(CFLAGS) $(STRCONST) $*.c		@@\
+ 	$(CP) $*.o debugger/$*.o					@@\
+-	$(CC) -c $(SHLIBDEF) $(CFLAGS) $(STRCONST) $*.c				@@\
++	$(CC) -c $(PIC) $(SHAREDCODEDEF) \                              @@\
++		$(SHLIBDEF) $(CFLAGS) $(STRCONST) $*.c			@@\
++	$(CP) $*.o shared/$*.o						@@\
+ 									@@\
+ clean::									@@\
+@@ -367,7 +388,7 @@
  #define	InstallSharedLibraryNoBuild(libname,rev,dest)				@@\
  install::  								@@\
 -        $(RM) /dest/lib/**/libname.so                                   @@\
@@ -45,4 +82,3 @@ $NetBSD: patch-ad,v 1.5 2000/09/13 20:21:54 jlam Exp $
 +	(cd dest; $(LN) lib/**/libname.so.rev lib/**/libname.so)
  
  #endif /* InstallSharedLibraryNoBuild */
- 
diff --git a/x11/xview-config/patches/patch-ae b/x11/xview-config/patches/patch-ae
index ff54f3ac180..5e8a3f5bb58 100644
--- a/x11/xview-config/patches/patch-ae
+++ b/x11/xview-config/patches/patch-ae
@@ -1,18 +1,15 @@
-$NetBSD: patch-ae,v 1.5 2000/10/23 18:02:56 jlam Exp $
-
---- XView.tmpl.orig	Sun Jun 26 22:10:00 1994
-+++ XView.tmpl
-@@ -96,7 +96,7 @@
-  *      Work around small conflict with Project.tmpl file
+$NetBSD: patch-ae,v 1.6 2001/05/02 21:46:08 dmcmahill Exp $
+ 
+--- ./XView.tmpl.orig	Sun Jun 26 22:10:00 1994
++++ ./XView.tmpl	Tue May  1 22:40:31 2001
+@@ -97,5 +97,5 @@
   */
  #if UseInstalled
 -              MKDIRHIER = BourneShell BinDir/mkdirhier
 +              MKDIRHIER = mkdirhier
  #endif
  
- #if OsHasLocale
-@@ -192,14 +192,6 @@
-                      AS = as
+@@ -193,12 +193,4 @@
   */
  /*
 - *	use the same trick X11R5 does for defining rules for installed libs
@@ -25,18 +22,14 @@ $NetBSD: patch-ae,v 1.5 2000/10/23 18:02:56 jlam Exp $
 -/*
   *	Temporary directory used during build process before the include
   *	files are installed.  This is just a place where symbolic links are
-  *	placed to point back to the actual files in the build hierarchy to
-@@ -224,7 +216,7 @@
-  *	afterwards.
+@@ -225,5 +217,5 @@
   */
  #ifndef XVIncludeDirName
 -#define XVIncludeDirName /include
 +#define XVIncludeDirName include
  #endif
                   INCDIR = XVIncludeDirName
- /*
-@@ -356,10 +348,10 @@
- 
+@@ -357,8 +349,8 @@
  #if SystemV4
               SYSV_CLIENT_LIB = -lintl -ldl
 -	     XVCLIENTSYSDEFINES = -DSVR4 -DSYSV
@@ -47,9 +40,7 @@ $NetBSD: patch-ae,v 1.5 2000/10/23 18:02:56 jlam Exp $
 +             XVCLIENTSYSDEFINES = -DSUNOS41
  #endif
  
- /*
-@@ -371,16 +363,16 @@
-  */
+@@ -372,14 +364,14 @@
  
  #if XvI18nLevel == 4
 -	XVCLIENTI18NDEFINES = -DOW_I18N_L4 -DOW_I18N_L3 -DOW_I18N -DFULL_R5
@@ -71,4 +62,3 @@ $NetBSD: patch-ae,v 1.5 2000/10/23 18:02:56 jlam Exp $
 +        XVCLIENTDEFINES = $(XVCLIENTSYSDEFINES) $(XVCLIENTI18NDEFINES)
  
  /*
-  *	Define libraries for XView clients