[pkgsrc/trunk]: pkgsrc/devel/electricfence simplify by commenting the pkg's M...

[grant <grant%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0ab416d35f95
branches:  trunk
changeset: 467630:0ab416d35f95
user:      grant <grant%pkgsrc.org@localhost>
date:      Wed Feb 04 13:33:36 2004 +0000

description:
simplify by commenting the pkg's Makefile variables as they're
already set by pkgsrc. override the do-install target.

diffstat:

 devel/electricfence/Makefile         |  14 ++++++++++-
 devel/electricfence/distinfo         |   4 +-
 devel/electricfence/patches/patch-aa |  46 ++++++++++++++---------------------
 3 files changed, 33 insertions(+), 31 deletions(-)

diffs (97 lines):

diff -r 993c3bdf7130 -r 0ab416d35f95 devel/electricfence/Makefile
--- a/devel/electricfence/Makefile      Wed Feb 04 13:25:43 2004 +0000
+++ b/devel/electricfence/Makefile      Wed Feb 04 13:33:36 2004 +0000
@@ -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 @@
 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 -r 993c3bdf7130 -r 0ab416d35f95 devel/electricfence/distinfo
--- a/devel/electricfence/distinfo      Wed Feb 04 13:25:43 2004 +0000
+++ b/devel/electricfence/distinfo      Wed Feb 04 13:33:36 2004 +0000
@@ -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 -r 993c3bdf7130 -r 0ab416d35f95 devel/electricfence/patches/patch-aa
--- a/devel/electricfence/patches/patch-aa      Wed Feb 04 13:25:43 2004 +0000
+++ b/devel/electricfence/patches/patch-aa      Wed Feb 04 13:33:36 2004 +0000
@@ -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