- Remove net/asterisk16, net/asterisk16-addons, japanese/asterisk16-sounds

- Update net/appkonference to 2.1 to make it work with net/asterisk [1]
- Switch www/bigbluebutton to net/asterisk
- While here fix typo in www/xxxterm's MOVED entry

PR:		ports/169038 [1]
Approved by:	maintainer [1]

3 files changed, 29 insertions, 25 deletions

diff --git a/net/appkonference/Makefile b/net/appkonference/Makefile
index e73d54910a0a..f55e7ef1eb11 100644
--- a/net/appkonference/Makefile
+++ b/net/appkonference/Makefile
@@ -6,19 +6,17 @@
 #
 
 PORTNAME=	appkonference
-PORTVERSION=	1.5
-PORTREVISION=	2
+PORTVERSION=	2.1
 CATEGORIES=	net
 MASTER_SITES=	SF
 
 MAINTAINER=	alex.deiter@gmail.com
 COMMENT=	High-performance Asterisk voice/video conferencing plugin
 
-BUILD_DEPENDS=  asterisk:${PORTSDIR}/net/asterisk16
-RUN_DEPENDS=    asterisk:${PORTSDIR}/net/asterisk16
+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
diff --git a/net/appkonference/distinfo b/net/appkonference/distinfo
index 45a6380b47e2..d47e3a6945be 100644
--- a/net/appkonference/distinfo
+++ b/net/appkonference/distinfo
@@ -1,2 +1,2 @@
-SHA256 (appkonference-1.5.tar.gz) = 6470cc38b07a14b27993bc1e6a5c636943ae36e7e2385a3e136b3bc55a87af27
-SIZE (appkonference-1.5.tar.gz) = 186882
+SHA256 (appkonference-2.1.tar.gz) = 0e1bc8d01cab61e9cb84e6aa0ab12d14c86fade453b7508b07331edc1142653c
+SIZE (appkonference-2.1.tar.gz) = 191953
diff --git a/net/appkonference/files/patch-Makefile b/net/appkonference/files/patch-Makefile
index 161f07a486d5..836e71c41710 100644
--- a/net/appkonference/files/patch-Makefile
+++ b/net/appkonference/files/patch-Makefile
@@ -1,23 +1,29 @@
---- Makefile.orig	2010-10-23 00:28:54.000000000 +0000
-+++ Makefile	2010-10-23 00:31:39.000000000 +0000
-@@ -18,9 +18,9 @@
- #
+--- ./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 =
  
- INSTALL_PREFIX :=
--INSTALL_MODULES_DIR := $(INSTALL_PREFIX)/usr/lib/asterisk/modules
-+INSTALL_MODULES_DIR := $(INSTALL_PREFIX)/${LOCALBASE}/lib/asterisk/modules
+ # 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_INCLUDE_DIR ?= ../asterisk/include
-+ASTERISK_INCLUDE_DIR ?= ${LOCALBASE}/include
+ # 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
  
- RELEASE = 1.5
+ # asterisk include directory
+-ASTERISK_INCLUDE_DIR = $(ASTERISK_SRC_DIR)/include
++ASTERISK_INCLUDE_DIR = ${LOCALBASE}/include
  
-@@ -157,7 +157,7 @@
- 	$(RM) $(TARGET)
+ # asterisk module directory
+-INSTALL_MODULES_DIR = /usr/lib/asterisk/modules
++INSTALL_MODULES_DIR = ${LOCALBASE}/lib/asterisk/modules
  
- $(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
+ # module release
+ RELEASE = 2.1
\ No newline at end of file