Minor fallout from libtool update.

4 files changed, 24 insertions, 6 deletions

diff --git a/net/freeradius2/distinfo b/net/freeradius2/distinfo
index 3be76a8558a..851bae7d13f 100644
--- a/net/freeradius2/distinfo
+++ b/net/freeradius2/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.14 2012/11/23 01:31:18 jnemeth Exp $
+$NetBSD: distinfo,v 1.15 2013/04/12 13:45:47 joerg Exp $
 
 SHA1 (freeradius-server-2.2.0.tar.bz2) = 8710b21972072241219f006d26f609cb58875cda
 RMD160 (freeradius-server-2.2.0.tar.bz2) = 243569a7ad93b292439e6938be8102dba12b843d
 Size (freeradius-server-2.2.0.tar.bz2) = 2703349 bytes
 SHA1 (patch-aa) = 90c0c676ea668e36851eeffc0f1703624d703339
 SHA1 (patch-ab) = 7a23eb75a9818b073263fd36cbf17b692fa19a9f
-SHA1 (patch-ac) = b8219f72d43f3bc61aef2fd7731d53dfa4e555b5
+SHA1 (patch-ac) = e0d7f8b671d4c3646ab51dab2833a3593bf95c6a
 SHA1 (patch-ae) = aa43b83ba991f510cee40cb65c3621e9d559d6dd
 SHA1 (patch-ai) = d3baec3e140981bd0d793a10fb1162e201e565e0
 SHA1 (patch-aj) = 865882e6e6e935276529b98616c9059c555272b9
diff --git a/net/freeradius2/patches/patch-ac b/net/freeradius2/patches/patch-ac
index 89119a53ded..a2f5a9ca38b 100644
--- a/net/freeradius2/patches/patch-ac
+++ b/net/freeradius2/patches/patch-ac
@@ -1,15 +1,14 @@
-$NetBSD: patch-ac,v 1.3 2010/10/29 15:59:00 adam Exp $
+$NetBSD: patch-ac,v 1.4 2013/04/12 13:45:47 joerg Exp $
 
 --- src/main/modules.c.orig	2010-10-29 11:11:18.000000000 +0000
 +++ src/main/modules.c
-@@ -1358,9 +1358,7 @@ int setup_modules(int reload, CONF_SECTI
+@@ -1358,9 +1358,6 @@ int setup_modules(int reload, CONF_SECTI
  		 *	It's like libtool and libltdl are some kind
  		 *	of sick joke.
  		 */
 -#ifdef IE_LIBTOOL_DIE
 -#define lt__PROGRAM__LTX_preloaded_symbols lt_libltdl_LTX_preloaded_symbols
 -#endif
-+#define lt_preloaded_symbols lt_libltdl_LTX_preloaded_symbols
  
  		/*
  		 *	Set the default list of preloaded symbols.
diff --git a/security/libprelude/distinfo b/security/libprelude/distinfo
index 72aff22b46b..e3b95ae8b2a 100644
--- a/security/libprelude/distinfo
+++ b/security/libprelude/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.34 2012/07/05 15:42:55 drochner Exp $
+$NetBSD: distinfo,v 1.35 2013/04/12 13:45:48 joerg Exp $
 
 SHA1 (libprelude-0.9.24.1.tar.gz) = b8c0c43efb33f3da741feac59b7a5482adf56282
 RMD160 (libprelude-0.9.24.1.tar.gz) = 0a2688cf5c44e834c07eaba36d333155b2ca226d
@@ -17,3 +17,4 @@ SHA1 (patch-al) = a3c150d76c91e33703d9ee05cd32e5d6f7b1264a
 SHA1 (patch-am) = 5581c999105a5d3b616e090afc105781e66eb888
 SHA1 (patch-ba) = adb9d29439df7f6f75396914e2f7f9732983eecf
 SHA1 (patch-bb) = 42ddad73912f8a5dd0deab11a710c5dcf32af322
+SHA1 (patch-src_include_prelude-plugin.h) = 4731b98059971577819906d84fe7f160c24c04f5
diff --git a/security/libprelude/patches/patch-src_include_prelude-plugin.h b/security/libprelude/patches/patch-src_include_prelude-plugin.h
new file mode 100644
index 00000000000..458583bfb05
--- /dev/null
+++ b/security/libprelude/patches/patch-src_include_prelude-plugin.h
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_include_prelude-plugin.h,v 1.1 2013/04/12 13:45:48 joerg Exp $
+
+--- src/include/prelude-plugin.h.orig	2009-05-12 07:49:42.000000000 +0000
++++ src/include/prelude-plugin.h
+@@ -59,11 +59,8 @@ typedef struct {
+  * Hack for plugin preloading,
+  * without having the end program depend on ltdl.
+  */
+-#ifdef PRELUDE_APPLICATION_USE_LIBTOOL2
+-# define lt_preloaded_symbols lt__PROGRAM__LTX_preloaded_symbols
+-#endif
+-
+-extern const void *lt_preloaded_symbols[];
++#include <ltdl.h>
++#define lt_preloaded_symbols lt__PROGRAM__LTX_preloaded_symbols
+ 
+ #define PRELUDE_PLUGIN_SET_PRELOADED_SYMBOLS()         \
+         prelude_plugin_set_preloaded_symbols(lt_preloaded_symbols)