summaryrefslogtreecommitdiff
path: root/devel/electricfence
diff options
context:
space:
mode:
authoragc <agc@pkgsrc.org>1998-10-27 11:03:09 +0000
committeragc <agc@pkgsrc.org>1998-10-27 11:03:09 +0000
commita8f1e26a506ba1ca5e899d4b06d22e0703ba3186 (patch)
treec02ec9867adbb92bb366f8846e6dfd17df593bb4 /devel/electricfence
parentd64d2e109ecb09e6e407fcf057959ffab31026e2 (diff)
downloadpkgsrc-a8f1e26a506ba1ca5e899d4b06d22e0703ba3186.tar.gz
Call ranlib(1) on the installed library.
Use a generic BSD definition, rather than just __NetBSD__.
Diffstat (limited to 'devel/electricfence')
-rw-r--r--devel/electricfence/patches/patch-aa25
-rw-r--r--devel/electricfence/patches/patch-ab19
2 files changed, 29 insertions, 15 deletions
diff --git a/devel/electricfence/patches/patch-aa b/devel/electricfence/patches/patch-aa
index 048a1f0703c..a0930adeabf 100644
--- a/devel/electricfence/patches/patch-aa
+++ b/devel/electricfence/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.1.1.1 1998/10/27 04:04:11 garbled Exp $
---- Makefile.orig Thu Jan 19 22:33:04 1995
-+++ Makefile Mon Oct 26 00:27:29 1998
-@@ -1,12 +1,12 @@
+$NetBSD: patch-aa,v 1.2 1998/10/27 11:03:09 agc Exp $
+
+--- Makefile.orig Fri Jan 20 05:33:04 1995
++++ Makefile Tue Oct 27 10:55:46 1998
+@@ -1,12 +1,11 @@
-ASFLAGS= -mips2
+#ASFLAGS= -mips2
CC= cc
AR= ar
-INSTALL= install
-+INSTALL= install -c -g bin -o bin
MV= mv
CHMOD= chmod
CFLAGS= -g
@@ -18,12 +18,17 @@ $NetBSD: patch-aa,v 1.1.1.1 1998/10/27 04:04:11 garbled Exp $
PACKAGE_SOURCE= README libefence.3 Makefile efence.h \
efence.c page.c print.c eftest.c tstheap.c CHANGES
-@@ -39,7 +39,7 @@
+@@ -39,10 +38,9 @@
@ echo
install: libefence.a libefence.3
- $(MV) libefence.a $(LIB_INSTALL_DIR)
-+ $(INSTALL) libefence.a $(LIB_INSTALL_DIR)
- $(CHMOD) 644 $(LIB_INSTALL_DIR)/libefence.a
- $(INSTALL) libefence.3 $(MAN_INSTALL_DIR)/libefence.3
- $(CHMOD) 644 $(MAN_INSTALL_DIR)/libefence.3
+- $(CHMOD) 644 $(LIB_INSTALL_DIR)/libefence.a
+- $(INSTALL) libefence.3 $(MAN_INSTALL_DIR)/libefence.3
+- $(CHMOD) 644 $(MAN_INSTALL_DIR)/libefence.3
++ ${INSTALL} -c -m 0644 -o root -g wheel libefence.a $(LIB_INSTALL_DIR)
++ ${RANLIB} ${LIB_INSTALL_DIR}/libefence.a
++ ${INSTALL} -c -m 0644 -o root -g wheel libefence.3 $(MAN_INSTALL_DIR)/libefence.3
+
+ clean:
+ - rm -f $(OBJECTS) tstheap.o eftest.o tstheap eftest libefence.a \
diff --git a/devel/electricfence/patches/patch-ab b/devel/electricfence/patches/patch-ab
index 84063268717..21e0088576b 100644
--- a/devel/electricfence/patches/patch-ab
+++ b/devel/electricfence/patches/patch-ab
@@ -1,12 +1,21 @@
-$NetBSD: patch-ab,v 1.1.1.1 1998/10/27 04:04:11 garbled Exp $
---- page.c.orig Mon Oct 26 00:21:10 1998
-+++ page.c Mon Oct 26 00:21:34 1998
-@@ -29,7 +29,7 @@
+$NetBSD: patch-ab,v 1.2 1998/10/27 11:03:09 agc Exp $
+
+--- page.c.orig Fri Jan 20 05:01:06 1995
++++ page.c Tue Oct 27 10:47:30 1998
+@@ -3,6 +3,7 @@
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <sys/mman.h>
++#include <sys/param.h>
+ #include <stdio.h>
+ #include <errno.h>
+ #include <string.h>
+@@ -29,7 +30,7 @@
static caddr_t startAddr = (caddr_t) 0;
-#if ( !defined(sgi) && !defined(_AIX) )
-+#if ( !defined(sgi) && !defined(_AIX) && !defined(__NetBSD__))
++#if ( !defined(sgi) && !defined(_AIX) && !(defined(BSD) && BSD >= 199306))
extern int sys_nerr;
extern char * sys_errlist[];
#endif