Date: Thu, 4 Jul 2013 22:46:34 +0000 (UTC) From: Florian Smeets <flo@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r322295 - in head/net: asterisk asterisk/files asterisk10 asterisk10/files Message-ID: <201307042246.r64MkYFN074228@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: flo Date: Thu Jul 4 22:46:33 2013 New Revision: 322295 URL: http://svnweb.freebsd.org/changeset/ports/322295 Log: - Don't force gcc, make this work with clang, too [1] - Don't call gmake directly [1] - Make the -p (Run as pseudo-realtime thread) work on FreeBSD [1] - Use @dirrmtry for directories that can contain files after deinstall Submitted by: tijl [1] Modified: head/net/asterisk/Makefile head/net/asterisk/files/patch-main::utils.c (contents, props changed) head/net/asterisk/pkg-plist head/net/asterisk10/Makefile head/net/asterisk10/files/patch-main::utils.c (contents, props changed) head/net/asterisk10/pkg-plist Modified: head/net/asterisk/Makefile ============================================================================== --- head/net/asterisk/Makefile Thu Jul 4 22:04:48 2013 (r322294) +++ head/net/asterisk/Makefile Thu Jul 4 22:46:33 2013 (r322295) @@ -3,7 +3,7 @@ PORTNAME= asterisk PORTVERSION= 1.8.22.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \ http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ @@ -26,7 +26,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-gsm=${LOCALBASE} LDFLAGS+= -L${LOCALBASE}/lib CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/openh323 -USE_GCC= any +USE_CSTD= gnu89 USE_GMAKE= yes USE_GNOME= libxml2 USES= bison @@ -286,7 +286,7 @@ post-patch: ${REINPLACE_CMD} -e 's|/var/lib|${PREFIX}/share|g' ${WRKSRC}/configs/musiconhold.conf.sample post-configure: - @cd ${WRKSRC} && gmake menuselect.makeopts + @cd ${WRKSRC} && ${GMAKE} menuselect.makeopts @cd ${WRKSRC} && ./menuselect/menuselect --disable res_timing_kqueue menuselect.makeopts .if ${PORT_OPTIONS:MMYSQL} @cd ${WRKSRC} && ./menuselect/menuselect --enable res_config_mysql menuselect.makeopts Modified: head/net/asterisk/files/patch-main::utils.c ============================================================================== --- head/net/asterisk/files/patch-main::utils.c Thu Jul 4 22:04:48 2013 (r322294) +++ head/net/asterisk/files/patch-main::utils.c Thu Jul 4 22:46:33 2013 (r322295) @@ -6,7 +6,7 @@ -#ifdef __linux__ - /* On Linux, pthread_attr_init() defaults to PTHREAD_EXPLICIT_SCHED, -+#ifdef __linux__ || defined(__FreeBSD__) ++#if defined(__linux__) || defined(__FreeBSD__) + /* On Linux and FreeBSD, pthread_attr_init() defaults to PTHREAD_EXPLICIT_SCHED, which is kind of useless. Change this here to PTHREAD_INHERIT_SCHED; that way the -p option to set realtime Modified: head/net/asterisk/pkg-plist ============================================================================== --- head/net/asterisk/pkg-plist Thu Jul 4 22:04:48 2013 (r322294) +++ head/net/asterisk/pkg-plist Thu Jul 4 22:46:33 2013 (r322295) @@ -1240,8 +1240,8 @@ spool/asterisk/voicemail/default/1234/en @dirrm spool/asterisk/voicemail @dirrm spool/asterisk/tmp @dirrm spool/asterisk -@dirrm log/asterisk/cdr-csv -@dirrm log/asterisk/cdr-custom -@dirrm log/asterisk/cel-custom -@dirrm log/asterisk +@dirrmtry log/asterisk/cdr-csv +@dirrmtry log/asterisk/cdr-custom +@dirrmtry log/asterisk/cel-custom +@dirrmtry log/asterisk @dirrmtry db/asterisk Modified: head/net/asterisk10/Makefile ============================================================================== --- head/net/asterisk10/Makefile Thu Jul 4 22:04:48 2013 (r322294) +++ head/net/asterisk10/Makefile Thu Jul 4 22:46:33 2013 (r322295) @@ -3,7 +3,7 @@ PORTNAME= asterisk PORTVERSION= 10.12.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \ http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ @@ -24,7 +24,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-gsm=${LOCALBASE} LDFLAGS+= -L${LOCALBASE}/lib CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/openh323 -USE_GCC= any +USE_CSTD= gnu89 USE_GMAKE= yes USE_GNOME= libxml2 USES= bison @@ -279,7 +279,7 @@ post-patch: post-configure: .if !empty(PORT_OPTIONS:MMYSQL) || !empty(PORT_OPTIONS:MNEWG711) || !empty(PORT_OPTIONS:MOOH323) || !empty(PORT_OPTIONS:MH323) - @cd ${WRKSRC} && gmake menuselect.makeopts + @cd ${WRKSRC} && ${GMAKE} menuselect.makeopts .if ${PORT_OPTIONS:MMYSQL} @cd ${WRKSRC} && ./menuselect/menuselect --enable res_config_mysql menuselect.makeopts @cd ${WRKSRC} && ./menuselect/menuselect --enable app_mysql menuselect.makeopts Modified: head/net/asterisk10/files/patch-main::utils.c ============================================================================== --- head/net/asterisk10/files/patch-main::utils.c Thu Jul 4 22:04:48 2013 (r322294) +++ head/net/asterisk10/files/patch-main::utils.c Thu Jul 4 22:46:33 2013 (r322295) @@ -6,7 +6,7 @@ -#ifdef __linux__ - /* On Linux, pthread_attr_init() defaults to PTHREAD_EXPLICIT_SCHED, -+#ifdef __linux__ || defined(__FreeBSD__) ++#if defined(__linux__) || defined(__FreeBSD__) + /* On Linux and FreeBSD, pthread_attr_init() defaults to PTHREAD_EXPLICIT_SCHED, which is kind of useless. Change this here to PTHREAD_INHERIT_SCHED; that way the -p option to set realtime Modified: head/net/asterisk10/pkg-plist ============================================================================== --- head/net/asterisk10/pkg-plist Thu Jul 4 22:04:48 2013 (r322294) +++ head/net/asterisk10/pkg-plist Thu Jul 4 22:46:33 2013 (r322295) @@ -1245,8 +1245,8 @@ spool/asterisk/voicemail/default/1234/en @dirrm spool/asterisk/voicemail @dirrm spool/asterisk/tmp @dirrm spool/asterisk -@dirrm log/asterisk/cdr-csv -@dirrm log/asterisk/cdr-custom -@dirrm log/asterisk/cel-custom -@dirrm log/asterisk +@dirrmtry log/asterisk/cdr-csv +@dirrmtry log/asterisk/cdr-custom +@dirrmtry log/asterisk/cel-custom +@dirrmtry log/asterisk @dirrmtry db/asterisk
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307042246.r64MkYFN074228>