Consolidate patches of same file into one patch

4 files changed, 46 insertions, 80 deletions

diff --git a/x11/tvtwm/files/patch-sum b/x11/tvtwm/files/patch-sum
index 157702a5e42..879d6284089 100644
--- a/x11/tvtwm/files/patch-sum
+++ b/x11/tvtwm/files/patch-sum
@@ -1,8 +1,6 @@
-$NetBSD: patch-sum,v 1.5 2000/09/11 00:58:29 wiz Exp $
+$NetBSD: patch-sum,v 1.6 2000/10/02 08:01:12 jlam Exp $
 
-MD5 (patch-aa) = d304c6366ef0dcb3ab1a2d00896d6fe9
-MD5 (patch-ab) = e65958b07272ba20302d0ffcb9501789
-MD5 (patch-ac) = 5cd534d6deaf3b8275e30828d2fa9926
+MD5 (patch-aa) = 14e3d6f232a8de8b7736d8fb00f5b43b
 MD5 (patch-ad) = e8e46b5564cb6ec6ca7f2118a7c4fe95
 MD5 (patch-ae) = b6ba9900002aec7938ff956557c0b0b7
 MD5 (patch-af) = 4d004d60e742e3b2d1fccfd0c59b9685
diff --git a/x11/tvtwm/patches/patch-aa b/x11/tvtwm/patches/patch-aa
index 6999d96e2b7..e98b1923d12 100644
--- a/x11/tvtwm/patches/patch-aa
+++ b/x11/tvtwm/patches/patch-aa
@@ -1,8 +1,41 @@
-$NetBSD: patch-aa,v 1.2 1999/07/21 04:17:50 mrg Exp $
+$NetBSD: patch-aa,v 1.3 2000/10/02 08:01:13 jlam Exp $
 
---- Imakefile.orig	Fri Feb  3 11:25:44 1995
-+++ Imakefile	Sun Jun 20 00:19:00 1999
-@@ -93,9 +93,9 @@
+--- Imakefile.orig	Thu Feb  2 19:25:44 1995
++++ Imakefile
+@@ -51,12 +51,12 @@
+ XCOMM                                 <cross@eng.umd.edu>
+ XCOMM
+ XCOMM   Also note, if you install your libXpm.a in a strange place, you'll
+-XCOMM have to adjust $(XPMLIB) below.  You may also have to change the
++XCOMM have to adjust $(XPM_LIB) below.  You may also have to change the
+ XCOMM include path of the compile, so that the code can include from
+ XCOMM <X11/xpm.h>.
+ XCOMM
+ 
+-         XPMLIB = -lXpm
++        XPM_LIB = -lXpm
+         XPM_DEF = -DXPM
+     XLOADIM_DEF = -DXLOADIMAGE=\"$(BINDIR)/xloadimage\"
+ 
+@@ -71,7 +71,7 @@
+ 
+ XCOMM   Various defines to pass into twm.c
+ 
+-#if DefaultToM4
++#ifdef DefaultToM4
+          M4_DEF = -DM4_DEFAULT
+ #endif
+ #ifdef No_waitpid
+@@ -79,7 +79,7 @@
+ #endif
+        TWM_DEFS = $(XLOADIM_DEF) $(M4_DEF) $(WAITPID_DEF)
+ 
+-LOCAL_LIBRARIES = $(XMULIB) $(EXTENSIONLIB) $(XPMLIB) $(XLIB)
++LOCAL_LIBRARIES = $(XMULIB) $(EXTENSIONLIB) $(XPM_LIB) $(XLIB)
+        LINTLIBS = $(LINTXMU) $(LINTEXTENSIONLIB) $(LINTXLIB)
+         DEFINES = -DSHAPE $(RELEASE_DEFINES) $(LOCAL_DEFINES) $(SIGNAL_DEFINES)
+ 
+@@ -93,11 +93,11 @@
                    iconmgr.o cursor.o icons.o vdt.o move.o LocPixmap.o \
                    regexp.o
  
@@ -12,9 +45,12 @@ $NetBSD: patch-aa,v 1.2 1999/07/21 04:17:50 mrg Exp $
 -SpecialObjectRule(parse.o,NullParameter,'-DSYSTEM_INIT_FILE="'$(TWMDIR)'/system.twmrc"')
 +SpecialObjectRule(parse.o,NullParameter,'-DSYSTEM_INIT_FILE="'$(TWMDIR)'/system.tvtwmrc"')
  SpecialObjectRule(vdt.o,NullParameter,$(XLOADIM_DEF))
- SpecialObjectRule(LocPixmap.o,NullParameter,'-DBITMAPDIR="$(INCDIR)/bitmaps"')
+-SpecialObjectRule(LocPixmap.o,NullParameter,'-DBITMAPDIR="$(INCDIR)/bitmaps"')
++SpecialObjectRule(LocPixmap.o,NullParameter,'-DBITMAPDIR="$(INCDIR)/X11/bitmaps"')
  SpecialObjectRule(twm.o,NullParameter,$(TWM_DEFS))
-@@ -120,11 +120,11 @@
+ 
+ #if defined(UltrixArchitecture) || defined(AlphaArchitecture)
+@@ -120,11 +120,12 @@
  XCOMM	ln $(BINDIR)/tvtwm $(BINDIR)/twm
  
  #if (ProjectX < 5)
@@ -25,11 +61,12 @@ $NetBSD: patch-aa,v 1.2 1999/07/21 04:17:50 mrg Exp $
 -InstallNonExecFile(system.twmrc,$(TWMDIR))
 -/* InstallNamedProg(ssetroot,xsetroot,$(BINDIR)) */
 +InstallNonExecFile(system.tvtwmrc,$(TWMDIR))
++/* Install ssetroot as ssetroot so we don't overwrite the real xsetroot */
 +InstallNamedProg(ssetroot,ssetroot,$(BINDIR))
  #endif
  
  gram.h gram.c: gram.y
-@@ -135,7 +135,10 @@
+@@ -135,7 +136,10 @@
  clean::
  	$(RM) y.tab.h y.tab.c lex.yy.c gram.h gram.c lex.c deftwmrc.c 
  
diff --git a/x11/tvtwm/patches/patch-ab b/x11/tvtwm/patches/patch-ab
deleted file mode 100644
index 2e9204af7c0..00000000000
--- a/x11/tvtwm/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 1999/06/21 13:17:53 mrg Exp $
-
---- Imakefile.orig	Fri Feb  3 11:25:44 1995
-+++ Imakefile	Mon Jun 21 23:01:49 1999
-@@ -58,7 +58,7 @@
- 
-          XPMLIB = -lXpm
-         XPM_DEF = -DXPM
--    XLOADIM_DEF = -DXLOADIMAGE=\"$(BINDIR)/xloadimage\"
-+XCOMM    XLOADIM_DEF = -DXLOADIMAGE=\"$(BINDIR)/xloadimage\"
- 
- XCOMM   Ultrix doesn't have a mkstemp in libc...
- XCOMM   Sys V doesn't seem to either...
diff --git a/x11/tvtwm/patches/patch-ac b/x11/tvtwm/patches/patch-ac
deleted file mode 100644
index 3ff313e8e97..00000000000
--- a/x11/tvtwm/patches/patch-ac
+++ /dev/null
@@ -1,56 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2000/02/05 15:58:29 wiz Exp $
-
-Index: Imakefile
-===================================================================
-RCS file: /home/siren/src/tvtwm/Imakefile,v
-retrieving revision 1.2
-retrieving revision 1.3
-diff -u -r1.2 -r1.3
---- Imakefile	1999/08/08 05:47:57	1.2
-+++ Imakefile	1999/08/08 05:56:46	1.3
-@@ -51,14 +51,14 @@
- XCOMM                                 <cross@eng.umd.edu>
- XCOMM
- XCOMM   Also note, if you install your libXpm.a in a strange place, you'll
--XCOMM have to adjust $(XPMLIB) below.  You may also have to change the
-+XCOMM have to adjust $(XPM_LIB) below.  You may also have to change the
- XCOMM include path of the compile, so that the code can include from
- XCOMM <X11/xpm.h>.
- XCOMM
- 
--         XPMLIB = -lXpm
--        XPM_DEF = -DXPM
--XCOMM    XLOADIM_DEF = -DXLOADIMAGE=\"$(BINDIR)/xloadimage\"
-+XPM_LIB = -lXpm
-+XPM_DEF = -DXPM
-+XLOADIM_DEF = -DXLOADIMAGE=\"$(BINDIR)/xloadimage\"
- 
- XCOMM   Ultrix doesn't have a mkstemp in libc...
- XCOMM   Sys V doesn't seem to either...
-@@ -71,7 +71,7 @@
- 
- XCOMM   Various defines to pass into twm.c
- 
--#if DefaultToM4
-+#ifdef DefaultToM4
-          M4_DEF = -DM4_DEFAULT
- #endif
- #ifdef No_waitpid
-@@ -79,7 +79,7 @@
- #endif
-        TWM_DEFS = $(XLOADIM_DEF) $(M4_DEF) $(WAITPID_DEF)
- 
--LOCAL_LIBRARIES = $(XMULIB) $(EXTENSIONLIB) $(XPMLIB) $(XLIB)
-+LOCAL_LIBRARIES = $(XMULIB) $(EXTENSIONLIB) $(XPM_LIB) $(XLIB)
-        LINTLIBS = $(LINTXMU) $(LINTEXTENSIONLIB) $(LINTXLIB)
-         DEFINES = -DSHAPE $(RELEASE_DEFINES) $(LOCAL_DEFINES) $(SIGNAL_DEFINES)
- 
-@@ -97,7 +97,7 @@
- 
- SpecialObjectRule(parse.o,NullParameter,'-DSYSTEM_INIT_FILE="'$(TWMDIR)'/system.tvtwmrc"')
- SpecialObjectRule(vdt.o,NullParameter,$(XLOADIM_DEF))
--SpecialObjectRule(LocPixmap.o,NullParameter,'-DBITMAPDIR="$(INCDIR)/bitmaps"')
-+SpecialObjectRule(LocPixmap.o,NullParameter,'-DBITMAPDIR="$(INCDIR)/X11/bitmaps"')
- SpecialObjectRule(twm.o,NullParameter,$(TWM_DEFS))
- 
- #if defined(UltrixArchitecture) || defined(AlphaArchitecture)