From 6e8f676783e80d5004357873cec81d74fd8fff28 Mon Sep 17 00:00:00 2001 From: danw Date: Sun, 23 May 2004 23:28:29 +0000 Subject: malloc.h fixes for darwin, plus a handful of other small fixes for problems found after fixing malloc problems --- textproc/biblook/Makefile | 6 +----- textproc/biblook/distinfo | 4 ++-- textproc/biblook/patches/patch-ab | 16 +++++++++++++--- 3 files changed, 16 insertions(+), 10 deletions(-) (limited to 'textproc') diff --git a/textproc/biblook/Makefile b/textproc/biblook/Makefile index c6b008d7ea3..e4c6f6f4a3b 100644 --- a/textproc/biblook/Makefile +++ b/textproc/biblook/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2004/01/20 12:26:49 agc Exp $ +# $NetBSD: Makefile,v 1.6 2004/05/23 23:28:29 danw Exp $ # DISTNAME= biblook @@ -10,16 +10,12 @@ MAINTAINER= seb@pbox.org HOMEPAGE= http://compgeom.cs.uiuc.edu/~jeffe/biblook.html COMMENT= Indexing and searching tools for BibTeX bibliography databases -.include "../../mk/bsd.prefs.mk" - WRKSRC= ${WRKDIR} MAKE_FLAGS= CC="${CC}" # override definitions in the package's Makefile via command line -.if ${OPSYS} == "NetBSD" MAKE_FLAGS+= OPT="${CFLAGS} -Dunix" MAKE_FLAGS+= DEF_H_FILES="-DHAVE_STDLIB_H -DHAVE_NETINET_IN_H" MAKE_FLAGS+= DEF_MORE="-DMOREPATH=\\\"/usr/bin/more\\\" -DMORE=\\\"more\\\"" -.endif .include "../../mk/bsd.pkg.mk" diff --git a/textproc/biblook/distinfo b/textproc/biblook/distinfo index 49ef42d6d6b..f7e0fa88fef 100644 --- a/textproc/biblook/distinfo +++ b/textproc/biblook/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.1.1.1 2001/05/31 10:54:21 agc Exp $ +$NetBSD: distinfo,v 1.2 2004/05/23 23:28:29 danw Exp $ SHA1 (biblook.tar.gz) = 2bb056b806db4518c07e245fc86097c12938443b Size (biblook.tar.gz) = 44691 bytes SHA1 (patch-aa) = 35775eda3f306e2cfa07bc91ac14daa59b84e10b -SHA1 (patch-ab) = 61aea8b1355d7441e3e1b9269bd9ce5e0b2cfaef +SHA1 (patch-ab) = 7063e2d7b92a45b1f055ca201fe1d6b11bfec7bc SHA1 (patch-ac) = 4d6ae0e4301a184b40c777712ee91ea739d7fbfe diff --git a/textproc/biblook/patches/patch-ab b/textproc/biblook/patches/patch-ab index 29ac213a798..ea994ab4094 100644 --- a/textproc/biblook/patches/patch-ab +++ b/textproc/biblook/patches/patch-ab @@ -1,8 +1,18 @@ -$NetBSD: patch-ab,v 1.1.1.1 2001/05/31 10:54:21 agc Exp $ +$NetBSD: patch-ab,v 1.2 2004/05/23 23:28:29 danw Exp $ ---- biblook.h.orig Tue Mar 31 01:31:04 1998 +--- biblook.h.orig Mon Mar 30 18:31:04 1998 +++ biblook.h -@@ -206,7 +206,7 @@ +@@ -73,9 +73,6 @@ extern uint16 ntohs (uint16 netshort); + /* around broken g++ libc.h */ + #else + #include +-#if HAVE_MALLOC_H +-#include +-#endif /* HAVE_MALLOC_H */ + #endif /* __NeXT__ */ + + #if (__STDC__ || __cplusplus || c_plusplus) +@@ -206,7 +203,7 @@ u_short ntohs(u_short netshort); #define MAJOR_VERSION 2 /* program version */ #define MINOR_VERSION 9 -- cgit v1.2.3