cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove configure.ac patching not needed since c-client no longer needs

Browse Source 
kerb5 libs.

@comment autosupport file which is very linux-centric.
This commit is contained in:
sthen 2014-04-21 22:54:50 +00:00
parent 72f2db68fc
commit 0e4c0113b5
3 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
telephony/asterisk/Makefile
View File

@ -1,10 +1,11 @@
# $OpenBSD: Makefile,v 1.195 2014/04/21 11:34:51 sthen Exp $
# $OpenBSD: Makefile,v 1.196 2014/04/21 22:54:50 sthen Exp $
SHARED_ONLY= Yes
COMMENT-main= open source multi-protocol PBX and telephony toolkit
VER= 11.8.1
REVISION-main= 0
REVISION-snmp= 0
REVISION-calendar= 0
DISTNAME= asterisk-${VER:S/beta/-beta/:S/rc/-rc/}
@ -129,7 +130,7 @@ CONFIGURE_ARGS+= --with-imap=yes
MAKE_FLAGS+= MENUSELECT_OPTS_app_voicemail=IMAP_STORAGE
CPPFLAGS+= -I${LOCALBASE}/include/c-client
LIB_DEPENDS-main+= mail/alpine,-c-client
WANTLIB-main+= c-client gssapi krb5
WANTLIB-main+= c-client
.else
CONFIGURE_ARGS+= --with-imap=no
.endif

11
telephony/asterisk/patches/patch-configure_ac
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-configure_ac,v 1.32 2013/12/20 12:37:05 sthen Exp $
$OpenBSD: patch-configure_ac,v 1.33 2014/04/21 22:54:50 sthen Exp $
c-client requires both kerbV libs *and* (separately) libssl.
@ -13,15 +13,6 @@ c-client requires both kerbV libs *and* (separately) libssl.
astvarlibdir='${prefix}/share/asterisk'
astdbdir='${localstatedir}/db/asterisk'
fi
@@ -1740,7 +1740,7 @@ if test "${USE_IMAP_TK}" != "no"; then
)
else #looking in imap directory didn't work, try c-client
imap_ldflags=""
- imap_libs="-lc-client"
+ imap_libs="`krb5-config --libs gssapi` -lssl -lc-client"
imap_include="-DUSE_SYSTEM_CCLIENT"
CPPFLAGS="${saved_cppflags}"
LIBS="${saved_libs}"
@@ -1926,7 +1926,7 @@ AST_EXT_TOOL_CHECK([NETSNMP], [net-snmp-config], , [--
AST_EXT_LIB_CHECK([NEWT], [newt], [newtBell], [newt.h])

6
telephony/asterisk/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.52 2013/12/20 12:37:06 sthen Exp $
@comment $OpenBSD: PLIST-main,v 1.53 2014/04/21 22:54:50 sthen Exp $
@conflict asterisk-sounds-<=1.2.1p2
@conflict asterisk-curl-*
@conflict asterisk-fax-*
@ -371,14 +371,14 @@ lib/asterisk/modules/res_xmpp.so
@man man/man8/astdb2sqlite3.8
@man man/man8/asterisk.8
@man man/man8/astgenkey.8
@man man/man8/autosupport.8
@comment @man man/man8/autosupport.8
@man man/man8/safe_asterisk.8
@bin sbin/astcanary
@bin sbin/astdb2bdb
@bin sbin/astdb2sqlite3
@bin sbin/asterisk
sbin/astgenkey
sbin/autosupport
@comment sbin/autosupport
sbin/rasterisk
sbin/safe_asterisk
share/asterisk/agi-bin/