aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Smeets <flo@FreeBSD.org>2012-09-13 09:39:53 +0000
committerFlorian Smeets <flo@FreeBSD.org>2012-09-13 09:39:53 +0000
commit00c146a0bd0d4c95363a29733ee04174fec8a1b2 (patch)
tree0ece8926d7197a2caa2940b8afb4556041c3bb0c
parenteb41274340c31953cb31cafc16e638e574fd1733 (diff)
downloadports-00c146a0bd0d4c95363a29733ee04174fec8a1b2.tar.gz
ports-00c146a0bd0d4c95363a29733ee04174fec8a1b2.zip
Notes
-rw-r--r--net/asterisk/Makefile19
-rw-r--r--net/asterisk10/Makefile20
2 files changed, 23 insertions, 16 deletions
diff --git a/net/asterisk/Makefile b/net/asterisk/Makefile
index cfcbb35e1f23..e8057bf03e56 100644
--- a/net/asterisk/Makefile
+++ b/net/asterisk/Makefile
@@ -7,6 +7,7 @@
PORTNAME= asterisk
PORTVERSION= 1.8.15.1
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \
http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/
@@ -55,11 +56,19 @@ OPTIONS_DEFAULT= VORBIS ODBC UNIXODBC PGSQL RADIUS SNMP H323 FREETDS JABBER GSM
OPTIONS_SINGLE= ODBC
OPTIONS_SINGLE_ODBC= IODBC UNIXODBC
+OPTIONS_DEFINE_i386= DAHDI
+OPTIONS_DEFINE_amd64= DAHDI
+OPTIONS_DEFINE_sparc64= DAHDI
+
+OPTIONS_DEFAULT_i386= DAHDI
+OPTIONS_DEFAULT_amd64= DAHDI
+OPTIONS_DEFAULT_sparc64=DAHDI
EXCHANGE_DESC?= Exchange calendar support
NEWG711_DESC?= New G711 Codec
SRTP_DESC?= SecureRTP support
OOH323_DESC?= ooh323 support
+DAHDI_DESC?= DAHDI support
PORTSCOUT= limit:^1\.8\.
@@ -77,12 +86,6 @@ VARDIR=/var
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}
@@ -155,10 +158,10 @@ CONFIGURE_ARGS+= --without-postgres
.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}
diff --git a/net/asterisk10/Makefile b/net/asterisk10/Makefile
index 9a7ca4a1477c..1b2e57755b8f 100644
--- a/net/asterisk10/Makefile
+++ b/net/asterisk10/Makefile
@@ -7,6 +7,7 @@
PORTNAME= asterisk
PORTVERSION= 10.7.1
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \
http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/
@@ -52,10 +53,19 @@ OPTIONS_DEFAULT= VORBIS ODBC UNIXODBC PGSQL RADIUS SNMP H323 FREETDS JABBER GSM
OPTIONS_SINGLE= ODBC
OPTIONS_SINGLE_ODBC= IODBC UNIXODBC
+OPTIONS_DEFINE_i386= DAHDI
+OPTIONS_DEFINE_amd64= DAHDI
+OPTIONS_DEFINE_sparc64= DAHDI
+
+OPTIONS_DEFAULT_i386= DAHDI
+OPTIONS_DEFAULT_amd64= DAHDI
+OPTIONS_DEFAULT_sparc64= DAHDI
+
EXCHANGE_DESC?= Exchange calendar support
NEWG711_DESC?= New G711 Codec
SRTP_DESC?= SecureRTP support
OOH323_DESC?= ooh323 support
+DAHDI_DESC?= DAHDI support
ASTERISK_USER?= asterisk
ASTERISK_GROUP?= asterisk
@@ -71,12 +81,6 @@ VARDIR=/var
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}
@@ -149,10 +153,10 @@ CONFIGURE_ARGS+= --without-postgres
.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}