summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--comms/asterisk16/options.mk15
-rw-r--r--comms/asterisk18/options.mk15
-rw-r--r--mk/defaults/options.description1
3 files changed, 6 insertions, 25 deletions
diff --git a/comms/asterisk16/options.mk b/comms/asterisk16/options.mk
index 3261f6fed2b..aeeca93b0c9 100644
--- a/comms/asterisk16/options.mk
+++ b/comms/asterisk16/options.mk
@@ -1,22 +1,13 @@
-# $NetBSD: options.mk,v 1.9 2010/10/06 22:39:41 jnemeth Exp $
+# $NetBSD: options.mk,v 1.10 2011/10/08 13:49:09 shattered Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.asterisk
-PKG_SUPPORTED_OPTIONS= zaptel x11 unixodbc ilbc webvmail ldap
+PKG_SUPPORTED_OPTIONS= 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 ldap
-
-# Asterisk now uses DAHDI, not zaptel; not implemented yet...
-#.if !empty(PKG_OPTIONS:Mzaptel)
-## zaptel only supported under NetBSD at the moment
-#. include "../../comms/zaptel-netbsd/buildlink3.mk"
-#PLIST.zaptel= yes
-#.else
-#MAKE_FLAGS+= WITHOUT_ZAPTEL=1
-#.endif
+PLIST_VARS+= x11 unixodbc ilbc webvmail ldap
# gtkconsole depends on GTK 1.x
.if !empty(PKG_OPTIONS:Mx11)
diff --git a/comms/asterisk18/options.mk b/comms/asterisk18/options.mk
index 009415904a3..55cb0c86c75 100644
--- a/comms/asterisk18/options.mk
+++ b/comms/asterisk18/options.mk
@@ -1,22 +1,13 @@
-# $NetBSD: options.mk,v 1.3 2011/07/16 21:35:11 jnemeth Exp $
+# $NetBSD: options.mk,v 1.4 2011/10/08 13:49:09 shattered Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.asterisk
-PKG_SUPPORTED_OPTIONS= zaptel x11 unixodbc ilbc webvmail ldap spandsp
+PKG_SUPPORTED_OPTIONS= x11 unixodbc ilbc webvmail ldap spandsp
PKG_OPTIONS_LEGACY_OPTS+= gtk:x11
PKG_SUGGESTED_OPTIONS= ldap
.include "../../mk/bsd.options.mk"
-PLIST_VARS+= zaptel x11 unixodbc ilbc webvmail ldap spandsp
-
-# Asterisk now uses DAHDI, not zaptel; not implemented yet...
-#.if !empty(PKG_OPTIONS:Mzaptel)
-## zaptel only supported under NetBSD at the moment
-#. include "../../comms/zaptel-netbsd/buildlink3.mk"
-#PLIST.zaptel= yes
-#.else
-#MAKE_FLAGS+= WITHOUT_ZAPTEL=1
-#.endif
+PLIST_VARS+= x11 unixodbc ilbc webvmail ldap spandsp
# gtkconsole depends on GTK 2.x
.if !empty(PKG_OPTIONS:Mx11)
diff --git a/mk/defaults/options.description b/mk/defaults/options.description
index 1084942432c..c4cb2b451a4 100644
--- a/mk/defaults/options.description
+++ b/mk/defaults/options.description
@@ -610,7 +610,6 @@ xterm-88color Enable 88 color support.
xterm-luit Enable locale <> UTF encoding translation.
xtest Use XTEST Extension Library.
xvid Enable usage of XVid codecs.
-zaptel Enable usage of Zaptel drivers.
zenmap Enable nmap GUI frontend.
ziplinks Compress data before transmitting it between servers.
zlib Enable support for zlib compression.