Attachment #125426 for bug #169038

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




#

PORTNAME=	appkonference
PORTVERSION=	2.1
PORTREVISION=	2
CATEGORIES=	net
MASTER_SITES=	SF

MAINTAINER=	alex.deiter@gmail.com
COMMENT=	High-performance Asterisk voice/video conferencing plugin

BUILD_DEPENDS=	asterisk:${PORTSDIR}/net/asterisk
RUN_DEPENDS=	asterisk:${PORTSDIR}/net/asterisk

USE_GMAKE=	yes
MAKE_ENV=	LOCALBASE=${LOCALBASE}
WRKSRC=		${WRKDIR}/${PORTNAME}/konference

PLIST_FILES=	lib/asterisk/modules/app_konference.so

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (appkonference-1.5.tar.gz) = 6470cc38b07a14b27993bc1e6a5c636943ae36e7e2385a3e136b3bc55a87af27	1	SHA256 (appkonference-2.1.tar.gz) = 0e1bc8d01cab61e9cb84e6aa0ab12d14c86fade453b7508b07331edc1142653c
2	SIZE (appkonference-1.5.tar.gz) = 186882	2	SIZE (appkonference-2.1.tar.gz) = 191953




--- ./Makefile.orig	2012-06-13 14:10:52.160359057 +0200
+++ ./Makefile	2012-06-13 14:13:01.635359504 +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 @@
 endif
 
 # asterisk include directory
-ASTERISK_INCLUDE_DIR = $(ASTERISK_SRC_DIR)/include
+ASTERISK_INCLUDE_DIR = ${LOCALBASE}/include
 
 # asterisk module directory
-INSTALL_MODULES_DIR = /usr/lib/asterisk/modules
+INSTALL_MODULES_DIR = ${LOCALBASE}/lib/asterisk/modules
 
 # module release
 RELEASE = 2.1
+INSTALL_MODULES_DIR := $(INSTALL_PREFIX)/${LOCALBASE}/lib/asterisk/modules
 
-ASTERISK_INCLUDE_DIR ?= ../asterisk/include
+ASTERISK_INCLUDE_DIR ?= ${LOCALBASE}/include
 
 RELEASE = 1.5
 
@@ -157,7 +157,7 @@
 	$(RM) $(TARGET)
 
 $(TARGET): $(OBJS)
-	$(CC) -pg $(SOLINK) -o $@ $(OBJS)
+	$(CC) $(SOLINK) -o $@ $(OBJS)
 
 vad_test: vad_test.o libspeex/preprocess.o libspeex/misc.o libspeex/smallft.o
 	$(CC) $(PROFILE) -o $@ $^ -lm

Return to bug 169038

Lines 6-24 Link Here

(-)Makefile (-5 / +3 lines)
6	#	6	#
7		7
8	PORTNAME= appkonference	8	PORTNAME= appkonference
9	PORTVERSION= 1.5	9	PORTVERSION= 2.1
10	PORTREVISION= 2
11	CATEGORIES= net	10	CATEGORIES= net
12	MASTER_SITES= SF	11	MASTER_SITES= SF
13		12
14	MAINTAINER= alex.deiter@gmail.com	13	MAINTAINER= alex.deiter@gmail.com
15	COMMENT= High-performance Asterisk voice/video conferencing plugin	14	COMMENT= High-performance Asterisk voice/video conferencing plugin
16		15
17	BUILD_DEPENDS= asterisk:${PORTSDIR}/net/asterisk16	16	BUILD_DEPENDS= asterisk:${PORTSDIR}/net/asterisk
18	RUN_DEPENDS= asterisk:${PORTSDIR}/net/asterisk16	17	RUN_DEPENDS= asterisk:${PORTSDIR}/net/asterisk
19		18
20	USE_GMAKE= yes	19	USE_GMAKE= yes
21	MAKE_ENV= LOCALBASE=${LOCALBASE}
22	WRKSRC= ${WRKDIR}/${PORTNAME}/konference	20	WRKSRC= ${WRKDIR}/${PORTNAME}/konference
23		21
24	PLIST_FILES= lib/asterisk/modules/app_konference.so	22	PLIST_FILES= lib/asterisk/modules/app_konference.so

Lines 1-23 Link Here

(-)files/patch-Makefile (-22 / +28 lines)
1	--- Makefile.orig 2010-10-23 00:28:54.000000000 +0000	1	--- ./Makefile.orig 2012-06-13 14:10:52.160359057 +0200
2	+++ Makefile 2010-10-23 00:31:39.000000000 +0000	2	+++ ./Makefile 2012-06-13 14:13:01.635359504 +0200
3	@@ -18,9 +18,9 @@	3	@@ -16,11 +16,11 @@
4	#	4	ASTERISK_SRC_DIR =
		5
		6	# asterisk release or subversion working copy
		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)
		8	+ASTERISK_SRC_VERSION = release
		9
		10	# asterisk release version or subversion branch
		11	ifeq ($(ASTERISK_SRC_VERSION),release)
		12	- ASTERISK = $(shell cat $(ASTERISK_SRC_DIR)/.version \| cut -d "." -f1,2 \| sed -e 's/\.//')
		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
		19
		20	# asterisk include directory
		21	-ASTERISK_INCLUDE_DIR = $(ASTERISK_SRC_DIR)/include
		22	+ASTERISK_INCLUDE_DIR = ${LOCALBASE}/include
		23
		24	# asterisk module directory
		25	-INSTALL_MODULES_DIR = /usr/lib/asterisk/modules
		26	+INSTALL_MODULES_DIR = ${LOCALBASE}/lib/asterisk/modules
5		27
6	INSTALL_PREFIX :=	28	# module release
7	-INSTALL_MODULES_DIR := $(INSTALL_PREFIX)/usr/lib/asterisk/modules	29	RELEASE = 2.1
8	+INSTALL_MODULES_DIR := $(INSTALL_PREFIX)/${LOCALBASE}/lib/asterisk/modules
9
10	-ASTERISK_INCLUDE_DIR ?= ../asterisk/include
11	+ASTERISK_INCLUDE_DIR ?= ${LOCALBASE}/include
12
13	RELEASE = 1.5
14
15	@@ -157,7 +157,7 @@
16	$(RM) $(TARGET)
17
18	$(TARGET): $(OBJS)
19	- $(CC) -pg $(SOLINK) -o $@ $(OBJS)
20	+ $(CC) $(SOLINK) -o $@ $(OBJS)
21
22	vad_test: vad_test.o libspeex/preprocess.o libspeex/misc.o libspeex/smallft.o
23	$(CC) $(PROFILE) -o $@ $^ -lm