diff options
| author | jnemeth <jnemeth> | 2010-05-07 23:57:56 +0000 |
|---|---|---|
| committer | jnemeth <jnemeth> | 2010-05-07 23:57:56 +0000 |
| commit | cee0897053d330a28325212bff0ddc9f1d469d85 (patch) | |
| tree | 7b243f363b3299b0ecd61c67cb3b9f20b0cc19ca /comms | |
| parent | deac79e2ee482bb1fd722e8b599377f9f6d861b5 (diff) | |
| download | pkgsrc-cee0897053d330a28325212bff0ddc9f1d469d85.tar.gz | |
Add an "ldap" option which defaults to enabled, since most modern
systems come with LDAP support built-in. This has no effect on
such systems. However, on older systems, it will pull in
openldap-client. But, a builder may still disable the option if
they wish. This fixes:
PR pkg/41987 - Robert Elz -- comms/asterisk16 PLIST problem
Diffstat (limited to 'comms')
| -rw-r--r-- | comms/asterisk16/Makefile | 4 | ||||
| -rw-r--r-- | comms/asterisk16/PLIST | 4 | ||||
| -rw-r--r-- | comms/asterisk16/options.mk | 14 |
3 files changed, 15 insertions, 7 deletions
diff --git a/comms/asterisk16/Makefile b/comms/asterisk16/Makefile index 906255404d5..e85b92ecb5a 100644 --- a/comms/asterisk16/Makefile +++ b/comms/asterisk16/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.16 2010/05/07 07:20:55 jnemeth Exp $ +# $NetBSD: Makefile,v 1.17 2010/05/07 23:57:56 jnemeth Exp $ # DISTNAME= asterisk-1.6.1.17 DIST_SUBDIR= ${PKGNAME_NOREV} -PKGREVISION= 3 +PKGREVISION= 4 EXTRACT_ONLY= ${DISTNAME}.tar.gz CATEGORIES= comms net audio MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \ diff --git a/comms/asterisk16/PLIST b/comms/asterisk16/PLIST index e76bee0c5ab..ff41c5db200 100644 --- a/comms/asterisk16/PLIST +++ b/comms/asterisk16/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.11 2010/05/07 07:20:55 jnemeth Exp $ +@comment $NetBSD: PLIST,v 1.12 2010/05/07 23:57:56 jnemeth Exp $ include/asterisk.h include/asterisk/_private.h include/asterisk/abstract_jb.h @@ -250,7 +250,7 @@ lib/asterisk/modules/res_ael_share.so lib/asterisk/modules/res_agi.so lib/asterisk/modules/res_clioriginate.so lib/asterisk/modules/res_config_curl.so -lib/asterisk/modules/res_config_ldap.so +${PLIST.ldap}lib/asterisk/modules/res_config_ldap.so ${PLIST.unixodbc}lib/asterisk/modules/res_config_odbc.so lib/asterisk/modules/res_convert.so lib/asterisk/modules/res_crypto.so diff --git a/comms/asterisk16/options.mk b/comms/asterisk16/options.mk index 66297b05768..245a261ce3c 100644 --- a/comms/asterisk16/options.mk +++ b/comms/asterisk16/options.mk @@ -1,12 +1,13 @@ -# $NetBSD: options.mk,v 1.6 2010/05/07 03:49:07 jnemeth Exp $ +# $NetBSD: options.mk,v 1.7 2010/05/07 23:57:56 jnemeth Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.asterisk -PKG_SUPPORTED_OPTIONS= zaptel x11 unixodbc ilbc webvmail +PKG_SUPPORTED_OPTIONS= zaptel x11 unixodbc ilbc webvmail ldap PKG_OPTIONS_LEGACY_OPTS+= gtk:x11 +PKG_SUGGESTED_OPTIONS= ldap .include "../../mk/bsd.options.mk" -PLIST_VARS+= zaptel x11 unixodbc ilbc webvmail +PLIST_VARS+= zaptel x11 unixodbc ilbc webvmail ldap # Asterisk now uses DAHDI, not zaptel; not implemented yet... #.if !empty(PKG_OPTIONS:Mzaptel) @@ -88,3 +89,10 @@ SPECIAL_PERMS+= ${PREFIX}/libexec/cgi-bin/vmail ${ASTERISK_USER} ${ASTERISK_GRO INSTALL_TARGET+= webvmail PLIST.webvmail= yes .endif + +.if !empty(PKG_OPTIONS:Mldap) +.include "../../databases/openldap-client/buildlink3.mk" +PLIST.ldap= yes +.else +CONFIGURE_ARGS+= --without-ldap +.endif |