From fd58c6e2c7917bb411423b636caea58941def4e1 Mon Sep 17 00:00:00 2001 From: wiz Date: Thu, 5 Apr 2001 14:06:55 +0000 Subject: Standardize patch file names. --- x11/openmotif/files/patch-sum | 26 +++++++++++----------- x11/openmotif/patches/patch-Imakefile | 22 ------------------ x11/openmotif/patches/patch-aa | 22 ++++++++++++++++++ x11/openmotif/patches/patch-ab | 17 ++++++++++++++ x11/openmotif/patches/patch-ac | 15 +++++++++++++ x11/openmotif/patches/patch-ad | 13 +++++++++++ x11/openmotif/patches/patch-ae | 26 ++++++++++++++++++++++ x11/openmotif/patches/patch-af | 26 ++++++++++++++++++++++ x11/openmotif/patches/patch-ag | 12 ++++++++++ x11/openmotif/patches/patch-ah | 21 +++++++++++++++++ x11/openmotif/patches/patch-ai | 15 +++++++++++++ x11/openmotif/patches/patch-aj | 15 +++++++++++++ x11/openmotif/patches/patch-ak | 13 +++++++++++ x11/openmotif/patches/patch-al | 13 +++++++++++ x11/openmotif/patches/patch-bindings-Imakefile | 17 -------------- x11/openmotif/patches/patch-clients-uil-Imakefile | 15 ------------- x11/openmotif/patches/patch-config-cf-Imakefile | 13 ----------- x11/openmotif/patches/patch-config-cf-Motif.rules | 26 ---------------------- x11/openmotif/patches/patch-config-imake-Imakefile | 26 ---------------------- x11/openmotif/patches/patch-config-imake-imake.c | 12 ---------- x11/openmotif/patches/patch-config-util-Imakefile | 21 ----------------- x11/openmotif/patches/patch-lib-Mrm-Imakefile | 15 ------------- x11/openmotif/patches/patch-lib-Xm-Imakefile | 15 ------------- x11/openmotif/patches/patch-lib-Xm-TextF.c | 13 ----------- .../patch-tests-Performance-Startup-editor.c | 13 ----------- 25 files changed, 221 insertions(+), 221 deletions(-) delete mode 100644 x11/openmotif/patches/patch-Imakefile create mode 100644 x11/openmotif/patches/patch-aa create mode 100644 x11/openmotif/patches/patch-ab create mode 100644 x11/openmotif/patches/patch-ac create mode 100644 x11/openmotif/patches/patch-ad create mode 100644 x11/openmotif/patches/patch-ae create mode 100644 x11/openmotif/patches/patch-af create mode 100644 x11/openmotif/patches/patch-ag create mode 100644 x11/openmotif/patches/patch-ah create mode 100644 x11/openmotif/patches/patch-ai create mode 100644 x11/openmotif/patches/patch-aj create mode 100644 x11/openmotif/patches/patch-ak create mode 100644 x11/openmotif/patches/patch-al delete mode 100644 x11/openmotif/patches/patch-bindings-Imakefile delete mode 100644 x11/openmotif/patches/patch-clients-uil-Imakefile delete mode 100644 x11/openmotif/patches/patch-config-cf-Imakefile delete mode 100644 x11/openmotif/patches/patch-config-cf-Motif.rules delete mode 100644 x11/openmotif/patches/patch-config-imake-Imakefile delete mode 100644 x11/openmotif/patches/patch-config-imake-imake.c delete mode 100644 x11/openmotif/patches/patch-config-util-Imakefile delete mode 100644 x11/openmotif/patches/patch-lib-Mrm-Imakefile delete mode 100644 x11/openmotif/patches/patch-lib-Xm-Imakefile delete mode 100644 x11/openmotif/patches/patch-lib-Xm-TextF.c delete mode 100644 x11/openmotif/patches/patch-tests-Performance-Startup-editor.c (limited to 'x11') diff --git a/x11/openmotif/files/patch-sum b/x11/openmotif/files/patch-sum index 3635d291126..99bd82d6951 100644 --- a/x11/openmotif/files/patch-sum +++ b/x11/openmotif/files/patch-sum @@ -1,14 +1,14 @@ -$NetBSD: patch-sum,v 1.1.1.1 2000/10/29 16:17:13 mjl Exp $ +$NetBSD: patch-sum,v 1.2 2001/04/05 14:06:55 wiz Exp $ -MD5 (patch-Imakefile) = b0d7201103da27a6d8eb49fd9325a382 -MD5 (patch-bindings-Imakefile) = 8a311dcf028d78f1fef08a23e5f85d5f -MD5 (patch-clients-uil-Imakefile) = cecaebadac1061a4c2a2b69acf6dbaab -MD5 (patch-config-cf-Imakefile) = e2d172752d6e36a5efebe2b8955b5c7b -MD5 (patch-config-cf-Motif.rules) = c0c691eacd3b3e1223967068ba12fe68 -MD5 (patch-config-imake-Imakefile) = 570d224b859ce767dc8df5fc88aa80ec -MD5 (patch-config-imake-imake.c) = f5d718ba16e8b6c4a3a514ad971bcf25 -MD5 (patch-config-util-Imakefile) = a5e3445c5a4c5b8486d5ef8c420692f1 -MD5 (patch-lib-Mrm-Imakefile) = 7bb20ed98449504c5de9ee966c8213bf -MD5 (patch-lib-Xm-Imakefile) = b3f2972b681e9e3e859e7edb66b2e154 -MD5 (patch-lib-Xm-TextF.c) = b1dbdd4921baf45791a93c47850795e2 -MD5 (patch-tests-Performance-Startup-editor.c) = f9060865bfbe3b680fba391f2739725d +SHA1 (patch-aa) = dd7877ff9663475c5595df46d54358c02626aaba +SHA1 (patch-ab) = 3d5eb587c8e76ee661da8aa2de476f4d3f8e7f33 +SHA1 (patch-ac) = 9cd69af480755c5bafebc9b9fcf7f0670d4403c9 +SHA1 (patch-ad) = 5b609ccb106f42b94d893b15da9c913f6be462a1 +SHA1 (patch-ae) = 55dcfe1f6c26e37a591c387e067c953ff437c565 +SHA1 (patch-af) = eed0db72c910c8ca3fa84688e61e5a7495844c62 +SHA1 (patch-ag) = 548a08419a5e3511897407ca7ae0f0d5b9c163d7 +SHA1 (patch-ah) = f0b2028398eab6d72b04c50ca6ee50c9736dcede +SHA1 (patch-ai) = a75f59d53b9902c3130e43ff82f65b0676359ad0 +SHA1 (patch-aj) = 92b4fc367c0728154d5e29349d5e3ae463921f21 +SHA1 (patch-ak) = 0d0ba4bbbe6742c5a8b2fda475adfe8a05647cc1 +SHA1 (patch-al) = 8423174dcf89e00e76ce0a27b3d7c27cf3540a17 diff --git a/x11/openmotif/patches/patch-Imakefile b/x11/openmotif/patches/patch-Imakefile deleted file mode 100644 index 6571a68b57a..00000000000 --- a/x11/openmotif/patches/patch-Imakefile +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-Imakefile,v 1.1.1.1 2000/10/29 16:17:13 mjl Exp $ - ---- Imakefile.orig Thu May 4 08:30:42 2000 -+++ Imakefile Wed Aug 9 19:29:42 2000 -@@ -57,7 +57,7 @@ - ImakeDependency(xmakefile) - xmakefile:: Imakefile - RMoveToBakFile(xmakefile) -- $(IMAKE_CMD) -s xmakefile -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR) -+ $(IMAKE) -s xmakefile -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR) - - - VerifyOS:: -@@ -89,7 +90,7 @@ - #ifdef UseInstalled - TESTS_IMAKE = $(IMAKE) -DUseInstalled - #else --TESTS_IMAKE = ../$(IMAKE) -+TESTS_IMAKE = $(IMAKE) - #endif - DIRS_TO_CREATE = $(USRLIBDIR) $(BINDIR) $(INCDIR) $(USRINCDIR) $(LIBDIR) $(XAPPLOADDIR) - CDE_DIRS_TO_CREATE = $(USRLIBDIR) $(BINDIR) $(PROJECTROOT)/share/include diff --git a/x11/openmotif/patches/patch-aa b/x11/openmotif/patches/patch-aa new file mode 100644 index 00000000000..d8f9e186ca1 --- /dev/null +++ b/x11/openmotif/patches/patch-aa @@ -0,0 +1,22 @@ +$NetBSD: patch-aa,v 1.1 2001/04/05 14:06:56 wiz Exp $ + +--- Imakefile.orig Thu May 4 08:30:42 2000 ++++ Imakefile Wed Aug 9 19:29:42 2000 +@@ -57,7 +57,7 @@ + ImakeDependency(xmakefile) + xmakefile:: Imakefile + RMoveToBakFile(xmakefile) +- $(IMAKE_CMD) -s xmakefile -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR) ++ $(IMAKE) -s xmakefile -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR) + + + VerifyOS:: +@@ -89,7 +90,7 @@ + #ifdef UseInstalled + TESTS_IMAKE = $(IMAKE) -DUseInstalled + #else +-TESTS_IMAKE = ../$(IMAKE) ++TESTS_IMAKE = $(IMAKE) + #endif + DIRS_TO_CREATE = $(USRLIBDIR) $(BINDIR) $(INCDIR) $(USRINCDIR) $(LIBDIR) $(XAPPLOADDIR) + CDE_DIRS_TO_CREATE = $(USRLIBDIR) $(BINDIR) $(PROJECTROOT)/share/include diff --git a/x11/openmotif/patches/patch-ab b/x11/openmotif/patches/patch-ab new file mode 100644 index 00000000000..fbaee3bacba --- /dev/null +++ b/x11/openmotif/patches/patch-ab @@ -0,0 +1,17 @@ +$NetBSD: patch-ab,v 1.1 2001/04/05 14:06:57 wiz Exp $ + +--- bindings/Imakefile.orig Wed May 3 11:12:34 2000 ++++ bindings/Imakefile Sun Oct 29 14:23:39 2000 +@@ -37,10 +37,10 @@ + XCOMM HISTORY + XCOMM + XCOMM $TOG: Imakefile /main/8 1997/07/02 17:51:43 samborn $ +-INSTALLFLAGS = $(INSTINCFLAGS) + + FILES = \ + xmbind.alias \ ++ CDE \ + acorn \ + apollo \ + dec \ + diff --git a/x11/openmotif/patches/patch-ac b/x11/openmotif/patches/patch-ac new file mode 100644 index 00000000000..298f2f81df1 --- /dev/null +++ b/x11/openmotif/patches/patch-ac @@ -0,0 +1,15 @@ +$NetBSD: patch-ac,v 1.1 2001/04/05 14:06:57 wiz Exp $ + +--- clients/uil/Imakefile.orig Sun Oct 29 14:29:52 2000 ++++ clients/uil/Imakefile Sun Oct 29 14:30:05 2000 +@@ -40,8 +40,10 @@ + + #define DoNormalLib NormalLibUil + #define DoSharedLib SharedLibUil ++#if 0 + #define DoDebugLib DebugLibUil + #define DoProfileLib ProfileLibUil ++#endif + #define LibName Uil + #define SoRev SOUILREV + #define HasSharedData NO diff --git a/x11/openmotif/patches/patch-ad b/x11/openmotif/patches/patch-ad new file mode 100644 index 00000000000..2d42c0697ab --- /dev/null +++ b/x11/openmotif/patches/patch-ad @@ -0,0 +1,13 @@ +$NetBSD: patch-ad,v 1.1 2001/04/05 14:06:57 wiz Exp $ + +--- config/cf/Imakefile.orig Sun Oct 29 15:17:58 2000 ++++ config/cf/Imakefile Sun Oct 29 15:19:49 2000 +@@ -121,7 +121,7 @@ + QNX.cf \ + xfree86.cf + +-INSTFILES = $(RULEFILES) $(TMPLFILES) $(DEFFILES) $(CFFILES) $(LOCALFILES) ++INSTFILES = Motif.rules Motif.tmpl host.def + + all:: + diff --git a/x11/openmotif/patches/patch-ae b/x11/openmotif/patches/patch-ae new file mode 100644 index 00000000000..c32f13b2389 --- /dev/null +++ b/x11/openmotif/patches/patch-ae @@ -0,0 +1,26 @@ +$NetBSD: patch-ae,v 1.1 2001/04/05 14:06:57 wiz Exp $ + +--- config/cf/Motif.rules.orig Sun Oct 29 15:34:02 2000 ++++ config/cf/Motif.rules Sun Oct 29 15:34:14 2000 +@@ -50,9 +50,10 @@ + # define MotifIsTopLevelProject NO + #endif + +-/* Include the X11 project rules file. */ ++#ifndef X11IsTopLevelProject ++/* If we have not included X11.rules yet, do it now. */ + #include +- ++#endif + + /* Use the in-tree Motif by default. */ + #ifndef UseInstalledMotif +@@ -698,7 +699,7 @@ + #define Real_MessageCatalogRule(prefix) @@\ + prefix.cat Concat(prefix,MsgCatI.h): @@\ + $(RM) Concat(prefix,MsgCatI.h) prefix.cat $(MLOCSRC)/C/msg/prefix.msg @@\ +- $(MKCATTOOL) Concat(prefix,MsgCatI.h) prefix.msg > $(MLOCSRC)/C/msg/prefix.msg @@\ ++ $(MKCATTOOL) Concat(prefix,MsgCatI.h) prefix.msg | sed '/^[ ]*$$/d' > $(MLOCSRC)/C/msg/prefix.msg @@\ + $(GENCAT) prefix.cat $(MLOCSRC)/C/msg/prefix.msg @@\ + @@\ + includes:: prefix.cat Concat(prefix,MsgCatI.h) @@\ diff --git a/x11/openmotif/patches/patch-af b/x11/openmotif/patches/patch-af new file mode 100644 index 00000000000..52edc56da4e --- /dev/null +++ b/x11/openmotif/patches/patch-af @@ -0,0 +1,26 @@ +$NetBSD: patch-af,v 1.1 2001/04/05 14:06:57 wiz Exp $ + +--- config/imake/Imakefile.orig Sun Oct 29 15:29:28 2000 ++++ config/imake/Imakefile Sun Oct 29 15:31:43 2000 +@@ -5,6 +5,21 @@ + XCOMM + XCOMM $XFree86: xc/config/imake/Imakefile,v 3.6.2.1 1997/06/11 12:08:33 dawes Exp $ + ++XCOMM ++XCOMM ++XCOMM ++ ++#ifdef NetBSDArchitecture ++#undef InstallProgram ++#define InstallProgram(file,dest) /* as nothing */ ++#undef InstallNamedProg ++#define InstallNamedProg(srcname,dstname,dest) /* as nothing */ ++#undef InstallManPage ++#define InstallManPage(file,dest) /* as nothing */ ++#undef InstallManPageLong ++#define InstallManPageLong(srcname,dest,dstname) /* as nothing */ ++#endif ++ + XCOMM Some compilers generate fatal errors if an -L directory does + XCOMM not exist. Since BUILDLIBDIR may not exist yet suppress its use. + LDPRELIB = diff --git a/x11/openmotif/patches/patch-ag b/x11/openmotif/patches/patch-ag new file mode 100644 index 00000000000..3f8cb497a8e --- /dev/null +++ b/x11/openmotif/patches/patch-ag @@ -0,0 +1,12 @@ +$NetBSD: patch-ag,v 1.1 2001/04/05 14:06:57 wiz Exp $ + +--- config/imake/imake.c.orig Sun Oct 29 15:34:13 2000 ++++ config/imake/imake.c Sun Oct 29 15:38:27 2000 +@@ -148,6 +148,7 @@ + #if defined(__FreeBSD__) || defined(__NetBSD__) + /* This needs to be before _POSIX_SOURCE gets defined */ + # include ++# include + # include + # include + #endif diff --git a/x11/openmotif/patches/patch-ah b/x11/openmotif/patches/patch-ah new file mode 100644 index 00000000000..b7c98c8f49f --- /dev/null +++ b/x11/openmotif/patches/patch-ah @@ -0,0 +1,21 @@ +$NetBSD: patch-ah,v 1.1 2001/04/05 14:06:57 wiz Exp $ + +--- config/util/Imakefile.orig Sun Oct 29 14:31:06 2000 ++++ config/util/Imakefile Sun Oct 29 14:31:30 2000 +@@ -1,4 +1,16 @@ + XCOMM $XConsortium: Imakefile /main/16 1996/11/13 14:43:28 lehors $ ++ ++#ifdef NetBSDArchitecture ++#undef InstallProgram ++#define InstallProgram(file,dest) /* as nothing */ ++#undef InstallNamedProg ++#define InstallNamedProg(srcname,dstname,dest) /* as nothing */ ++#undef InstallManPage ++#define InstallManPage(file,dest) /* as nothing */ ++#undef InstallManPageLong ++#define InstallManPageLong(srcname,dest,dstname) /* as nothing */ ++#endif ++ + #if UseCCMakeDepend + MDEP_PROG = makedepend + #endif diff --git a/x11/openmotif/patches/patch-ai b/x11/openmotif/patches/patch-ai new file mode 100644 index 00000000000..88d01142bba --- /dev/null +++ b/x11/openmotif/patches/patch-ai @@ -0,0 +1,15 @@ +$NetBSD: patch-ai,v 1.1 2001/04/05 14:06:58 wiz Exp $ + +--- lib/Mrm/Imakefile.orig Sun Oct 29 14:21:24 2000 ++++ lib/Mrm/Imakefile Sun Oct 29 14:21:51 2000 +@@ -36,8 +36,10 @@ + + #define DoNormalLib NormalLibMrm + #define DoSharedLib SharedLibMrm ++#if 0 + #define DoDebugLib DebugLibMrm + #define DoProfileLib ProfileLibMrm ++#endif + #define LibName Mrm + #define SoRev SOMRMREV + #define HasSharedData NO diff --git a/x11/openmotif/patches/patch-aj b/x11/openmotif/patches/patch-aj new file mode 100644 index 00000000000..6c6105397d9 --- /dev/null +++ b/x11/openmotif/patches/patch-aj @@ -0,0 +1,15 @@ +$NetBSD: patch-aj,v 1.1 2001/04/05 14:06:58 wiz Exp $ + +--- lib/Xm/Imakefile.orig Sun Oct 29 14:19:45 2000 ++++ lib/Xm/Imakefile Sun Oct 29 14:20:15 2000 +@@ -41,8 +41,10 @@ + + #define DoNormalLib NormalLibXm + #define DoSharedLib SharedLibXm ++#if 0 + #define DoDebugLib DebugLibXm + #define DoProfileLib ProfileLibXm ++#endif + #define LibName Xm + #define SoRev SOXMREV + #define HasSharedData YES diff --git a/x11/openmotif/patches/patch-ak b/x11/openmotif/patches/patch-ak new file mode 100644 index 00000000000..d3126b98cb2 --- /dev/null +++ b/x11/openmotif/patches/patch-ak @@ -0,0 +1,13 @@ +$NetBSD: patch-ak,v 1.1 2001/04/05 14:06:58 wiz Exp $ + +--- lib/Xm/TextF.c.orig Sun Oct 29 15:43:15 2000 ++++ lib/Xm/TextF.c Sun Oct 29 15:45:35 2000 +@@ -84,7 +84,7 @@ + #include /* for XmIsPrintShell */ + + +-#if defined(__FreeBSD__) ++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined (__NetBSD__) + /* + * Modification by Integrated Computer Solutions, Inc. May 2000 + * diff --git a/x11/openmotif/patches/patch-al b/x11/openmotif/patches/patch-al new file mode 100644 index 00000000000..fab476ac7dd --- /dev/null +++ b/x11/openmotif/patches/patch-al @@ -0,0 +1,13 @@ +$NetBSD: patch-al,v 1.1 2001/04/05 14:06:58 wiz Exp $ + +--- tests/Performance/Startup/editor.c.orig Wed May 3 05:12:48 2000 ++++ tests/Performance/Startup/editor.c Wed Aug 9 19:29:43 2000 +@@ -238,7 +238,7 @@ + + strcpy(tempname, "/tmp/xmeditXXXXXX"); + +- if ((tfp = fopen(mktemp(tempname), "w")) == NULL) { ++ if ((tfp = mkstemp(tempname)) == NULL) { + fprintf(stderr, "Warning: unable to open temp file, text not saved.\n"); + return(False);; + } diff --git a/x11/openmotif/patches/patch-bindings-Imakefile b/x11/openmotif/patches/patch-bindings-Imakefile deleted file mode 100644 index d237faf91c3..00000000000 --- a/x11/openmotif/patches/patch-bindings-Imakefile +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-bindings-Imakefile,v 1.1.1.1 2000/10/29 16:17:13 mjl Exp $ - ---- bindings/Imakefile.orig Wed May 3 11:12:34 2000 -+++ bindings/Imakefile Sun Oct 29 14:23:39 2000 -@@ -37,10 +37,10 @@ - XCOMM HISTORY - XCOMM - XCOMM $TOG: Imakefile /main/8 1997/07/02 17:51:43 samborn $ --INSTALLFLAGS = $(INSTINCFLAGS) - - FILES = \ - xmbind.alias \ -+ CDE \ - acorn \ - apollo \ - dec \ - diff --git a/x11/openmotif/patches/patch-clients-uil-Imakefile b/x11/openmotif/patches/patch-clients-uil-Imakefile deleted file mode 100644 index 913f57d9347..00000000000 --- a/x11/openmotif/patches/patch-clients-uil-Imakefile +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-clients-uil-Imakefile,v 1.1.1.1 2000/10/29 16:17:13 mjl Exp $ - ---- clients/uil/Imakefile.orig Sun Oct 29 14:29:52 2000 -+++ clients/uil/Imakefile Sun Oct 29 14:30:05 2000 -@@ -40,8 +40,10 @@ - - #define DoNormalLib NormalLibUil - #define DoSharedLib SharedLibUil -+#if 0 - #define DoDebugLib DebugLibUil - #define DoProfileLib ProfileLibUil -+#endif - #define LibName Uil - #define SoRev SOUILREV - #define HasSharedData NO diff --git a/x11/openmotif/patches/patch-config-cf-Imakefile b/x11/openmotif/patches/patch-config-cf-Imakefile deleted file mode 100644 index 293e7a99744..00000000000 --- a/x11/openmotif/patches/patch-config-cf-Imakefile +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-config-cf-Imakefile,v 1.1.1.1 2000/10/29 16:17:13 mjl Exp $ - ---- config/cf/Imakefile.orig Sun Oct 29 15:17:58 2000 -+++ config/cf/Imakefile Sun Oct 29 15:19:49 2000 -@@ -121,7 +121,7 @@ - QNX.cf \ - xfree86.cf - --INSTFILES = $(RULEFILES) $(TMPLFILES) $(DEFFILES) $(CFFILES) $(LOCALFILES) -+INSTFILES = Motif.rules Motif.tmpl host.def - - all:: - diff --git a/x11/openmotif/patches/patch-config-cf-Motif.rules b/x11/openmotif/patches/patch-config-cf-Motif.rules deleted file mode 100644 index 4a95e9072ff..00000000000 --- a/x11/openmotif/patches/patch-config-cf-Motif.rules +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-config-cf-Motif.rules,v 1.1.1.1 2000/10/29 16:17:13 mjl Exp $ - ---- config/cf/Motif.rules.orig Sun Oct 29 15:34:02 2000 -+++ config/cf/Motif.rules Sun Oct 29 15:34:14 2000 -@@ -50,9 +50,10 @@ - # define MotifIsTopLevelProject NO - #endif - --/* Include the X11 project rules file. */ -+#ifndef X11IsTopLevelProject -+/* If we have not included X11.rules yet, do it now. */ - #include -- -+#endif - - /* Use the in-tree Motif by default. */ - #ifndef UseInstalledMotif -@@ -698,7 +699,7 @@ - #define Real_MessageCatalogRule(prefix) @@\ - prefix.cat Concat(prefix,MsgCatI.h): @@\ - $(RM) Concat(prefix,MsgCatI.h) prefix.cat $(MLOCSRC)/C/msg/prefix.msg @@\ -- $(MKCATTOOL) Concat(prefix,MsgCatI.h) prefix.msg > $(MLOCSRC)/C/msg/prefix.msg @@\ -+ $(MKCATTOOL) Concat(prefix,MsgCatI.h) prefix.msg | sed '/^[ ]*$$/d' > $(MLOCSRC)/C/msg/prefix.msg @@\ - $(GENCAT) prefix.cat $(MLOCSRC)/C/msg/prefix.msg @@\ - @@\ - includes:: prefix.cat Concat(prefix,MsgCatI.h) @@\ diff --git a/x11/openmotif/patches/patch-config-imake-Imakefile b/x11/openmotif/patches/patch-config-imake-Imakefile deleted file mode 100644 index 2ce8b9633f5..00000000000 --- a/x11/openmotif/patches/patch-config-imake-Imakefile +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-config-imake-Imakefile,v 1.1.1.1 2000/10/29 16:17:13 mjl Exp $ - ---- config/imake/Imakefile.orig Sun Oct 29 15:29:28 2000 -+++ config/imake/Imakefile Sun Oct 29 15:31:43 2000 -@@ -5,6 +5,21 @@ - XCOMM - XCOMM $XFree86: xc/config/imake/Imakefile,v 3.6.2.1 1997/06/11 12:08:33 dawes Exp $ - -+XCOMM -+XCOMM -+XCOMM -+ -+#ifdef NetBSDArchitecture -+#undef InstallProgram -+#define InstallProgram(file,dest) /* as nothing */ -+#undef InstallNamedProg -+#define InstallNamedProg(srcname,dstname,dest) /* as nothing */ -+#undef InstallManPage -+#define InstallManPage(file,dest) /* as nothing */ -+#undef InstallManPageLong -+#define InstallManPageLong(srcname,dest,dstname) /* as nothing */ -+#endif -+ - XCOMM Some compilers generate fatal errors if an -L directory does - XCOMM not exist. Since BUILDLIBDIR may not exist yet suppress its use. - LDPRELIB = diff --git a/x11/openmotif/patches/patch-config-imake-imake.c b/x11/openmotif/patches/patch-config-imake-imake.c deleted file mode 100644 index 52020f2c276..00000000000 --- a/x11/openmotif/patches/patch-config-imake-imake.c +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-config-imake-imake.c,v 1.1.1.1 2000/10/29 16:17:13 mjl Exp $ - ---- config/imake/imake.c.orig Sun Oct 29 15:34:13 2000 -+++ config/imake/imake.c Sun Oct 29 15:38:27 2000 -@@ -148,6 +148,7 @@ - #if defined(__FreeBSD__) || defined(__NetBSD__) - /* This needs to be before _POSIX_SOURCE gets defined */ - # include -+# include - # include - # include - #endif diff --git a/x11/openmotif/patches/patch-config-util-Imakefile b/x11/openmotif/patches/patch-config-util-Imakefile deleted file mode 100644 index 730e1cc4740..00000000000 --- a/x11/openmotif/patches/patch-config-util-Imakefile +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-config-util-Imakefile,v 1.1.1.1 2000/10/29 16:17:13 mjl Exp $ - ---- config/util/Imakefile.orig Sun Oct 29 14:31:06 2000 -+++ config/util/Imakefile Sun Oct 29 14:31:30 2000 -@@ -1,4 +1,16 @@ - XCOMM $XConsortium: Imakefile /main/16 1996/11/13 14:43:28 lehors $ -+ -+#ifdef NetBSDArchitecture -+#undef InstallProgram -+#define InstallProgram(file,dest) /* as nothing */ -+#undef InstallNamedProg -+#define InstallNamedProg(srcname,dstname,dest) /* as nothing */ -+#undef InstallManPage -+#define InstallManPage(file,dest) /* as nothing */ -+#undef InstallManPageLong -+#define InstallManPageLong(srcname,dest,dstname) /* as nothing */ -+#endif -+ - #if UseCCMakeDepend - MDEP_PROG = makedepend - #endif diff --git a/x11/openmotif/patches/patch-lib-Mrm-Imakefile b/x11/openmotif/patches/patch-lib-Mrm-Imakefile deleted file mode 100644 index 33e15279504..00000000000 --- a/x11/openmotif/patches/patch-lib-Mrm-Imakefile +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-lib-Mrm-Imakefile,v 1.1.1.1 2000/10/29 16:17:13 mjl Exp $ - ---- lib/Mrm/Imakefile.orig Sun Oct 29 14:21:24 2000 -+++ lib/Mrm/Imakefile Sun Oct 29 14:21:51 2000 -@@ -36,8 +36,10 @@ - - #define DoNormalLib NormalLibMrm - #define DoSharedLib SharedLibMrm -+#if 0 - #define DoDebugLib DebugLibMrm - #define DoProfileLib ProfileLibMrm -+#endif - #define LibName Mrm - #define SoRev SOMRMREV - #define HasSharedData NO diff --git a/x11/openmotif/patches/patch-lib-Xm-Imakefile b/x11/openmotif/patches/patch-lib-Xm-Imakefile deleted file mode 100644 index ee7044e6d6a..00000000000 --- a/x11/openmotif/patches/patch-lib-Xm-Imakefile +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-lib-Xm-Imakefile,v 1.1.1.1 2000/10/29 16:17:13 mjl Exp $ - ---- lib/Xm/Imakefile.orig Sun Oct 29 14:19:45 2000 -+++ lib/Xm/Imakefile Sun Oct 29 14:20:15 2000 -@@ -41,8 +41,10 @@ - - #define DoNormalLib NormalLibXm - #define DoSharedLib SharedLibXm -+#if 0 - #define DoDebugLib DebugLibXm - #define DoProfileLib ProfileLibXm -+#endif - #define LibName Xm - #define SoRev SOXMREV - #define HasSharedData YES diff --git a/x11/openmotif/patches/patch-lib-Xm-TextF.c b/x11/openmotif/patches/patch-lib-Xm-TextF.c deleted file mode 100644 index aeb34788ef4..00000000000 --- a/x11/openmotif/patches/patch-lib-Xm-TextF.c +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-lib-Xm-TextF.c,v 1.1.1.1 2000/10/29 16:17:13 mjl Exp $ - ---- lib/Xm/TextF.c.orig Sun Oct 29 15:43:15 2000 -+++ lib/Xm/TextF.c Sun Oct 29 15:45:35 2000 -@@ -84,7 +84,7 @@ - #include /* for XmIsPrintShell */ - - --#if defined(__FreeBSD__) -+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined (__NetBSD__) - /* - * Modification by Integrated Computer Solutions, Inc. May 2000 - * diff --git a/x11/openmotif/patches/patch-tests-Performance-Startup-editor.c b/x11/openmotif/patches/patch-tests-Performance-Startup-editor.c deleted file mode 100644 index 698049d9832..00000000000 --- a/x11/openmotif/patches/patch-tests-Performance-Startup-editor.c +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-tests-Performance-Startup-editor.c,v 1.1.1.1 2000/10/29 16:17:13 mjl Exp $ - ---- tests/Performance/Startup/editor.c.orig Wed May 3 05:12:48 2000 -+++ tests/Performance/Startup/editor.c Wed Aug 9 19:29:43 2000 -@@ -238,7 +238,7 @@ - - strcpy(tempname, "/tmp/xmeditXXXXXX"); - -- if ((tfp = fopen(mktemp(tempname), "w")) == NULL) { -+ if ((tfp = mkstemp(tempname)) == NULL) { - fprintf(stderr, "Warning: unable to open temp file, text not saved.\n"); - return(False);; - } -- cgit v1.2.3