Date: Fri, 8 Apr 2016 12:38:10 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r412739 - in head/net/appkonference: . files Message-ID: <201604081238.u38CcA6K010701@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Fri Apr 8 12:38:10 2016 New Revision: 412739 URL: https://svnweb.freebsd.org/changeset/ports/412739 Log: Update to 2.7. PR: 208615 Submitted by: tkato432 yahoo com Sponsored by: Absolight Modified: head/net/appkonference/Makefile (contents, props changed) head/net/appkonference/distinfo (contents, props changed) head/net/appkonference/files/patch-Makefile (contents, props changed) Modified: head/net/appkonference/Makefile ============================================================================== --- head/net/appkonference/Makefile Fri Apr 8 12:38:03 2016 (r412738) +++ head/net/appkonference/Makefile Fri Apr 8 12:38:10 2016 (r412739) @@ -2,19 +2,19 @@ # $FreeBSD$ PORTNAME= appkonference -PORTVERSION= 2.1 -PORTREVISION= 2 +PORTVERSION= 2.7 CATEGORIES= net MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= High-performance Asterisk voice/video conferencing plugin +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/LICENSE + BUILD_DEPENDS= asterisk:net/asterisk RUN_DEPENDS= asterisk:net/asterisk -LICENSE= GPLv2 -LICENSE_FILE= ${WRKSRC}/LICENSE USE_CSTD= gnu89 USES= compiler:features gmake @@ -25,14 +25,15 @@ PLIST_FILES= lib/asterisk/modules/app_ko ONLY_FOR_ARCHS= amd64 arm i386 ia64 ONLY_FOR_ARCHS_REASON= not yet ported to this architecture +OPTIONS_DEFINE= OPTIMIZED_CFLAGS +OPTIONS_DEFAULT= OPTIMIZED_CFLAGS + +OPTIMIZED_CFLAGS_CFLAGS= -O3 -ffast-math + .include <bsd.port.pre.mk> -.if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} < 36 -post-patch: - @${REINPLACE_CMD} -e 's|-fsingle-precision-constant||' ${WRKSRC}/Makefile +.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} && ${CHOSEN_COMPILER_TYPE} == gcc +CFLAGS+= -funroll-all-loops -fsingle-precision-constant .endif -post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/asterisk/modules/app_konference.so - .include <bsd.port.post.mk> Modified: head/net/appkonference/distinfo ============================================================================== --- head/net/appkonference/distinfo Fri Apr 8 12:38:03 2016 (r412738) +++ head/net/appkonference/distinfo Fri Apr 8 12:38:10 2016 (r412739) @@ -1,2 +1,2 @@ -SHA256 (appkonference-2.1.tar.gz) = 0e1bc8d01cab61e9cb84e6aa0ab12d14c86fade453b7508b07331edc1142653c -SIZE (appkonference-2.1.tar.gz) = 191953 +SHA256 (appkonference-2.7.tar.gz) = 52c0d9d23fa57a25581bc0a92bf7286730ce9a2d621a9e534f9afe53d4311734 +SIZE (appkonference-2.7.tar.gz) = 190040 Modified: head/net/appkonference/files/patch-Makefile ============================================================================== --- head/net/appkonference/files/patch-Makefile Fri Apr 8 12:38:03 2016 (r412738) +++ head/net/appkonference/files/patch-Makefile Fri Apr 8 12:38:10 2016 (r412739) @@ -1,33 +1,33 @@ ---- ./Makefile.orig 2012-01-25 20:40:01.000000000 +0100 -+++ ./Makefile 2014-08-22 10:44:57.000000000 +0200 -@@ -16,11 +16,11 @@ - ASTERISK_SRC_DIR = - - # asterisk release or subversion working copy --ASTERISK_SRC_VERSION = $(shell if [ -e $(ASTERISK_SRC_DIR)/.version ] ; then echo release; elif [ -e $(ASTERISK_SRC_DIR)/.svn ] ; then echo subversion; else echo unknown; fi) -+ASTERISK_SRC_VERSION = release - - # asterisk release version or subversion branch - ifeq ($(ASTERISK_SRC_VERSION),release) -- ASTERISK = $(shell cat $(ASTERISK_SRC_DIR)/.version | cut -d "." -f1,2 | sed -e 's/\.//') -+ ASTERISK = 18 - else - ifeq ($(ASTERISK_SRC_VERSION),subversion) - ASTERISK = $(shell svn info $(ASTERISK_SRC_DIR) | grep URL | sed -e 's:^.*/::' | cut -d "." -f 1,2 | sed -e 's/\.//') -@@ -31,10 +31,10 @@ +--- Makefile.orig 2016-01-05 16:43:05 UTC ++++ Makefile +@@ -13,7 +13,7 @@ + # + + # asterisk source directory +-ASTERISK_SRC_DIR = ++ASTERISK_SRC_DIR = ${LOCALBASE} + + ifndef ASTERISK_SRC_DIR + $(warning Asterisk source directory is not set) +@@ -21,7 +21,7 @@ ifndef ASTERISK_SRC_DIR endif - # asterisk include directory --ASTERISK_INCLUDE_DIR = $(ASTERISK_SRC_DIR)/include -+ASTERISK_INCLUDE_DIR = ${LOCALBASE}/include + # asterisk version +-ASTERISK_SRC_VERSION = $(shell if [ -e $(ASTERISK_SRC_DIR)/.version ] ; then cat $(ASTERISK_SRC_DIR)/.version | awk -F. '{printf "%01d%02d",$$1,$$2}' ; fi) ++ASTERISK_SRC_VERSION = 18 + + ifeq ($(ASTERISK_SRC_VERSION),) + $(warning Asterisk version is not set) +@@ -32,7 +32,7 @@ endif + ASTERISK_INCLUDE_DIR = $(ASTERISK_SRC_DIR)/include # asterisk module directory -INSTALL_MODULES_DIR = /usr/lib/asterisk/modules -+INSTALL_MODULES_DIR = ${LOCALBASE}/lib/asterisk/modules ++INSTALL_MODULES_DIR = ${PREFIX}/lib/asterisk/modules # module release - RELEASE = 2.1 -@@ -86,7 +86,7 @@ + RELEASE = 2.7 +@@ -84,12 +84,12 @@ INCLUDE = -I$(ASTERISK_INCLUDE_DIR) # compiler flags # @@ -36,16 +36,31 @@ #CFLAGS += -O3 -march=pentium3 -msse -mfpmath=sse,387 -ffast-math # PERF: below is 10% faster than -O2 or -O3 alone. #CFLAGS += -O3 -ffast-math -funroll-loops -@@ -103,7 +103,7 @@ + # below is another 5% faster or so. +-CFLAGS += -O3 -ffast-math -funroll-all-loops -fsingle-precision-constant ++#CFLAGS += -O3 -ffast-math -funroll-all-loops -fsingle-precision-constant + #CFLAGS += -mcpu=7450 -faltivec -mabi=altivec -mdynamic-no-pic + # adding -msse -mfpmath=sse has little effect. + #CFLAGS += -O3 -msse -mfpmath=sse +@@ -102,7 +102,7 @@ CFLAGS += -fPIC # preprocessor flags # -CPPFLAGS = $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE +CPPFLAGS += $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE CPPFLAGS += -DRELEASE=\"$(RELEASE)\" - CPPFLAGS += -DASTERISK=$(ASTERISK) + CPPFLAGS += -DASTERISK_SRC_VERSION=$(ASTERISK_SRC_VERSION) CPPFLAGS += -DCHANNEL_TABLE_SIZE=$(CHANNEL_TABLE_SIZE) -@@ -182,7 +182,8 @@ +@@ -127,7 +127,7 @@ CPPFLAGS += -DAC_USE_ULAW + # + # Uncomment this if you want to use *bsd kqueue for timing + # +-# CPPFLAGS += -DKQUEUE ++CPPFLAGS += -DKQUEUE + # + + # +@@ -207,7 +207,8 @@ clean: $(OBJS): $(INCS) $(TARGET): $(OBJS) @@ -53,6 +68,6 @@ + $(CC) $(LDFLAGS) $(SOLINK) -o $@ $(OBJS) install: -- $(INSTALL) -m 755 $(TARGET) $(INSTALL_MODULES_DIR) +- if [ -f $(TARGET) ]; then $(INSTALL) -m 755 $(TARGET) $(INSTALL_MODULES_DIR); fi + mkdir -p $(DESTDIR)$(INSTALL_MODULES_DIR) -+ $(INSTALL) -m 755 $(TARGET) $(DESTDIR)$(INSTALL_MODULES_DIR) ++ ${BSD_INSTALL_LIB} $(TARGET) $(DESTDIR)$(INSTALL_MODULES_DIR)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604081238.u38CcA6K010701>