re-merge py-ldap subpackages, done in the py21/22/etc days, examples are

no longer conflicting. avoids awkwards use of MODPY_PY_PREFIX in FULLPKGNAME.
This commit is contained in:
sthen 2021-02-18 12:21:27 +00:00
parent 8e6ad13dcb
commit a398d91089
5 changed files with 53 additions and 62 deletions

View File

@ -1,17 +1,11 @@
# $OpenBSD: Makefile,v 1.56 2021/02/16 22:58:13 sthen Exp $
# $OpenBSD: Makefile,v 1.57 2021/02/18 12:21:27 sthen Exp $
COMMENT-main= LDAP client API for Python
COMMENT-examples= example programs for the LDAP client API for Python
COMMENT= LDAP client API for Python
MODPY_EGG_VERSION = 3.3.1
DISTNAME= python-ldap-${MODPY_EGG_VERSION}
PKGNAME= py-ldap-${MODPY_EGG_VERSION}
REVISION= 0
FULLPKGPATH-main= databases/py-ldap,-main${MODPY_FLAVOR}
FULLPKGNAME-main= ${MODPY_PY_PREFIX}ldap-${MODPY_EGG_VERSION}
FULLPKGPATH-examples= databases/py-ldap,-examples${MODPY_FLAVOR}
FULLPKGNAME-examples= ${MODPY_PY_PREFIX}ldap-examples-${MODPY_EGG_VERSION}
REVISION= 1
CATEGORIES= databases
@ -20,9 +14,7 @@ HOMEPAGE= https://www.python-ldap.org/
# Python
PERMIT_PACKAGE= Yes
WANTLIB-main += lber ldap_r pthread ${MODPY_WANTLIB}
MULTI_PACKAGES= -main -examples
WANTLIB += lber ldap_r pthread ${MODPY_WANTLIB}
MODULES= lang/python
@ -32,17 +24,17 @@ FLAVOR= python3
MODPY_PI= Yes
MODPY_SETUPTOOLS= Yes
LIB_DEPENDS-main= ${MODPY_LIB_DEPENDS} \
LIB_DEPENDS= ${MODPY_LIB_DEPENDS} \
databases/openldap
RUN_DEPENDS-main= ${MODPY_RUN_DEPENDS} \
RUN_DEPENDS= ${MODPY_RUN_DEPENDS} \
devel/py-asn1-modules${MODPY_FLAVOR}
MAKE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
MODPY_PYTEST= Yes
TEST_DEPENDS= ${RUN_DEPENDS-main} \
TEST_DEPENDS= ${RUN_DEPENDS} \
databases/openldap,-server
TEST_ENV= SBIN=${LOCALBASE}/libexec:${LOCALBASE}/sbin

View File

@ -1,2 +0,0 @@
Example programs for the python-ldap API to access LDAP directory servers
from Python programs.

View File

@ -1,6 +1,10 @@
@comment $OpenBSD: PLIST-main,v 1.15 2021/02/16 22:58:13 sthen Exp $
@pkgpath databases/py-ldap
@comment $OpenBSD: PLIST,v 1.10 2021/02/18 12:21:27 sthen Exp $
@conflict py-ldap-examples-*
@conflict py3-ldap-examples-*
@pkgpath databases/py-ldap,-main
@pkgpath databases/py-ldap,-main,python3
@pkgpath databases/py-ldap,-examples
@pkgpath databases/py-ldap,-examples,python3
lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}ldapurl.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}ldapurl.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}ldif.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@ -151,3 +155,43 @@ lib/python${MODPY_VERSION}/site-packages/slapdtest/certs/gennssdb.sh
lib/python${MODPY_VERSION}/site-packages/slapdtest/certs/server.conf
lib/python${MODPY_VERSION}/site-packages/slapdtest/certs/server.key
lib/python${MODPY_VERSION}/site-packages/slapdtest/certs/server.pem
share/examples/py-ldap/
share/examples/py-ldap/Demo/
share/examples/py-ldap/Demo/Lib/
share/examples/py-ldap/Demo/Lib/ldap/
share/examples/py-ldap/Demo/Lib/ldap/async/
share/examples/py-ldap/Demo/Lib/ldap/async/deltree.py
share/examples/py-ldap/Demo/Lib/ldap/async/ldifwriter.py
share/examples/py-ldap/Demo/Lib/ldap/async/sizelimit.py
share/examples/py-ldap/Demo/Lib/ldapurl/
share/examples/py-ldap/Demo/Lib/ldapurl/urlsearch.py
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/ldapurl_search.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/dds.py
share/examples/py-ldap/Demo/pyasn1/derefcontrol.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/sss_highest_number.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
share/examples/py-ldap/Demo/sasl_bind.py
share/examples/py-ldap/Demo/schema.py
share/examples/py-ldap/Demo/schema_tree.py
share/examples/py-ldap/Demo/simple.py
share/examples/py-ldap/Demo/simplebrowse.py

View File

@ -1,43 +0,0 @@
@comment $OpenBSD: PLIST-examples,v 1.12 2021/02/16 22:58:13 sthen Exp $
@pkgpath databases/py-ldap,-examples
@conflict py-ldap-examples-*
share/examples/py-ldap/
share/examples/py-ldap/Demo/
share/examples/py-ldap/Demo/Lib/
share/examples/py-ldap/Demo/Lib/ldap/
share/examples/py-ldap/Demo/Lib/ldap/async/
share/examples/py-ldap/Demo/Lib/ldap/async/deltree.py
share/examples/py-ldap/Demo/Lib/ldap/async/ldifwriter.py
share/examples/py-ldap/Demo/Lib/ldap/async/sizelimit.py
share/examples/py-ldap/Demo/Lib/ldapurl/
share/examples/py-ldap/Demo/Lib/ldapurl/urlsearch.py
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/ldapurl_search.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/dds.py
share/examples/py-ldap/Demo/pyasn1/derefcontrol.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/sss_highest_number.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
share/examples/py-ldap/Demo/sasl_bind.py
share/examples/py-ldap/Demo/schema.py
share/examples/py-ldap/Demo/schema_tree.py
share/examples/py-ldap/Demo/simple.py
share/examples/py-ldap/Demo/simplebrowse.py