Thu Apr 19 12:34:43 2012 UTC ()
Make this build on SunOS.


(hans)
diff -r1.11 -r1.12 pkgsrc/devel/ptlib/distinfo
diff -r0 -r1.1 pkgsrc/devel/ptlib/patches/patch-include_ptclib_pldap.h
diff -r0 -r1.1 pkgsrc/devel/ptlib/patches/patch-src_ptclib_pldap.cxx
cvs diff -r1.11 -r1.12 pkgsrc/devel/ptlib/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/ptlib/Attic/distinfo 2011/12/04 21:59:36 1.11
+++ pkgsrc/devel/ptlib/Attic/distinfo 2012/04/19 12:34:43 1.12
@@ -1,24 +1,26 @@ @@ -1,24 +1,26 @@
1$NetBSD: distinfo,v 1.11 2011/12/04 21:59:36 marino Exp $ 1$NetBSD: distinfo,v 1.12 2012/04/19 12:34:43 hans Exp $
2 2
3SHA1 (ptlib-2.6.5.tar.bz2) = 919487aee09d5a1ea5c4f0abdc01bc49d9dcb596 3SHA1 (ptlib-2.6.5.tar.bz2) = 919487aee09d5a1ea5c4f0abdc01bc49d9dcb596
4RMD160 (ptlib-2.6.5.tar.bz2) = ab2f8897b64ab7b1eb9fecc35470ce09af42bcf2 4RMD160 (ptlib-2.6.5.tar.bz2) = ab2f8897b64ab7b1eb9fecc35470ce09af42bcf2
5Size (ptlib-2.6.5.tar.bz2) = 3302864 bytes 5Size (ptlib-2.6.5.tar.bz2) = 3302864 bytes
6SHA1 (patch-Nucleus-NucleusPTime.cxx) = 3d8288a12f077867768d5ab0fc2a4e01c1cdb5fc 6SHA1 (patch-Nucleus-NucleusPTime.cxx) = 3d8288a12f077867768d5ab0fc2a4e01c1cdb5fc
7SHA1 (patch-Nucleus-pmachdep.h) = e78bd26dbe72538aeeb88bdb75faa35768e328d9 7SHA1 (patch-Nucleus-pmachdep.h) = e78bd26dbe72538aeeb88bdb75faa35768e328d9
8SHA1 (patch-configure) = 3af145c86d6a7060cb197228ae8046edbde437d4 8SHA1 (patch-configure) = 3af145c86d6a7060cb197228ae8046edbde437d4
9SHA1 (patch-configure.ac) = 0813261dd595f2980bf691ad6fc69b27a527f803 9SHA1 (patch-configure.ac) = 0813261dd595f2980bf691ad6fc69b27a527f803
10SHA1 (patch-include_ptbuildopts.h.in) = 93559a280ec01e3eaa8396cd83bce7cf4ac275c5 10SHA1 (patch-include_ptbuildopts.h.in) = 93559a280ec01e3eaa8396cd83bce7cf4ac275c5
 11SHA1 (patch-include_ptclib_pldap.h) = 0a6d27519797174883de7c1c5dfe47b6f187d491
11SHA1 (patch-make_unix.mak) = 03a436317afc6f77e574bf712b1926327bf00f6e 12SHA1 (patch-make_unix.mak) = 03a436317afc6f77e574bf712b1926327bf00f6e
12SHA1 (patch-plugins_sound_esd_sound_esd.h) = 6caff0b4890fe3b137e5dd7ceb1013abe1f7fec8 13SHA1 (patch-plugins_sound_esd_sound_esd.h) = 6caff0b4890fe3b137e5dd7ceb1013abe1f7fec8
13SHA1 (patch-plugins_sound_oss_sound_oss.cxx) = d00476fb46a0bf2474e8963a8fe9f1765d393d04 14SHA1 (patch-plugins_sound_oss_sound_oss.cxx) = d00476fb46a0bf2474e8963a8fe9f1765d393d04
14SHA1 (patch-plugins_sound_oss_sound_oss.h) = 7661d3d2f270680f293ddd4bb58cac8f6f021862 15SHA1 (patch-plugins_sound_oss_sound_oss.h) = 7661d3d2f270680f293ddd4bb58cac8f6f021862
15SHA1 (patch-plugins_vidinput_bsd_vidinput_bsd.h) = 33ee2ced0dd8a1e0e567f8700bba92431193dc10 16SHA1 (patch-plugins_vidinput_bsd_vidinput_bsd.h) = 33ee2ced0dd8a1e0e567f8700bba92431193dc10
 17SHA1 (patch-src_ptclib_pldap.cxx) = 8c0f8b4326327abfac88f99dfa6edf5b7e250fbf
16SHA1 (patch-unix-config.cxx) = bf263b858d4b964786360c702bd634aa989a8751 18SHA1 (patch-unix-config.cxx) = bf263b858d4b964786360c702bd634aa989a8751
17SHA1 (patch-unix-ossaix.cxx) = 5e473ffb524811c4da35fe8cb2f5f77b4807de5c 19SHA1 (patch-unix-ossaix.cxx) = 5e473ffb524811c4da35fe8cb2f5f77b4807de5c
18SHA1 (patch-unix-osutil.cxx) = 33482828d543fda07fd4070f05295e5536a89e64 20SHA1 (patch-unix-osutil.cxx) = 33482828d543fda07fd4070f05295e5536a89e64
19SHA1 (patch-unix-pipechan.cxx) = 03117bf11b31c14255f30afe397d8e4b06d93760 21SHA1 (patch-unix-pipechan.cxx) = 03117bf11b31c14255f30afe397d8e4b06d93760
20SHA1 (patch-unix-pmachdep.h) = 4ff7e803fca00f1e86f34234289efbb0910e26c3 22SHA1 (patch-unix-pmachdep.h) = 4ff7e803fca00f1e86f34234289efbb0910e26c3
21SHA1 (patch-unix-serchan.cxx) = 20131e476b495b7e0babaeb1755c4bfc130909d6 23SHA1 (patch-unix-serchan.cxx) = 20131e476b495b7e0babaeb1755c4bfc130909d6
22SHA1 (patch-unix-socket.cxx) = 15364058387caad5da2827cc823da6d578525835 24SHA1 (patch-unix-socket.cxx) = 15364058387caad5da2827cc823da6d578525835
23SHA1 (patch-unix-switch.cxx) = b68d3dad99a7ff90113b9f4b6b19331c472bcca2 25SHA1 (patch-unix-switch.cxx) = b68d3dad99a7ff90113b9f4b6b19331c472bcca2
24SHA1 (patch-unix-tlib.cxx) = 6f4c6e8750316698484cea5dae4cd91d5717881d 26SHA1 (patch-unix-tlib.cxx) = 6f4c6e8750316698484cea5dae4cd91d5717881d
File Added: pkgsrc/devel/ptlib/patches/Attic/patch-include_ptclib_pldap.h
$NetBSD: patch-include_ptclib_pldap.h,v 1.1 2012/04/19 12:34:43 hans Exp $

--- include/ptclib/pldap.h.orig	2009-09-21 02:25:53.000000000 +0200
+++ include/ptclib/pldap.h	2012-04-18 20:29:59.394305646 +0200
@@ -103,12 +103,7 @@ class PLDAPSession : public PObject
       AuthSimple,
       AuthSASL,
       AuthKerberos,
-#ifdef SOLARIS
-      NumAuthenticationMethod1,
-      NumAuthenticationMethod2
-#else
       NumAuthenticationMethod
-#endif
     };
 
     /**Bind to the remote LDAP server.
File Added: pkgsrc/devel/ptlib/patches/Attic/patch-src_ptclib_pldap.cxx
$NetBSD: patch-src_ptclib_pldap.cxx,v 1.1 2012/04/19 12:34:43 hans Exp $

--- src/ptclib/pldap.cxx.orig	2009-09-21 02:25:24.000000000 +0200
+++ src/ptclib/pldap.cxx	2012-04-18 20:29:09.841685925 +0200
@@ -132,13 +132,8 @@ PBoolean PLDAPSession::Bind(const PStrin
   else
     whoPtr = who;
 
-#ifdef SOLARIS
-  static const int AuthMethodCode[NumAuthenticationMethod2] = {
-    LDAP_AUTH_SIMPLE, LDAP_AUTH_SASL, LDAP_AUTH_KRBV41_30, LDAP_AUTH_KRBV42_30
-#else
   static const int AuthMethodCode[NumAuthenticationMethod] = {
     LDAP_AUTH_SIMPLE, LDAP_AUTH_SASL, LDAP_AUTH_KRBV4
-#endif
   };
   errorNumber = ldap_bind_s(ldapContext, whoPtr, passwd, AuthMethodCode[authMethod]);
   return errorNumber == LDAP_SUCCESS;