From b7582bce4e89905dc787b362abc0b10c55459479 Mon Sep 17 00:00:00 2001 From: flo Date: Tue, 24 May 2011 19:38:10 +0000 Subject: - update to 1.8.4.1 - remove CPPFLAGS from CONFIGURE_ENV we already set it explicitly - fix WITH_LUA case LDFLAGS was not set correctly [1] - use tabs instead of spaces in WITH_SRTP part Reported by: Victor Timonin [1] --- net/asterisk/Makefile | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'net/asterisk/Makefile') diff --git a/net/asterisk/Makefile b/net/asterisk/Makefile index be8a1b20fdcf..552235ee2a29 100644 --- a/net/asterisk/Makefile +++ b/net/asterisk/Makefile @@ -6,8 +6,7 @@ # PORTNAME= asterisk -PORTVERSION= 1.8.4 -PORTREVISION= 1 +PORTVERSION= 1.8.4.1 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \ http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ @@ -24,9 +23,9 @@ RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123 ONLY_FOR_ARCHS= i386 amd64 powerpc sparc64 GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/openh323" \ - LDFLAGS="-L${LOCALBASE}/lib" +CONFIGURE_ENV= LDFLAGS="${LDFLAGS}" CONFIGURE_ARGS= --with-gsm=${LOCALBASE} +LDFLAGS= -L${LOCALBASE}/lib CPPFLAGS= -I${LOCALBASE}/include -I${LOCALBASE}/include/openh323 USE_GMAKE= yes USE_GNOME= libxml2 @@ -261,12 +260,12 @@ EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-menuselect-tree-g711-new-codec.diff .endif .if !defined(WITH_SRTP) -PLIST_SUB+= WITH_SRTP="@comment " -CONFIGURE_ARGS+= --without-srtp +PLIST_SUB+= WITH_SRTP="@comment " +CONFIGURE_ARGS+= --without-srtp .else -PLIST_SUB+= WITH_SRTP="" -BUILD_DEPENDS+= libsrtp>=1.4.4:${PORTSDIR}/net/libsrtp -CONFIGURE_ARGS+= --with-srtp +PLIST_SUB+= WITH_SRTP="" +BUILD_DEPENDS+= libsrtp>=1.4.4:${PORTSDIR}/net/libsrtp +CONFIGURE_ARGS+= --with-srtp .endif .if defined(WITH_LUA) -- cgit