From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Apr 14 06:10:02 2007 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id CD96B16A401 for ; Sat, 14 Apr 2007 06:10:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.freebsd.org (Postfix) with ESMTP id B023613C46C for ; Sat, 14 Apr 2007 06:10:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id l3E6A2UU064009 for ; Sat, 14 Apr 2007 06:10:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id l3E6A2o7064008; Sat, 14 Apr 2007 06:10:02 GMT (envelope-from gnats) Resent-Date: Sat, 14 Apr 2007 06:10:02 GMT Resent-Message-Id: <200704140610.l3E6A2o7064008@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Phillip Neumann Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C8CA916A401 for ; Sat, 14 Apr 2007 06:04:19 +0000 (UTC) (envelope-from pneumann@gmail.com) Received: from wx-out-0506.google.com (wx-out-0506.google.com [66.249.82.237]) by mx1.freebsd.org (Postfix) with ESMTP id 7BDC513C43E for ; Sat, 14 Apr 2007 06:04:19 +0000 (UTC) (envelope-from pneumann@gmail.com) Received: by wx-out-0506.google.com with SMTP id s18so1032565wxc for ; Fri, 13 Apr 2007 23:04:19 -0700 (PDT) Received: by 10.70.29.7 with SMTP id c7mr7001750wxc.1176530658151; Fri, 13 Apr 2007 23:04:18 -0700 (PDT) Received: from negro.transtel.cl ( [201.215.221.113]) by mx.google.com with ESMTP id h39sm1084645wxd.2007.04.13.23.04.15; Fri, 13 Apr 2007 23:04:16 -0700 (PDT) Message-Id: <1176530638.1841@negro.transtel.cl> Date: Sat, 14 Apr 2007 02:03:58 -0400 From: Phillip Neumann To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: fgast@only640k.org Subject: ports/111554: [PATCH] net/asterisk-addons: update to 1.4.0 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Apr 2007 06:10:03 -0000 >Number: 111554 >Category: ports >Synopsis: [PATCH] net/asterisk-addons: update to 1.4.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sat Apr 14 06:10:01 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Phillip Neumann >Release: FreeBSD 6.2-STABLE i386 >Organization: >Environment: System: FreeBSD negro.transtel.cl 6.2-STABLE FreeBSD 6.2-STABLE #1: Sun Feb 11 18:00:14 CLST 2007 >Description: - Update to 1.4.0 Added file(s): - files/patch-asterisk-ooh323c-Makefile.in - files/patch-asterisk-ooh323c-configure - files/patch-format_mp3-Makefile Port maintainer (fgast@only640k.org) is cc'd. Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- asterisk-addons-1.4.0.patch begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/net/asterisk-addons/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- Makefile 5 Jun 2006 16:32:07 -0000 1.3 +++ Makefile 14 Apr 2007 06:01:18 -0000 @@ -6,34 +6,34 @@ # PORTNAME= asterisk-addons -PORTVERSION= 1.2.3 -PORTREVISION= 1 +PORTVERSION= 1.4.0 CATEGORIES= net -MASTER_SITES= http://ftp.digium.com/pub/asterisk/ \ - http://ftp.digium.com/pub/asterisk/old-releases/ \ - ftp://ftp.asterisk.org/pub/telephony/asterisk/ \ - ftp://ftp.asterisk.org/pub/telephony/asterisk/old-releases/ +MASTER_SITES= http://ftp.digium.com/pub/asterisk/releases/ MAINTAINER= fgast@only640k.org -COMMENT= Additional modules for the Asterisk Open Source PBX +COMMENT= GPL modules for the Asterisk Open Source PBX BUILD_DEPENDS= asterisk:${PORTSDIR}/net/asterisk RUN_DEPENDS= asterisk:${PORTSDIR}/net/asterisk +OPTIONS= SAMPLE_CONFIG "Install sample configuration files" off + ONLY_FOR_ARCHS= i386 sparc64 amd64 USE_MYSQL= yes USE_GMAKE= yes +GNU_CONFIGURE= yes -CONF_SAMPLES= cdr_mysql.conf.sample res_mysql.conf.sample -ASTETCDIR= ${PREFIX}/etc/asterisk +.include -post-patch: - @${REINPLACE_CMD} 's,^CFLAGS+=-I../asterisk,CFLAGS+=-I${LOCALBASE}/include,' ${WRKSRC}/Makefile +.if defined(WITH_SAMPLE_CONFIG) +PLIST_SUB+= SAMPLE_CONFIG="" +.else +PLIST_SUB+= SAMPLE_CONFIG="@comment " +.endif post-install: - ${MKDIR} ${ASTETCDIR} -.for f in ${CONF_SAMPLES} - ${INSTALL_DATA} ${WRKSRC}/configs/$f ${ASTETCDIR} -.endfor +.if defined(WITH_SAMPLE_CONFIG) + @cd ${WRKSRC} && ${GMAKE} samples +.endif -.include +.include Index: distinfo =================================================================== RCS file: /home/ncvs/ports/net/asterisk-addons/distinfo,v retrieving revision 1.2 diff -u -r1.2 distinfo --- distinfo 3 Jun 2006 07:34:22 -0000 1.2 +++ distinfo 14 Apr 2007 06:01:18 -0000 @@ -1,3 +1,3 @@ -MD5 (asterisk-addons-1.2.3.tar.gz) = 2089e119985508b5a4a1916e2242184d -SHA256 (asterisk-addons-1.2.3.tar.gz) = 4eeb3f9f5ceb64b0742e8118ca7ba842330d28e7fd505a828730db0ee2997467 -SIZE (asterisk-addons-1.2.3.tar.gz) = 750973 +MD5 (asterisk-addons-1.4.0.tar.gz) = 603de356bc330bf117c765ced6ede746 +SHA256 (asterisk-addons-1.4.0.tar.gz) = f6d46b5afecc224fd58875a519c52319538e1ea51059e0d9119e8de405e8065b +SIZE (asterisk-addons-1.4.0.tar.gz) = 995313 Index: pkg-descr =================================================================== RCS file: /home/ncvs/ports/net/asterisk-addons/pkg-descr,v retrieving revision 1.1 diff -u -r1.1 pkg-descr --- pkg-descr 27 Mar 2006 17:23:47 -0000 1.1 +++ pkg-descr 14 Apr 2007 06:01:18 -0000 @@ -1,5 +1,5 @@ This package contains additional modules for the Asterisk Open Source PBX -which are, for one reason or another, not included in the normal base -distribution. Many of these modules are experimental. +which are, not included in the normal base distribution, becouse of licence +incompatilities. WWW: http://www.asteriskpbx.com Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/net/asterisk-addons/pkg-plist,v retrieving revision 1.1 diff -u -r1.1 pkg-plist --- pkg-plist 27 Mar 2006 17:23:47 -0000 1.1 +++ pkg-plist 14 Apr 2007 06:01:18 -0000 @@ -1,11 +1,9 @@ -@unexec if cmp -s %D/etc/asterisk/cdr_mysql.conf %D/etc/asterisk/cdr_mysql.conf.sample; then rm -f %D/etc/asterisk/cdr_mysql.conf; fi -etc/asterisk/cdr_mysql.conf.sample -@exec [-f %B/cdr_mysql.conf ] || cp %B/%f %B/cdr_mysql.conf -@unexec if cmp -s %D/etc/asterisk/res_mysql.conf %D/etc/asterisk/res_mysql.conf.sample; then rm -f %D/etc/asterisk/res_mysql.conf; fi -etc/asterisk/res_mysql.conf.sample -@exec [-f %B/res_mysql.conf ] || cp $B/%f %B/res_mysql.conf lib/asterisk/modules/app_addon_sql_mysql.so lib/asterisk/modules/app_saycountpl.so lib/asterisk/modules/cdr_addon_mysql.so -lib/asterisk/modules/format_mp3.so lib/asterisk/modules/res_config_mysql.so +lib/asterisk/modules/format_mp3.so +lib/asterisk/modules/chan_ooh323.so +%%SAMPLE_CONFIG%%etc/asterisk/cdr_mysql.conf +%%SAMPLE_CONFIG%%etc/asterisk/res_mysql.conf +%%SAMPLE_CONFIG%%@dirrmtry etc/asterisk Index: files/patch-Makefile =================================================================== RCS file: /home/ncvs/ports/net/asterisk-addons/files/patch-Makefile,v retrieving revision 1.1 diff -u -r1.1 patch-Makefile --- files/patch-Makefile 27 Mar 2006 17:23:47 -0000 1.1 +++ files/patch-Makefile 14 Apr 2007 06:01:18 -0000 @@ -1,23 +1,11 @@ ---- Makefile.orig Fri Dec 2 05:14:28 2005 -+++ Makefile Tue Mar 28 00:15:47 2006 -@@ -20,8 +20,8 @@ - CFLAGS+=-D_GNU_SOURCE +--- Makefile.orig Mon Apr 2 22:05:57 2007 ++++ Makefile Mon Apr 2 22:07:31 2007 +@@ -16,7 +16,7 @@ + # Overwite config files on "make samples" + OVERWRITE:=y - INSTALL=install --INSTALL_PREFIX= --ASTLIBDIR=$(INSTALL_PREFIX)/usr/lib/asterisk -+INSTALL_PREFIX=$(PREFIX) -+ASTLIBDIR=$(INSTALL_PREFIX)/lib/asterisk - MODULES_DIR=$(ASTLIBDIR)/modules +-CFLAGS+=-fPIC ++CFLAGS+=-fPIC -I/usr/local/include - # -@@ -56,7 +56,8 @@ - $(MAKE) -C format_mp3 all - - install: all -- for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done -+ mkdir -p $(DESTDIR)$(MODULES_DIR) -+ for x in $(MODS); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(MODULES_DIR) ; done - - clean: - rm -f *.so *.o .depend + # If the file .asteriskaddons.makeopts is present in your home directory, you can + # include all of your favorite menuselect options so that every time you download Index: files/patch-asterisk-ooh323c-Makefile.in =================================================================== RCS file: files/patch-asterisk-ooh323c-Makefile.in diff -N files/patch-asterisk-ooh323c-Makefile.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-asterisk-ooh323c-Makefile.in 14 Apr 2007 06:01:18 -0000 @@ -0,0 +1,20 @@ +--- asterisk-ooh323c/Makefile.in.orig Wed May 17 12:50:02 2006 ++++ asterisk-ooh323c/Makefile.in Mon Apr 2 22:38:02 2007 +@@ -93,7 +93,7 @@ + libchan_h323_la_LDFLAGS = -L$(top_builddir)/ooh323c/src -version-info 1:1:0 + libchan_h323_la_SOURCES = src/chan_h323.h src/chan_h323.c src/ooh323cDriver.h src/ooh323cDriver.c ooh323c/src/ooCmdChannel.h ooh323c/src/ooCmdChannel.c ooh323c/src/ooLogChan.h ooh323c/src/ooLogChan.c ooh323c/src/ooUtils.c ooh323c/src/ooUtils.h ooh323c/src/ooGkClient.h ooh323c/src/ooGkClient.c ooh323c/src/context.c ooh323c/src/ooCommon.h ooh323c/src/ooDateTime.h ooh323c/src/ooDateTime.c ooh323c/src/decode.c ooh323c/src/dlist.c ooh323c/src/encode.c ooh323c/src/errmgmt.c ooh323c/src/memheap.c ooh323c/src/memheap.h ooh323c/src/ooasn1.h ooh323c/src/ootrace.h ooh323c/src/ootrace.c ooh323c/src/oochannels.c ooh323c/src/oochannels.h ooh323c/src/ooh245.c ooh323c/src/ooh245.h ooh323c/src/oohdr.h ooh323c/src/ooper.h ooh323c/src/ooports.c ooh323c/src/ooports.h ooh323c/src/ooq931.c ooh323c/src/ooq931.h ooh323c/src/ooCapability.c ooh323c/src/ooCapability.h ooh323c/src/ooSocket.c ooh323c/src/ooSocket.h ooh323c/src/ootypes.h ooh323c/src/perutil.c ooh323c/src/eventHandler.c ooh323c/src/even tHandler.h ooh323c/src/ooCalls.c ooh323c/src/ooCalls.h ooh323c/src/ooStackCmds.c ooh323c/src/ooStackCmds.h ooh323c/src/ooh323.c ooh323c/src/ooh323.h ooh323c/src/ooh323ep.c ooh323c/src/ooh323ep.h ooh323c/src/printHandler.c ooh323c/src/printHandler.h ooh323c/src/rtctype.c ooh323c/src/rtctype.h ooh323c/src/ooTimer.c ooh323c/src/ooTimer.h ooh323c/src/h323/H235-SECURITY-MESSAGESDec.c ooh323c/src/h323/H235-SECURITY-MESSAGESEnc.c ooh323c/src/h323/H235-SECURITY-MESSAGES.h ooh323c/src/h323/H323-MESSAGES.c ooh323c/src/h323/H323-MESSAGESDec.c ooh323c/src/h323/H323-MESSAGESEnc.c ooh323c/src/h323/H323-MESSAGES.h ooh323c/src/h323/MULTIMEDIA-SYSTEM-CONTROL.c ooh323c/src/h323/MULTIMEDIA-SYSTEM-CONTROLDec.c ooh323c/src/h323/MULTIMEDIA-SYSTEM-CONTROLEnc.c ooh323c/src/h323/MULTIMEDIA-SYSTEM-CONTROL.h + +-INCLUDES = -I$(top_builddir)/ooh323c/src -I$(top_builddir)/ooh323c/src/h323 ++INCLUDES = -I$(top_builddir)/ooh323c/src -I$(top_builddir)/ooh323c/src/h323 -I$(includedir) + + libchan_h323_la_LIBADD = -lpthread + +@@ -1239,7 +1239,7 @@ + $(MAKE) "CFLAGS = -g -DGNU -D_GNU_SOURCE -D_REENTRANT $(DEBUG_THREADS)" all + + install: +- cp .libs/libchan_h323.so.1.0.1 $(DESTDIR)/usr/lib/asterisk/modules/chan_ooh323.so ++ cp .libs/libchan_h323.so /usr/local/lib/asterisk/modules/chan_ooh323.so + + sample: + cp h323.conf.sample $(DESTDIR)/etc/asterisk/ooh323.conf Index: files/patch-asterisk-ooh323c-configure =================================================================== RCS file: files/patch-asterisk-ooh323c-configure diff -N files/patch-asterisk-ooh323c-configure --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-asterisk-ooh323c-configure 14 Apr 2007 06:01:18 -0000 @@ -0,0 +1,22 @@ +--- asterisk-ooh323c/configure.orig Mon Apr 2 22:21:59 2007 ++++ asterisk-ooh323c/configure Mon Apr 2 22:22:18 2007 +@@ -7951,8 +7951,8 @@ + + fi + +-echo "$as_me:$LINENO: checking for /usr/include/asterisk/channel.h" >&5 +-echo $ECHO_N "checking for /usr/include/asterisk/channel.h... $ECHO_C" >&6 ++echo "$as_me:$LINENO: checking for /usr/local/include/asterisk/channel.h" >&5 ++echo $ECHO_N "checking for /usr/local/include/asterisk/channel.h... $ECHO_C" >&6 + if test "${ac_cv_file__usr_include_asterisk_channel_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +@@ -7960,7 +7960,7 @@ + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 + echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } +-if test -r "/usr/include/asterisk/channel.h"; then ++if test -r "/usr/local/include/asterisk/channel.h"; then + ac_cv_file__usr_include_asterisk_channel_h=yes + else + ac_cv_file__usr_include_asterisk_channel_h=no Index: files/patch-format_mp3-Makefile =================================================================== RCS file: files/patch-format_mp3-Makefile diff -N files/patch-format_mp3-Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-format_mp3-Makefile 14 Apr 2007 06:01:18 -0000 @@ -0,0 +1,8 @@ +--- format_mp3/Makefile.orig Mon Apr 2 22:26:03 2007 ++++ format_mp3/Makefile Mon Apr 2 22:26:12 2007 +@@ -1,4 +1,4 @@ +-INSTALLTO=$(DESTDIR)/usr/lib/asterisk/modules ++INSTALLTO=/usr/local/lib/asterisk/modules + MODS=format_mp3.so + MP3OBJS=common.o dct64_i386.o decode_ntom.o layer3.o tabinit.o interface.o format_mp3.o + --- asterisk-addons-1.4.0.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: