--- Makefile.orig	2012-09-13 12:12:18.000000000 +0600
+++ Makefile	2012-09-13 12:42:48.000000000 +0600
@@ -24,7 +24,6 @@
 ONLY_FOR_ARCHS=	i386 amd64 powerpc sparc64
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-gsm=${LOCALBASE}
 LDFLAGS+=	-L${LOCALBASE}/lib
 CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/openh323
 USE_GMAKE=	yes
@@ -52,6 +51,12 @@
 OPTIONS_SINGLE=	ODBC
 OPTIONS_SINGLE_ODBC=	IODBC UNIXODBC
 
+.if ${ARCH} == "i386" || ${ARCH} == "amd64" || ${ARCH} == "sparc64"
+OPTIONS_DEFINE+=	DAHDI
+OPTIONS_DEFAULT+=	DAHDI
+.endif
+
+DAHDI_DESC?=	DAHDI support
 EXCHANGE_DESC?=	Exchange calendar support
 NEWG711_DESC?=	New G711 Codec
 SRTP_DESC?=	SecureRTP support
@@ -71,12 +76,6 @@
 VARDIR=${PREFIX}/var
 .endif
 
-.if ${ARCH} == "i386" || ${ARCH} == "amd64" || ${ARCH} == "sparc64"
-OPTIONS_DEFINE+=	DAHDI
-OPTIONS_DEFAULT+=	DAHDI
-DAHDI_DESC?=	DAHDI support
-.endif
-
 SUB_LIST+=	ASTERISK_USER=${ASTERISK_USER}
 PLIST_SUB+=	ASTERISK_USER=${ASTERISK_USER}
 PLIST_SUB+=	ASTERISK_GROUP=${ASTERISK_GROUP}
@@ -97,7 +96,7 @@
 CONFIGURE_ARGS+=	--with-dahdi --with-openr2
 BUILD_DEPENDS+=	libpri>=1.4.10:${PORTSDIR}/misc/libpri \
 		${LOCALBASE}/include/dahdi/user.h:${PORTSDIR}/misc/dahdi
-LIB_DEPENDS+=	pri.1:${PORTSDIR}/misc/libpri\
+LIB_DEPENDS+=	pri.1:${PORTSDIR}/misc/libpri \
 		openr2.4:${PORTSDIR}/misc/openr2
 .else
 PLIST_SUB+=	WITH_DAHDI="@comment "
@@ -149,10 +148,10 @@
 .if ${PORT_OPTIONS:MMYSQL}
 PLIST_SUB+=	WITH_MYSQL=""
 USE_MYSQL=	yes
-CONFIGURE_ARGS+=	--with-mysql
+CONFIGURE_ARGS+=	--with-mysqlclient
 .else
 PLIST_SUB+=	WITH_MYSQL="@comment "
-CONFIGURE_ARGS+=	--without-mysql
+CONFIGURE_ARGS+=	--without-mysqlclient
 .endif
 
 .if ${PORT_OPTIONS:MVORBIS}