Use unified diffs

5 files changed, 177 insertions, 298 deletions

diff --git a/x11/xview-config/patches/patch-aa b/x11/xview-config/patches/patch-aa
index 86fe31eaefd..db19781c1b1 100644
--- a/x11/xview-config/patches/patch-aa
+++ b/x11/xview-config/patches/patch-aa
@@ -1,22 +1,13 @@
-$NetBSD: patch-aa,v 1.2 1998/08/07 11:18:32 agc Exp $
+$NetBSD: patch-aa,v 1.3 2000/09/13 15:30:25 jlam Exp $
 
-diff -rc ../old/xview3.2p1-X11R6/config/Imakefile Imakefile
-*** ../old/xview3.2p1-X11R6/config/Imakefile	Tue Jun 29 01:13:19 1993
---- Imakefile	Sun Nov 20 13:38:58 1994
-***************
-*** 8,14 ****
-  /**/# config directory
-  /**/# @(#)Imakefile	1.9 28 Jun 1993 SMI
-  
-! XVFILES = XView.cf XView.lib XView.obj XView.rules XView.tmpl library.tmpl
-  CFFILES = $(XVFILES) $(HEADERS)
-  
-  InstallMultipleDestFlags(install,$(CFFILES),$(CONFIGDIR),$(INSTDATFLAGS))
---- 8,14 ----
-  /**/# config directory
-  /**/# @(#)Imakefile	1.9 28 Jun 1993 SMI
-  
-! XVFILES = XView.cf XView.lib XView.obj XView.rules XView.tmpl XView.prog
-  CFFILES = $(XVFILES) $(HEADERS)
-  
-  InstallMultipleDestFlags(install,$(CFFILES),$(CONFIGDIR),$(INSTDATFLAGS))
+--- Imakefile.orig	Tue Jun 29 01:13:19 1993
++++ Imakefile
+@@ -8,7 +8,7 @@
+ /**/# config directory
+ /**/# @(#)Imakefile	1.9 28 Jun 1993 SMI
+ 
+-XVFILES = XView.cf XView.lib XView.obj XView.rules XView.tmpl library.tmpl
++XVFILES = XView.cf XView.lib XView.obj XView.rules XView.tmpl XView.prog
+ CFFILES = $(XVFILES) $(HEADERS)
+ 
+ InstallMultipleDestFlags(install,$(CFFILES),$(CONFIGDIR),$(INSTDATFLAGS))
diff --git a/x11/xview-config/patches/patch-ab b/x11/xview-config/patches/patch-ab
index 1c2a4873510..6a819d7eb66 100644
--- a/x11/xview-config/patches/patch-ab
+++ b/x11/xview-config/patches/patch-ab
@@ -1,90 +1,49 @@
-$NetBSD: patch-ab,v 1.3 1999/12/15 23:44:10 dmcmahill Exp $
+$NetBSD: patch-ab,v 1.4 2000/09/13 15:30:26 jlam Exp $
 
-diff -rc ../old/xview3.2p1-X11R6/config/XView.cf XView.cf
-*** ../old/xview3.2p1-X11R6/config/XView.cf	Sun Jun 26 22:09:19 1994
---- XView.cf	Sun Nov 20 13:38:58 1994
-***************
-*** 101,107 ****
-   *	the appropriate value.
-   */
-  #ifndef XVDestDir
-! #define XVDestDir /usr/X11/xview
-  #endif
-  /*
-   *	Command to add object modules to the library.
---- 101,107 ----
-   *	the appropriate value.
-   */
-  #ifndef XVDestDir
-! #define XVDestDir /usr/X11R6
-  #endif
-  /*
-   *	Command to add object modules to the library.
-***************
-*** 139,145 ****
-   *	installed in $(DESTDIR)/lib/X11/config (aka $(CONFIGDIR)).
-   */ 
-  #ifndef OnlyNeedsNewXViewConfigInstalled 
-! #define OnlyNeedsNewXViewConfigInstalled NO 
-  #endif 
-  /*
-   *	If you would like the XView man pages to be installed in 
---- 139,145 ----
-   *	installed in $(DESTDIR)/lib/X11/config (aka $(CONFIGDIR)).
-   */ 
-  #ifndef OnlyNeedsNewXViewConfigInstalled 
-! #define OnlyNeedsNewXViewConfigInstalled YES 
-  #endif 
-  /*
-   *	If you would like the XView man pages to be installed in 
-***************
-*** 305,311 ****
-   *	malloc() and read() will be used instead.
-   */
-  #ifndef OsHasMmap
-! #define OsHasMmap YES
-  #endif
-  /*
-   *	The implementation of internationalization support in XView depends
---- 305,311 ----
-   *	malloc() and read() will be used instead.
-   */
-  #ifndef OsHasMmap
-! #define OsHasMmap NO
-  #endif
-  /*
-   *	The implementation of internationalization support in XView depends
-***************
-*** 315,321 ****
-   *	features disabled.
-   */
-  #ifndef OsHasLocale
-! #define OsHasLocale YES
-  #endif
-  /*
-   *	There are number of memory allocation macros in lib/libxview/base.h 
---- 315,321 ----
-   *	features disabled.
-   */
-  #ifndef OsHasLocale
-! #define OsHasLocale NO
-  #endif
-  /*
-   *	There are number of memory allocation macros in lib/libxview/base.h 
-***************
-*** 360,366 ****
-   *    	be defined as -PIC
-   */
-  #ifndef PositionIndependentCodeFlag
-! #define PositionIndependentCodeFlag -PIC
-  #endif
-  
-  /*
---- 360,366 ----
-   *    	be defined as -PIC
-   */
-  #ifndef PositionIndependentCodeFlag
-! #define PositionIndependentCodeFlag -fPIC
-  #endif
-  
-  /*
+--- XView.cf.orig	Sun Jun 26 22:09:19 1994
++++ XView.cf
+@@ -101,7 +101,7 @@
+  *	the appropriate value.
+  */
+ #ifndef XVDestDir
+-#define XVDestDir /usr/X11/xview
++#define XVDestDir /usr/X11R6
+ #endif
+ /*
+  *	Command to add object modules to the library.
+@@ -139,7 +139,7 @@
+  *	installed in $(DESTDIR)/lib/X11/config (aka $(CONFIGDIR)).
+  */ 
+ #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.
+  */
+ #ifndef OsHasMmap
+-#define OsHasMmap YES
++#define OsHasMmap NO
+ #endif
+ /*
+  *	The implementation of internationalization support in XView depends
+@@ -315,7 +315,7 @@
+  *	features disabled.
+  */
+ #ifndef OsHasLocale
+-#define OsHasLocale YES
++#define OsHasLocale NO
+ #endif
+ /*
+  *	There are number of memory allocation macros in lib/libxview/base.h 
+@@ -360,7 +360,7 @@
+  *    	be defined as -PIC
+  */
+ #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 8db2fb244ac..116193cf3ce 100644
--- a/x11/xview-config/patches/patch-ac
+++ b/x11/xview-config/patches/patch-ac
@@ -1,74 +1,42 @@
-$NetBSD: patch-ac,v 1.2 1998/08/07 11:18:33 agc Exp $
+$NetBSD: patch-ac,v 1.3 2000/09/13 15:30:26 jlam Exp $
 
-diff -rc ../old/xview3.2p1-X11R6/config/XView.obj XView.obj
-*** ../old/xview3.2p1-X11R6/config/XView.obj	Tue Jun 29 01:13:20 1993
---- XView.obj	Sun Nov 20 13:38:59 1994
-***************
-*** 15,21 ****
-              STD_DEFINES = StandardDefines LibXViewDefines 
-  #endif
-  HEADERS= ${HDRSPUBLIC} ${HDRSPRIVATE}
-! INCLUDES= -I$(BUILDINCDIR)$(INCDIR) 
-  OBJS = $(TEXT_OBJS) $(DATA_OBJS) $(SPECIAL_OBJS)
-  #if !NotLibXView
-  ALLFILES = $(SRCS) $(HEADERS)
---- 15,21 ----
-              STD_DEFINES = StandardDefines LibXViewDefines 
-  #endif
-  HEADERS= ${HDRSPUBLIC} ${HDRSPRIVATE}
-! INCLUDES= -I$(BUILDINCDIR)/$(INCDIR) 
-  OBJS = $(TEXT_OBJS) $(DATA_OBJS) $(SPECIAL_OBJS)
-  #if !NotLibXView
-  ALLFILES = $(SRCS) $(HEADERS)
-***************
-*** 85,98 ****
-  
-  #if SubdirHasPublicHeaders
-  # if NotLibXView
-! BuildIncludes($(HDRSPUBLIC),$(PUB_INCDIR),/**/)
-  
-  install::
-  	$(MKDIRHIER) $(PUB_HEADER_DEST)
-  
-  InstallMultiple($(HDRSPUBLIC),$(PUB_HEADER_DEST))
-  # else
-! BuildIncludes($(HDRSPUBLIC),$(XVPUB_INCDIR),/**/)
-  
-  install::
-  	$(MKDIRHIER) $(XVPUB_HEADER_DEST)
---- 85,98 ----
-  
-  #if SubdirHasPublicHeaders
-  # if NotLibXView
-! BuildIncludes($(HDRSPUBLIC),$(PUB_INCDIR),.)
-  
-  install::
-  	$(MKDIRHIER) $(PUB_HEADER_DEST)
-  
-  InstallMultiple($(HDRSPUBLIC),$(PUB_HEADER_DEST))
-  # else
-! BuildIncludes($(HDRSPUBLIC),$(XVPUB_INCDIR),.)
-  
-  install::
-  	$(MKDIRHIER) $(XVPUB_HEADER_DEST)
-***************
-*** 103,111 ****
-  
-  #if SubdirHasPrivateHeaders
-  # if NotLibXView
-! BuildIncludes($(HDRSPRIVATE),$(PRI_INCDIR),/**/)
-  # else
-! BuildIncludes($(HDRSPRIVATE),$(XVPRI_INCDIR),/**/)
-  # endif
-  # if InstallPrivateHeaders
-  #  if NotLibXView
---- 103,111 ----
-  
-  #if SubdirHasPrivateHeaders
-  # if NotLibXView
-! BuildIncludes($(HDRSPRIVATE),$(PRI_INCDIR),.)
-  # else
-! BuildIncludes($(HDRSPRIVATE),$(XVPRI_INCDIR),.)
-  # endif
-  # if InstallPrivateHeaders
-  #  if NotLibXView
+--- XView.obj.orig	Tue Jun 29 01:13:20 1993
++++ XView.obj
+@@ -15,7 +15,7 @@
+             STD_DEFINES = StandardDefines LibXViewDefines 
+ #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 @@
+ 
+ #if SubdirHasPublicHeaders
+ # if NotLibXView
+-BuildIncludes($(HDRSPUBLIC),$(PUB_INCDIR),/**/)
++BuildIncludes($(HDRSPUBLIC),$(PUB_INCDIR),.)
+ 
+ install::
+ 	$(MKDIRHIER) $(PUB_HEADER_DEST)
+ 
+ InstallMultiple($(HDRSPUBLIC),$(PUB_HEADER_DEST))
+ # else
+-BuildIncludes($(HDRSPUBLIC),$(XVPUB_INCDIR),/**/)
++BuildIncludes($(HDRSPUBLIC),$(XVPUB_INCDIR),.)
+ 
+ install::
+ 	$(MKDIRHIER) $(XVPUB_HEADER_DEST)
+@@ -103,9 +103,9 @@
+ 
+ #if SubdirHasPrivateHeaders
+ # if NotLibXView
+-BuildIncludes($(HDRSPRIVATE),$(PRI_INCDIR),/**/)
++BuildIncludes($(HDRSPRIVATE),$(PRI_INCDIR),.)
+ # else
+-BuildIncludes($(HDRSPRIVATE),$(XVPRI_INCDIR),/**/)
++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 b29f0b5b8fd..4cfdfcb8f19 100644
--- a/x11/xview-config/patches/patch-ad
+++ b/x11/xview-config/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.3 1999/07/23 22:52:17 tron Exp $
+$NetBSD: patch-ad,v 1.4 2000/09/13 15:30:26 jlam Exp $
 
---- XView.rules.orig	Tue Jun 29 07:13:20 1993
-+++ XView.rules	Sat Jul 24 00:28:53 1999
+--- 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.
   */
diff --git a/x11/xview-config/patches/patch-ae b/x11/xview-config/patches/patch-ae
index a163c7b8daf..b900e20200e 100644
--- a/x11/xview-config/patches/patch-ae
+++ b/x11/xview-config/patches/patch-ae
@@ -1,113 +1,74 @@
-$NetBSD: patch-ae,v 1.2 1998/08/07 11:18:34 agc Exp $
+$NetBSD: patch-ae,v 1.3 2000/09/13 15:30:26 jlam Exp $
 
-*** XView.tmpl.orig	Sun Jun 26 21:10:00 1994
---- XView.tmpl	Sun May  3 22:09:02 1998
-***************
-*** 96,102 ****
-   *      Work around small conflict with Project.tmpl file
-   */
-  #if UseInstalled
-!               MKDIRHIER = BourneShell BinDir/mkdirhier
-  #endif
-  
-  #if OsHasLocale
---- 96,102 ----
-   *      Work around small conflict with Project.tmpl file
-   */
-  #if UseInstalled
-!               MKDIRHIER = mkdirhier
-  #endif
-  
-  #if OsHasLocale
-***************
-*** 192,205 ****
-                       AS = as
-   */
-  /*
--  *	use the same trick X11R5 does for defining rules for installed libs
--  */
-- #ifdef UseInstalled
-- #define _Use(a,b) a
-- #else
-- #define _Use(a,b) b
-- #endif
-- /*
-   *	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
---- 192,197 ----
-***************
-*** 224,230 ****
-   *	afterwards.
-   */
-  #ifndef XVIncludeDirName
-! #define XVIncludeDirName /include
-  #endif
-                   INCDIR = XVIncludeDirName
-  /*
---- 216,222 ----
-   *	afterwards.
-   */
-  #ifndef XVIncludeDirName
-! #define XVIncludeDirName include
-  #endif
-                   INCDIR = XVIncludeDirName
-  /*
-***************
-*** 356,365 ****
-  
-  #if SystemV4
-               SYSV_CLIENT_LIB = -lintl -ldl
-! 	     XVCLIENTSYSDEFINES = -DSVR4 -DSYSV
-  #else
-               SYSV_CLIENT_LIB =
-! 	     XVCLIENTSYSDEFINES = -DSUNOS41
-  #endif
-  
-  /*
---- 348,357 ----
-  
-  #if SystemV4
-               SYSV_CLIENT_LIB = -lintl -ldl
-!              XVCLIENTSYSDEFINES = -DSVR4 -DSYSV
-  #else
-               SYSV_CLIENT_LIB =
-!              XVCLIENTSYSDEFINES = -DSUNOS41
-  #endif
-  
-  /*
-***************
-*** 371,386 ****
-   */
-  
-  #if XvI18nLevel == 4
-! 	XVCLIENTI18NDEFINES = -DOW_I18N_L4 -DOW_I18N_L3 -DOW_I18N -DFULL_R5
-! 	XVCLIENTMISCLIB = -lw
-! 	XVCLIENTINCLUDES = -I$(OPENWINHOME)/include
-  #else
-! 	XVCLIENTI18NDEFINES = -DOW_I18N_L3
-! 	XVCLIENTMISCLIB = 
-! 	XVCLIENTINCLUDES = 
-  #endif
-  
-! 	XVCLIENTDEFINES = $(XVCLIENTSYSDEFINES) $(XVCLIENTI18NDEFINES)
-  
-  /*
-   *	Define libraries for XView clients
---- 363,378 ----
-   */
-  
-  #if XvI18nLevel == 4
-!         XVCLIENTI18NDEFINES = -DOW_I18N_L4 -DOW_I18N_L3 -DOW_I18N -DFULL_R5
-!         XVCLIENTMISCLIB = -lw
-!         XVCLIENTINCLUDES = -I$(OPENWINHOME)/include
-  #else
-!         XVCLIENTI18NDEFINES = -DOW_I18N_L3
-!         XVCLIENTMISCLIB = 
-!         XVCLIENTINCLUDES = 
-  #endif
-  
-!         XVCLIENTDEFINES = $(XVCLIENTSYSDEFINES) $(XVCLIENTI18NDEFINES)
-  
-  /*
-   *	Define libraries for XView clients
+--- XView.tmpl.orig	Sun Jun 26 22:10:00 1994
++++ XView.tmpl
+@@ -96,7 +96,7 @@
+  *      Work around small conflict with Project.tmpl file
+  */
+ #if UseInstalled
+-              MKDIRHIER = BourneShell BinDir/mkdirhier
++              MKDIRHIER = mkdirhier
+ #endif
+ 
+ #if OsHasLocale
+@@ -192,14 +192,6 @@
+                      AS = as
+  */
+ /*
+- *	use the same trick X11R5 does for defining rules for installed libs
+- */
+-#ifdef UseInstalled
+-#define _Use(a,b) a
+-#else
+-#define _Use(a,b) b
+-#endif
+-/*
+  *	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.
+  */
+ #ifndef XVIncludeDirName
+-#define XVIncludeDirName /include
++#define XVIncludeDirName include
+ #endif
+                  INCDIR = XVIncludeDirName
+ /*
+@@ -356,10 +348,10 @@
+ 
+ #if SystemV4
+              SYSV_CLIENT_LIB = -lintl -ldl
+-	     XVCLIENTSYSDEFINES = -DSVR4 -DSYSV
++             XVCLIENTSYSDEFINES = -DSVR4 -DSYSV
+ #else
+              SYSV_CLIENT_LIB =
+-	     XVCLIENTSYSDEFINES = -DSUNOS41
++             XVCLIENTSYSDEFINES = -DSUNOS41
+ #endif
+ 
+ /*
+@@ -371,16 +363,16 @@
+  */
+ 
+ #if XvI18nLevel == 4
+-	XVCLIENTI18NDEFINES = -DOW_I18N_L4 -DOW_I18N_L3 -DOW_I18N -DFULL_R5
+-	XVCLIENTMISCLIB = -lw
+-	XVCLIENTINCLUDES = -I$(OPENWINHOME)/include
++        XVCLIENTI18NDEFINES = -DOW_I18N_L4 -DOW_I18N_L3 -DOW_I18N -DFULL_R5
++        XVCLIENTMISCLIB = -lw
++        XVCLIENTINCLUDES = -I$(OPENWINHOME)/include
+ #else
+-	XVCLIENTI18NDEFINES = -DOW_I18N_L3
+-	XVCLIENTMISCLIB = 
+-	XVCLIENTINCLUDES = 
++        XVCLIENTI18NDEFINES = -DOW_I18N_L3
++        XVCLIENTMISCLIB = 
++        XVCLIENTINCLUDES = 
+ #endif
+ 
+-	XVCLIENTDEFINES = $(XVCLIENTSYSDEFINES) $(XVCLIENTI18NDEFINES)
++        XVCLIENTDEFINES = $(XVCLIENTSYSDEFINES) $(XVCLIENTI18NDEFINES)
+ 
+ /*
+  *	Define libraries for XView clients