4 files changed, 50 insertions, 21 deletions

diff --git a/devel/ElectricFence/Makefile b/devel/ElectricFence/Makefile
index e59a286afe3e..47509b821e16 100644
--- a/devel/ElectricFence/Makefile
+++ b/devel/ElectricFence/Makefile
@@ -7,14 +7,18 @@
 #
 
 PORTNAME=	electricfence
-PORTVERSION=	2.0.5
+PORTVERSION=	2.2.2
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_SUNSITE}
+MASTER_SITES=	ftp://ftp.perens.com/pub/ElectricFence/Beta/  \
+		ftp://ftp.netsw.org/netsw/System/Libs/Memory/Debug/  \
+		ftp://ftp.sai.msu.su/pub/unix/debug/  \
+		${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	devel/lang/c
 DISTNAME=	ElectricFence-${PORTVERSION}
 
 MAINTAINER=	obrien@FreeBSD.org
 
+CFLAGS+=	-D__USE_BSD
 MAN3=		libefence.3
 
 do-install:
diff --git a/devel/ElectricFence/distinfo b/devel/ElectricFence/distinfo
index a31ca703e050..e599ca0ef083 100644
--- a/devel/ElectricFence/distinfo
+++ b/devel/ElectricFence/distinfo
@@ -1 +1 @@
-MD5 (ElectricFence-2.0.5.tar.gz) = d6a8459d2e9ef955eb4d3f76004617f8
+MD5 (ElectricFence-2.2.2.tar.gz) = 56a3cbfdbf65f916988787c789c63e80
diff --git a/devel/ElectricFence/files/patch-aa b/devel/ElectricFence/files/patch-aa
index 3b89f39d1082..f826b1455b09 100644
--- a/devel/ElectricFence/files/patch-aa
+++ b/devel/ElectricFence/files/patch-aa
@@ -1,14 +1,41 @@
---- Makefile.orig	Thu Jan 19 23:33:04 1995
-+++ Makefile	Tue Sep 21 17:44:46 1999
-@@ -4,7 +4,10 @@
- INSTALL= install
- MV= mv
- CHMOD= chmod
--CFLAGS= -g
-+CFLAGS+= -g
+--- Makefile.orig	Sat Aug 26 18:29:55 2000
++++ Makefile	Sat Aug 26 18:31:42 2000
+@@ -1,8 +1,14 @@
+ PIC= -fPIC
+-CFLAGS= -g -DUSE_SEMAPHORE $(PIC)
+-LIBS= -lpthread
++#CFLAGS= -g -DUSE_SEMAPHORE $(PIC)
++CFLAGS+= -g $(PIC)
 +.if ${MACHINE_ARCH} == "i386"
 +CFLAGS+= -DPAGE_PROTECTION_VIOLATED_SIGNAL=SIGBUS
 +.endif
- LIB_INSTALL_DIR= /usr/lib
- MAN_INSTALL_DIR= /usr/man/man3
++#CFLAGS+= -pthread
++#	for FreeBSD comment out the below as this is not how we do pthreads.
++#LIB_PTHREADS= -lpthread -lc
+ 
+-prefix=/usr
++prefix=$(PREFIX)
+ BIN_INSTALL_DIR= $(prefix)/bin
+ LIB_INSTALL_DIR= $(prefix)/lib
+ MAN_INSTALL_DIR= $(prefix)/man/man3
+@@ -54,16 +60,16 @@
+ 	$(AR) crv libefence.a $(OBJECTS)
+ 
+ libefence.so.0.0: $(OBJECTS)
+-	gcc -g -shared -Wl,-soname,libefence.so.0 -o libefence.so.0.0 \
+-		$(OBJECTS) -lpthread -lc 
++	$(CC) $(CFLAGS) -shared -Wl,-soname,libefence.so.0 -o libefence.so.0.0 \
++		$(OBJECTS) $(LIB_PTHREADS)
+ 
+ tstheap: libefence.a tstheap.o
+ 	- rm -f tstheap
+-	$(CC) $(CFLAGS) tstheap.o libefence.a -o tstheap $(LIBS)
++	$(CC) $(CFLAGS) tstheap.o libefence.a -o tstheap $(LIB_PTHREADS)
+ 
+ eftest: libefence.a eftest.o
+ 	- rm -f eftest
+-	$(CC) $(CFLAGS) eftest.o libefence.a -o eftest $(LIBS)
++	$(CC) $(CFLAGS) eftest.o libefence.a -o eftest $(LIB_PTHREADS)
+ 
+ $(OBJECTS) tstheap.o eftest.o: efence.h
  
diff --git a/devel/ElectricFence/files/patch-ab b/devel/ElectricFence/files/patch-ab
index 5fbb7b906fd7..25d27763eb86 100644
--- a/devel/ElectricFence/files/patch-ab
+++ b/devel/ElectricFence/files/patch-ab
@@ -1,13 +1,11 @@
---- page.c.orig	Wed Nov 12 21:57:13 1997
-+++ page.c	Wed Nov 12 23:19:57 1997
-@@ -30,8 +30,10 @@
+--- page.c.orig	Sun Apr 11 14:45:26 1999
++++ page.c	Sat Aug 26 18:19:58 2000
+@@ -29,7 +29,7 @@
+ 
  static caddr_t	startAddr = (caddr_t) 0;
  
- #if ( !defined(sgi) && !defined(_AIX) )
-+#if ( !defined(BSD) || (BSD < 199103) )
+-#if ( !defined(sgi) && !defined(_AIX) &&!defined(__USE_BSD))
++#if ( !defined(sgi) && !defined(_AIX) && !(defined(BSD) && (BSD >= 199103)) )
  extern int	sys_nerr;
  extern char *	sys_errlist[];
-+#endif
  #endif
- 
- static const char *