Attachment #169087 for bug #208615

View | Details | Raw Unified | Return to bug 208615
Collapse All | Expand All




# $FreeBSD: head/net/appkonference/Makefile 412348 2016-04-01 14:17:44Z mat $

PORTNAME=	appkonference
PORTVERSION=	2.7
PORTREVISION=	2
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

WRKSRC=		${WRKDIR}/${PORTNAME}/konference
LICENSE_FILE=	${WRKSRC}/LICENSE

USE_CSTD=	gnu89
USES=		compiler:features gmake
USE_CSTD=	gnu89

PLIST_FILES=	lib/asterisk/modules/app_konference.so

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 ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} && ${CHOSEN_COMPILER_TYPE} == gcc
CFLAGS+=	-funroll-all-loops -fsingle-precision-constant
	@${REINPLACE_CMD} -e 's|-fsingle-precision-constant||' ${WRKSRC}/Makefile
.endif

post-install:
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/asterisk/modules/app_konference.so

.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)net/appkonference/distinfo (-2 / +2 lines)
1	SHA256 (appkonference-2.1.tar.gz) = 0e1bc8d01cab61e9cb84e6aa0ab12d14c86fade453b7508b07331edc1142653c	1	SHA256 (appkonference-2.7.tar.gz) = 52c0d9d23fa57a25581bc0a92bf7286730ce9a2d621a9e534f9afe53d4311734
2	SIZE (appkonference-2.1.tar.gz) = 191953	2	SIZE (appkonference-2.7.tar.gz) = 190040




--- 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
+ 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 @@
 endif
 
 # 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 = ${PREFIX}/lib/asterisk/modules
 
 # module release
 RELEASE = 2.7
@@ -84,12 +84,12 @@ INCLUDE = -I$(ASTERISK_INCLUDE_DIR)
 # compiler flags
 #
 

 #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
 # 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_SRC_VERSION=$(ASTERISK_SRC_VERSION)
 CPPFLAGS += -DCHANNEL_TABLE_SIZE=$(CHANNEL_TABLE_SIZE)
@@ -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)

+	$(CC) $(LDFLAGS) $(SOLINK) -o $@ $(OBJS)
 
 install:
-	if [ -f $(TARGET) ]; then $(INSTALL) -m 755 $(TARGET) $(INSTALL_MODULES_DIR); fi
+	mkdir -p $(DESTDIR)$(INSTALL_MODULES_DIR)
+	${BSD_INSTALL_LIB} $(TARGET) $(DESTDIR)$(INSTALL_MODULES_DIR)

Return to bug 208615

Lines 2-38 Link Here

(-)net/appkonference/Makefile (-12 / +13 lines)
2	# $FreeBSD: head/net/appkonference/Makefile 412348 2016-04-01 14:17:44Z mat $	2	# $FreeBSD: head/net/appkonference/Makefile 412348 2016-04-01 14:17:44Z mat $
3		3
4	PORTNAME= appkonference	4	PORTNAME= appkonference
5	PORTVERSION= 2.1	5	PORTVERSION= 2.7
6	PORTREVISION= 2
7	CATEGORIES= net	6	CATEGORIES= net
8	MASTER_SITES= SF	7	MASTER_SITES= SF
9		8
10	MAINTAINER= ports@FreeBSD.org	9	MAINTAINER= ports@FreeBSD.org
11	COMMENT= High-performance Asterisk voice/video conferencing plugin	10	COMMENT= High-performance Asterisk voice/video conferencing plugin
12		11
		12	LICENSE= GPLv2
		13	LICENSE_FILE= ${WRKSRC}/LICENSE
		14
13	BUILD_DEPENDS= asterisk:net/asterisk	15	BUILD_DEPENDS= asterisk:net/asterisk
14	RUN_DEPENDS= asterisk:net/asterisk	16	RUN_DEPENDS= asterisk:net/asterisk
15		17
16	LICENSE= GPLv2	18	WRKSRC= ${WRKDIR}/${PORTNAME}/konference
17	LICENSE_FILE= ${WRKSRC}/LICENSE
18		19
19	USE_CSTD= gnu89
20	USES= compiler:features gmake	20	USES= compiler:features gmake
21	WRKSRC= ${WRKDIR}/${PORTNAME}/konference	21	USE_CSTD= gnu89
22		22
23	PLIST_FILES= lib/asterisk/modules/app_konference.so	23	PLIST_FILES= lib/asterisk/modules/app_konference.so
24		24
25	ONLY_FOR_ARCHS= amd64 arm i386 ia64	25	ONLY_FOR_ARCHS= amd64 arm i386 ia64
26	ONLY_FOR_ARCHS_REASON= not yet ported to this architecture	26	ONLY_FOR_ARCHS_REASON= not yet ported to this architecture
27		27
		28	OPTIONS_DEFINE= OPTIMIZED_CFLAGS
		29	OPTIONS_DEFAULT= OPTIMIZED_CFLAGS
		30
		31	OPTIMIZED_CFLAGS_CFLAGS= -O3 -ffast-math
		32
28	.include <bsd.port.pre.mk>	33	.include <bsd.port.pre.mk>
29		34
30	.if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} < 36	35	.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} && ${CHOSEN_COMPILER_TYPE} == gcc
31	post-patch:	36	CFLAGS+= -funroll-all-loops -fsingle-precision-constant
32	@${REINPLACE_CMD} -e 's\|-fsingle-precision-constant\|\|' ${WRKSRC}/Makefile
33	.endif	37	.endif
34		38
35	post-install:
36	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/asterisk/modules/app_konference.so
37
38	.include <bsd.port.post.mk>	39	.include <bsd.port.post.mk>

Lines 1-33 Link Here

(-)net/appkonference/files/patch-Makefile (-28 / +43 lines)
1	--- ./Makefile.orig 2012-01-25 20:40:01.000000000 +0100	1	--- Makefile.orig 2016-01-05 16:43:05 UTC
2	+++ ./Makefile 2014-08-22 10:44:57.000000000 +0200	2	+++ Makefile
3	@@ -16,11 +16,11 @@	3	@@ -13,7 +13,7 @@
4	ASTERISK_SRC_DIR =	4	#
5		5
6	# asterisk release or subversion working copy	6	# asterisk source directory
7	-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)	7	-ASTERISK_SRC_DIR =
8	+ASTERISK_SRC_VERSION = release	8	+ASTERISK_SRC_DIR = ${LOCALBASE}
9		9
10	# asterisk release version or subversion branch	10	ifndef ASTERISK_SRC_DIR
11	ifeq ($(ASTERISK_SRC_VERSION),release)	11	$(warning Asterisk source directory is not set)
12	- ASTERISK = $(shell cat $(ASTERISK_SRC_DIR)/.version \| cut -d "." -f1,2 \| sed -e 's/\.//')	12	@@ -21,7 +21,7 @@ ifndef ASTERISK_SRC_DIR
13	+ ASTERISK = 18
14	else
15	ifeq ($(ASTERISK_SRC_VERSION),subversion)
16	ASTERISK = $(shell svn info $(ASTERISK_SRC_DIR) \| grep URL \| sed -e 's:^.*/::' \| cut -d "." -f 1,2 \| sed -e 's/\.//')
17	@@ -31,10 +31,10 @@
18	endif	13	endif
19		14
20	# asterisk include directory	15	# asterisk version
21	-ASTERISK_INCLUDE_DIR = $(ASTERISK_SRC_DIR)/include	16	-ASTERISK_SRC_VERSION = $(shell if [ -e $(ASTERISK_SRC_DIR)/.version ] ; then cat $(ASTERISK_SRC_DIR)/.version \| awk -F. '{printf "%01d%02d",$$1,$$2}' ; fi)
22	+ASTERISK_INCLUDE_DIR = ${LOCALBASE}/include	17	+ASTERISK_SRC_VERSION = 18
		18
		19	ifeq ($(ASTERISK_SRC_VERSION),)
		20	$(warning Asterisk version is not set)
		21	@@ -32,7 +32,7 @@ endif
		22	ASTERISK_INCLUDE_DIR = $(ASTERISK_SRC_DIR)/include
23		23
24	# asterisk module directory	24	# asterisk module directory
25	-INSTALL_MODULES_DIR = /usr/lib/asterisk/modules	25	-INSTALL_MODULES_DIR = /usr/lib/asterisk/modules
26	+INSTALL_MODULES_DIR = ${LOCALBASE}/lib/asterisk/modules	26	+INSTALL_MODULES_DIR = ${PREFIX}/lib/asterisk/modules
27		27
28	# module release	28	# module release
29	RELEASE = 2.1	29	RELEASE = 2.7
30	@@ -86,7 +86,7 @@	30	@@ -84,12 +84,12 @@ INCLUDE = -I$(ASTERISK_INCLUDE_DIR)
31	# compiler flags	31	# compiler flags
32	#	32	#
33		33
Lines 36-51 Link Here
36	#CFLAGS += -O3 -march=pentium3 -msse -mfpmath=sse,387 -ffast-math	36	#CFLAGS += -O3 -march=pentium3 -msse -mfpmath=sse,387 -ffast-math
37	# PERF: below is 10% faster than -O2 or -O3 alone.	37	# PERF: below is 10% faster than -O2 or -O3 alone.
38	#CFLAGS += -O3 -ffast-math -funroll-loops	38	#CFLAGS += -O3 -ffast-math -funroll-loops
39	@@ -103,7 +103,7 @@	39	# below is another 5% faster or so.
		40	-CFLAGS += -O3 -ffast-math -funroll-all-loops -fsingle-precision-constant
		41	+#CFLAGS += -O3 -ffast-math -funroll-all-loops -fsingle-precision-constant
		42	#CFLAGS += -mcpu=7450 -faltivec -mabi=altivec -mdynamic-no-pic
		43	# adding -msse -mfpmath=sse has little effect.
		44	#CFLAGS += -O3 -msse -mfpmath=sse
		45	@@ -102,7 +102,7 @@ CFLAGS += -fPIC
40	# preprocessor flags	46	# preprocessor flags
41	#	47	#
42		48
43	-CPPFLAGS = $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE	49	-CPPFLAGS = $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE
44	+CPPFLAGS += $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE	50	+CPPFLAGS += $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE
45	CPPFLAGS += -DRELEASE=\"$(RELEASE)\"	51	CPPFLAGS += -DRELEASE=\"$(RELEASE)\"
46	CPPFLAGS += -DASTERISK=$(ASTERISK)	52	CPPFLAGS += -DASTERISK_SRC_VERSION=$(ASTERISK_SRC_VERSION)
47	CPPFLAGS += -DCHANNEL_TABLE_SIZE=$(CHANNEL_TABLE_SIZE)	53	CPPFLAGS += -DCHANNEL_TABLE_SIZE=$(CHANNEL_TABLE_SIZE)
48	@@ -182,7 +182,8 @@	54	@@ -127,7 +127,7 @@ CPPFLAGS += -DAC_USE_ULAW
		55	#
		56	# Uncomment this if you want to use *bsd kqueue for timing
		57	#
		58	-# CPPFLAGS += -DKQUEUE
		59	+CPPFLAGS += -DKQUEUE
		60	#
		61
		62	#
		63	@@ -207,7 +207,8 @@ clean:
49	$(OBJS): $(INCS)	64	$(OBJS): $(INCS)
50		65
51	$(TARGET): $(OBJS)	66	$(TARGET): $(OBJS)
Lines 53-58 Link Here
53	+ $(CC) $(LDFLAGS) $(SOLINK) -o $@ $(OBJS)	68	+ $(CC) $(LDFLAGS) $(SOLINK) -o $@ $(OBJS)
54		69
55	install:	70	install:
56	- $(INSTALL) -m 755 $(TARGET) $(INSTALL_MODULES_DIR)	71	- if [ -f $(TARGET) ]; then $(INSTALL) -m 755 $(TARGET) $(INSTALL_MODULES_DIR); fi
57	+ mkdir -p $(DESTDIR)$(INSTALL_MODULES_DIR)	72	+ mkdir -p $(DESTDIR)$(INSTALL_MODULES_DIR)
58	+ $(INSTALL) -m 755 $(TARGET) $(DESTDIR)$(INSTALL_MODULES_DIR)	73	+ ${BSD_INSTALL_LIB} $(TARGET) $(DESTDIR)$(INSTALL_MODULES_DIR)