From owner-svn-ports-all@FreeBSD.ORG Fri Jun 14 07:07:02 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 775B498B; Fri, 14 Jun 2013 07:07:02 +0000 (UTC) (envelope-from flo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 69ABD16F5; Fri, 14 Jun 2013 07:07:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5E7721K006448; Fri, 14 Jun 2013 07:07:02 GMT (envelope-from flo@svn.freebsd.org) Received: (from flo@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5E771e5006441; Fri, 14 Jun 2013 07:07:01 GMT (envelope-from flo@svn.freebsd.org) Message-Id: <201306140707.r5E771e5006441@svn.freebsd.org> From: Florian Smeets Date: Fri, 14 Jun 2013 07:07:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r320887 - in head/net: asterisk asterisk10 asterisk11 asterisk11/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Jun 2013 07:07:02 -0000 Author: flo Date: Fri Jun 14 07:07:01 2013 New Revision: 320887 URL: http://svnweb.freebsd.org/changeset/ports/320887 Log: - create missing directories before chowning them [1] - asterisk depends on gmake so use gmake to run the menuselect.makeopts target [1] - disable res_timing_kqueue module until we can figure out what's wrong with it [2] Submitted by: John Marino [1] Reported by: Ian FREISLICH , [2] Alejandro Imass , [2] Amr Elsharqawi [2] Added: head/net/asterisk11/files/patch-main__Makefile (contents, props changed) Modified: head/net/asterisk/Makefile head/net/asterisk/pkg-plist head/net/asterisk10/Makefile head/net/asterisk11/Makefile Modified: head/net/asterisk/Makefile ============================================================================== --- head/net/asterisk/Makefile Fri Jun 14 06:56:16 2013 (r320886) +++ head/net/asterisk/Makefile Fri Jun 14 07:07:01 2013 (r320887) @@ -3,6 +3,7 @@ PORTNAME= asterisk PORTVERSION= 1.8.22.0 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \ http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ @@ -285,8 +286,8 @@ post-patch: ${REINPLACE_CMD} -e 's|/var/lib|${PREFIX}/share|g' ${WRKSRC}/configs/musiconhold.conf.sample post-configure: -.if !empty(PORT_OPTIONS:MMYSQL) || !empty(PORT_OPTIONS:MNEWG711) || !empty(PORT_OPTIONS:MOOH323) - @cd ${WRKSRC} && make 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 @cd ${WRKSRC} && ./menuselect/menuselect --enable app_mysql menuselect.makeopts @@ -298,9 +299,9 @@ post-configure: .if ${PORT_OPTIONS:MNEWG711} @cd ${WRKSRC} && ./menuselect/menuselect --enable G711_NEW_ALGORITHM menuselect.makeopts .endif -.endif post-install: + @${MKDIR} ${VARDIR}/db/asterisk ${VARDIR}/log/asterisk ${VARDIR}/spool/asterisk @${CHOWN} -R ${ASTERISK_USER}:${ASTERISK_GROUP} ${VARDIR}/db/asterisk ${VARDIR}/log/asterisk ${VARDIR}/spool/asterisk .include Modified: head/net/asterisk/pkg-plist ============================================================================== --- head/net/asterisk/pkg-plist Fri Jun 14 06:56:16 2013 (r320886) +++ head/net/asterisk/pkg-plist Fri Jun 14 07:07:01 2013 (r320887) @@ -467,7 +467,6 @@ lib/asterisk/modules/res_realtime.so %%WITH_SRTP%%lib/asterisk/modules/res_srtp.so %%WITH_DAHDI%%lib/asterisk/modules/res_timing_dahdi.so lib/asterisk/modules/res_timing_pthread.so -lib/asterisk/modules/res_timing_kqueue.so lib/asterisk/modules/app_adsiprog.so lib/asterisk/modules/app_alarmreceiver.so lib/asterisk/modules/app_amd.so Modified: head/net/asterisk10/Makefile ============================================================================== --- head/net/asterisk10/Makefile Fri Jun 14 06:56:16 2013 (r320886) +++ head/net/asterisk10/Makefile Fri Jun 14 07:07:01 2013 (r320887) @@ -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} && make 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 @@ -297,6 +297,7 @@ post-configure: .endif post-install: + @${MKDIR} ${VARDIR}/db/asterisk ${VARDIR}/log/asterisk ${VARDIR}/spool/asterisk @${CHOWN} -R ${ASTERISK_USER}:${ASTERISK_GROUP} ${VARDIR}/db/asterisk ${VARDIR}/log/asterisk ${VARDIR}/spool/asterisk .include Modified: head/net/asterisk11/Makefile ============================================================================== --- head/net/asterisk11/Makefile Fri Jun 14 06:56:16 2013 (r320886) +++ head/net/asterisk11/Makefile Fri Jun 14 07:07:01 2013 (r320887) @@ -2,6 +2,7 @@ PORTNAME= asterisk PORTVERSION= 11.4.0 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \ http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ @@ -269,8 +270,8 @@ post-patch: ${REINPLACE_CMD} -e 's|/var/lib|${PREFIX}/share|g' ${WRKSRC}/configs/musiconhold.conf.sample post-configure: -.if !empty(PORT_OPTIONS:MMYSQL) || !empty(PORT_OPTIONS:MNEWG711) || !empty(PORT_OPTIONS:MOOH323) - @cd ${WRKSRC} && make 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 @cd ${WRKSRC} && ./menuselect/menuselect --enable app_mysql menuselect.makeopts @@ -282,9 +283,9 @@ post-configure: .if ${PORT_OPTIONS:MNEWG711} @cd ${WRKSRC} && ./menuselect/menuselect --enable G711_NEW_ALGORITHM menuselect.makeopts .endif -.endif post-install: + @${MKDIR} ${VARDIR}/db/asterisk ${VARDIR}/log/asterisk ${VARDIR}/spool/asterisk @${CHOWN} -R ${ASTERISK_USER}:${ASTERISK_GROUP} ${VARDIR}/db/asterisk ${VARDIR}/log/asterisk ${VARDIR}/spool/asterisk .include Added: head/net/asterisk11/files/patch-main__Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/asterisk11/files/patch-main__Makefile Fri Jun 14 07:07:01 2013 (r320887) @@ -0,0 +1,15 @@ +--- main/Makefile.orig 2013-06-13 19:07:52.590762266 +0200 ++++ main/Makefile 2013-06-13 19:07:24.770763707 +0200 +@@ -215,9 +215,9 @@ + endif + $(ECHO_PREFIX) echo " [LD] $^ -> $@" + $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(CC_LDFLAGS_SO) $^ $(CC_LIBS) +-ifneq ($(LDCONFIG),) +- $(LDCONFIG) $(LDCONFIG_FLAGS) . +-endif ++#ifneq ($(LDCONFIG),) ++# $(LDCONFIG) $(LDCONFIG_FLAGS) . ++#endif + + $(ASTSSL_LIB): $(ASTSSL_LIB).$(ASTSSL_SO_VERSION) + $(LN) -sf $< $@