Updated ElectricFence to 2.1.13.0.1.

Changes since 2.1.0 (from debian/changelog):
electric-fence (2.1.13-0.1) unstable; urgency=low

  * Non-maintainer upload
  * eftest.c: uses sig{set,long}jmp() instead of {set,long}jmp() to work on
    both 2.4 and 2.6 kernels (closes: #203436)
  * Added a proper description (closes: #209479)
  * Changed order of commands to build static library without PIC
    (closes: #154034)
  * Clarified and fixed manpage:
    - clarified semantics of EF_PROTECT_FREE (closes: #177800)
    - EF_ALLOC_MALLOC_0 -> EF_ALLOW_MALLOC_0 (closes: #177807)
    - mention EF_ALLOW_MALLOC_0 in the synopsis, correct number of conf
      switches (closes: #177808)
  * /usr/doc symlink not created any more, added postrm with ldconfig call,
    added debhelper tokens (closes: #222980)

 -- Martin Pitt <mpitt@debian.org>  Fri,  5 Dec 2003 16:51:38 +0100

electric-fence (2.1.13) unstable; urgency=high

  * Link with pthreads (closes: #135122)

 -- Matthew Vernon <matthew@debian.org>  Fri, 22 Feb 2001 09:57:50 +0000

electric-fence (2.1.12) unstable; urgency=high

  * Add multithreading support (thanks to infrared@mail.index.hu)
    (closes: #67838)
  * Specify the GPL version (closes: #133494)
  * Patch to allow you to specify that electric-fence should set freed
    memory to a fixed value - makes things more helpful under gdb in
    certain circumstances (patch from Petter Reinholdtsen <pere@hungry.com>
    and modified by yours truly to make it legal :-) (closes: #59764)
  * That's all the outstanding bugs fixed for the next release

 -- Matthew Vernon <matthew@debian.org>  Tue, 19 Feb 2001 22:09:37 +0000

electric-fence (2.1.11) unstable; urgency=low

  * Fix daft typo (closes: #105418)

 -- Matthew Vernon <matthew@debian.org>  Mon, 16 Jul 2001 08:56:01 +0100

electric-fence (2.1.10) unstable; urgency=low

  * pass int not char as type to va_arg (closes: #104800)

 -- Matthew Vernon <matthew@debian.org>  Sun, 15 Jul 2001 13:05:34 +0100

electric-fence (2.1.9) unstable; urgency=low

  * Get the /usr/doc/ stuff right this time (closes: #97010, #97890)

 -- Matthew Vernon <matthew@debian.org>  Fri, 18 May 2001 14:28:01 +0100

electric-fence (2.1.8) unstable; urgency=low

  * Remove spurious (int) casts in calls to mmap (closes: #84940)

 -- Matthew Vernon <matthew@debian.org>  Wed, 11 Apr 2001 15:48:39 +0100

electric-fence (2.1.7) unstable; urgency=low

  * Check if /usr/doc/electric-fence is a symlink in postinst (closes: #93534)

 -- Matthew Vernon <matthew@debian.org>  Tue, 10 Apr 2001 15:41:49 +0100

electric-fence (2.1.6) unstable; urgency=low

  * Make the banner print a correct version (closes: #81413)
  * Man page into /usr/share/man (closes: #91147,#81450)
  * Be sure to get rid of /usr/doc/electric-fence (closes: #81023)

 -- Matthew Vernon <matthew@debian.org>  Mon, 09 Apr 2001 14:52:03 +0100

electric-fence (2.1.5) unstable; urgency=low

  * rename the manpage to correspond to the README file (closes: #77243)

 -- Matthew Vernon <matthew@debian.org>  Fri, 17 Nov 2000 18:35:42 +0000

electric-fence (2.1.4) unstable; urgency=low

  * build tidy-ups (closes: #48156, #52927, #56142)

 -- Matthew Vernon <matthew@debian.org>  Mon, 16 Oct 2000 18:01:36 +0100

electric-fence (2.1.3) unstable; urgency=low

  * install libefence.so (closes:48156)

 -- Matthew Vernon <matthew@debian.org>  Mon, 07 dec 1999 15:42:00 +0000

electric-fence (2.1.2) unstable; urgency=low

  * Actually install that gdb documentation <sigh>

 -- Matthew Vernon <matthew@debian.org>  Mon, 13 Sep 1999 14:08:00 +0100

electric-fence (2.1.1) unstable; urgency=low

   * Taking over this package properly
   * Version numbering fixed (I hope)

 -- Matthew Vernon <matthew@debian.org>  Mon, 01 Sep 1999 13:00:00 +0100

electric-fence (2.1-2) unstable; urgency=low

   * Added Ian Jackson's patches (closes: #41314)
   * Added gdb documentation     (closes: #33186)

 -- Matthew Vernon <matthew@debian.org>  Mon, 16 Aug 1999 16:08:22 +0100

electric-fence (2.1-1) unstable; urgency=low

  * new upstream release (closes: #35853)

6 files changed, 98 insertions, 73 deletions

diff --git a/devel/electricfence/Makefile b/devel/electricfence/Makefile
index bb24b86be1b..976a30aedca 100644
--- a/devel/electricfence/Makefile
+++ b/devel/electricfence/Makefile
@@ -1,15 +1,21 @@
-# $NetBSD: Makefile,v 1.13 2008/03/03 17:45:35 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2008/12/02 22:26:45 rillig Exp $
 
-DISTNAME=		ElectricFence-2.1
-PKGREVISION=		1
+DISTNAME=		electric-fence_2.1.13-0.1
+PKGNAME=		ElectricFence-2.1.13.0.1
 CATEGORIES=		devel
-MASTER_SITES=		ftp://ftp.perens.com/pub/ElectricFence/
+MASTER_SITES=		http://perens.com/works/software/ElectricFence/
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.perens.com/FreeSoftware/
 COMMENT=		Different kind of malloc() debugger
 
 PKG_DESTDIR_SUPPORT=	user-destdir
+USE_LIBTOOL=		yes
+WRKSRC=			${WRKDIR}/${DISTNAME:C/-0.1//1:C/_/-/1}
+
+MAKE_FLAGS=		INSTALL_MAN=${INSTALL_MAN:Q}
+PTHREAD_AUTO_VARS=	yes
+AUTO_MKDIRS=		yes
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -19,11 +25,5 @@ CFLAGS+=		-g -DPAGE_PROTECTION_VIOLATED_SIGNAL=SIGBUS
 CFLAGS+=		-g
 .endif
 
-INSTALLATION_DIRS=	lib ${PKGMANDIR}/man3
-
-do-install:
-	${INSTALL_DATA} ${WRKSRC}/libefence.a ${DESTDIR}${PREFIX}/lib
-	${INSTALL_MAN} ${WRKSRC}/libefence.3 \
-		${DESTDIR}${PREFIX}/${PKGMANDIR}/man3
-
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/electricfence/PLIST b/devel/electricfence/PLIST
index 77f0523e82f..36146c1855f 100644
--- a/devel/electricfence/PLIST
+++ b/devel/electricfence/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:23:21 zuntum Exp $
-lib/libefence.a
+@comment $NetBSD: PLIST,v 1.2 2008/12/02 22:26:45 rillig Exp $
+lib/libefence.la
 man/man3/libefence.3
diff --git a/devel/electricfence/distinfo b/devel/electricfence/distinfo
index 5e601a56dea..2ea006736a3 100644
--- a/devel/electricfence/distinfo
+++ b/devel/electricfence/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.9 2006/01/08 20:25:34 joerg Exp $
+$NetBSD: distinfo,v 1.10 2008/12/02 22:26:45 rillig Exp $
 
-SHA1 (ElectricFence-2.1.tar.gz) = 1794db6d446f31045ebf845543cf6759cbab1e4f
-RMD160 (ElectricFence-2.1.tar.gz) = 4513b43b2c9b4212822c2b2d749b6485909d8f67
-Size (ElectricFence-2.1.tar.gz) = 47917 bytes
-SHA1 (patch-aa) = 53c7c23d6d0a5b4f9814125bce8d6280f474fd56
-SHA1 (patch-ab) = 54c2dca3c58f430fd2ffe3a59ddfd6d89fc4bbda
+SHA1 (electric-fence_2.1.13-0.1.tar.gz) = e6765bcb1543272040b806eea706fc7ae9b60524
+RMD160 (electric-fence_2.1.13-0.1.tar.gz) = 75e41de7bef263007f24a1053528959f9f7fe1fa
+Size (electric-fence_2.1.13-0.1.tar.gz) = 29991 bytes
+SHA1 (patch-aa) = 9b2f1720a92c805d8d4b36631317493124c2f2d7
+SHA1 (patch-ab) = 64c503ce8d2ea9b55432d59a187e644af38e257b
 SHA1 (patch-ac) = 4c56eeea0b8e53cdf260b61aa8fdef16f601b186
-SHA1 (patch-ad) = 28cb084b2cbf6ecb6ec38c9ba11237fd2204aa92
diff --git a/devel/electricfence/patches/patch-aa b/devel/electricfence/patches/patch-aa
index 1843846e064..36b0d73835f 100644
--- a/devel/electricfence/patches/patch-aa
+++ b/devel/electricfence/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2004/02/04 13:33:36 grant Exp $
+$NetBSD: patch-aa,v 1.5 2008/12/02 22:26:45 rillig Exp $
 
---- Makefile.orig	1998-03-13 06:52:19.000000000 +1100
+--- Makefile.orig	2002-02-19 23:51:44.000000000 +0200
 +++ Makefile
-@@ -1,12 +1,12 @@
+@@ -1,12 +1,14 @@
 -ASFLAGS= -mips2
 -CC= cc
 -AR= ar
@@ -19,8 +19,67 @@ $NetBSD: patch-aa,v 1.4 2004/02/04 13:33:36 grant Exp $
 +#MV= mv
 +#CHMOD= chmod
 +#CFLAGS= -g
-+#LIB_INSTALL_DIR= /usr/lib
-+#MAN_INSTALL_DIR= /usr/man/man3
++LIB_INSTALL_DIR=	${PREFIX}/lib
++MAN_INSTALL_DIR=	${PREFIX}/${PKGMANDIR}/man3
++SO_VER=			0:0
++LIBTOOL=		libtool
  
  PACKAGE_SOURCE= README libefence.3 Makefile efence.h \
  	efence.c page.c print.c eftest.c tstheap.c CHANGES COPYING
+@@ -26,9 +28,9 @@ PACKAGE_SOURCE= README libefence.3 Makef
+ # as well if using Sun's compiler, -static if using GCC.
+ # CFLAGS= -g -Bstatic -DPAGE_PROTECTION_VIOLATED_SIGNAL=SIGBUS
+ 
+-OBJECTS= efence.o page.o print.o
++OBJECTS= efence.lo page.lo print.lo
+ 
+-all:	libefence.a tstheap eftest
++all:	libefence.la tstheap eftest
+ 	@ echo
+ 	@ echo "Testing Electric Fence."
+ 	@ echo "After the last test, it should print that the test has PASSED."
+@@ -38,11 +40,9 @@ all:	libefence.a tstheap eftest
+ 	@ echo "Electric Fence confidence test PASSED." 
+ 	@ echo
+ 
+-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: libefence.la libefence.3
++	$(LIBTOOL) --mode=install $(INSTALL) -c libefence.la $(DESTDIR)${LIB_INSTALL_DIR}
++	$(INSTALL_MAN) libefence.3 ${DESTDIR}$(MAN_INSTALL_DIR)/libefence.3
+ 
+ clean:
+ 	- rm -f $(OBJECTS) tstheap.o eftest.o tstheap eftest libefence.a \
+@@ -57,16 +57,22 @@ ElectricFence.shar: $(PACKAGE_SOURCE)
+ 
+ shar: ElectricFence.shar
+ 
+-libefence.a: $(OBJECTS)
+-	- rm -f libefence.a
+-	$(AR) crv libefence.a $(OBJECTS)
++libefence.la: $(OBJECTS)
++	$(LIBTOOL) --tag=CC --mode=link ${CC} -o libefence.la \
++		${OBJECTS} ${LDFLAGS} ${LIBS} \
++		-rpath ${LIB_INSTALL_DIR} -version-info ${SO_VER}
+ 
+-tstheap: libefence.a tstheap.o
++tstheap: libefence.la tstheap.o
+ 	- rm -f tstheap
+-	$(CC) $(CFLAGS) tstheap.o libefence.a -o tstheap -lpthread
++	$(CC) $(CFLAGS) tstheap.o .libs/libefence.a -o tstheap -lpthread
+ 
+-eftest: libefence.a eftest.o
++eftest: libefence.la eftest.o
+ 	- rm -f eftest
+-	$(CC) $(CFLAGS) eftest.o libefence.a -o eftest -lpthread
++	$(CC) $(CFLAGS) eftest.o .libs/libefence.a -o eftest -lpthread
+ 
+ $(OBJECTS) tstheap.o eftest.o: efence.h
++
++.SUFFIXES: .lo
++.c.lo:
++	$(LIBTOOL) --tag=CC --mode=compile $(CC) -o ${.TARGET} \
++		-c ${CPPFLAGS} ${CFLAGS} ${.IMPSRC}
diff --git a/devel/electricfence/patches/patch-ab b/devel/electricfence/patches/patch-ab
index 2da0b6ff191..1573ae0dd3e 100644
--- a/devel/electricfence/patches/patch-ab
+++ b/devel/electricfence/patches/patch-ab
@@ -1,48 +1,28 @@
-$NetBSD: patch-ab,v 1.5 2005/11/08 03:27:32 tv Exp $
+$NetBSD: patch-ab,v 1.6 2008/12/02 22:26:45 rillig Exp $
 
---- page.c.orig	1996-04-26 18:57:38.000000000 -0400
+--- page.c.orig	2001-04-11 17:44:04.000000000 +0300
 +++ page.c
-@@ -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 @@
+@@ -29,7 +29,7 @@
  
  static caddr_t	startAddr = (caddr_t) 0;
  
 -#if ( !defined(sgi) && !defined(_AIX) )
-+#if ( !defined(sgi) && !defined(_AIX) && !(defined(BSD) && BSD >= 199306)) && !defined(linux) && !defined(__INTERIX)
++#if ( !defined(sgi) && !defined(_AIX) && !(defined(BSD) && BSD >= 199306) && !defined(linux) && !defined(__INTERIX) )
  extern int	sys_nerr;
- extern char *	sys_errlist[];
+ /*extern char *	sys_errlist[];*/
  #endif
-@@ -39,7 +40,7 @@ stringErrorReport(void)
+@@ -39,13 +39,8 @@ stringErrorReport(void)
  {
  #if ( defined(sgi) )
  	return strerror(oserror());
 -#elif ( defined(_AIX) )
-+#elif ( defined(_AIX) || defined(__INTERIX) )
- 	return strerror(errno);
+-	return strerror(errno);
  #else
- 	if ( errno > 0 && errno < sys_nerr )
-@@ -70,7 +71,7 @@ Page_Create(size_t size)
- 	 */
- 	allocation = (caddr_t) mmap(
- 	 startAddr
--	,(int)size
-+	,size
- 	,PROT_READ|PROT_WRITE
- 	,MAP_PRIVATE|MAP_ANONYMOUS
- 	,-1
-@@ -122,7 +123,7 @@ Page_Create(size_t size)
- 	 */
- 	allocation = (caddr_t) mmap(
- 	 startAddr
--	,(int)size
-+	,size
- 	,PROT_READ|PROT_WRITE
- 	,MAP_PRIVATE
- 	,devZeroFd
+-	if ( errno > 0 && errno < sys_nerr )
+-		return sys_errlist[errno];
+-	else
+-		return "Unknown error.\n";
++	return strerror(errno);
+ #endif
+ }
+ 
diff --git a/devel/electricfence/patches/patch-ad b/devel/electricfence/patches/patch-ad
deleted file mode 100644
index 96b18471dc1..00000000000
--- a/devel/electricfence/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2006/01/08 20:25:34 joerg Exp $
-
---- print.c.orig	2006-01-08 20:17:34.000000000 +0000
-+++ print.c
-@@ -99,7 +99,7 @@ vprint(const char * pattern, va_list arg
- 				break;
- 			case 'c':
- 				{
--					char	c = va_arg(args, char);
-+					char	c = va_arg(args, int);
- 					
- 					(void) write(2, &c, 1);
- 				}