3 files changed, 48 insertions, 63 deletions
diff --git a/net/openldap/files/patch-aa b/net/openldap/files/patch-aa
index bfa9c66bc95a..335c36f7f2d6 100644
--- a/net/openldap/files/patch-aa
+++ b/net/openldap/files/patch-aa
@@ -1,25 +1,24 @@
-*** Make-common.orig	Fri Sep  4 13:28:19 1998
---- Make-common	Mon Sep 21 14:35:10 1998
-***************
-*** 261,270 ****
-  # LDAP_ACLGROUP=-DACLGROUP
-  
-  # uncomment these lines to enable support for CRYPT passwords in LDBM.
-! # LDAP_CRYPT=-DLDAP_CRYPT
-  # LDAP_CRYPT_LIB?=
-  # and comment this line out
-! LDAP_CRYPT_LIB=
-  
-  # uncomment these lines to enable support fro tcp_wrappers in servers.
-  # Requires tcp_wrappers.
---- 261,270 ----
-  # LDAP_ACLGROUP=-DACLGROUP
-  
-  # uncomment these lines to enable support for CRYPT passwords in LDBM.
-! LDAP_CRYPT=-DLDAP_CRYPT
-  # LDAP_CRYPT_LIB?=
-  # and comment this line out
-! # LDAP_CRYPT_LIB=
-  
-  # uncomment these lines to enable support fro tcp_wrappers in servers.
-  # Requires tcp_wrappers.
+--- Make-common.orig	Fri Oct 16 18:59:29 1998
++++ Make-common	Fri Oct 16 19:08:04 1998
+@@ -189,7 +189,7 @@
+ 
+ # Locations of auxilary programs
+ # (excepts to below are generally defined in Make-platform)
+-LDAP_SENDMAIL?=/usr/lib/sendmail
++LDAP_SENDMAIL?=/usr/sbin/sendmail
+ LDAP_EDITOR?=/usr/ucb/vi
+ LDAP_FINGER?=/usr/ucb/finger
+ 
+@@ -261,10 +261,10 @@
+ # LDAP_ACLGROUP=-DACLGROUP
+ 
+ # uncomment these lines to enable support for CRYPT passwords in LDBM.
+-# LDAP_CRYPT=-DLDAP_CRYPT
++LDAP_CRYPT=-DLDAP_CRYPT
+ # LDAP_CRYPT_LIB?=
+ # and comment this line out
+-LDAP_CRYPT_LIB=
++# LDAP_CRYPT_LIB=
+ 
+ # uncomment these lines to enable support fro tcp_wrappers in servers.
+ # Requires tcp_wrappers.
diff --git a/net/openldap/files/patch-ab b/net/openldap/files/patch-ab
index 6fff54cd4064..9007987a52b3 100644
--- a/net/openldap/files/patch-ab
+++ b/net/openldap/files/patch-ab
@@ -1,19 +1,11 @@
-*** build/platforms/freebsd2-gcc/Make-platform.orig	Mon Sep 21 14:44:56 1998
---- build/platforms/freebsd2-gcc/Make-platform	Mon Sep 21 14:53:32 1998
-***************
-*** 6,12 ****
-  #
-  # add any platform-specific overrides below here
-  #
-! EXTRACFLAGS=-O -g
-  LDBMBACKEND=-DLDBM_USE_DBBTREE
-  LDBMINCLUDE=-I/usr/include
-  
---- 6,12 ----
-  #
-  # add any platform-specific overrides below here
-  #
-! EXTRACFLAGS?=-O -g
-  LDBMBACKEND=-DLDBM_USE_DBBTREE
-  LDBMINCLUDE=-I/usr/include
-  
+--- build/platforms/freebsd2-gcc/Make-platform.orig	Wed Sep 16 11:55:05 1998
++++ build/platforms/freebsd2-gcc/Make-platform	Fri Oct 16 18:59:41 1998
+@@ -6,7 +6,7 @@
+ #
+ # add any platform-specific overrides below here
+ #
+-EXTRACFLAGS=-O -g
++EXTRACFLAGS?=-O -g
+ LDBMBACKEND=-DLDBM_USE_DBBTREE
+ LDBMINCLUDE=-I/usr/include
+ 
diff --git a/net/openldap/files/patch-ac b/net/openldap/files/patch-ac
index 2f33c00ad1f1..847a4bf0a165 100644
--- a/net/openldap/files/patch-ac
+++ b/net/openldap/files/patch-ac
@@ -1,19 +1,13 @@
-*** build/platforms/freebsd3-gcc/Make-platform.orig	Mon Sep 21 14:45:53 1998
---- build/platforms/freebsd3-gcc/Make-platform	Mon Sep 21 14:53:44 1998
-***************
-*** 6,12 ****
-  #
-  # add any platform-specific overrides below here
-  #
-! EXTRACFLAGS=-O -g
-  LDBMBACKEND=-DLDBM_USE_DBBTREE
-  LDBMINCLUDE=-I/usr/include
-  
---- 6,12 ----
-  #
-  # add any platform-specific overrides below here
-  #
-! EXTRACFLAGS?=-O -g
-  LDBMBACKEND=-DLDBM_USE_DBBTREE
-  LDBMINCLUDE=-I/usr/include
-  
+--- build/platforms/freebsd3-gcc/Make-platform.orig	Wed Sep 16 11:55:05 1998
++++ build/platforms/freebsd3-gcc/Make-platform	Fri Oct 16 19:06:39 1998
+@@ -30,8 +30,8 @@
+ THREADS= -DPOSIX_THREADS -D_THREAD_SAFE -DPTHREAD_PREEMPTIVE
+ 
+ # use special gcc flag to include libc_r.a
+-THREADSLIB= -pthread
+-#THREADSLIB= -lc_r
++#THREADSLIB= -pthread
++THREADSLIB= -lc_r
+ 
+ # if you built/installed with -DNOLIBC_R, you'll need uncomment
+ # out the following