[pkgsrc/trunk]: pkgsrc/lang/ocaml Override config.guess and config.sub manual...

[tv <tv%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/345f915a26e4
branches:  trunk
changeset: 487759:345f915a26e4
user:      tv <tv%pkgsrc.org@localhost>
date:      Wed Jan 19 17:43:59 2005 +0000

description:
Override config.guess and config.sub manually, since GNU_CONFIGURE is not
correct here (and thus automatic overriding doesn't work).

diffstat:

 lang/ocaml/Makefile.common  |   8 ++++++--
 lang/ocaml/distinfo         |   3 +--
 lang/ocaml/patches/patch-as |  13 -------------
 3 files changed, 7 insertions(+), 17 deletions(-)

diffs (58 lines):

diff -r 64c4c716fdc6 -r 345f915a26e4 lang/ocaml/Makefile.common
--- a/lang/ocaml/Makefile.common        Wed Jan 19 17:39:13 2005 +0000
+++ b/lang/ocaml/Makefile.common        Wed Jan 19 17:43:59 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1 2004/12/24 17:16:04 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.2 2005/01/19 17:43:59 tv Exp $
 
 DISTNAME=      ocaml-3.06
 CATEGORIES=    lang
@@ -24,9 +24,13 @@
 INSTALL_UNSTRIPPED=    yes
 .endif
 
-post-extract: cp-power-bsd
+post-extract: cp-power-bsd cp-gnu-config
 
 cp-power-bsd:
        ${CP} ${WRKSRC}/asmrun/power-elf.S ${WRKSRC}/asmrun/power-bsd.S
 
+cp-gnu-config:
+       ${CP} ${PKGSRCDIR}/mk/gnu-config/config.guess ${WRKSRC}/config/gnu/
+       ${CP} ${PKGSRCDIR}/mk/gnu-config/config.sub ${WRKSRC}/config/gnu/
+
 .include "../../mk/pthread.buildlink3.mk"
diff -r 64c4c716fdc6 -r 345f915a26e4 lang/ocaml/distinfo
--- a/lang/ocaml/distinfo       Wed Jan 19 17:39:13 2005 +0000
+++ b/lang/ocaml/distinfo       Wed Jan 19 17:43:59 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2004/12/24 17:16:04 jmmv Exp $
+$NetBSD: distinfo,v 1.19 2005/01/19 17:43:59 tv Exp $
 
 SHA1 (ocaml-3.06.tar.gz) = cf1b053bf751ad566e445ca13c620ffef3a1b863
 Size (ocaml-3.06.tar.gz) = 2436887 bytes
@@ -20,7 +20,6 @@
 SHA1 (patch-ap) = 852b73b2a75442e32ae6eca40b87ccb972555143
 SHA1 (patch-aq) = 86b1c641f5adf4fd13b49b8d3149d266b4863d05
 SHA1 (patch-ar) = b52759d59840fb0e156ede1192ea3cfc66df88a7
-SHA1 (patch-as) = e2fe81931265e70cdb9fcb7b9f743ac39ea45528
 SHA1 (patch-at) = 13f1b894a662510a16f86d63f015e2e8cfde3403
 SHA1 (patch-au) = 348834bb0a5e22fd1adce0003f73cd6bcc07e79d
 SHA1 (patch-av) = d61391c89398e0e2b0386f39247a693aa87baf74
diff -r 64c4c716fdc6 -r 345f915a26e4 lang/ocaml/patches/patch-as
--- a/lang/ocaml/patches/patch-as       Wed Jan 19 17:39:13 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-as,v 1.1 2004/04/22 09:18:38 tron Exp $
-
---- config/gnu/config.sub.orig Mon Jun 25 16:04:51 2001
-+++ config/gnu/config.sub      Thu Apr 22 10:34:37 2004
-@@ -289,7 +289,7 @@
-             | [cjt]90-* \
-             | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
-             | thumb-* | v850-* | d30v-* | tic30-* | tic80-* | c30-* | fr30-* \
--            | bs2000-* | tic54x-* | c54x-* | x86_64-* | pj-* | pjl-*)
-+            | bs2000-* | tic54x-* | c54x-* | x86_64-* | pj-* | pjl-* | macppc-*)
-               ;;
-       # Recognize the various machine names and aliases which stand
-       # for a CPU type and a company and sometimes even an OS.