svn commit: r304188 - in head/net: asterisk asterisk10
Florian Smeets
flo at FreeBSD.org
Thu Sep 13 09:39:54 UTC 2012
Author: flo
Date: Thu Sep 13 09:39:53 2012
New Revision: 304188
URL: http://svn.freebsd.org/changeset/ports/304188
Log:
- fix typo --with-mysql does not exist, use --with-mysqlclient
- use OPTIONS_DEFINE_$ARCH for DAHDI option, which fixes the option
- bump PORTREVISION so the packages have DAHDI support again
PR: ports/171590
Submitted by: Dmitry <dmitry2004 at yandex.ru>
Modified:
head/net/asterisk/Makefile
head/net/asterisk10/Makefile
Modified: head/net/asterisk/Makefile
==============================================================================
--- head/net/asterisk/Makefile Thu Sep 13 09:22:25 2012 (r304187)
+++ head/net/asterisk/Makefile Thu Sep 13 09:39:53 2012 (r304188)
@@ -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 PG
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}
Modified: head/net/asterisk10/Makefile
==============================================================================
--- head/net/asterisk10/Makefile Thu Sep 13 09:22:25 2012 (r304187)
+++ head/net/asterisk10/Makefile Thu Sep 13 09:39:53 2012 (r304188)
@@ -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 PG
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}
More information about the svn-ports-all
mailing list