(lang/ghc) remove duplicate (similar) patch

[Makoto Fujiwara <makoto%ki.nu@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Makoto Fujiwara <makoto%ki.nu@localhost>
Pushed By:	mef
Date:		Tue Oct 8 22:23:02 2019 +0900
Changeset:	c8b5e0494a673116e3490363dcaa2eeea0847c25

Modified Files:
	ghc68/distinfo
	ghc68/patches/patch-ghc.6.4.2_ghc_rts_Stable.c
Removed Files:
	ghc68/patches/patch-ghc-6.4.2-wlibraries_base_include_HsBase.h

Log Message:
(lang/ghc) remove duplicate (similar) patch

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=c8b5e0494a673116e3490363dcaa2eeea0847c25

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 ghc68/distinfo                                     |  5 ++---
 ...atch-ghc-6.4.2-wlibraries_base_include_HsBase.h | 25 ----------------------
 ghc68/patches/patch-ghc.6.4.2_ghc_rts_Stable.c     |  2 +-
 3 files changed, 3 insertions(+), 29 deletions(-)

diffs:
diff --git a/ghc68/distinfo b/ghc68/distinfo
index 8b2c4e9c8e..88ffc2658b 100644
--- a/ghc68/distinfo
+++ b/ghc68/distinfo
@@ -37,10 +37,9 @@ SHA1 (patch-ar) = 0cc6fedc5ee6304b201da79b7cc0104a804501cd
 SHA1 (patch-as) = cebeefbeada25b1d52a528c4d83d66b7a2766e1a
 SHA1 (patch-at) = f6c1b589d1285e14de9344cdcbbacb4d128e8f7c
 SHA1 (patch-au) = 4eb10fb1558a758ce9919c422ec7f15fa5b466e1
-SHA1 (patch-ghc-6.4.2-wlibraries_base_include_HsBase.h) = e29eecf3d9ba267e719daa8c127c7df2c7328422
 SHA1 (patch-ghc-6.4.2_ghc_includes_DerivedConstants.c) = 9509651d6dbdfb1391f7a51f8c6abe8d36882e0d
-SHA1 (patch-ghc-6.4.2_libraries_base_include_HSBase.h) = 2323c5b63b61cb70f06d2c729c56cfc00e463ead
+SHA1 (patch-ghc-6.4.2_libraries_base_include_HSBase.h) = 4590e759b9f5908bb7aeb9390b2341df9ddebfdb
 SHA1 (patch-ghc.6.4.2_ghc_includes_Makefile) = c09dac2e629e6f4e13204cde5defac0e1e84c6b3
-SHA1 (patch-ghc.6.4.2_ghc_rts_Stable.c) = 8ab5ff8abfb278a0b50bb94711c9a30b788e3d73
+SHA1 (patch-ghc.6.4.2_ghc_rts_Stable.c) = 6352b50e908ea770b51d45170da261793b45b1ff
 SHA1 (patch-ghc.6.4.2_ghc_rts_Stable.h) = 1f259ab4af320c6b3cae17b2eaf0d6fcd21850c9
 SHA1 (patch-includes_Makefile) = cfd571976b611914fa469a357030b4657e95fdd0
diff --git a/ghc68/patches/patch-ghc-6.4.2-wlibraries_base_include_HsBase.h b/ghc68/patches/patch-ghc-6.4.2-wlibraries_base_include_HsBase.h
deleted file mode 100644
index 9af8806b40..0000000000
--- a/ghc68/patches/patch-ghc-6.4.2-wlibraries_base_include_HsBase.h
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD$
-
-gcc -x c Control/Arrow.hc -o Control/Arrow.o -c -O  -fno-defer-pop -fomit-frame-pointer  -DNO_REGS -DUSE_MINIINTERPRETER  -DDONT_WANT_WIN32_DLL_SUPPORT -D__GLASGOW_HASKELL__=604  -O -I/export/WRKOBJDIR/wip/ghc68/work/ghc-6.4.2/ghc/includes -I/export/WRKOBJDIR/wip/ghc68/work/ghc-6.4.2/libraries/base/include -I/export/WRKOBJDIR/wip/ghc68/work/ghc-6.4.2/libraries/unix/include -I/export/WRKOBJDIR/wip/ghc68/work/ghc-6.4.2/libraries/parsec/include  -I/export/WRKOBJDIR/wip/ghc68/work/ghc-6.4.2/libraries/readline/include    -I.  `echo  | sed 's/^$/-DSTOLEN_X86_REGS=4/'`
-In file included from Control/Arrow.hc:4:0:
-/export/WRKOBJDIR/wip/ghc68/work/ghc-6.4.2/libraries/base/include/HsBase.h:144:12: error: conflicting types for 'execvpe'
- extern int execvpe(char *name, char *const argv[], char **envp);
-            ^~~~~~~
-In file included from /export/WRKOBJDIR/wip/ghc68/work/ghc-6.4.2/libraries/base/include/HsBase.h:33:0,
-                 from Control/Arrow.hc:4:
-/usr/include/unistd.h:334:6: note: previous declaration of 'execvpe' was here
- int  execvpe(const char *, char * const *, char * const *);
-
-
-
---- ghc-6.4.2/libraries/base/include/HsBase.h.orig	2006-02-02 01:15:56.000000000 +0900
-+++ ../ghc-6.4.2/libraries/base/include/HsBase.h	2019-10-07 23:55:26.568530629 +0900
-@@ -141,7 +141,7 @@ extern HsInt nocldstop;
- 
- #if !defined(mingw32_HOST_OS)
- /* in execvpe.c */
--extern int execvpe(char *name, char *const argv[], char **envp);
-+// extern int execvpe(char *name, char *const argv[], char **envp);
- extern void pPrPr_disableITimers (void);
- #endif
- 
diff --git a/ghc68/patches/patch-ghc.6.4.2_ghc_rts_Stable.c b/ghc68/patches/patch-ghc.6.4.2_ghc_rts_Stable.c
index fe77ea0f40..db9e04cd21 100644
--- a/ghc68/patches/patch-ghc.6.4.2_ghc_rts_Stable.c
+++ b/ghc68/patches/patch-ghc.6.4.2_ghc_rts_Stable.c
@@ -8,7 +8,7 @@ probably not necessary
    application, etc of a stable pointer.
  
  */
-+snEntry RTS_VAR(stable_ptr_table) = NULL;
++snEntry *stable_ptr_table = NULL;
  
  snEntry *stable_ptr_table = NULL;
  static snEntry *stable_ptr_free = NULL;