Fix usage of libc_r (i. e. replace -lc_r with -pthread) and simplify

prefix handling.

OK'ed by:	maintainer

2 files changed, 5 insertions, 28 deletions

diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile
index 5c0bd4d9f47d..4c16882e5a8a 100644
--- a/security/stunnel/Makefile
+++ b/security/stunnel/Makefile
@@ -22,16 +22,10 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=/var/run
 
 MAN8=		stunnel.8
-CONFIGURE_ENV+= LOCALBASE=${LOCALBASE}
 
 cert:
 	@(cd ${WRKSRC}; make cert)
 
-post-patch:
-	${SED} -e 's,%%LOCALBASE%%,${LOCALBASE},' ${WRKSRC}/configure > ${WRKSRC}/configure~
-	${MV} ${WRKSRC}/configure~ ${WRKSRC}/configure
-	${CHMOD} a+x ${WRKSRC}/configure
-
 post-build:
 	@${ECHO} ""
 	@${ECHO} "********************************************************************"
diff --git a/security/stunnel/files/patch-ac b/security/stunnel/files/patch-ac
index 180b11e87da6..084c75b1f7d6 100644
--- a/security/stunnel/files/patch-ac
+++ b/security/stunnel/files/patch-ac
@@ -1,22 +1,5 @@
-*** configure.orig	Thu Feb 10 06:18:18 2000
---- configure	Fri Feb 25 16:29:14 2000
-***************
-*** 9,15 ****
-  
-  # Defaults:
-  ac_help=
-! ac_default_prefix=/usr/local
-  # Any additions from configure.in:
-  ac_help="$ac_help
-    --with-random=FILE      read randomness from FILE (default=/dev/urandom)"
---- 9,15 ----
-  
-  # Defaults:
-  ac_help=
-! ac_default_prefix=%%LOCALBASE%%
-  # Any additions from configure.in:
-  ac_help="$ac_help
-    --with-random=FILE      read randomness from FILE (default=/dev/urandom)"
+*** configure.orig	Thu Feb 10 12:18:18 2000
+--- configure	Tue Feb 29 13:56:21 2000
 ***************
 *** 1051,1064 ****
     echo "$ac_t""no" 1>&6
@@ -44,7 +27,7 @@
     echo $ac_n "(cached) $ac_c" 1>&6
   else
     ac_save_LIBS="$LIBS"
-! LIBS="-lc_r  $LIBS"
+! LIBS="-pthread  $LIBS"
   cat > conftest.$ac_ext <<EOF
   #line 1064 "configure"
   #include "confdefs.h"
@@ -73,7 +56,7 @@
   #define $ac_tr_lib 1
   EOF
   
-!   LIBS="-lc_r $LIBS"
+!   LIBS="-pthread $LIBS"
   
   else
     echo "$ac_t""no" 1>&6
@@ -107,7 +90,7 @@
   echo $ac_n "checking for RSAref library""... $ac_c" 1>&6
   echo "configure:1201: checking for RSAref library" >&5
   saved_LIBS="$LIBS"
-! LIBS="$saved_LIBS -lRSAglue -L%%LOCALBASE%%/lib -lrsaref"
+! LIBS="$saved_LIBS -lRSAglue -L${prefix}/lib -lrsaref"
   cat > conftest.$ac_ext <<EOF
   #line 1205 "configure"
   #include "confdefs.h"