From 91d4f8aa68b42b031cc596f3293771ed286f31c0 Mon Sep 17 00:00:00 2001 From: joerg Date: Wed, 22 Mar 2006 22:36:13 +0000 Subject: Override all config.guess and config.sub scripts. Remove patches which have been useless anyway due to the former. Add DragonFly support. --- net/irrtoolset-nox11/Makefile | 7 ++++++- net/irrtoolset-nox11/distinfo | 9 ++------- net/irrtoolset-nox11/patches/patch-au | 14 -------------- net/irrtoolset-nox11/patches/patch-av | 13 ------------- net/irrtoolset-nox11/patches/patch-aw | 14 -------------- net/irrtoolset-nox11/patches/patch-ax | 13 ------------- net/irrtoolset-nox11/patches/patch-ay | 14 -------------- net/irrtoolset-nox11/patches/patch-az | 13 ------------- net/irrtoolset-nox11/patches/patch-cl | 17 +++++++++++++++++ 9 files changed, 25 insertions(+), 89 deletions(-) delete mode 100644 net/irrtoolset-nox11/patches/patch-au delete mode 100644 net/irrtoolset-nox11/patches/patch-av delete mode 100644 net/irrtoolset-nox11/patches/patch-aw delete mode 100644 net/irrtoolset-nox11/patches/patch-ax delete mode 100644 net/irrtoolset-nox11/patches/patch-ay delete mode 100644 net/irrtoolset-nox11/patches/patch-az create mode 100644 net/irrtoolset-nox11/patches/patch-cl (limited to 'net/irrtoolset-nox11') diff --git a/net/irrtoolset-nox11/Makefile b/net/irrtoolset-nox11/Makefile index 6fe1216ea4b..9dde8cd6115 100644 --- a/net/irrtoolset-nox11/Makefile +++ b/net/irrtoolset-nox11/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2006/02/15 20:07:40 spz Exp $ +# $NetBSD: Makefile,v 1.6 2006/03/22 22:36:13 joerg Exp $ # DISTNAME= IRRToolSet-4.8.2 @@ -17,4 +17,9 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --without-x +CONFIG_GUESS_OVERRIDE= config.guess src/Core/.aux/config.guess \ + src/rpsl/config.guess +CONFIG_SUB_OVERRIDE= config.sub src/Core/.aux/config.sub \ + src/rpsl/config.sub + .include "../../mk/bsd.pkg.mk" diff --git a/net/irrtoolset-nox11/distinfo b/net/irrtoolset-nox11/distinfo index 83b8f2da398..1f39d16db63 100644 --- a/net/irrtoolset-nox11/distinfo +++ b/net/irrtoolset-nox11/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.7 2006/02/15 20:07:40 spz Exp $ +$NetBSD: distinfo,v 1.8 2006/03/22 22:36:13 joerg Exp $ SHA1 (IRRToolSet-4.8.2.tar.gz) = f60a03cb6585503f1ef0b8b7c0a2ce7c39ce999c RMD160 (IRRToolSet-4.8.2.tar.gz) = 00332f7fe1144b56c93dc327126ec51aa094b6ab @@ -23,12 +23,6 @@ SHA1 (patch-aq) = a284f9fdacdedc50ee74acded9e4b21dca98de21 SHA1 (patch-ar) = e3a5beff29dfef654c700116ec593bf401e289b1 SHA1 (patch-as) = 920af485b7bcc83e95d1923186b46b7a3b16ac97 SHA1 (patch-at) = ac1f4e401f82bcdea3550ec42621ffa6ff73f06c -SHA1 (patch-au) = 842c5fd25244ac2f0d9f3e894bb4407c1113179b -SHA1 (patch-av) = 5a5e42af7e3f89689cf8869cb8d3eb477f74c388 -SHA1 (patch-aw) = 1aee708df76060154f78e8df2f926f4671b30c85 -SHA1 (patch-ax) = 24180d9b2485c400c5084b399ef8312be09971e4 -SHA1 (patch-ay) = 545a721115733810cd90cf360736f5e6a7d4196f -SHA1 (patch-az) = 532ffcdda54a70e7ff57800a16feef5898b2bb82 SHA1 (patch-ba) = 9ad9e3ff42415f40a92d7788afe9a74f9f27c957 SHA1 (patch-bb) = 6d917213312f1884277d8081f5223e4890e11d8d SHA1 (patch-bc) = ece1c767df515d59f994de1981197f1869ac7928 @@ -65,3 +59,4 @@ SHA1 (patch-ch) = 40ee868bdb7ecb73cb279e5e9f1ff546ab4a4ffe SHA1 (patch-ci) = 2e0104e01b7c8beb9d9feab837520014ad6b63e4 SHA1 (patch-cj) = 86950483f15144510fab6f46cfd36a1759eb3bb4 SHA1 (patch-ck) = 175f93a15bdb000070b80688ab594a38af26e6f0 +SHA1 (patch-cl) = 19629aa17d557ddb0dc5cac5daecb0047f9a0a43 diff --git a/net/irrtoolset-nox11/patches/patch-au b/net/irrtoolset-nox11/patches/patch-au deleted file mode 100644 index f654a5f9f91..00000000000 --- a/net/irrtoolset-nox11/patches/patch-au +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-au,v 1.2 2005/03/04 15:03:17 spz Exp $ - ---- config.guess.orig 2002-04-09 12:40:29.000000000 +0200 -+++ config.guess -@@ -103,6 +103,9 @@ EOF - 21064:Windows_NT:50:3) - echo alpha-dec-winnt3.5 - exit 0 ;; -+ amd64:NetBSD:*:*) -+ echo amd64-unknown-netbsd${UNAME_RELEASE} -+ exit 0;; - Amiga*:UNIX_System_V:4.0:*) - echo m68k-cbm-sysv4 - exit 0;; diff --git a/net/irrtoolset-nox11/patches/patch-av b/net/irrtoolset-nox11/patches/patch-av deleted file mode 100644 index 0f0709cc785..00000000000 --- a/net/irrtoolset-nox11/patches/patch-av +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-av,v 1.2 2005/03/04 15:03:17 spz Exp $ - ---- config.sub.orig 2002-04-09 12:40:29.000000000 +0200 -+++ config.sub -@@ -155,7 +155,7 @@ case $basic_machine in - | alpha | alphaev5 | alphaev56 | we32k | ns16k | clipper \ - | i370 | sh | powerpc | powerpcle | 1750a | dsp16xx | pdp11 \ - | mips64 | mipsel | mips64el | mips64orion | mips64orionel \ -- | mipstx39 | mipstx39el \ -+ | mipstx39 | mipstx39el | amd64 \ - | sparc | sparclet | sparclite | sparc64 | v850) - basic_machine=$basic_machine-unknown - ;; diff --git a/net/irrtoolset-nox11/patches/patch-aw b/net/irrtoolset-nox11/patches/patch-aw deleted file mode 100644 index 9ef8a435c13..00000000000 --- a/net/irrtoolset-nox11/patches/patch-aw +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-aw,v 1.2 2005/03/04 15:03:17 spz Exp $ - ---- src/rpsl/config.guess.orig 2002-03-27 12:32:59.000000000 +0100 -+++ src/rpsl/config.guess -@@ -61,6 +61,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ - 21064:Windows_NT:50:3) - echo alpha-dec-winnt3.5 - exit 0 ;; -+ amd64:NetBSD:*:*) -+ echo amd64-unknown-netbsd${UNAME_RELEASE} -+ exit 0;; - Amiga*:UNIX_System_V:4.0:*) - echo m68k-cbm-sysv4 - exit 0;; diff --git a/net/irrtoolset-nox11/patches/patch-ax b/net/irrtoolset-nox11/patches/patch-ax deleted file mode 100644 index ed5dfa3cb9f..00000000000 --- a/net/irrtoolset-nox11/patches/patch-ax +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ax,v 1.2 2005/03/04 15:03:17 spz Exp $ - ---- src/rpsl/config.sub.orig 2002-03-27 12:32:59.000000000 +0100 -+++ src/rpsl/config.sub -@@ -155,7 +155,7 @@ case $basic_machine in - | alpha | alphaev5 | alphaev56 | we32k | ns16k | clipper \ - | i370 | sh | powerpc | powerpcle | 1750a | dsp16xx | pdp11 \ - | mips64 | mipsel | mips64el | mips64orion | mips64orionel \ -- | mipstx39 | mipstx39el \ -+ | mipstx39 | mipstx39el | amd64 \ - | sparc | sparclet | sparclite | sparc64 | v850) - basic_machine=$basic_machine-unknown - ;; diff --git a/net/irrtoolset-nox11/patches/patch-ay b/net/irrtoolset-nox11/patches/patch-ay deleted file mode 100644 index df91b1e8b69..00000000000 --- a/net/irrtoolset-nox11/patches/patch-ay +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ay,v 1.2 2005/03/04 15:03:17 spz Exp $ - ---- src/Core/.aux/config.guess.orig 2002-03-27 12:32:59.000000000 +0100 -+++ src/Core/.aux/config.guess -@@ -61,6 +61,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ - 21064:Windows_NT:50:3) - echo alpha-dec-winnt3.5 - exit 0 ;; -+ amd64:NetBSD:*:*) -+ echo amd64-unknown-netbsd${UNAME_RELEASE} -+ exit 0 ;; - Amiga*:UNIX_System_V:4.0:*) - echo m68k-cbm-sysv4 - exit 0;; diff --git a/net/irrtoolset-nox11/patches/patch-az b/net/irrtoolset-nox11/patches/patch-az deleted file mode 100644 index ec283e9c649..00000000000 --- a/net/irrtoolset-nox11/patches/patch-az +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-az,v 1.2 2005/03/04 15:03:17 spz Exp $ - ---- src/Core/.aux/config.sub.orig 2002-03-27 12:32:59.000000000 +0100 -+++ src/Core/.aux/config.sub -@@ -150,7 +150,7 @@ case $basic_machine in - # Recognize the basic CPU types without company name. - # Some are omitted here because they have special meanings below. - tahoe | i860 | m68k | m68000 | m88k | ns32k | arm \ -- | arme[lb] | pyramid \ -+ | arme[lb] | pyramid | amd64 \ - | tron | a29k | 580 | i960 | h8300 | hppa | hppa1.0 | hppa1.1 \ - | alpha | we32k | ns16k | clipper | i370 | sh \ - | powerpc | powerpcle | 1750a | dsp16xx | mips64 | mipsel \ diff --git a/net/irrtoolset-nox11/patches/patch-cl b/net/irrtoolset-nox11/patches/patch-cl new file mode 100644 index 00000000000..0e5b00b2264 --- /dev/null +++ b/net/irrtoolset-nox11/patches/patch-cl @@ -0,0 +1,17 @@ +$NetBSD: patch-cl,v 1.1 2006/03/22 22:36:13 joerg Exp $ + +--- src/Core/configure.orig 2006-03-22 22:27:49.000000000 +0000 ++++ src/Core/configure +@@ -1362,6 +1362,12 @@ _ACEOF + bsdi* ) + EXTRA_LIBS="-lipc" + ;; ++ dragonfly*) ++ cat >>confdefs.h <<\_ACEOF ++#define HOST_OS_IS_FREEBSD 1 ++_ACEOF ++ ;; ++ + freebsd* ) + EXTRA_INCLUDE_DIRS="-I/usr/local/lib/g++-include" + cat >>confdefs.h <<\_ACEOF -- cgit v1.2.3