Hi, this is the diff to update python-ldap to 2.4.16.
Ok? Cheers, Remi.
Index: Makefile =================================================================== RCS file: /cvs/ports/databases/py-ldap/Makefile,v retrieving revision 1.35 diff -u -p -r1.35 Makefile --- Makefile 11 Mar 2013 02:52:07 -0000 1.35 +++ Makefile 11 Sep 2014 08:44:28 -0000 @@ -5,12 +5,10 @@ SHARED_ONLY= Yes COMMENT-main= LDAP client API for Python COMMENT-examples= example programs for the LDAP client API for Python -V= 2.3.1 +V= 2.4.16 DISTNAME= python-ldap-${V} PKGNAME-main= py-ldap-${V} -REVISION-main = 11 FULLPKGNAME-examples= py-ldap-examples-${V} -REVISION-examples = 10 FULLPKGPATH-examples= databases/py-ldap,-examples CATEGORIES= databases @@ -22,7 +20,7 @@ PERMIT_PACKAGE_CDROM= Yes WANTLIB-main= crypto ssl ${MODPY_WANTLIB} -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=python-ldap/} +MASTER_SITES= ${MASTER_SITE_PYPI:=p/python-ldap/} MODULES= lang/python @@ -33,6 +31,9 @@ WANTLIB-main += ldap_r>=7 lber>=7 sasl2 MULTI_PACKAGES= -main -examples EXAMPLESDIR= ${PREFIX}/share/examples/py-ldap + +post-extract: + find ${WRKSRC} -name \.cvsignore -exec rm {} \; post-install: ${INSTALL_DATA_DIR} ${EXAMPLESDIR} Index: distinfo =================================================================== RCS file: /cvs/ports/databases/py-ldap/distinfo,v retrieving revision 1.10 diff -u -p -r1.10 distinfo --- distinfo 14 Jan 2008 11:11:33 -0000 1.10 +++ distinfo 11 Sep 2014 08:44:28 -0000 @@ -1,5 +1,2 @@ -MD5 (python-ldap-2.3.1.tar.gz) = Gpfg/vJWfjDXXtE3qJFFWQ== -RMD160 (python-ldap-2.3.1.tar.gz) = CiiZyNJXSILGVa8pzroFR95zqRQ= -SHA1 (python-ldap-2.3.1.tar.gz) = HqZZpTCBymNWUHx0vERcUv+aWUQ= -SHA256 (python-ldap-2.3.1.tar.gz) = KYat27FbvChdcb4ftgmMb6BREAOv52GQLxdBve5PKds= -SIZE (python-ldap-2.3.1.tar.gz) = 76522 +SHA256 (python-ldap-2.4.16.tar.gz) = Uk3oqZos8AHo1puOhrK9SvGPa5swV7vS6tJ1iuWsFEM= +SIZE (python-ldap-2.4.16.tar.gz) = 137873 Index: patches/patch-setup_cfg =================================================================== RCS file: /cvs/ports/databases/py-ldap/patches/patch-setup_cfg,v retrieving revision 1.7 diff -u -p -r1.7 patch-setup_cfg --- patches/patch-setup_cfg 14 Jan 2008 11:11:33 -0000 1.7 +++ patches/patch-setup_cfg 11 Sep 2014 08:44:28 -0000 @@ -1,13 +1,11 @@ ---- setup.cfg.orig Wed Nov 15 18:26:26 2006 -+++ setup.cfg Mon Jan 14 10:44:14 2008 -@@ -7,8 +7,8 @@ - # for wrapping OpenLDAP 2 libs +--- setup.cfg.orig Wed Sep 10 14:17:37 2014 ++++ setup.cfg Thu Sep 11 10:38:08 2014 +@@ -1,6 +1,6 @@ [_ldap] - --library_dirs = /usr/local/openldap-2.3/lib --include_dirs = /usr/local/openldap-2.3/include /usr/include/sasl +-library_dirs = /opt/openldap/lib64 /usr/lib +-include_dirs = /opt/openldap/include /usr/include/sasl /usr/include +library_dirs = /usr/local/lib +include_dirs = /usr/local/include /usr/local/include/sasl - + defines = HAVE_SASL HAVE_TLS HAVE_LIBLDAP_R extra_compile_args = extra_objects = Index: patches/patch-setup_py =================================================================== RCS file: /cvs/ports/databases/py-ldap/patches/patch-setup_py,v retrieving revision 1.3 diff -u -p -r1.3 patch-setup_py --- patches/patch-setup_py 14 Jan 2008 11:11:33 -0000 1.3 +++ patches/patch-setup_py 11 Sep 2014 08:44:28 -0000 @@ -1,14 +1,14 @@ ---- setup.py.orig Wed Jul 25 00:42:56 2007 -+++ setup.py Mon Jan 14 11:12:16 2008 -@@ -7,11 +7,7 @@ $Id: setup.py,v 1.61 2007/07/16 10:40:29 stroeder Exp +--- setup.py.orig Wed Sep 10 14:15:41 2014 ++++ setup.py Thu Sep 11 10:39:16 2014 +@@ -7,11 +7,7 @@ $Id: setup.py,v 1.72 2014/03/12 20:29:23 stroeder Exp """ has_setuptools = False -try: -- from setuptools import setup, Extension -- has_setuptools = True +- from setuptools import setup, Extension +- has_setuptools = True -except ImportError: -- from distutils.core import setup, Extension +- from distutils.core import setup, Extension +from distutils.core import setup, Extension from ConfigParser import ConfigParser @@ -17,16 +17,16 @@ #-- A class describing the features and requirements of OpenLDAP 2.0 class OpenLDAP2: -- library_dirs = [] -- include_dirs = [] -+ localbase = os.getenv('LOCALBASE') -+ if localbase == None: -+ print "LOCALBASE not set" -+ sys.exit(1) +- library_dirs = [] +- include_dirs = [] ++ localbase = os.getenv('LOCALBASE') ++ if localbase == None: ++ print "LOCALBASE not set" ++ sys.exit(1) + -+ library_dirs = ['%s/lib' % localbase] -+ include_dirs = ['%s/include' % localbase, '%s/include/sasl' % localbase] ++ library_dirs = ['%s/lib' % localbase] ++ include_dirs = ['%s/include' % localbase, '%s/include/sasl' % localbase] + - extra_compile_args = [] - extra_link_args = [] - extra_objects = [] + extra_compile_args = [] + extra_link_args = [] + extra_objects = [] Index: pkg/PLIST-examples =================================================================== RCS file: /cvs/ports/databases/py-ldap/pkg/PLIST-examples,v retrieving revision 1.7 diff -u -p -r1.7 PLIST-examples --- pkg/PLIST-examples 20 Dec 2011 11:39:23 -0000 1.7 +++ pkg/PLIST-examples 11 Sep 2014 08:44:28 -0000 @@ -14,12 +14,22 @@ share/examples/py-ldap/Demo/Lib/ldif/ share/examples/py-ldap/Demo/Lib/ldif/ldifcopy.py share/examples/py-ldap/Demo/initialize.py share/examples/py-ldap/Demo/ldapcontrols.py +share/examples/py-ldap/Demo/matchedvalues.py +share/examples/py-ldap/Demo/ms_ad_bind.py share/examples/py-ldap/Demo/options.py share/examples/py-ldap/Demo/page_control.py +share/examples/py-ldap/Demo/paged_search_ext_s.py share/examples/py-ldap/Demo/passwd_ext_op.py share/examples/py-ldap/Demo/pickle_ldapobject.py share/examples/py-ldap/Demo/pyasn1/ -share/examples/py-ldap/Demo/pyasn1/prereadcontrol.py +share/examples/py-ldap/Demo/pyasn1/README +share/examples/py-ldap/Demo/pyasn1/dds.py +share/examples/py-ldap/Demo/pyasn1/noopsearch.py +share/examples/py-ldap/Demo/pyasn1/ppolicy.py +share/examples/py-ldap/Demo/pyasn1/psearch.py +share/examples/py-ldap/Demo/pyasn1/readentrycontrol.py +share/examples/py-ldap/Demo/pyasn1/sessiontrack.py +share/examples/py-ldap/Demo/pyasn1/syncrepl.py share/examples/py-ldap/Demo/reconnect.py share/examples/py-ldap/Demo/rename.py share/examples/py-ldap/Demo/resiter.py Index: pkg/PLIST-main =================================================================== RCS file: /cvs/ports/databases/py-ldap/pkg/PLIST-main,v retrieving revision 1.7 diff -u -p -r1.7 PLIST-main --- pkg/PLIST-main 20 Dec 2011 11:39:23 -0000 1.7 +++ pkg/PLIST-main 11 Sep 2014 08:44:28 -0000 @@ -15,12 +15,44 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/ldap/cidict.py lib/python${MODPY_VERSION}/site-packages/ldap/cidict.pyc lib/python${MODPY_VERSION}/site-packages/ldap/cidict.pyo -lib/python${MODPY_VERSION}/site-packages/ldap/controls.py -lib/python${MODPY_VERSION}/site-packages/ldap/controls.pyc -lib/python${MODPY_VERSION}/site-packages/ldap/controls.pyo +lib/python${MODPY_VERSION}/site-packages/ldap/controls/ +lib/python${MODPY_VERSION}/site-packages/ldap/controls/__init__.py +lib/python${MODPY_VERSION}/site-packages/ldap/controls/__init__.pyc +lib/python${MODPY_VERSION}/site-packages/ldap/controls/__init__.pyo +lib/python${MODPY_VERSION}/site-packages/ldap/controls/libldap.py +lib/python${MODPY_VERSION}/site-packages/ldap/controls/libldap.pyc +lib/python${MODPY_VERSION}/site-packages/ldap/controls/libldap.pyo +lib/python${MODPY_VERSION}/site-packages/ldap/controls/openldap.py +lib/python${MODPY_VERSION}/site-packages/ldap/controls/openldap.pyc +lib/python${MODPY_VERSION}/site-packages/ldap/controls/openldap.pyo +lib/python${MODPY_VERSION}/site-packages/ldap/controls/ppolicy.py +lib/python${MODPY_VERSION}/site-packages/ldap/controls/ppolicy.pyc +lib/python${MODPY_VERSION}/site-packages/ldap/controls/ppolicy.pyo +lib/python${MODPY_VERSION}/site-packages/ldap/controls/psearch.py +lib/python${MODPY_VERSION}/site-packages/ldap/controls/psearch.pyc +lib/python${MODPY_VERSION}/site-packages/ldap/controls/psearch.pyo +lib/python${MODPY_VERSION}/site-packages/ldap/controls/pwdpolicy.py +lib/python${MODPY_VERSION}/site-packages/ldap/controls/pwdpolicy.pyc +lib/python${MODPY_VERSION}/site-packages/ldap/controls/pwdpolicy.pyo +lib/python${MODPY_VERSION}/site-packages/ldap/controls/readentry.py +lib/python${MODPY_VERSION}/site-packages/ldap/controls/readentry.pyc +lib/python${MODPY_VERSION}/site-packages/ldap/controls/readentry.pyo +lib/python${MODPY_VERSION}/site-packages/ldap/controls/sessiontrack.py +lib/python${MODPY_VERSION}/site-packages/ldap/controls/sessiontrack.pyc +lib/python${MODPY_VERSION}/site-packages/ldap/controls/sessiontrack.pyo +lib/python${MODPY_VERSION}/site-packages/ldap/controls/simple.py +lib/python${MODPY_VERSION}/site-packages/ldap/controls/simple.pyc +lib/python${MODPY_VERSION}/site-packages/ldap/controls/simple.pyo lib/python${MODPY_VERSION}/site-packages/ldap/dn.py lib/python${MODPY_VERSION}/site-packages/ldap/dn.pyc lib/python${MODPY_VERSION}/site-packages/ldap/dn.pyo +lib/python${MODPY_VERSION}/site-packages/ldap/extop/ +lib/python${MODPY_VERSION}/site-packages/ldap/extop/__init__.py +lib/python${MODPY_VERSION}/site-packages/ldap/extop/__init__.pyc +lib/python${MODPY_VERSION}/site-packages/ldap/extop/__init__.pyo +lib/python${MODPY_VERSION}/site-packages/ldap/extop/dds.py +lib/python${MODPY_VERSION}/site-packages/ldap/extop/dds.pyc +lib/python${MODPY_VERSION}/site-packages/ldap/extop/dds.pyo lib/python${MODPY_VERSION}/site-packages/ldap/filter.py lib/python${MODPY_VERSION}/site-packages/ldap/filter.pyc lib/python${MODPY_VERSION}/site-packages/ldap/filter.pyo @@ -30,9 +62,15 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/ldap/ldapobject.py lib/python${MODPY_VERSION}/site-packages/ldap/ldapobject.pyc lib/python${MODPY_VERSION}/site-packages/ldap/ldapobject.pyo +lib/python${MODPY_VERSION}/site-packages/ldap/logger.py +lib/python${MODPY_VERSION}/site-packages/ldap/logger.pyc +lib/python${MODPY_VERSION}/site-packages/ldap/logger.pyo lib/python${MODPY_VERSION}/site-packages/ldap/modlist.py lib/python${MODPY_VERSION}/site-packages/ldap/modlist.pyc lib/python${MODPY_VERSION}/site-packages/ldap/modlist.pyo +lib/python${MODPY_VERSION}/site-packages/ldap/resiter.py +lib/python${MODPY_VERSION}/site-packages/ldap/resiter.pyc +lib/python${MODPY_VERSION}/site-packages/ldap/resiter.pyo lib/python${MODPY_VERSION}/site-packages/ldap/sasl.py lib/python${MODPY_VERSION}/site-packages/ldap/sasl.pyc lib/python${MODPY_VERSION}/site-packages/ldap/sasl.pyo @@ -49,6 +87,9 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/ldap/schema/tokenizer.py lib/python${MODPY_VERSION}/site-packages/ldap/schema/tokenizer.pyc lib/python${MODPY_VERSION}/site-packages/ldap/schema/tokenizer.pyo +lib/python${MODPY_VERSION}/site-packages/ldap/syncrepl.py +lib/python${MODPY_VERSION}/site-packages/ldap/syncrepl.pyc +lib/python${MODPY_VERSION}/site-packages/ldap/syncrepl.pyo lib/python${MODPY_VERSION}/site-packages/ldapurl.py lib/python${MODPY_VERSION}/site-packages/ldapurl.pyc lib/python${MODPY_VERSION}/site-packages/ldapurl.pyo