- 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 <draco@marino.st>  [1]
Reported by:	Ian FREISLICH <ianf@clue.co.za>, [2]
		Alejandro Imass <ait@p2ee.org>, [2]
		Amr Elsharqawi <aelsharqawi@live.com> [2]
This commit is contained in:
Florian Smeets 2013-06-14 07:07:01 +00:00
parent 632f0ed926
commit 92e116c94e
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=320887
5 changed files with 25 additions and 8 deletions

View file

@ -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 <bsd.port.post.mk>

View file

@ -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

View file

@ -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 <bsd.port.post.mk>

View file

@ -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 <bsd.port.post.mk>

View file

@ -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 $< $@