From 69b707c4f42489a14f179daf4fa5942f34826228 Mon Sep 17 00:00:00 2001
From: reed <reed>
Date: Sun, 14 Feb 2010 00:06:16 +0000
Subject: Per my old PR #40238: Match up the directory name and package name to
 match the source distfile name. (It had three different names, including, the
 distfile name.)

This moves electricfence to electricfence and renames the package from
ElectricFence to electric-fence.
---
 devel/electric-fence/patches/patch-aa | 85 +++++++++++++++++++++++++++++++++++
 devel/electric-fence/patches/patch-ab | 28 ++++++++++++
 devel/electric-fence/patches/patch-ac | 13 ++++++
 3 files changed, 126 insertions(+)
 create mode 100644 devel/electric-fence/patches/patch-aa
 create mode 100644 devel/electric-fence/patches/patch-ab
 create mode 100644 devel/electric-fence/patches/patch-ac

(limited to 'devel/electric-fence/patches')

diff --git a/devel/electric-fence/patches/patch-aa b/devel/electric-fence/patches/patch-aa
new file mode 100644
index 00000000000..33a397d66be
--- /dev/null
+++ b/devel/electric-fence/patches/patch-aa
@@ -0,0 +1,85 @@
+$NetBSD: patch-aa,v 1.1.1.1 2010/02/14 00:06:16 reed Exp $
+
+--- Makefile.orig	2002-02-19 23:51:44.000000000 +0200
++++ Makefile
+@@ -1,12 +1,14 @@
+-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
++#ASFLAGS= -mips2
++#CC= cc
++#AR= ar
++#INSTALL= install
++#MV= mv
++#CHMOD= chmod
++#CFLAGS= -g
++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/electric-fence/patches/patch-ab b/devel/electric-fence/patches/patch-ab
new file mode 100644
index 00000000000..5c9cfc36eed
--- /dev/null
+++ b/devel/electric-fence/patches/patch-ab
@@ -0,0 +1,28 @@
+$NetBSD: patch-ab,v 1.1.1.1 2010/02/14 00:06:16 reed Exp $
+
+--- page.c.orig	2001-04-11 17:44:04.000000000 +0300
++++ page.c
+@@ -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) )
+ extern int	sys_nerr;
+ /*extern char *	sys_errlist[];*/
+ #endif
+@@ -39,13 +39,8 @@ stringErrorReport(void)
+ {
+ #if ( defined(sgi) )
+ 	return strerror(oserror());
+-#elif ( defined(_AIX) )
+-	return strerror(errno);
+ #else
+-	if ( errno > 0 && errno < sys_nerr )
+-		return sys_errlist[errno];
+-	else
+-		return "Unknown error.\n";
++	return strerror(errno);
+ #endif
+ }
+ 
diff --git a/devel/electric-fence/patches/patch-ac b/devel/electric-fence/patches/patch-ac
new file mode 100644
index 00000000000..ccd3df4eb21
--- /dev/null
+++ b/devel/electric-fence/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1.1.1 2010/02/14 00:06:16 reed Exp $
+
+--- tstheap.c.orig	Fri Jan 20 05:54:32 1995
++++ tstheap.c
+@@ -47,7 +47,7 @@
+ 
+ 	for ( ; count < duration; count++ ) {
+ 		void * *	element = &pool[(int)(drand48() * POOL_SIZE)];
+-		size_t		size = (size_t)(drand48() * (LARGEST_BUFFER + 1));
++		size_t		size = (size_t)(lrand48() % (LARGEST_BUFFER + 1));
+ 
+ 		if ( *element ) {
+ 			free( *element );
-- 
cgit v1.2.3