1 files changed, 29 insertions, 35 deletions

diff --git a/net/asterisk14/Makefile b/net/asterisk14/Makefile
index 6674a712dd3c..e4e498bb66bc 100644
--- a/net/asterisk14/Makefile
+++ b/net/asterisk14/Makefile
@@ -40,18 +40,19 @@ MAKE_ENV=	MKDIR="${MKDIR}" \
 MAN8=		asterisk.8 astgenkey.8 autosupport.8 safe_asterisk.8
 CONFLICTS=	asterisk*-1.2* asterisk*-1.6* asterisk*-1.8*
 
-OPTIONS=	OGGVORBIS	"Enable Ogg Vorbis support" on \
-		ODBC		"Enable ODBC support" on \
-		POSTGRES	"Enable PostgreSQL support" on \
-		RADIUS		"Enable RADIUS accounting support" on \
-		SNMP		"Enable SNMP support" on \
-		H323		"Enable H.323 support" on \
-		FREETDS		"Enable FreeTDS support" on \
-		JABBER		"Enable Jabber and Gtalk support" on \
-		SQLITE          "Enable SQLITE support" on \
-		CODEC_PATCH	"Apply codec negotiation patch" off \
-		ILBC		"Enable iLBC codec" off \
-		MISC_PATCHES	"Apply additional patches" off
+OPTIONS_DEFINE=	VORBIS ODBC PGSQL RADIUS SNMP H323 FREETDS JABBER SQLITE \
+		CODEC_PATCH ILBC MISC_PATCHES
+OPTIONS_DEFAULT=	VORBIS ODBC PGSQL RADIUS SNMP H323 FREETFS JABBER SQLITE
+MISC_PATCHES_DESC=	Apply additional patches
+ILBC_DESC=	iLBC codec
+DAHDI_DESC=	DAHDI support
+
+OPTIONS_DEFINE_i386=	DAHDI
+OPTIONS_DEFAULT_i386=	DAHDI
+OPTIONS_DEFINE_amd64=	DAHDI
+OPTIONS_DEFAULT_amd64=	DAHDI
+OPTIONS_DEFINE_sparc64=	DAHDI
+OPTIONS_DEFAULT_sparc64=	DAHDI
 
 .include <bsd.port.pre.mk>
 
@@ -59,14 +60,7 @@ OPTIONS=	OGGVORBIS	"Enable Ogg Vorbis support" on \
 CONFIGURE_ARGS+=--localstatedir=/var
 .endif
 
-.if ${ARCH} == "i386" || ${ARCH} == "amd64" || ${ARCH} == "sparc64"
-OPTIONS+=	DAHDI		"Enable DAHDI support" on
-
-# Include this since we have altered OPTIONS.
-.include <bsd.port.options.mk>
-.endif
-
-.if !defined(WITH_H323)
+.if ! ${PORT_OPTIONS:MH323}
 PLIST_SUB+=	WITH_H323="@comment "
 CONFIGURE_ARGS+= --without-h323
 .else
@@ -76,7 +70,7 @@ LIB_DEPENDS+=	pt_r.1:${PORTSDIR}/devel/pwlib \
 		h323_r.1:${PORTSDIR}/net/openh323
 .endif
 
-.if !defined(WITH_DAHDI)
+.if ! ${PORT_OPTIONS:MDAHDI}
 PLIST_SUB+=	WITH_DAHDI="@comment "
 CONFIGURE_ARGS+=	--without-dahdi
 .else
@@ -91,7 +85,7 @@ RUN_DEPENDS+=	${LOCALBASE}/lib/dahdi/dahdi.ko:${PORTSDIR}/misc/dahdi-kmod
 #
 # WITH_FREETDS, WITH_PGSQL and WITH_SQLITE can also be added to MAKE_ENV
 # similarly
-.if !defined(WITH_ODBC)
+.if ! ${PORT_OPTIONS:MODBC}
 PLIST_SUB+=	WITH_ODBC="@comment "
 CONFIGURE_ARGS+= --without-odbc
 .else
@@ -101,7 +95,7 @@ USE_AUTOTOOLS+=	libltdl
 LIB_DEPENDS+=	odbc.2:${PORTSDIR}/databases/unixODBC
 .endif
 
-.if !defined(WITH_FREETDS)
+.if ! ${PORT_OPTIONS:MFREETDS}
 PLIST_SUB+=	WITH_FREETDS="@comment "
 CONFIGURE_ARGS+= --without-tds
 .else
@@ -110,7 +104,7 @@ CONFIGURE_ARGS+= --with-tds=${LOCALBASE}
 LIB_DEPENDS+=	tds.5:${PORTSDIR}/databases/freetds
 .endif
 
-.if !defined(WITH_POSTGRES)
+.if ! ${PORT_OPTIONS:MPGSQL}
 PLIST_SUB+=	WITH_POSTGRES="@comment "
 CONFIGURE_ARGS+= --without-postgres
 .else
@@ -119,16 +113,16 @@ USE_PGSQL=	yes
 CONFIGURE_ARGS+= --with-postgres
 .endif
 
-.if !defined(WITH_OGGVORBIS)
-PLIST_SUB+=	WITH_OGGVORBIS="@comment "
+.if ! ${PORT_OPTIONS:MVORBIS}
+PLIST_SUB+=	WITH_VORBIS="@comment "
 CONFIGURE_ARGS+= --without-ogg
 .else
-PLIST_SUB+=	WITH_OGGVORBIS=""
+PLIST_SUB+=	WITH_VORBIS=""
 CONFIGURE_ARGS+= --with-ogg
 LIB_DEPENDS+=	vorbis.4:${PORTSDIR}/audio/libvorbis
 .endif
 
-.if !defined(WITH_RADIUS)
+.if ! ${PORT_OPTIONS:MRADIUS}
 PLIST_SUB+=	WITH_RADIUS="@comment "
 CONFIGURE_ARGS+= --without-radius
 .else
@@ -137,7 +131,7 @@ CONFIGURE_ARGS+= --with-radius
 LIB_DEPENDS+=	radiusclient-ng.2:${PORTSDIR}/net/radiusclient
 .endif
 
-.if !defined(WITH_SNMP)
+.if ! ${PORT_OPTIONS:MSNMP}
 PLIST_SUB+=	WITH_SNMP="@comment "
 CONFIGURE_ARGS+= --without-netsnmp
 .else
@@ -146,7 +140,7 @@ CONFIGURE_ARGS+= --with-netsnmp
 LIB_DEPENDS+=	netsnmp:${PORTSDIR}/net-mgmt/net-snmp
 .endif
 
-.if !defined(WITH_JABBER)
+.if ! ${PORT_OPTIONS:MJABBER}
 PLIST_SUB+=	WITH_JABBER="@comment "
 CONFIGURE_ARGS+= --without-iksemel
 .else
@@ -155,7 +149,7 @@ CONFIGURE_ARGS+= --with-iksemel
 LIB_DEPENDS+=	iksemel.4:${PORTSDIR}/textproc/iksemel
 .endif
 
-.if !defined(WITH_SQLITE)
+.if ! ${PORT_OPTIONS:MSQLITE}
 PLIST_SUB+=	WITH_SQLITE="@comment "
 CONFIGURE_ARGS+=	--without-sqlite
 .else
@@ -164,14 +158,14 @@ CONFIGURE_ARGS+= --with-sqlite
 LIB_DEPENDS+=	sqlite:${PORTSDIR}/databases/sqlite2
 .endif
 
-.if !defined(WITH_ILBC)
+.if ! ${PORT_OPTIONS:MILBC}
 PLIST_SUB+=	WITH_ILBC="@comment "
 .else
 PLIST_SUB+=	WITH_ILBC=""
 EXTRA_PATCHES+=	${PATCHDIR}/ilbc_enable.diff
 .endif
 
-.if defined(WITH_CODEC_PATCH)
+.if ${PORT_OPTIONS:MCODEC_PATCH}
 PATCHFILES=	asterisk-1.4.42-codec-negotiation-20111017.diff.gz
 PATCH_SITES=	${MASTER_SITE_LOCAL}
 PATCH_SITE_SUBDIR=	fjoe/
@@ -180,11 +174,11 @@ EXTRA_PATCHES+=	${PATCHDIR}/codecnego-patch-Makefile
 EXTRA_PATCHES+=	${PATCHDIR}/nocodecnego-patch-Makefile
 .endif
 
-.if defined(WITH_MISC_PATCHES)
+.if ${PORT_OPTIONS:MMISC_PATCHES}
 EXTRA_PATCHES+=	${PATCHDIR}/dtmf_debug.diff
 EXTRA_PATCHES+=	${PATCHDIR}/sip_force_callid.diff
 EXTRA_PATCHES+=	${PATCHDIR}/sip_set_auth.diff
-.if defined(WITH_CODEC_PATCH)
+.if ${PORT_OPTIONS:MCODEC_PATCH}
 EXTRA_PATCHES+=	${PATCHDIR}/rtp_force_dtmf-codecnego.diff
 .else
 EXTRA_PATCHES+=	${PATCHDIR}/rtp_force_dtmf-nocodecnego.diff