svn commit: r384274 - in branches/2015Q2/net: asterisk asterisk/files asterisk11 asterisk11/files asterisk13 asterisk13/files
Guido Falsi
madpilot at FreeBSD.org
Sun Apr 19 09:31:12 UTC 2015
Author: madpilot
Date: Sun Apr 19 09:31:09 2015
New Revision: 384274
URL: https://svnweb.freebsd.org/changeset/ports/384274
Log:
MFH: r384255
- Add SYSINFO option to asterisk ports and force them to respect
it, otherwise they fail to build when devel/libsysinfo port is
already present on system.
While here:
- Silence some Makefile commands
- Remove mostly obsolete comment from option description
Reported by: Bob Eager <bob at eager.cx>
Approved by: portmgr (erwin)
Modified:
branches/2015Q2/net/asterisk/Makefile
branches/2015Q2/net/asterisk/files/patch-main__Makefile
branches/2015Q2/net/asterisk11/Makefile
branches/2015Q2/net/asterisk11/files/patch-main__Makefile
branches/2015Q2/net/asterisk13/Makefile
branches/2015Q2/net/asterisk13/files/patch-main__Makefile
Directory Properties:
branches/2015Q2/ (props changed)
Modified: branches/2015Q2/net/asterisk/Makefile
==============================================================================
--- branches/2015Q2/net/asterisk/Makefile Sun Apr 19 09:06:51 2015 (r384273)
+++ branches/2015Q2/net/asterisk/Makefile Sun Apr 19 09:31:09 2015 (r384274)
@@ -47,7 +47,7 @@ CONFLICTS_BUILD= linuxthreads-*
CONFLICTS_INSTALL= asterisk*-11* asterisk*-13*
OPTIONS_DEFINE= VORBIS PGSQL MYSQL ODBC RADIUS SNMP H323 FREETDS JABBER SQLITE GSM \
- CURL SPANDSP EXCHANGE NEWG711 SRTP LUA LDAP OOH323
+ CURL SPANDSP EXCHANGE NEWG711 SRTP LUA LDAP OOH323 SYSINFO
OPTIONS_DEFAULT= VORBIS ODBC PGSQL RADIUS SNMP H323 FREETDS JABBER GSM \
SQLITE CURL LUA
@@ -64,6 +64,7 @@ NEWG711_DESC?= New G711 Codec
SRTP_DESC?= SecureRTP support
OOH323_DESC?= ooh323 support
DAHDI_DESC?= DAHDI support
+SYSINFO_DESC?= Use devel/libsysinfo to get system information
OPTIONS_SUB= yes
H323_CONFIGURE_WITH= h323
@@ -115,6 +116,7 @@ LUA_CFLAGS= -I${LUA_INCDIR}
LUA_LDFLAGS= -L${LUA_LIBDIR}
LDAP_CONFIGURE_WITH= ldap
LDAP_USE= OPENLDAP=yes
+SYSINFO_LIB_DEPENDS= libsysinfo.so:${PORTSDIR}/devel/libsysinfo
PORTSCOUT= limit:^1\.8\.
@@ -138,10 +140,16 @@ PLIST_SUB+= ASTERISK_GROUP=${ASTERISK_GR
PLIST_SUB+= VARDIR=${VARDIR}
post-extract:
- ${FIND} ${WRKSRC} -name '*.d' -delete
+ @${FIND} ${WRKSRC} -name '*.d' -delete
post-patch:
- ${REINPLACE_CMD} -e 's|/var/lib|${PREFIX}/share|g' ${WRKSRC}/configs/musiconhold.conf.sample
+ @${REINPLACE_CMD} -e 's|/var/lib|${PREFIX}/share|g' ${WRKSRC}/configs/musiconhold.conf.sample
+.if ${PORT_OPTIONS:MSYSINFO}
+ @${REINPLACE_CMD} -e 's/%%LIBSYSINFO%%/-lsysinfo/' ${WRKSRC}/main/Makefile
+.else
+ @${REINPLACE_CMD} -e '/#define HAVE_SYSINFO 1/d' ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e '/%%LIBSYSINFO%%/d' ${WRKSRC}/main/Makefile
+.endif
post-configure:
@cd ${WRKSRC} && ${MAKE_CMD} menuselect.makeopts
Modified: branches/2015Q2/net/asterisk/files/patch-main__Makefile
==============================================================================
--- branches/2015Q2/net/asterisk/files/patch-main__Makefile Sun Apr 19 09:06:51 2015 (r384273)
+++ branches/2015Q2/net/asterisk/files/patch-main__Makefile Sun Apr 19 09:31:09 2015 (r384274)
@@ -1,6 +1,14 @@
---- ./main/Makefile.orig 2010-08-02 16:41:46.000000000 +0200
-+++ ./main/Makefile 2010-11-06 14:54:37.000000000 +0100
-@@ -107,8 +107,8 @@
+--- main/Makefile.orig 2013-02-26 19:06:51 UTC
++++ main/Makefile
+@@ -70,6 +70,7 @@ ifeq ($(OSARCH),FreeBSD)
+ BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk)
+ AST_LIBS+=$(shell if test $(BSDVERSION) -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi)
+ AST_LIBS+=-lcrypto
++ AST_LIBS+=%%LIBSYSINFO%%
+ endif
+
+ ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
+@@ -109,8 +110,8 @@ editline/libedit.a: CHECK_SUBDIR
cd editline && test -f config.h || CFLAGS="$(PTHREAD_CFLAGS) $(subst $(ASTTOPDIR),../../,$(_ASTCFLAGS:-Werror=) $(ASTCFLAGS))" LDFLAGS="$(_ASTLDFLAGS) $(ASTLDFLAGS)" ./configure --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --with-ncurses=$(NCURSES_DIR) --with-curses=$(CURSES_DIR) --with-termcap=$(TERMCAP_DIR) --with-tinfo=$(TINFO_DIR)
$(MAKE) -C editline libedit.a
@@ -11,9 +19,9 @@
ifneq ($(findstring REBUILD_PARSERS,$(MENUSELECT_CFLAGS)),)
ast_expr2.c ast_expr2.h: ast_expr2.y
-@@ -173,13 +173,13 @@
+@@ -179,13 +180,13 @@ ssl.o: _ASTCFLAGS+=$(OPENSSL_INCLUDE)
- $(OBJS): _ASTCFLAGS+=-DAST_MODULE=\"core\"
+ tcptls.o: _ASTCFLAGS+=$(OPENSSL_INCLUDE)
-$(MAIN_TGT): $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS)
+$(MAIN_TGT): $(OBJS) editline/libedit.a $(AST_EMBED_LDSCRIPTS)
Modified: branches/2015Q2/net/asterisk11/Makefile
==============================================================================
--- branches/2015Q2/net/asterisk11/Makefile Sun Apr 19 09:06:51 2015 (r384273)
+++ branches/2015Q2/net/asterisk11/Makefile Sun Apr 19 09:31:09 2015 (r384274)
@@ -42,7 +42,7 @@ CONFLICTS_BUILD= linuxthreads-*
CONFLICTS_INSTALL= asterisk*-1.8* asterisk*-13*
OPTIONS_DEFINE= VORBIS PGSQL MYSQL ODBC RADIUS SNMP FREETDS XMPP SQLITE GSM \
- CURL SPANDSP EXCHANGE NEWG711 SRTP LUA LDAP OOH323 UUID
+ CURL SPANDSP EXCHANGE NEWG711 SRTP LUA LDAP OOH323 UUID SYSINFO
OPTIONS_DEFAULT= VORBIS ODBC PGSQL RADIUS SNMP FREETDS \
XMPP GSM SQLITE CURL LUA UUID
@@ -61,6 +61,7 @@ OOH323_DESC?= ooh323 support
DAHDI_DESC?= DAHDI support
XMPP_DESC?= XMPP/GTALK support
UUID_DESC?= libuuid support (required for ICE and TURN in RTP)
+SYSINFO_DESC?= Use devel/libsysinfo to get system information
OPTIONS_SUB= yes
OOH323_LIB_DEPENDS= libpt_r.so:${PORTSDIR}/devel/pwlib \
@@ -113,6 +114,7 @@ UUID_LIB_DEPENDS= libuuid.so:${PORTSDIR}
UUID_CONFIGURE_ON= --with-uuid=${LOCALBASE}
UUID_CONFIGURE_OFF= --disable-uuid
UUID_CONFLICTS= ossp-uuid-[0-9]*
+SYSINFO_LIB_DEPENDS= libsysinfo.so:${PORTSDIR}/devel/libsysinfo
ASTERISK_USER?= asterisk
ASTERISK_GROUP?= asterisk
@@ -134,10 +136,16 @@ PLIST_SUB+= ASTERISK_GROUP=${ASTERISK_GR
PLIST_SUB+= VARDIR=${VARDIR}
post-extract:
- ${FIND} ${WRKSRC} -name '*.d' -delete
+ @${FIND} ${WRKSRC} -name '*.d' -delete
post-patch:
- ${REINPLACE_CMD} -e 's|/var/lib|${PREFIX}/share|g' ${WRKSRC}/configs/musiconhold.conf.sample
+ @${REINPLACE_CMD} -e 's|/var/lib|${PREFIX}/share|g' ${WRKSRC}/configs/musiconhold.conf.sample
+.if ${PORT_OPTIONS:MSYSINFO}
+ @${REINPLACE_CMD} -e 's/%%LIBSYSINFO%%/-lsysinfo/' ${WRKSRC}/main/Makefile
+.else
+ @${REINPLACE_CMD} -e '/#define HAVE_SYSINFO 1/d' ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e '/%%LIBSYSINFO%%/d' ${WRKSRC}/main/Makefile
+.endif
post-configure:
@cd ${WRKSRC} && ${MAKE_CMD} menuselect.makeopts
Modified: branches/2015Q2/net/asterisk11/files/patch-main__Makefile
==============================================================================
--- branches/2015Q2/net/asterisk11/files/patch-main__Makefile Sun Apr 19 09:06:51 2015 (r384273)
+++ branches/2015Q2/net/asterisk11/files/patch-main__Makefile Sun Apr 19 09:31:09 2015 (r384274)
@@ -1,6 +1,14 @@
---- main/Makefile.orig 2013-02-26 20:19:51.000000000 +0100
-+++ main/Makefile 2014-05-16 11:48:55.545963341 +0200
-@@ -215,9 +215,9 @@
+--- main/Makefile.orig 2015-03-12 12:26:57 UTC
++++ main/Makefile
+@@ -76,6 +76,7 @@ ifeq ($(OSARCH),FreeBSD)
+ BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk)
+ AST_LIBS+=$(shell if test $(BSDVERSION) -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi)
+ AST_LIBS+=-lcrypto
++ AST_LIBS+=%%LIBSYSINFO%%
+ endif
+
+ ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
+@@ -218,9 +219,9 @@ ifeq ($(GNU_LD),1)
endif
$(ECHO_PREFIX) echo " [LD] $^ -> $@"
$(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(CC_LDFLAGS_SO) $^ $(CC_LIBS)
@@ -13,7 +21,7 @@
$(ASTSSL_LIB): $(ASTSSL_LIB).$(ASTSSL_SO_VERSION)
$(LN) -sf $< $@
-@@ -266,9 +266,9 @@
+@@ -269,9 +270,9 @@ ifeq ($(findstring darwin,$(OSARCH)),) #
else # Darwin
$(INSTALL) -m 755 $(ASTSSL_LIB) "$(DESTDIR)$(ASTLIBDIR)/"
endif
Modified: branches/2015Q2/net/asterisk13/Makefile
==============================================================================
--- branches/2015Q2/net/asterisk13/Makefile Sun Apr 19 09:06:51 2015 (r384273)
+++ branches/2015Q2/net/asterisk13/Makefile Sun Apr 19 09:31:09 2015 (r384274)
@@ -44,7 +44,8 @@ CONFLICTS_BUILD= linuxthreads-*
CONFLICTS_INSTALL= asterisk*-1.8* asterisk*-11*
OPTIONS_DEFINE= VORBIS PGSQL MYSQL ODBC RADIUS SNMP FREETDS XMPP SQLITE GSM \
- CURL SPANDSP EXCHANGE NEWG711 SRTP LUA LDAP OOH323 PJSIP SPEEX
+ CURL SPANDSP EXCHANGE NEWG711 SRTP LUA LDAP OOH323 PJSIP SPEEX \
+ SYSINFO
OPTIONS_DEFAULT= VORBIS ODBC PGSQL RADIUS SNMP FREETDS \
XMPP GSM SQLITE3 CURL LUA PJSIP SPEEX
@@ -58,11 +59,12 @@ OPTIONS_DEFAULT_sparc64= DAHDI
EXCHANGE_DESC?= Exchange calendar support
NEWG711_DESC?= New G711 Codec
-SRTP_DESC?= SecureRTP support (Needs all ports build with WITH_OPENSSL_PORT=yes)
+SRTP_DESC?= SecureRTP support
OOH323_DESC?= ooh323 support
DAHDI_DESC?= DAHDI support
XMPP_DESC?= XMPP/GTALK support
PJSIP_DESC?= Build the PJSIP based SIP channel
+SYSINFO_DESC?= Use devel/libsysinfo to get system information
OPTIONS_SUB= yes
OOH323_LIB_DEPENDS= libpt_r.so:${PORTSDIR}/devel/pwlib \
@@ -115,6 +117,7 @@ PJSIP_CONFIGURE_WITH= pjproject
PJSIP_USES= pkgconfig
SPEEX_LIB_DEPENDS= libspeex.so:${PORTSDIR}/audio/speex
SPEEX_CONFIGURE_WITH= speex
+SYSINFO_LIB_DEPENDS= libsysinfo.so:${PORTSDIR}/devel/libsysinfo
ASTERISK_USER?= asterisk
ASTERISK_GROUP?= asterisk
@@ -142,10 +145,16 @@ PLIST_SUB+= ASTERISK_GROUP=${ASTERISK_GR
PLIST_SUB+= VARDIR=${VARDIR}
post-extract:
- ${FIND} ${WRKSRC} -name '*.d' -delete
+ @${FIND} ${WRKSRC} -name '*.d' -delete
post-patch:
- ${REINPLACE_CMD} -e 's|/var/lib|${PREFIX}/share|g' ${WRKSRC}/configs/samples/musiconhold.conf.sample
+ @${REINPLACE_CMD} -e 's|/var/lib|${PREFIX}/share|g' ${WRKSRC}/configs/samples/musiconhold.conf.sample
+.if ${PORT_OPTIONS:MSYSINFO}
+ @${REINPLACE_CMD} -e 's/%%LIBSYSINFO%%/-lsysinfo/' ${WRKSRC}/main/Makefile
+.else
+ @${REINPLACE_CMD} -e '/#define HAVE_SYSINFO 1/d' ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e '/%%LIBSYSINFO%%/d' ${WRKSRC}/main/Makefile
+.endif
post-configure:
@cd ${WRKSRC} && ${MAKE_CMD} menuselect.makeopts
Modified: branches/2015Q2/net/asterisk13/files/patch-main__Makefile
==============================================================================
--- branches/2015Q2/net/asterisk13/files/patch-main__Makefile Sun Apr 19 09:06:51 2015 (r384273)
+++ branches/2015Q2/net/asterisk13/files/patch-main__Makefile Sun Apr 19 09:31:09 2015 (r384274)
@@ -1,6 +1,14 @@
---- main/Makefile.orig 2014-07-04 15:26:58 UTC
+--- main/Makefile.orig 2015-03-12 12:39:26 UTC
+++ main/Makefile
-@@ -217,9 +217,9 @@ ifeq ($(GNU_LD),1)
+@@ -79,6 +79,7 @@ ifeq ($(OSARCH),FreeBSD)
+ BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk)
+ AST_LIBS+=$(shell if test $(BSDVERSION) -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi)
+ AST_LIBS+=-lcrypto
++ AST_LIBS+=%%LIBSYSINFO%%
+ endif
+
+ ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
+@@ -218,9 +219,9 @@ ifeq ($(GNU_LD),1)
endif
$(ECHO_PREFIX) echo " [LD] $^ -> $@"
$(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(CC_LDFLAGS_SO) $^ $(CC_LIBS)
@@ -13,7 +21,7 @@
$(ASTSSL_LIB): $(ASTSSL_LIB).$(ASTSSL_SO_VERSION)
$(LN) -sf $< $@
-@@ -264,9 +264,9 @@ ifeq ($(findstring darwin,$(OSARCH)),) #
+@@ -265,9 +266,9 @@ ifeq ($(findstring darwin,$(OSARCH)),) #
else # Darwin
$(INSTALL) -m 755 $(ASTSSL_LIB) "$(DESTDIR)$(ASTLIBDIR)/"
endif
More information about the svn-ports-branches
mailing list