Fix build for USA_RESIDENT=yes. Also get this to compile again on

-current.

PR:		14888
Inspired by:	maintainer and the stunnel port

3 files changed, 58 insertions, 2 deletions

diff --git a/security/bjorb/Makefile b/security/bjorb/Makefile
index 303ed1cdb3e0..aad973c2f153 100644
--- a/security/bjorb/Makefile
+++ b/security/bjorb/Makefile
@@ -35,9 +35,9 @@ RESTRICTED=	"Cryptography"
 INSTALL_TARGET=		install certificate
 .endif
 
-HAS_CONFIGURE=	yes
+USE_AUTOCONF=	yes
 CFLAGS+=	-I${PREFIX}/include/openssl
-CONFIGURE_ARGS=	--with-ssltop=${PREFIX}
+CONFIGURE_ARGS=	--with-ssltop=${PREFIX} --with-ssllib=${PREFIX}/lib
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 DOCSRC=		${WRKDIR}/${DISTNAME}
 DOCS=		ChangeLog \
diff --git a/security/bjorb/files/patch-ac b/security/bjorb/files/patch-ac
new file mode 100644
index 000000000000..36933f82a817
--- /dev/null
+++ b/security/bjorb/files/patch-ac
@@ -0,0 +1,45 @@
+--- configure.in.orig	Sun Feb 21 20:40:47 1999
++++ configure.in	Sun Dec 26 12:02:27 1999
+@@ -16,6 +16,7 @@
+ 	prefix=$ac_default_prefix
+ fi
+ ssltop=$prefix/ssl
++ssllib=$prefix/ssl
+ 
+ dnl Checks for programs.
+ AC_PROG_AWK
+@@ -86,6 +87,13 @@
+ 
+ AC_SUBST(ssltop)
+ 
++# with SSL lib
++AC_ARG_WITH(ssllib,
++[  --with-ssllib=DIR specifies directory to put SSL libbary.],
++ssllib=$with_ssllib)
++
++AC_SUBST(ssllib)
++
+ dnl Checks for libraries.
+ 
+ # shared option
+@@ -100,12 +108,16 @@
+ 
+ # for USA_RESIDENT on FreeBSD
+ if test X$disable_ssl = X; then
+-  LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$ssltop/lib"
++  LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$ssllib"
+   export LD_LIBRARY_PATH
+ 
+-  AC_CHECK_LIB(RSAglue, ERR_load_RSAREF_strings,,,-lcrypto -lssl)
+-  AC_CHECK_LIB(rsaref, DES3_CBCInit)
+-  ssllibs="-lssl -lcrypto"
++  AC_MSG_CHECKING([for RSAref library])
++  saved_LIBS="-L$ssllib -lcrypto -lssl"
++  LIBS="$saved_LIBS -lRSAglue -lrsaref"
++  AC_TRY_LINK([], [],
++    [AC_MSG_RESULT(yes); ],
++    [AC_MSG_RESULT(no)]; LIBS="$saved_LIBS")
++  ssllibs="$LIBS"
+ fi
+ 
+ deflib()
diff --git a/security/bjorb/files/patch-ad b/security/bjorb/files/patch-ad
new file mode 100644
index 000000000000..9275b45a429a
--- /dev/null
+++ b/security/bjorb/files/patch-ad
@@ -0,0 +1,11 @@
+--- Config.cc.orig	Sun Dec 26 11:25:39 1999
++++ Config.cc	Sun Dec 26 11:25:57 1999
+@@ -334,7 +334,7 @@
+   int retval = 1;
+ 
+   SOCKADDR_IN sa_client;
+-  int addr_len = sizeof(SOCKADDR_IN);
++  unsigned int addr_len = sizeof(SOCKADDR_IN);
+ 
+ #ifndef NO_DEBUG
+   PUTERR(2, ("::accept() begin\n"));