Use canonical config.guess and config.sub scripts instead of patching

them. Add DragonFly support.

4 files changed, 20 insertions, 25 deletions

diff --git a/benchmarks/hbench/Makefile b/benchmarks/hbench/Makefile
index 408caa564cf..39b6147ddbe 100644
--- a/benchmarks/hbench/Makefile
+++ b/benchmarks/hbench/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2005/12/29 03:26:28 reed Exp $
+# $NetBSD: Makefile,v 1.33 2006/01/12 15:10:29 joerg Exp $
 
 DISTNAME=		hbench-OS-1.0
 PKGNAME=		hbench-1.0
@@ -21,6 +21,10 @@ USE_TOOLS+=		perl:run
 
 DIST_SUBDIR=		${PKGNAME_NOREV}
 
+pre-configure:
+	@${CP} ${PKGSRCDIR}/mk/gnu-config/config.guess ${WRKSRC}/scripts
+	@${CP} ${PKGSRCDIR}/mk/gnu-config/config.sub ${WRKSRC}/scripts
+
 post-configure:
 	cd ${WRKSRC};							\
 	for f in scripts/create-all-analyses				\
diff --git a/benchmarks/hbench/distinfo b/benchmarks/hbench/distinfo
index 4db95364489..07cdd62f7cb 100644
--- a/benchmarks/hbench/distinfo
+++ b/benchmarks/hbench/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2005/11/05 19:47:51 kristerw Exp $
+$NetBSD: distinfo,v 1.10 2006/01/12 15:10:29 joerg Exp $
 
 SHA1 (hbench-1.0/hbench-OS-1.0.tar.gz) = b1a72287e2d04561141f296ba04d142f60152fe0
 RMD160 (hbench-1.0/hbench-OS-1.0.tar.gz) = 2e2702c035689e1dec39328e47dc9dc9ff558103
@@ -13,9 +13,9 @@ SHA1 (patch-ag) = 037db0b965aad72ad8a1b93f9cf4b4af9f446fdf
 SHA1 (patch-ah) = 6c01c679b394985d0570df4fe29c09642cbde6c3
 SHA1 (patch-ai) = d59d05c9d73aa4c06f5ac5153a069694a4267fd1
 SHA1 (patch-aj) = 7bca0c1062626b5c03f04b7bce17f7c2d8c14231
-SHA1 (patch-ak) = 986d86c1b6d6850585cde8cb9ffd119fbe2351ee
 SHA1 (patch-al) = 53ac43ab3287f4ae7dc246aa9b047923e8acd8b6
 SHA1 (patch-am) = 1d58355f664879ccd8880a63f574388fb61c0780
 SHA1 (patch-an) = 4cb762c246cdde99a219b8a4de2d354f2b6abb85
 SHA1 (patch-ao) = 69c92f83d10f061f8f0aa05da860cfc5cf764859
 SHA1 (patch-ap) = 057465b9f89e76367781401d91b333679a651cb4
+SHA1 (patch-aq) = 1d6b1c4dfadce17985b39bf1563176840119bcb6
diff --git a/benchmarks/hbench/patches/patch-ak b/benchmarks/hbench/patches/patch-ak
deleted file mode 100644
index d67922545ec..00000000000
--- a/benchmarks/hbench/patches/patch-ak
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ak,v 1.2 2000/05/09 14:24:39 dmcmahill Exp $
-
-the original version would take things like "1.4.2_ALPHA" and change it to "1.4.2."
-This messes up paths when ${OS_VERSION} is used in PLIST's and install scripts.
-
-Also, we want output like 'mipsel-unknown-netbsd1.4.1' not 'pmax-unknown-netbsd1.4.1'
-
---- scripts/config.guess.orig	Thu Jun 26 20:31:08 1997
-+++ scripts/config.guess	Tue May  9 10:13:07 2000
-@@ -42,4 +42,5 @@
- fi
- 
-+UNAME_PROCESSOR=`(uname -p) 2>/dev/null` || UNAME_PROCESSOR=unknown
- UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
- UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-@@ -386,5 +387,5 @@
- 	exit 0 ;;
-     *:NetBSD:*:*)
--	echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-+	echo ${UNAME_PROCESSOR}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-].*/\./'`
- 	exit 0 ;;
-     *:OpenBSD:*:*)
diff --git a/benchmarks/hbench/patches/patch-aq b/benchmarks/hbench/patches/patch-aq
new file mode 100644
index 00000000000..d75418251a7
--- /dev/null
+++ b/benchmarks/hbench/patches/patch-aq
@@ -0,0 +1,13 @@
+$NetBSD: patch-aq,v 1.1 2006/01/12 15:10:29 joerg Exp $
+
+--- src/Makefile.orig	1997-06-27 14:50:31.000000000 +0000
++++ src/Makefile
+@@ -89,7 +89,7 @@ COMPILE=$(CC) $(CFLAGS) $(CPPFLAGS) $(LD
+ #####################################
+ 
+ # The following don't need special handling.
+-freebsd netbsd openbsd sunos linux:
++dragonfly freebsd netbsd openbsd sunos linux:
+ 	@$(MAKE) binaries
+ 
+ bsdi: