1 files changed, 41 insertions, 73 deletions
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