From cf71dfffb9c89adfcdecc33412e98af05caba757 Mon Sep 17 00:00:00 2001
From: joerg <joerg>
Date: Wed, 6 Dec 2006 16:52:20 +0000
Subject: Fix path to csh in scripts. Bump revision.

---
 biology/mummer/Makefile         |  5 +++--
 biology/mummer/distinfo         |  6 +++---
 biology/mummer/patches/patch-aa |  5 +++--
 biology/mummer/patches/patch-ab | 12 +++++++-----
 4 files changed, 16 insertions(+), 12 deletions(-)

(limited to 'biology')

diff --git a/biology/mummer/Makefile b/biology/mummer/Makefile
index 7e37f708734..fb7a8d110a2 100644
--- a/biology/mummer/Makefile
+++ b/biology/mummer/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2006/06/21 19:02:03 minskim Exp $
+# $NetBSD: Makefile,v 1.14 2006/12/06 16:52:20 joerg Exp $
 #
 
 DISTNAME=		MUMmer3.18
 PKGNAME=		mummer-3.18
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		biology
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=mummer/}
 
@@ -17,6 +17,7 @@ USE_LANGUAGES=		c c++
 
 MAKE_ENV+=		SH=${SH:Q}
 MAKE_ENV+=		PERL=${PERL5:Q}
+MAKE_ENV+=		CSH=${TOOLS_PATH.csh:Q}
 INSTALLATION_DIRS=	bin
 
 do-install:
diff --git a/biology/mummer/distinfo b/biology/mummer/distinfo
index 840c44eaa0f..b7e98faead1 100644
--- a/biology/mummer/distinfo
+++ b/biology/mummer/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.6 2006/04/19 16:50:36 joerg Exp $
+$NetBSD: distinfo,v 1.7 2006/12/06 16:52:20 joerg Exp $
 
 SHA1 (MUMmer3.18.tar.gz) = 484846f7ff68e19bc0e0deca92254fd423947a9f
 RMD160 (MUMmer3.18.tar.gz) = 7361a90d28e2432a9163e0745ab854dfd31cf306
 Size (MUMmer3.18.tar.gz) = 3069437 bytes
-SHA1 (patch-aa) = 369c4646b01acb4607aae933b70a08448331c3e6
-SHA1 (patch-ab) = 8548bc11a6d43b489ea9af5dbca584ce0d2750c9
+SHA1 (patch-aa) = 707f0466ac20b58feb22a5fd525f5f8d9df31dac
+SHA1 (patch-ab) = af42da79fd287786cb83efa9c9b4fc8025abd728
 SHA1 (patch-ac) = 7f0f16bdd83bc80833f1ffdcfe1bad7c2ee76eec
 SHA1 (patch-ad) = 0804b2c966d7035c23444c4f72e1d93e45805bcf
diff --git a/biology/mummer/patches/patch-aa b/biology/mummer/patches/patch-aa
index 6fed9c79204..20723ca7f72 100644
--- a/biology/mummer/patches/patch-aa
+++ b/biology/mummer/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2006/01/29 19:31:43 schwarz Exp $
+$NetBSD: patch-aa,v 1.4 2006/12/06 16:52:20 joerg Exp $
 
 --- Makefile.orig	2003-07-09 09:49:51.000000000 -0400
 +++ Makefile	2003-09-27 18:15:34.000000000 -0400
@@ -21,7 +21,8 @@ $NetBSD: patch-aa,v 1.3 2006/01/29 19:31:43 schwarz Exp $
 +#CC   := $(filter /%,$(shell /bin/sh -c 'type gcc'))
 +#CXX  := $(filter /%,$(shell /bin/sh -c 'type g++'))
 +#SED  := $(filter /%,$(shell /bin/sh -c 'type sed'))
- CSH  := $(filter /%,$(shell /bin/sh -c 'type csh'))
+-CSH  := $(filter /%,$(shell /bin/sh -c 'type csh'))
++#CSH  := $(filter /%,$(shell /bin/sh -c 'type csh'))
 -PERL := $(filter /%,$(shell /bin/sh -c 'type perl'))
 -AR   := $(filter /%,$(shell /bin/sh -c 'type ar'))
 -
diff --git a/biology/mummer/patches/patch-ab b/biology/mummer/patches/patch-ab
index 90db65090b2..deea77220ef 100644
--- a/biology/mummer/patches/patch-ab
+++ b/biology/mummer/patches/patch-ab
@@ -1,12 +1,14 @@
-$NetBSD: patch-ab,v 1.1 2005/06/19 01:13:23 kristerw Exp $
+$NetBSD: patch-ab,v 1.2 2006/12/06 16:52:20 joerg Exp $
 
---- scripts/Makefile.orig	2005-06-19 03:10:05.000000000 +0200
-+++ scripts/Makefile	2005-06-19 03:10:14.000000000 +0200
-@@ -14,7 +14,7 @@
+--- scripts/Makefile.orig	2005-06-28 18:46:35.000000000 +0000
++++ scripts/Makefile
+@@ -13,8 +13,8 @@ endif
+ 
  SCRIPT_DIR := $(CURDIR)
  SED := $(filter /%,$(shell /bin/sh -c 'type sed'))
- CSH := $(filter /%,$(shell /bin/sh -c 'type csh'))
+-CSH := $(filter /%,$(shell /bin/sh -c 'type csh'))
 -PERL := $(filter /%,$(shell /bin/sh -c 'type perl'))
++#CSH := $(filter /%,$(shell /bin/sh -c 'type csh'))
 +#PERL := $(filter /%,$(shell /bin/sh -c 'type perl'))
  VPATH := $(BIN_DIR)
  
-- 
cgit v1.2.3