4 files changed, 14 insertions, 111 deletions
diff --git a/devel/bennugd-modules/files/patch-configure b/devel/bennugd-modules/files/patch-configure
index e4119a7e6a3c..d35cbe9cbe24 100644
--- a/devel/bennugd-modules/files/patch-configure
+++ b/devel/bennugd-modules/files/patch-configure
@@ -1,60 +1,11 @@
---- configure.orig	2009-07-22 06:02:45.000000000 +0400
-+++ configure	2009-11-06 06:10:30.000000000 +0300
-@@ -10946,7 +10946,7 @@
- 	    COMMON_LDFLAGS="-L/usr/i586-mingw32msvc/lib -lshlwapi"
+--- configure.orig	2013-01-06 05:50:56.000000000 +0400
++++ configure	2013-09-12 05:47:52.458664790 +0400
+@@ -11315,7 +11315,7 @@
+         USE_OPENSSL=yes
  	    ;;
  
 -    dragonfly*)
-+    freebsd* | 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;
- }
-@@ -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
- 
- 
+         LM=-lm
diff --git a/devel/bennugd-modules/files/patch-include-crypt.h b/devel/bennugd-modules/files/patch-include-crypt.h
deleted file mode 100644
index 5203fe4b806e..000000000000
--- a/devel/bennugd-modules/files/patch-include-crypt.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../core/include/crypt.h.orig	2009-07-02 04:20:53.000000000 +0400
-+++ ../core/include/crypt.h	2009-11-06 05:52:32.000000000 +0300
-@@ -24,7 +24,7 @@
- 
- /* ------------------------------------------------------------------------- */
- 
--#include <des.h>
-+#include <openssl/des.h>
- 
- /* ------------------------------------------------------------------------- */
- 
diff --git a/devel/bennugd-modules/files/patch-mod__map-file__png.c b/devel/bennugd-modules/files/patch-mod__map-file__png.c
deleted file mode 100644
index 26e44948b742..000000000000
--- a/devel/bennugd-modules/files/patch-mod__map-file__png.c
+++ /dev/null
@@ -1,37 +0,0 @@
---- mod_map/file_png.c.orig	2009-07-22 04:02:45.000000000 +0200
-+++ mod_map/file_png.c	2012-05-27 11:54:18.000000000 +0200
-@@ -24,6 +24,7 @@
- /* --------------------------------------------------------------------------- */
- 
- #include <png.h>
-+#include <pngpriv.h>
- 
- #include "mod_map.h"
- 
-@@ -89,7 +90,7 @@
- 
-     /* Rutina de error */
- 
--    if ( setjmp( png_ptr->jmpbuf ) )
-+    if ( setjmp( png_jmpbuf(png_ptr) ) )
-     {
-         png_destroy_read_struct( &png_ptr, &info_ptr, &end_info ) ;
-         file_close( png ) ;
-@@ -286,7 +287,7 @@
- 
-     /* Fin */
- 
--    if ( !setjmp( png_ptr->jmpbuf ) ) png_read_end( png_ptr, 0 ) ;
-+    if ( !setjmp( png_jmpbuf(png_ptr) ) ) png_read_end( png_ptr, 0 ) ;
- 
-     bitmap->modified = 1 ;
- 
-@@ -356,7 +357,7 @@
- 
-     /* Error handling... */
- 
--    if ( setjmp( png_ptr->jmpbuf ) )
-+    if ( setjmp( png_jmpbuf(png_ptr) ) )
-     {
-         png_destroy_write_struct( &png_ptr, NULL ) ;
-         free( rowpointers ) ;
diff --git a/devel/bennugd-modules/files/patch-mod__mem-mod__mem.c b/devel/bennugd-modules/files/patch-mod__mem-mod__mem.c
index b94bdc5842f8..5e934ae0f64c 100644
--- a/devel/bennugd-modules/files/patch-mod__mem-mod__mem.c
+++ b/devel/bennugd-modules/files/patch-mod__mem-mod__mem.c
@@ -1,20 +1,20 @@
---- mod_mem/mod_mem.c.orig	2009-06-15 22:34:24.000000000 +0400
-+++ mod_mem/mod_mem.c	2009-11-06 06:28:55.000000000 +0300
-@@ -128,7 +128,7 @@
+--- mod_mem/mod_mem.c.orig	2013-09-12 06:03:12.588226648 +0400
++++ mod_mem/mod_mem.c	2013-09-12 06:03:50.452231577 +0400
+@@ -133,7 +133,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)
+-#elif !defined(TARGET_MAC) && !defined(TARGET_WII)
++#elif !defined(TARGET_MAC) && !defined(TARGET_WII) && !defined(TARGET_BSD)
      /* Linux and other Unix (?) */
      struct sysinfo meminf;
      int fv;
-@@ -166,7 +166,7 @@
+@@ -171,7 +171,7 @@
      get_system_info( &info );
      return  B_PAGE_SIZE * ( info.max_pages );
  
--#elif !defined(TARGET_MAC)
-+#elif !defined(TARGET_MAC) && !defined(TARGET_BSD)
+-#elif !defined(TARGET_MAC) && !defined(TARGET_WII)
++#elif !defined(TARGET_MAC) && !defined(TARGET_WII) && !defined(TARGET_BSD)
      /* Linux and other Unix (?) */
      struct sysinfo meminf;
      int fv;