Index: core/bgdrtm/src/dirs.c
===================================================================
--- core/bgdrtm/src/dirs.c	(revision 113)
+++ core/bgdrtm/src/dirs.c	(working copy)
@@ -230,10 +230,8 @@
     /* Convert *.* to * */
     if ( fptr > path_final + 2 && fptr[ -1 ] == '*' && fptr[ -2 ] == '.' && fptr[ -3 ] == '*' ) fptr[ -2 ] = 0;
 
-#if defined(TARGET_MAC)
+#if defined(TARGET_MAC) || defined(TARGET_BEOS) || defined(TARGET_BSD)
     glob( path_final, GLOB_ERR | GLOB_NOSORT, NULL, &hDir->globd );
-#elif defined(TARGET_BEOS)
-    glob( path_final, GLOB_ERR | GLOB_NOSORT, NULL, &hDir->globd );
 #else
     glob( path_final, GLOB_ERR | GLOB_PERIOD | GLOB_NOSORT, NULL, &hDir->globd );
 #endif
Index: core/configure
===================================================================
--- core/configure	(revision 113)
+++ core/configure	(working copy)
@@ -10929,7 +10929,7 @@
 	    COMMON_LDFLAGS="-L/usr/i586-mingw32msvc/lib -lshlwapi"
 	    ;;
 
-    dragonfly*)
+    dragonfly* | freebsd*)
         INCLUDES="-I/usr/local/include"
         COMMON_CFLAGS="-Wall -DTARGET_BSD"
 	    COMMON_LDFLAGS="-L/usr/local/lib -lpthread"
@@ -12461,13 +12461,13 @@
    { (exit 1); exit 1; }; }
 fi
 
-{ $as_echo "$as_me:$LINENO: checking for des_ecb_encrypt in -ldes" >&5
-$as_echo_n "checking for des_ecb_encrypt in -ldes... " >&6; }
+{ $as_echo "$as_me:$LINENO: checking for des_ecb_encrypt in -lcrypto" >&5
+$as_echo_n "checking for des_ecb_encrypt in -lcrypto... " >&6; }
 if test "${ac_cv_lib_des_des_ecb_encrypt+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldes  $LIBS"
+LIBS="-lcrypto  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -12481,11 +12481,11 @@
 #ifdef __cplusplus
 extern "C"
 #endif
-char des_ecb_encrypt ();
+char DES_ecb_encrypt ();
 int
 main ()
 {
-return des_ecb_encrypt ();
+return DES_ecb_encrypt ();
   ;
   return 0;
 }
@@ -12546,7 +12546,7 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-#include <des.h>
+#include <openssl/des.h>
 _ACEOF
 rm -f conftest.$ac_objext
 if { (ac_try="$ac_compile"
@@ -12587,7 +12587,7 @@
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <des.h>
+#include <openssl/des.h>
 _ACEOF
 if { (ac_try="$ac_cpp conftest.$ac_ext"
 case "(($ac_try" in
@@ -12655,7 +12655,7 @@
 
 fi
 if test "x$ac_cv_header_des_h" = x""yes; then
-  DESLIBS="-ldes"
+  DESLIBS="-lcrypto"
 fi
 
 
Index: core/include/crypt.h
===================================================================
--- core/include/crypt.h	(revision 113)
+++ core/include/crypt.h	(working copy)
@@ -24,7 +24,7 @@
 
 /* ------------------------------------------------------------------------- */
 
-#include <des.h>
+#include <openssl/des.h>
 
 /* ------------------------------------------------------------------------- */
 
Index: core/configure.in
===================================================================
--- core/configure.in	(revision 113)
+++ core/configure.in	(working copy)
@@ -50,10 +50,10 @@
 	    COMMON_LDFLAGS="-L/usr/i586-mingw32msvc/lib -lshlwapi"
 	    ;;
 
-    dragonfly*)
+    dragonfly* | freebsd* )
         INCLUDES="-I/usr/local/include"
         COMMON_CFLAGS="-Wall -DTARGET_BSD"
-	    COMMON_LDFLAGS="-L/usr/local/lib -lpthread"
+	    COMMON_LDFLAGS="-L/usr/local/lib -pthread"
 	    ;;
 
     darwin*)
@@ -81,7 +81,7 @@
 dnl librerias para todos
 
 AC_CHECK_LIB(z, gzsetparams, [AC_CHECK_HEADER(zlib.h,ZLIBS="-lz",)], [AC_MSG_ERROR(zlib library not found)])
-AC_CHECK_LIB(des, des_ecb_encrypt, [AC_CHECK_HEADER(des.h,DESLIBS="-ldes",)], [AC_MSG_ERROR(libdes library not found)])
+AC_CHECK_LIB(crypto, DES_ecb_encrypt, [AC_CHECK_HEADER(openssl/des.h,DESLIBS="-lcrypto",)], [AC_MSG_ERROR(libcrypto library not found)])
 
 dnl make these visible to all Makefiles
 
Index: modules/configure.in
===================================================================
--- modules/configure.in	(revision 113)
+++ modules/configure.in	(working copy)
@@ -50,7 +50,7 @@
 	    COMMON_LDFLAGS="-L/usr/i586-mingw32msvc/lib -lshlwapi"
 	    ;;
 
-    dragonfly*)
+    dragonfly* | freebsd*)
         COMMON_CFLAGS="-I/usr/local/include -Wall -DTARGET_BSD"
 	    COMMON_LDFLAGS="-pthread -L/usr/local/lib"
 	    ;;
@@ -83,7 +83,7 @@
 
 AC_CHECK_LIB(z, gzsetparams, [AC_CHECK_HEADER(zlib.h,ZLIBS="-lz",)], [AC_MSG_ERROR(zlib library not found)])
 AC_CHECK_LIB(png, png_read_info, [AC_CHECK_HEADER(png.h,PNGLIBS="-lpng",)], AC_MSG_ERROR(*** PNG library not found ***), -lz -lm)
-AC_CHECK_LIB(des, des_ecb_encrypt, [AC_CHECK_HEADER(des.h,DESLIBS="-ldes",)], [AC_MSG_ERROR(libdes library not found)])
+AC_CHECK_LIB(crypto, DES_ecb_encrypt, [AC_CHECK_HEADER(openssl/des.h,DESLIBS="-lcrypto",)], [AC_MSG_ERROR(libcrypto library not found)])
 
 AC_CHECK_LIB(SDL_mixer, Mix_AllocateChannels, [AC_CHECK_HEADER(SDL_mixer.h,LIBS+="-lSDL_mixer",)], [AC_MSG_ERROR(libSDL_mixer not found!)], $SDL_MIXER_DEPS)
 #AC_CHECK_LIB(SDL_mixer, Mix_AllocateChannels,LIBS=$LIBS, AC_MSG_ERROR([*** SDL_mixer library not found!]))
Index: modules/configure
===================================================================
--- modules/configure	(revision 113)
+++ modules/configure	(working copy)
@@ -10946,7 +10946,7 @@
 	    COMMON_LDFLAGS="-L/usr/i586-mingw32msvc/lib -lshlwapi"
 	    ;;
 
-    dragonfly*)
+    dragonfly* | freebsd*)
         COMMON_CFLAGS="-I/usr/local/include -Wall -DTARGET_BSD"
 	    COMMON_LDFLAGS="-pthread -L/usr/local/lib"
 	    ;;
@@ -13073,13 +13073,13 @@
    { (exit 1); exit 1; }; }
 fi
 
-{ $as_echo "$as_me:$LINENO: checking for des_ecb_encrypt in -ldes" >&5
-$as_echo_n "checking for des_ecb_encrypt in -ldes... " >&6; }
+{ $as_echo "$as_me:$LINENO: checking for des_ecb_encrypt in -lcrypto" >&5
+$as_echo_n "checking for des_ecb_encrypt in -lcrypto... " >&6; }
 if test "${ac_cv_lib_des_des_ecb_encrypt+set}" = set; then
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldes  $LIBS"
+LIBS="-lcrypto  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -13093,11 +13093,11 @@
 #ifdef __cplusplus
 extern "C"
 #endif
-char des_ecb_encrypt ();
+char DES_ecb_encrypt ();
 int
 main ()
 {
-return des_ecb_encrypt ();
+return DES_ecb_encrypt ();
   ;
   return 0;
 }
@@ -13158,7 +13158,7 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-#include <des.h>
+#include <openssl/des.h>
 _ACEOF
 rm -f conftest.$ac_objext
 if { (ac_try="$ac_compile"
@@ -13199,7 +13199,7 @@
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <des.h>
+#include <openssl/des.h>
 _ACEOF
 if { (ac_try="$ac_cpp conftest.$ac_ext"
 case "(($ac_try" in
@@ -13267,7 +13267,7 @@
 
 fi
 if test "x$ac_cv_header_des_h" = x""yes; then
-  DESLIBS="-ldes"
+  DESLIBS="-lcrypto"
 fi
 
 
Index: modules/mod_mem/mod_mem.c
===================================================================
--- modules/mod_mem/mod_mem.c	(revision 113)
+++ modules/mod_mem/mod_mem.c	(working copy)
@@ -128,7 +128,7 @@
     get_system_info( &info );
     return B_PAGE_SIZE * ( info.max_pages - info.used_pages );
 
-#elif !defined(TARGET_MAC)
+#elif !defined(TARGET_MAC) && !defined(TARGET_BSD)
     /* Linux and other Unix (?) */
     struct sysinfo meminf;
     int fv;
@@ -166,7 +166,7 @@
     get_system_info( &info );
     return  B_PAGE_SIZE * ( info.max_pages );
 
-#elif !defined(TARGET_MAC)
+#elif !defined(TARGET_MAC) && !defined(TARGET_BSD)
     /* Linux and other Unix (?) */
     struct sysinfo meminf;
     int fv;