summaryrefslogtreecommitdiff
path: root/devel/electricfence
diff options
context:
space:
mode:
authorgrant <grant@pkgsrc.org>2004-02-04 13:33:36 +0000
committergrant <grant@pkgsrc.org>2004-02-04 13:33:36 +0000
commit0a55d7d6cdf461eef998a783be0ff90f474b704a (patch)
tree825dde3010b9ca06b4b5e97cf6c3f6ebf601fa0d /devel/electricfence
parent99a9467d38aa2fe9b68c378c573bff2ec67e89c6 (diff)
downloadpkgsrc-0a55d7d6cdf461eef998a783be0ff90f474b704a.tar.gz
simplify by commenting the pkg's Makefile variables as they're
already set by pkgsrc. override the do-install target.
Diffstat (limited to 'devel/electricfence')
-rw-r--r--devel/electricfence/Makefile14
-rw-r--r--devel/electricfence/distinfo4
-rw-r--r--devel/electricfence/patches/patch-aa46
3 files changed, 33 insertions, 31 deletions
diff --git a/devel/electricfence/Makefile b/devel/electricfence/Makefile
index a8512faf2f3..6651fec9ca7 100644
--- a/devel/electricfence/Makefile
+++ b/devel/electricfence/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/11/29 01:12:29 hubertf Exp $
+# $NetBSD: Makefile,v 1.8 2004/02/04 13:33:36 grant Exp $
DISTNAME= ElectricFence-2.1
PKGREVISION= 1
@@ -9,4 +9,16 @@ MAINTAINER= root@garbled.net
HOMEPAGE= http://www.perens.com/FreeSoftware/
COMMENT= Different kind of malloc() debugger
+.include "../../mk/bsd.prefs.mk"
+
+.if ${MACHINE_ARCH} == "mipsel"
+CFLAGS+= -g -DPAGE_PROTECTION_VIOLATED_SIGNAL=SIGBUS
+.else
+CFLAGS+= -g
+.endif
+
+do-install:
+ ${INSTALL_DATA} ${WRKSRC}/libefence.a ${PREFIX}/lib
+ ${INSTALL_MAN} ${WRKSRC}/libefence.3 ${PREFIX}/man/man3
+
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/electricfence/distinfo b/devel/electricfence/distinfo
index 7b8cb05a5b6..8dd2f1b24be 100644
--- a/devel/electricfence/distinfo
+++ b/devel/electricfence/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2001/11/09 00:39:39 hubertf Exp $
+$NetBSD: distinfo,v 1.5 2004/02/04 13:33:36 grant Exp $
SHA1 (ElectricFence-2.1.tar.gz) = 1794db6d446f31045ebf845543cf6759cbab1e4f
Size (ElectricFence-2.1.tar.gz) = 47917 bytes
-SHA1 (patch-aa) = 4bf399ac54af53bd564158d3a55925ab1b38f551
+SHA1 (patch-aa) = 53c7c23d6d0a5b4f9814125bce8d6280f474fd56
SHA1 (patch-ab) = 85d3ae4197e520c6718367d60836c1378e71f33c
SHA1 (patch-ac) = 4c56eeea0b8e53cdf260b61aa8fdef16f601b186
diff --git a/devel/electricfence/patches/patch-aa b/devel/electricfence/patches/patch-aa
index d6a8e8deddf..1843846e064 100644
--- a/devel/electricfence/patches/patch-aa
+++ b/devel/electricfence/patches/patch-aa
@@ -1,36 +1,26 @@
-$NetBSD: patch-aa,v 1.3 2000/07/07 02:42:10 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.4 2004/02/04 13:33:36 grant Exp $
---- Makefile.orig Fri Jan 20 00:33:04 1995
-+++ Makefile Thu Jul 6 16:59:59 2000
-@@ -1,11 +1,14 @@
+--- Makefile.orig 1998-03-13 06:52:19.000000000 +1100
++++ Makefile
+@@ -1,12 +1,12 @@
-ASFLAGS= -mips2
-+#ASFLAGS= -mips2
- CC= cc
- AR= ar
+-CC= cc
+-AR= ar
-INSTALL= install
- MV= mv
- CHMOD= chmod
+-MV= mv
+-CHMOD= chmod
-CFLAGS= -g
-LIB_INSTALL_DIR= /usr/lib
-MAN_INSTALL_DIR= /usr/man/man3
-+.if ${MACHINE_ARCH} == "mipsel"
-+CFLAGS= -g -DPAGE_PROTECTION_VIOLATED_SIGNAL=SIGBUS
-+.else
-+CFLAGS= -g
-+.endif
-+LIB_INSTALL_DIR= ${PREFIX}/lib
-+MAN_INSTALL_DIR= ${PREFIX}/man/man3
++#ASFLAGS= -mips2
++#CC= cc
++#AR= ar
++#INSTALL= install
++#MV= mv
++#CHMOD= chmod
++#CFLAGS= -g
++#LIB_INSTALL_DIR= /usr/lib
++#MAN_INSTALL_DIR= /usr/man/man3
PACKAGE_SOURCE= README libefence.3 Makefile efence.h \
-@@ -40,8 +43,7 @@
-
- install: libefence.a libefence.3
-- $(MV) 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
-+ ${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:
+ efence.c page.c print.c eftest.c tstheap.c CHANGES COPYING