- build examples package only once

- add pkgpath fixes updating from unflavored versions

ok mbalmer@ simon@
This commit is contained in:
winiger 2008-02-08 10:12:15 +00:00
parent de9b85a5ea
commit a6b1653d44
2 changed files with 12 additions and 10 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.17 2008/01/14 11:11:33 winiger Exp $ # $OpenBSD: Makefile,v 1.18 2008/02/08 10:12:15 winiger Exp $
SHARED_ONLY= Yes SHARED_ONLY= Yes
@ -7,7 +7,7 @@ COMMENT-examples= example programs for the LDAP client API for Python
V= 2.3.1 V= 2.3.1
DISTNAME= python-ldap-${V} DISTNAME= python-ldap-${V}
PKGNAME-main= py-ldap-${V} PKGNAME-main= py-ldap-${V}p0
FULLPKGNAME-examples= py-ldap-examples-${V} FULLPKGNAME-examples= py-ldap-examples-${V}
CATEGORIES= databases CATEGORIES= databases
@ -26,22 +26,23 @@ WANTLIB-main= crypto ssl
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=python-ldap/} MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=python-ldap/}
MODULES= lang/python
MODPY_VERSION= ${FLAVOR:S/python//}
LIB_DEPENDS-main= ldap_r.>=7,lber.>=7::databases/openldap \ LIB_DEPENDS-main= ldap_r.>=7,lber.>=7::databases/openldap \
sasl2.>=2::security/cyrus-sasl2 sasl2.>=2::security/cyrus-sasl2
FLAVORS= python2.4 python2.5 FLAVORS= python2.4 python2.5
FLAVOR?= python2.5 FLAVOR?= python2.5
.if !${FLAVOR} || ${FLAVOR:L:Npython?.?} .if ${FLAVOR:L:Mpython2.4} && !${FLAVOR:L:Npython2.4}
MULTI_PACKAGES= -main
.elif ${FLAVOR:L:Mpython2.5} && !${FLAVOR:L:Npython2.5}
MULTI_PACKAGES= -main -examples
.else
ERRORS+= "Fatal: You must select one version: ${FLAVORS}" ERRORS+= "Fatal: You must select one version: ${FLAVORS}"
.endif .endif
MULTI_PACKAGES= -main -examples
MODPY_VERSION= ${FLAVOR:S/python//}
MODULES= lang/python
EXAMPLESDIR= ${PREFIX}/share/examples/py-ldap EXAMPLESDIR= ${PREFIX}/share/examples/py-ldap
post-install: post-install:

View File

@ -1,6 +1,7 @@
@comment $OpenBSD: PLIST-main,v 1.2 2008/01/14 11:11:33 winiger Exp $ @comment $OpenBSD: PLIST-main,v 1.3 2008/02/08 10:12:15 winiger Exp $
@option no-default-conflict @option no-default-conflict
@conflict py-ldap-*-python${MODPY_VERSION} @conflict py-ldap-*-python${MODPY_VERSION}
@pkgpath databases/py-ldap
lib/python${MODPY_VERSION}/site-packages/_ldap.so lib/python${MODPY_VERSION}/site-packages/_ldap.so
lib/python${MODPY_VERSION}/site-packages/dsml.py lib/python${MODPY_VERSION}/site-packages/dsml.py
lib/python${MODPY_VERSION}/site-packages/dsml.pyc lib/python${MODPY_VERSION}/site-packages/dsml.pyc