From fbc7d96af6372bc44d7d1993917cd2d0a2a90e03 Mon Sep 17 00:00:00 2001 From: Guido Falsi Date: Mon, 28 Jan 2019 19:00:15 +0000 Subject: [PATCH] - Force asterisk ports to prefer newly compiled libasteriskssl.so to already installed one when compiling the port on live system where asterisk is already present. - While here Make some minor cosmetic changes. PR: 235233 Submitted by: pfduch@yandex.ru --- net/asterisk13/Makefile | 12 ++++++------ net/asterisk15/Makefile | 14 +++++++------- net/asterisk16/Makefile | 14 +++++++------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/net/asterisk13/Makefile b/net/asterisk13/Makefile index 6854d2bd13e0..014b4d2ff39c 100644 --- a/net/asterisk13/Makefile +++ b/net/asterisk13/Makefile @@ -21,7 +21,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid \ libjansson.so:devel/jansson -ONLY_FOR_ARCHS= amd64 armv6 armv7 i386 powerpc sparc64 +ONLY_FOR_ARCHS= amd64 armv6 armv7 i386 powerpc sparc64 EXTRACT_ONLY:= ${DISTNAME}${EXTRACT_SUFX} @@ -34,17 +34,17 @@ USE_RC_SUBR= asterisk USE_GITHUB= nodefault GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --datarootdir=${DATADIR} \ - --with-ilbc=internal \ - --with-crypto=${OPENSSLBASE} \ - --with-ssl=${OPENSSLBASE} +CONFIGURE_ARGS= --datarootdir=${DATADIR} \ + --with-ilbc=internal \ + --with-crypto=${OPENSSLBASE} \ + --with-ssl=${OPENSSLBASE} CPE_VENDOR= digium SHEBANG_FILES= agi/agi-test.agi \ agi/jukebox.agi \ contrib/scripts/astversion - +LDFLAGS= -L. MAKE_ENV= PTHREAD_LIBS="-lpthread" \ MKDIR="${MKDIR}" \ PWLIBDIR=${LOCALBASE}/share/pwlib \ diff --git a/net/asterisk15/Makefile b/net/asterisk15/Makefile index f5dd0f5bd4f9..93a4dd7427d8 100644 --- a/net/asterisk15/Makefile +++ b/net/asterisk15/Makefile @@ -24,7 +24,7 @@ EXPIRATION_DATE=2019-10-03 LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid \ libjansson.so:devel/jansson -ONLY_FOR_ARCHS= amd64 armv6 armv7 i386 powerpc sparc64 +ONLY_FOR_ARCHS= amd64 armv6 armv7 i386 powerpc sparc64 EXTRACT_ONLY:= ${DISTNAME}${EXTRACT_SUFX} @@ -37,18 +37,18 @@ USE_RC_SUBR= asterisk USE_GITHUB= nodefault GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --datarootdir=${DATADIR} \ - --with-ilbc=internal \ - --with-crypto=${OPENSSLBASE} \ - --with-pjproject-bundled=no \ - --with-ssl=${OPENSSLBASE} +CONFIGURE_ARGS= --datarootdir=${DATADIR} \ + --with-ilbc=internal \ + --with-crypto=${OPENSSLBASE} \ + --with-pjproject-bundled=no \ + --with-ssl=${OPENSSLBASE} CPE_VENDOR= digium SHEBANG_FILES= agi/agi-test.agi \ agi/jukebox.agi \ contrib/scripts/astversion - +LDFLAGS= -L. MAKE_ENV= PTHREAD_LIBS="-lpthread" \ MKDIR="${MKDIR}" \ PWLIBDIR=${LOCALBASE}/share/pwlib \ diff --git a/net/asterisk16/Makefile b/net/asterisk16/Makefile index b3debc810df1..b8336f570201 100644 --- a/net/asterisk16/Makefile +++ b/net/asterisk16/Makefile @@ -21,7 +21,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid \ libjansson.so:devel/jansson -ONLY_FOR_ARCHS= amd64 armv6 armv7 i386 powerpc sparc64 +ONLY_FOR_ARCHS= amd64 armv6 armv7 i386 powerpc sparc64 EXTRACT_ONLY:= ${DISTNAME}${EXTRACT_SUFX} @@ -34,18 +34,18 @@ USE_RC_SUBR= asterisk USE_GITHUB= nodefault GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --datarootdir=${DATADIR} \ - --with-ilbc=internal \ - --with-crypto=${OPENSSLBASE} \ - --with-pjproject-bundled=no \ - --with-ssl=${OPENSSLBASE} +CONFIGURE_ARGS= --datarootdir=${DATADIR} \ + --with-ilbc=internal \ + --with-crypto=${OPENSSLBASE} \ + --with-pjproject-bundled=no \ + --with-ssl=${OPENSSLBASE} CPE_VENDOR= digium SHEBANG_FILES= agi/agi-test.agi \ agi/jukebox.agi \ contrib/scripts/astversion - +LDFLAGS= -L. MAKE_ENV= PTHREAD_LIBS="-lpthread" \ MKDIR="${MKDIR}" \ PWLIBDIR=${LOCALBASE}/share/pwlib \