From c49b8e0836c0dce6b9ea7b78e8dab7c99867b2f4 Mon Sep 17 00:00:00 2001 From: "Philip M. Gollucci" Date: Sat, 16 Jan 2010 17:54:38 +0000 Subject: - Fix on amd64 PR: ports/142472 Submitted by: Edmund Sumbar --- biology/crimap/Makefile | 1 + biology/crimap/files/patch-defs.h | 11 +++++++++++ biology/crimap/files/patch-our_allo.c | 24 ++++++++++++++++++++++++ biology/crimap/files/patch-our_orde.c | 24 ++++++++++++++++++++++++ 4 files changed, 60 insertions(+) create mode 100644 biology/crimap/files/patch-defs.h create mode 100644 biology/crimap/files/patch-our_allo.c create mode 100644 biology/crimap/files/patch-our_orde.c (limited to 'biology') diff --git a/biology/crimap/Makefile b/biology/crimap/Makefile index a3428748d787..e3e5a323cda3 100644 --- a/biology/crimap/Makefile +++ b/biology/crimap/Makefile @@ -7,6 +7,7 @@ PORTNAME= crimap PORTVERSION= 2.4 +PORTREVISION= 1 CATEGORIES= biology MASTER_SITES= http://compgen.rutgers.edu/multimap/crimap/ DISTNAME= ${PORTNAME}.source diff --git a/biology/crimap/files/patch-defs.h b/biology/crimap/files/patch-defs.h new file mode 100644 index 000000000000..54e23c3a4ddd --- /dev/null +++ b/biology/crimap/files/patch-defs.h @@ -0,0 +1,11 @@ +--- ./defs.h.orig 1990-10-10 17:07:22.000000000 -0400 ++++ ./defs.h 2010-01-16 12:51:21.484797488 -0500 +@@ -17,7 +17,7 @@ + typedef short SHORT; + typedef long ID; + typedef long LINDEX; +-typedef int INT; ++typedef long INT; + + struct loci_orders{ + SHORT num_loci; diff --git a/biology/crimap/files/patch-our_allo.c b/biology/crimap/files/patch-our_allo.c new file mode 100644 index 000000000000..7062747d642d --- /dev/null +++ b/biology/crimap/files/patch-our_allo.c @@ -0,0 +1,24 @@ +--- ./our_allo.c.orig 1989-04-04 12:36:21.000000000 -0400 ++++ ./our_allo.c 2010-01-16 12:50:32.073330216 -0500 +@@ -21,10 +21,11 @@ + static HEADER base; + static HEADER *allocp = NULL; + ++static HEADER *morecore(); ++ + char *our_alloc(nbytes) + ALLOC nbytes; + { +- HEADER *morecore(); + HEADER *p; + HEADER *q; + ALLOC nunits; +@@ -76,7 +77,7 @@ + cp = malloc(rnu * sizeof(HEADER)); + if (!cp) { + printf("\n ERROR: ALLOCATION FAILED IN MORECORE\n"); +- exit(); ++ exit(0); + } + up = (HEADER *)cp; + up->s.size = rnu; diff --git a/biology/crimap/files/patch-our_orde.c b/biology/crimap/files/patch-our_orde.c new file mode 100644 index 000000000000..5479206d547c --- /dev/null +++ b/biology/crimap/files/patch-our_orde.c @@ -0,0 +1,24 @@ +--- ./our_orde.c.orig 1989-04-04 12:36:22.000000000 -0400 ++++ ./our_orde.c 2010-01-16 12:50:32.076328932 -0500 +@@ -21,10 +21,11 @@ + static HEADER orders_base; + static HEADER *orders_allocp = NULL; + ++static HEADER *orders_morecore(); ++ + char *our_orders_alloc(nbytes) + ALLOC nbytes; + { +- HEADER *orders_morecore(); + HEADER *p, *q; + ALLOC nunits; + +@@ -76,7 +77,7 @@ + cp = malloc(rnu * sizeof(HEADER)); + if (!cp) { + printf("\nALLOC FAILED IN OUR_ORDERS_ALLOC\n"); +- exit (); ++ exit(0); + } + up = (HEADER *)cp; + up->s.size = rnu; -- cgit v1.2.3