ports/119659: [UPDATE] net/asterisk12 to 1.2.26
Vladimir Korkodinov
viper at perm.raid.ru
Mon Jan 14 13:20:02 UTC 2008
>Number: 119659
>Category: ports
>Synopsis: [UPDATE] net/asterisk12 to 1.2.26
>Confidential: no
>Severity: serious
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Mon Jan 14 13:20:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Vladimir Korkodinov
>Release: 6.3-PRERELEASE
>Organization:
>Environment:
FreeBSD asterisk-reg 6.3-PRERELEASE FreeBSD 6.3-PRERELEASE #0: Fri Nov 23 12:23:15 YEKT 2007 viper at asterisk-reg:/usr/obj/usr/src/sys/viper2 i386
>Description:
Here a patch to update net/asterisk12 to 1.2.26.
It corrects the bugs
( http://downloads.digium.com/pub/security/AST-2007-027.pdf and
http://downloads.digium.com/pub/asa/AST-2007-026.pdf)
Added menu to select options
>How-To-Repeat:
>Fix:
Apply patch
Patch attached with submission follows:
diff -ruN asterisk12.old/Makefile asterisk12/Makefile
--- asterisk12.old/Makefile 2007-10-17 16:12:50.000000000 +0600
+++ asterisk12/Makefile 2008-01-14 18:03:36.000000000 +0500
@@ -6,15 +6,13 @@
#
PORTNAME= asterisk
-PORTVERSION= 1.2.24
+PORTVERSION= 1.2.26
PORTREVISION= 1
PKGNAMESUFFIX= 12
CATEGORIES= net
MASTER_SITES= http://ftp.digium.com/pub/asterisk/ \
http://ftp.digium.com/pub/asterisk/old-releases/
-PATCHFILES= asterisk-1.2.23-codec-negotiation-20070730.diff.gz
-PATCH_SITES= http://sobomax.homeunix.org/~sobomax/
# ${PORTNAME}-1.2.4-${BRIVER}.patch.gz:bristuff
# ${MASTER_SITE_LOCAL:S,$,:bristuff,}
@@ -46,12 +44,20 @@
CXX="${CXX}"
PLIST_SUB= BRISTUFF="@comment "
MAN8= asterisk.8 astgenkey.8 autosupport.8 safe_asterisk.8
+
+OPTIONS= H323 "Enable H.323 support" on \
+ ODBC "Enable ODBC support" off \
+ FREETDS "Enable FreeTDS support" off \
+ CODEC_PATCH "Apply codec negotiation patch" off
+
WITHOUT_FAX= yes # Doesn't build with spandsp-0.0.3.
.include <bsd.port.pre.mk>
-.if ${ARCH} != "i386"
-WITHOUT_ZAPTEL= 1
+.if ${ARCH} == "i386" || ${ARCH} == "amd64"
+OPTIONS+= ZAPTEL "Enable Zaptel support" off
+.else
+WITHOUT_ZAPTEL= yes
.endif
.if defined(WITHOUT_H323)
@@ -102,6 +108,14 @@
PLIST_SUB+= WITH_FAX=""
.endif
+.if defined(WITH_CODEC_PATCH)
+PATCHFILES= asterisk-1.2.23-codec-negotiation-20070730.diff.gz
+PATCH_SITES= http://b2bua.org/chrome/site/
+EXTRA_PATCHES+= ${PATCHDIR}/codecnego-patch-Makefile
+.else
+EXTRA_PATCHES+= ${PATCHDIR}/nocodecnego-patch-Makefile
+.endif
+
post-patch:
${REINPLACE_CMD} -e 's|/var/lib|${PREFIX}/share|g' ${WRKSRC}/configs/musiconhold.conf.sample
diff -ruN asterisk12.old/distinfo asterisk12/distinfo
--- asterisk12.old/distinfo 2007-09-03 14:26:52.000000000 +0600
+++ asterisk12/distinfo 2008-01-14 17:19:58.000000000 +0500
@@ -1,6 +1,6 @@
-MD5 (asterisk-1.2.24.tar.gz) = 63dc8b7be4cd10375c5fbda893c780bc
-SHA256 (asterisk-1.2.24.tar.gz) = 9debaf410636fa477e1e1f09fe0b16a1c2814afaf7195f34f29e4ce5b8debbbd
-SIZE (asterisk-1.2.24.tar.gz) = 10644451
+MD5 (asterisk-1.2.26.tar.gz) = a995607ad57c9a032c926ab29cd3b4a6
+SHA256 (asterisk-1.2.26.tar.gz) = f0facb12a88a90a47c376b94ca0473959b1d40d8ec4bea4ebd96ce0e925b7551
+SIZE (asterisk-1.2.26.tar.gz) = 10645100
MD5 (asterisk-1.2.23-codec-negotiation-20070730.diff.gz) = 8aed76c48ae24470fc578861078e38d0
SHA256 (asterisk-1.2.23-codec-negotiation-20070730.diff.gz) = 5cfec2daae25d4543abb31d1767c9ad2718ec5e27cb09494f5dc40d83f2fa9b1
SIZE (asterisk-1.2.23-codec-negotiation-20070730.diff.gz) = 32935
diff -ruN asterisk12.old/files/codecnego-patch-Makefile asterisk12/files/codecnego-patch-Makefile
--- asterisk12.old/files/codecnego-patch-Makefile 1970-01-01 05:00:00.000000000 +0500
+++ asterisk12/files/codecnego-patch-Makefile 2007-08-01 03:18:09.000000000 +0600
@@ -0,0 +1,507 @@
+
+$FreeBSD: ports/net/asterisk12/files/patch-Makefile,v 1.19 2007/07/31 21:18:09 sobomax Exp $
+
+--- Makefile.orig
++++ Makefile
+@@ -19,8 +19,8 @@
+ # CROSS_COMPILE=/opt/montavista/pro/devkit/arm/xscale_be/bin/xscale_be-
+ # CROSS_COMPILE_BIN=/opt/montavista/pro/devkit/arm/xscale_be/bin/
+ # CROSS_COMPILE_TARGET=/opt/montavista/pro/devkit/arm/xscale_be/target
+-CC=$(CROSS_COMPILE)gcc
+-HOST_CC=gcc
++CC?=$(CROSS_COMPILE)gcc
++HOST_CC=${CC}
+ # CROSS_ARCH=Linux
+ # CROSS_PROC=arm
+ # SUB_PROC=xscale # or maverick
+@@ -47,14 +47,14 @@
+ #K6OPT = -DK6OPT
+
+ #Tell gcc to optimize the code
+-OPTIMIZE+=-O6
++#OPTIMIZE+=-O6
+ endif
+
+ #Overwite config files on "make samples"
+-OVERWRITE=y
++OVERWRITE=n
+
+ #Include debug and macro symbols in the executables (-g) and profiling info (-pg)
+-DEBUG=-g3 #-pg
++#DEBUG=-g3 #-pg
+
+ #Set NOCRYPTO to yes if you do not want to have crypto support or
+ #dependencies
+@@ -88,7 +88,7 @@
+
+ # Where to install asterisk after compiling
+ # Default -> leave empty
+-INSTALL_PREFIX?=
++INSTALL_PREFIX=$(PREFIX)
+
+ # Staging directory
+ # Files are copied here temporarily during the install process
+@@ -111,17 +111,17 @@
+ BUSYDETECT+= #-DBUSYDETECT_COMPARE_TONE_AND_SILENCE
+
+ ifneq ($(OSARCH),SunOS)
+- ASTLIBDIR=$(INSTALL_PREFIX)/usr/lib/asterisk
+- ASTVARLIBDIR=$(INSTALL_PREFIX)/var/lib/asterisk
++ ASTLIBDIR=$(INSTALL_PREFIX)/lib/asterisk
++ ASTVARLIBDIR=$(INSTALL_PREFIX)/share/asterisk
+ ASTETCDIR=$(INSTALL_PREFIX)/etc/asterisk
+- ASTSPOOLDIR=$(INSTALL_PREFIX)/var/spool/asterisk
+- ASTLOGDIR=$(INSTALL_PREFIX)/var/log/asterisk
+- ASTHEADERDIR=$(INSTALL_PREFIX)/usr/include/asterisk
++ ASTSPOOLDIR=/var/spool/asterisk
++ ASTLOGDIR=/var/log/asterisk
++ ASTHEADERDIR=$(INSTALL_PREFIX)/include/asterisk
+ ASTCONFPATH=$(ASTETCDIR)/asterisk.conf
+- ASTBINDIR=$(INSTALL_PREFIX)/usr/bin
+- ASTSBINDIR=$(INSTALL_PREFIX)/usr/sbin
+- ASTVARRUNDIR=$(INSTALL_PREFIX)/var/run
+- ASTMANDIR=$(INSTALL_PREFIX)/usr/share/man
++ ASTBINDIR=$(INSTALL_PREFIX)/bin
++ ASTSBINDIR=$(INSTALL_PREFIX)/sbin
++ ASTVARRUNDIR=/var/run
++ ASTMANDIR=$(INSTALL_PREFIX)/man
+ MODULES_DIR=$(ASTLIBDIR)/modules
+ AGI_DIR=$(ASTVARLIBDIR)/agi-bin
+ else
+@@ -226,25 +226,25 @@
+ endif
+
+ INCLUDE+=-Iinclude -I../include
+-ASTCFLAGS+=-pipe -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY
+-ASTCFLAGS+=$(OPTIMIZE)
++ASTCFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE -DMAKE_VALGRIND_HAPPY
++#ASTCFLAGS+=$(OPTIMIZE)
+ ASTOBJ=-o asterisk
+
+ ifeq ($(findstring BSD,$(OSARCH)),BSD)
+ PROC=$(shell uname -m)
+- ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib
++ ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include -L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib
+ endif
+
+ ifneq ($(PROC),ultrasparc)
+- ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
++# ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
+ endif
+
+ ifeq ($(PROC),ppc)
+ ASTCFLAGS+=-fsigned-char
+ endif
+
+-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/osp/osp.h),)
+- ASTCFLAGS+=-DOSP_SUPPORT -I$(CROSS_COMPILE_TARGET)/usr/local/include/osp
++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/osp/osp.h),)
++ ASTCFLAGS+=-DOSP_SUPPORT -I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/osp
+ else
+ ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/osp/osp.h),)
+ ASTCFLAGS+=-DOSP_SUPPORT -I$(CROSS_COMPILE_TARGET)/usr/include/osp
+@@ -253,27 +253,24 @@
+
+ ifeq ($(OSARCH),FreeBSD)
+ BSDVERSION=$(shell make -V OSVERSION -f $(CROSS_COMPILE_TARGET)/usr/share/mk/bsd.port.subdir.mk)
+- ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)
+- LIBS+=$(shell if test $(BSDVERSION) -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi)
+- ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/spandsp),)
+- ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include/spandsp
++ ASTCFLAGS+=$(PTHREAD_CFLAGS)
++ LIBS+=$(PTHREAD_LIBS)
++ ifneq ($(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/spandsp),)
++ ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/spandsp
+ endif
+ MPG123TARG=freebsd
+
+- # XXX FreeBSD paths
+- PREFIX?=/usr/local
+- ASTLIBDIR=$(INSTALL_PREFIX)$(PREFIX)/lib/asterisk
+- ASTVARLIBDIR=$(INSTALL_PREFIX)$(PREFIX)/share/asterisk
+- ASTETCDIR=$(INSTALL_PREFIX)$(PREFIX)/etc/asterisk
+- ASTSPOOLDIR=$(INSTALL_PREFIX)/var/spool/asterisk
+- ASTLOGDIR=$(INSTALL_PREFIX)/var/log/asterisk
+- ASTHEADERDIR=$(INSTALL_PREFIX)$(PREFIX)/include/asterisk
++ ASTLIBDIR=$(INSTALL_PREFIX)/lib/asterisk
++ ASTVARLIBDIR=$(INSTALL_PREFIX)/share/asterisk
++ ASTETCDIR=$(INSTALL_PREFIX)/etc/asterisk
++ ASTSPOOLDIR=/var/spool/asterisk
++ ASTLOGDIR=/var/log/asterisk
++ ASTHEADERDIR=$(INSTALL_PREFIX)/include/asterisk
+ ASTCONFPATH=$(ASTETCDIR)/asterisk.conf
+- ASTBINDIR=$(INSTALL_PREFIX)$(PREFIX)/bin
+- ASTSBINDIR=$(INSTALL_PREFIX)$(PREFIX)/sbin
+- ASTVARRUNDIR=$(INSTALL_PREFIX)/var/run
+- ASTMANDIR=$(INSTALL_PREFIX)$(PREFIX)/man
+- # XXX end FreeBSD paths
++ ASTBINDIR=$(INSTALL_PREFIX)/bin
++ ASTSBINDIR=$(INSTALL_PREFIX)/sbin
++ ASTVARRUNDIR=/var/run
++ ASTMANDIR=$(INSTALL_PREFIX)/man
+
+ endif # FreeBSD
+
+@@ -307,7 +304,7 @@
+
+ ifndef WITHOUT_ZAPTEL
+
+-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),)
++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/zaptel/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),)
+ ASTCFLAGS+=-DZAPTEL_OPTIMIZATIONS
+ endif
+
+@@ -414,7 +411,7 @@
+ endif
+
+ # This is used when generating the doxygen documentation
+-ifneq ($(wildcard /usr/local/bin/dot)$(wildcard /usr/bin/dot),)
++ifneq ($(wildcard $(LOCALBASE)/bin/dot)$(wildcard /usr/bin/dot),)
+ HAVEDOT=yes
+ else
+ HAVEDOT=no
+@@ -431,7 +428,7 @@
+ @echo " + $(MAKE) install +"
+ @echo " +-------------------------------------------+"
+
+-all: cleantest depend asterisk subdirs
++all: cleantest depend asterisk subdirs manpage
+
+ #ifneq ($(wildcard tags),)
+ ctags: tags
+@@ -450,13 +447,13 @@
+ cd editline && unset CFLAGS LIBS && test -f config.h || CFLAGS="$(OPTIMIZE)" ./configure
+ $(MAKE) -C editline libedit.a
+
+-db1-ast/libdb1.a: FORCE
+- @if [ -d db1-ast ]; then \
+- $(MAKE) -C db1-ast libdb1.a ; \
+- else \
+- echo "You need to do a cvs update -d not just cvs update"; \
+- exit 1; \
+- fi
++#db1-ast/libdb1.a: FORCE
++# @if [ -d db1-ast ]; then \
++# $(MAKE) -C db1-ast libdb1.a ; \
++# else \
++# echo "You need to do a cvs update -d not just cvs update"; \
++# exit 1; \
++# fi
+
+ ifneq ($(wildcard .depend),)
+ include .depend
+@@ -480,10 +477,10 @@
+
+ manpage: asterisk.8
+
+-asterisk.8: asterisk.sgml
+- rm -f asterisk.8
+- docbook2man asterisk.sgml
+- mv ./*.8 asterisk.8
++#asterisk.8: asterisk.sgml
++# rm -f asterisk.8
++# docbook2man asterisk.sgml
++# mv ./*.8 asterisk.8
+
+ asterisk.pdf: asterisk.sgml
+ docbook2pdf asterisk.sgml
+@@ -523,14 +520,14 @@
+ cygwin_a:
+ $(MAKE) -C cygwin all
+
+-asterisk: $(CYGLOADER) editline/libedit.a db1-ast/libdb1.a stdtime/libtime.a $(OBJS)
++asterisk: $(CYGLOADER) editline/libedit.a stdtime/libtime.a $(OBJS)
+ build_tools/make_build_h > include/asterisk/build.h.tmp
+ if cmp -s include/asterisk/build.h.tmp include/asterisk/build.h ; then echo ; else \
+ mv include/asterisk/build.h.tmp include/asterisk/build.h ; \
+ fi
+ rm -f include/asterisk/build.h.tmp
+ $(CC) -c -o buildinfo.o $(CFLAGS) buildinfo.c
+- $(CC) $(DEBUG) $(ASTOBJ) $(ASTLINK) $(OBJS) buildinfo.o $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a $(LIBS)
++ $(CC) $(DEBUG) $(ASTOBJ) $(ASTLINK) $(OBJS) buildinfo.o $(LIBEDIT) stdtime/libtime.a $(LIBS)
+
+ muted: muted.o
+ $(CC) $(AUDIO_LIBS) -o muted muted.o
+@@ -552,12 +549,12 @@
+
+ datafiles: all
+ if [ x`$(ID) -un` = xroot ]; then sh mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
+- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits
+- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/silence
+- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/priv-callerintros
++ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits
++ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/silence
++ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/priv-callerintros
+ for x in sounds/digits/*.gsm; do \
+ if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
+- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits ; \
++ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits ; \
+ else \
+ echo "No description for $$x"; \
+ exit 1; \
+@@ -565,34 +562,34 @@
+ done
+ for x in sounds/silence/*.gsm; do \
+ if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
+- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/silence ; \
++ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/silence ; \
+ else \
+ echo "No description for $$x"; \
+ exit 1; \
+ fi; \
+ done
+- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/dictate
++ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/dictate
+ for x in sounds/dictate/*.gsm; do \
+ if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
+- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/dictate ; \
++ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/dictate ; \
+ else \
+ echo "No description for $$x"; \
+ exit 1; \
+ fi; \
+ done
+- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters
++ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters
+ for x in sounds/letters/*.gsm; do \
+ if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
+- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters ; \
++ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters ; \
+ else \
+ echo "No description for $$x"; \
+ exit 1; \
+ fi; \
+ done
+- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic
++ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic
+ for x in sounds/phonetic/*.gsm; do \
+ if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
+- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic ; \
++ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic ; \
+ else \
+ echo "No description for $$x"; \
+ exit 1; \
+@@ -600,18 +597,18 @@
+ done
+ for x in sounds/demo-* sounds/vm-* sounds/transfer* sounds/pbx-* sounds/ss-* sounds/beep* sounds/dir-* sounds/conf-* sounds/agent-* sounds/invalid* sounds/tt-* sounds/auth-* sounds/privacy-* sounds/queue-* sounds/spy-* sounds/priv-* sounds/screen-* sounds/hello-* sounds/hours* sounds/minute* sounds/second* ; do \
+ if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
+- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
++ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
+ else \
+ echo "No description for $$x"; \
+ exit 1; \
+ fi; \
+ done
+- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/mohmp3
+- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/images
++ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/mohmp3
++ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/images
+ for x in images/*.jpg; do \
+- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/images ; \
++ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/images ; \
+ done
+- mkdir -p $(DESTDIR)$(AGI_DIR)
++ $(MKDIR) $(DESTDIR)$(AGI_DIR)
+
+ update:
+ @if [ -d .svn ]; then \
+@@ -640,47 +637,47 @@
+ OLDHEADERS=$(filter-out $(NEWHEADERS),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h)))
+
+ bininstall: all
+- mkdir -p $(DESTDIR)$(MODULES_DIR)
+- mkdir -p $(DESTDIR)$(ASTSBINDIR)
+- mkdir -p $(DESTDIR)$(ASTETCDIR)
+- mkdir -p $(DESTDIR)$(ASTBINDIR)
+- mkdir -p $(DESTDIR)$(ASTVARRUNDIR)
+- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail
+- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/dictate
+- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/system
+- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/tmp
+- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/meetme
+- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/monitor
+- if [ -f asterisk ]; then $(INSTALL) -m 755 asterisk $(DESTDIR)$(ASTSBINDIR)/; fi
+- if [ -f cygwin/asterisk.exe ]; then $(INSTALL) -m 755 cygwin/asterisk.exe $(DESTDIR)$(ASTSBINDIR)/; fi
+- if [ -f asterisk.dll ]; then $(INSTALL) -m 755 asterisk.dll $(DESTDIR)$(ASTSBINDIR)/; fi
++ $(MKDIR) $(DESTDIR)$(MODULES_DIR)
++ $(MKDIR) $(DESTDIR)$(ASTSBINDIR)
++ $(MKDIR) $(DESTDIR)$(ASTETCDIR)
++ $(MKDIR) $(DESTDIR)$(ASTBINDIR)
++ $(MKDIR) $(DESTDIR)$(ASTVARRUNDIR)
++ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail
++ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/dictate
++ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/system
++ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/tmp
++ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/meetme
++ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/monitor
++ if [ -f asterisk ]; then $(BSD_INSTALL_PROGRAM) asterisk $(DESTDIR)$(ASTSBINDIR)/; fi
++ if [ -f cygwin/asterisk.exe ]; then $(BSD_INSTALL_PROGRAM) cygwin/asterisk.exe $(DESTDIR)$(ASTSBINDIR)/; fi
++ if [ -f asterisk.dll ]; then $(BSD_INSTALL_PROGRAM) asterisk.dll $(DESTDIR)$(ASTSBINDIR)/; fi
+ $(LN) -sf asterisk $(DESTDIR)$(ASTSBINDIR)/rasterisk
+- $(INSTALL) -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
+- $(INSTALL) -m 755 contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/
++ $(BSD_INSTALL_SCRIPT) contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
++ $(BSD_INSTALL_SCRIPT) contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/
+ if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ]; then \
+ cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ;\
+ chmod 755 $(DESTDIR)$(ASTSBINDIR)/safe_asterisk;\
+ fi
+- $(INSTALL) -d $(DESTDIR)$(ASTHEADERDIR)
+- $(INSTALL) -m 644 include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR)
++ $(MKDIR) $(DESTDIR)$(ASTHEADERDIR)
++ $(BSD_INSTALL_DATA) include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR)
+ if [ -n "$(OLDHEADERS)" ]; then \
+ rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\
+ fi
+- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds
+- mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv
+- mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-custom
+- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/keys
+- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/firmware
+- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax
+- mkdir -p $(DESTDIR)$(ASTMANDIR)/man8
+- $(INSTALL) -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
+- $(INSTALL) -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
+- $(INSTALL) -m 644 asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
+- $(INSTALL) -m 644 contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8
+- $(INSTALL) -m 644 contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8
+- $(INSTALL) -m 644 contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
++ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds
++ $(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-csv
++ $(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-custom
++ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/keys
++ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/firmware
++ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax
++ $(MKDIR) $(DESTDIR)$(ASTMANDIR)/man8
++ $(BSD_INSTALL_DATA) keys/iaxtel.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
++ $(BSD_INSTALL_DATA) keys/freeworlddialup.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
++ $(BSD_INSTALL_DATA) asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
++ $(BSD_INSTALL_DATA) contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8
++ $(BSD_INSTALL_DATA) contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8
++ $(BSD_INSTALL_DATA) contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
+ if [ -d contrib/firmware/iax ]; then \
+- $(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax/iaxy.bin; \
++ $(BSD_INSTALL_DATA) contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax/iaxy.bin; \
+ else \
+ echo "You need to do cvs update -d not just cvs update" ; \
+ fi
+@@ -710,46 +707,28 @@
+ echo " WARNING WARNING WARNING" ;\
+ fi
+
+-install: all datafiles bininstall install-subdirs
++install: all datafiles bininstall install-subdirs samples
+ @if [ -x /usr/sbin/asterisk-post-install ]; then \
+ /usr/sbin/asterisk-post-install $(DESTDIR) . ; \
+ fi
+- @echo " +---- Asterisk Installation Complete -------+"
+- @echo " + +"
+- @echo " + YOU MUST READ THE SECURITY DOCUMENT +"
+- @echo " + +"
+- @echo " + Asterisk has successfully been installed. +"
+- @echo " + If you would like to install the sample +"
+- @echo " + configuration files (overwriting any +"
+- @echo " + existing config files), run: +"
+- @echo " + +"
+- @echo " + $(MAKE) samples +"
+- @echo " + +"
+- @echo " +----------------- or ---------------------+"
+- @echo " + +"
+- @echo " + You can go ahead and install the asterisk +"
+- @echo " + program documentation now or later run: +"
+- @echo " + +"
+- @echo " + $(MAKE) progdocs +"
+- @echo " + +"
+- @echo " + **Note** This requires that you have +"
+- @echo " + doxygen installed on your local system +"
+- @echo " +-------------------------------------------+"
+ @$(MAKE) -s oldmodcheck
+
+ upgrade: all bininstall
+
+ adsi:
+- mkdir -p $(DESTDIR)$(ASTETCDIR)
++ $(MKDIR) $(DESTDIR)$(ASTETCDIR)
+ for x in configs/*.adsi; do \
++ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x`-dist; \
+ if [ ! -f $(DESTDIR)$(ASTETCDIRX)/$$x ]; then \
+- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x` ; \
++ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x` ; \
+ fi ; \
+ done
+
+ samples: adsi
+- mkdir -p $(DESTDIR)$(ASTETCDIR)
++ echo ADSI INSTALL $(BSD_INSTALL_DATA)
++ $(MKDIR) $(DESTDIR)$(ASTETCDIR)
+ for x in configs/*.sample; do \
++ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample`-dist;\
+ if [ -f $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ]; then \
+ if [ "$(OVERWRITE)" = "y" ]; then \
+ if cmp -s $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` $$x ; then \
+@@ -762,7 +741,7 @@
+ continue; \
+ fi ;\
+ fi ; \
+- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ;\
++ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ;\
+ done
+ if [ "$(OVERWRITE)" = "y" ] || [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; then \
+ ( \
+@@ -822,25 +801,25 @@
+ echo "; Default: strict"; \
+ echo ";"; \
+ echo ";translation_algorithm = strict"; \
+- ) > $(DESTDIR)$(ASTCONFPATH) ; \
++ ) > $(DESTDIR)$(ASTCONFPATH)-dist ; \
+ else \
+ echo "Skipping asterisk.conf creation"; \
+ fi
+- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
++ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
+ for x in sounds/demo-*; do \
+ if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
+- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
++ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
+ else \
+ echo "No description for $$x"; \
+ exit 1; \
+ fi; \
+ done
+- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \
++ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \
+ for x in sounds/moh/*.mp3 sounds/moh/LICENSE; do \
+- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \
++ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \
+ done
+ rm -f $(DESTDIR)$(ASTVARLIBDIR)/mohmp3/sample-hold.mp3
+- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
++ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
+ :> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm
+ for x in vm-theperson digits/1 digits/2 digits/3 digits/4 vm-isunavail; do \
+ cat $(DESTDIR)$(ASTVARLIBDIR)/sounds/$$x.gsm >> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm ; \
+@@ -854,9 +833,9 @@
+ @[ -d $(DESTDIR)$(HTTP_DOCSDIR)/ ] || ( printf "http docs directory not found.\nUpdate assignment of variable HTTP_DOCSDIR in Makefile!\n" && exit 1 )
+ @[ -d $(DESTDIR)$(HTTP_CGIDIR) ] || ( printf "cgi-bin directory not found.\nUpdate assignment of variable HTTP_CGIDIR in Makefile!\n" && exit 1 )
+ $(INSTALL) -m 4755 -o root -g root contrib/scripts/vmail.cgi $(DESTDIR)$(HTTP_CGIDIR)/vmail.cgi
+- mkdir -p $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk
++ $(MKDIR) $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk
+ for x in images/*.gif; do \
+- $(INSTALL) -m 644 $$x $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/; \
++ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/; \
+ done
+ @echo " +--------- Asterisk Web Voicemail ----------+"
+ @echo " + +"
+@@ -883,10 +862,10 @@
+
+ __rpm: include/asterisk/version.h spec
+ rm -rf /tmp/asterisk ; \
+- mkdir -p /tmp/asterisk/redhat/RPMS/i386 ; \
++ $(MKDIR) /tmp/asterisk/redhat/RPMS/i386 ; \
+ $(MAKE) DESTDIR=/tmp/asterisk install ; \
+ $(MAKE) DESTDIR=/tmp/asterisk samples ; \
+- mkdir -p /tmp/asterisk/etc/rc.d/init.d ; \
++ $(MKDIR) /tmp/asterisk/etc/rc.d/init.d ; \
+ cp -f contrib/init.d/rc.redhat.asterisk /tmp/asterisk/etc/rc.d/init.d/asterisk ; \
+ rpmbuild --rcfile /usr/lib/rpm/rpmrc:redhat/rpmrc -bb asterisk.spec
+
diff -ruN asterisk12.old/files/nocodecnego-patch-Makefile asterisk12/files/nocodecnego-patch-Makefile
--- asterisk12.old/files/nocodecnego-patch-Makefile 1970-01-01 05:00:00.000000000 +0500
+++ asterisk12/files/nocodecnego-patch-Makefile 2008-01-14 17:50:05.000000000 +0500
@@ -0,0 +1,504 @@
+--- Makefile.orig 2007-07-17 00:33:02.000000000 +0600
++++ Makefile 2008-01-14 17:49:52.000000000 +0500
+@@ -19,8 +19,8 @@
+ # CROSS_COMPILE=/opt/montavista/pro/devkit/arm/xscale_be/bin/xscale_be-
+ # CROSS_COMPILE_BIN=/opt/montavista/pro/devkit/arm/xscale_be/bin/
+ # CROSS_COMPILE_TARGET=/opt/montavista/pro/devkit/arm/xscale_be/target
+-CC=$(CROSS_COMPILE)gcc
+-HOST_CC=gcc
++CC?=$(CROSS_COMPILE)gcc
++HOST_CC=${CC}
+ # CROSS_ARCH=Linux
+ # CROSS_PROC=arm
+ # SUB_PROC=xscale # or maverick
+@@ -47,14 +47,14 @@
+ #K6OPT = -DK6OPT
+
+ #Tell gcc to optimize the code
+-OPTIMIZE+=-O6
++#OPTIMIZE+=-O6
+ endif
+
+ #Overwite config files on "make samples"
+-OVERWRITE=y
++OVERWRITE=n
+
+ #Include debug and macro symbols in the executables (-g) and profiling info (-pg)
+-DEBUG=-g3 #-pg
++#DEBUG=-g3 #-pg
+
+ #Set NOCRYPTO to yes if you do not want to have crypto support or
+ #dependencies
+@@ -88,7 +88,7 @@
+
+ # Where to install asterisk after compiling
+ # Default -> leave empty
+-INSTALL_PREFIX?=
++INSTALL_PREFIX=$(PREFIX)
+
+ # Staging directory
+ # Files are copied here temporarily during the install process
+@@ -111,17 +111,17 @@
+ BUSYDETECT+= #-DBUSYDETECT_COMPARE_TONE_AND_SILENCE
+
+ ifneq ($(OSARCH),SunOS)
+- ASTLIBDIR=$(INSTALL_PREFIX)/usr/lib/asterisk
+- ASTVARLIBDIR=$(INSTALL_PREFIX)/var/lib/asterisk
++ ASTLIBDIR=$(INSTALL_PREFIX)/lib/asterisk
++ ASTVARLIBDIR=$(INSTALL_PREFIX)/share/asterisk
+ ASTETCDIR=$(INSTALL_PREFIX)/etc/asterisk
+- ASTSPOOLDIR=$(INSTALL_PREFIX)/var/spool/asterisk
+- ASTLOGDIR=$(INSTALL_PREFIX)/var/log/asterisk
+- ASTHEADERDIR=$(INSTALL_PREFIX)/usr/include/asterisk
++ ASTSPOOLDIR=/var/spool/asterisk
++ ASTLOGDIR=/var/log/asterisk
++ ASTHEADERDIR=$(INSTALL_PREFIX)/include/asterisk
+ ASTCONFPATH=$(ASTETCDIR)/asterisk.conf
+- ASTBINDIR=$(INSTALL_PREFIX)/usr/bin
+- ASTSBINDIR=$(INSTALL_PREFIX)/usr/sbin
+- ASTVARRUNDIR=$(INSTALL_PREFIX)/var/run
+- ASTMANDIR=$(INSTALL_PREFIX)/usr/share/man
++ ASTBINDIR=$(INSTALL_PREFIX)/bin
++ ASTSBINDIR=$(INSTALL_PREFIX)/sbin
++ ASTVARRUNDIR=/var/run
++ ASTMANDIR=$(INSTALL_PREFIX)/man
+ MODULES_DIR=$(ASTLIBDIR)/modules
+ AGI_DIR=$(ASTVARLIBDIR)/agi-bin
+ else
+@@ -226,25 +226,25 @@
+ endif
+
+ INCLUDE+=-Iinclude -I../include
+-ASTCFLAGS+=-pipe -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY
+-ASTCFLAGS+=$(OPTIMIZE)
++ASTCFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE -DMAKE_VALGRIND_HAPPY
++#ASTCFLAGS+=$(OPTIMIZE)
+ ASTOBJ=-o asterisk
+
+ ifeq ($(findstring BSD,$(OSARCH)),BSD)
+ PROC=$(shell uname -m)
+- ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib
++ ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include -L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib
+ endif
+
+ ifneq ($(PROC),ultrasparc)
+- ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
++# ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
+ endif
+
+ ifeq ($(PROC),ppc)
+ ASTCFLAGS+=-fsigned-char
+ endif
+
+-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/osp/osp.h),)
+- ASTCFLAGS+=-DOSP_SUPPORT -I$(CROSS_COMPILE_TARGET)/usr/local/include/osp
++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/osp/osp.h),)
++ ASTCFLAGS+=-DOSP_SUPPORT -I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/osp
+ else
+ ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/osp/osp.h),)
+ ASTCFLAGS+=-DOSP_SUPPORT -I$(CROSS_COMPILE_TARGET)/usr/include/osp
+@@ -253,27 +253,24 @@
+
+ ifeq ($(OSARCH),FreeBSD)
+ BSDVERSION=$(shell make -V OSVERSION -f $(CROSS_COMPILE_TARGET)/usr/share/mk/bsd.port.subdir.mk)
+- ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)
+- LIBS+=$(shell if test $(BSDVERSION) -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi)
+- ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/spandsp),)
+- ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include/spandsp
++ ASTCFLAGS+=$(PTHREAD_CFLAGS)
++ LIBS+=$(PTHREAD_LIBS)
++ ifneq ($(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/spandsp),)
++ ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/spandsp
+ endif
+ MPG123TARG=freebsd
+
+- # XXX FreeBSD paths
+- PREFIX?=/usr/local
+- ASTLIBDIR=$(INSTALL_PREFIX)$(PREFIX)/lib/asterisk
+- ASTVARLIBDIR=$(INSTALL_PREFIX)$(PREFIX)/share/asterisk
+- ASTETCDIR=$(INSTALL_PREFIX)$(PREFIX)/etc/asterisk
+- ASTSPOOLDIR=$(INSTALL_PREFIX)/var/spool/asterisk
+- ASTLOGDIR=$(INSTALL_PREFIX)/var/log/asterisk
+- ASTHEADERDIR=$(INSTALL_PREFIX)$(PREFIX)/include/asterisk
++ ASTLIBDIR=$(INSTALL_PREFIX)/lib/asterisk
++ ASTVARLIBDIR=$(INSTALL_PREFIX)/share/asterisk
++ ASTETCDIR=$(INSTALL_PREFIX)/etc/asterisk
++ ASTSPOOLDIR=/var/spool/asterisk
++ ASTLOGDIR=/var/log/asterisk
++ ASTHEADERDIR=$(INSTALL_PREFIX)/include/asterisk
+ ASTCONFPATH=$(ASTETCDIR)/asterisk.conf
+- ASTBINDIR=$(INSTALL_PREFIX)$(PREFIX)/bin
+- ASTSBINDIR=$(INSTALL_PREFIX)$(PREFIX)/sbin
+- ASTVARRUNDIR=$(INSTALL_PREFIX)/var/run
+- ASTMANDIR=$(INSTALL_PREFIX)$(PREFIX)/man
+- # XXX end FreeBSD paths
++ ASTBINDIR=$(INSTALL_PREFIX)/bin
++ ASTSBINDIR=$(INSTALL_PREFIX)/sbin
++ ASTVARRUNDIR=/var/run
++ ASTMANDIR=$(INSTALL_PREFIX)/man
+
+ endif # FreeBSD
+
+@@ -307,7 +304,7 @@
+
+ ifndef WITHOUT_ZAPTEL
+
+-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),)
++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/zaptel/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),)
+ ASTCFLAGS+=-DZAPTEL_OPTIMIZATIONS
+ endif
+
+@@ -414,7 +411,7 @@
+ endif
+
+ # This is used when generating the doxygen documentation
+-ifneq ($(wildcard /usr/local/bin/dot)$(wildcard /usr/bin/dot),)
++ifneq ($(wildcard $(LOCALBASE)/bin/dot)$(wildcard /usr/bin/dot),)
+ HAVEDOT=yes
+ else
+ HAVEDOT=no
+@@ -431,7 +428,7 @@
+ @echo " + $(MAKE) install +"
+ @echo " +-------------------------------------------+"
+
+-all: cleantest depend asterisk subdirs
++all: cleantest depend asterisk subdirs manpage
+
+ #ifneq ($(wildcard tags),)
+ ctags: tags
+@@ -450,13 +447,13 @@
+ cd editline && unset CFLAGS LIBS && test -f config.h || CFLAGS="$(OPTIMIZE)" ./configure
+ $(MAKE) -C editline libedit.a
+
+-db1-ast/libdb1.a: FORCE
+- @if [ -d db1-ast ]; then \
+- $(MAKE) -C db1-ast libdb1.a ; \
+- else \
+- echo "You need to do a cvs update -d not just cvs update"; \
+- exit 1; \
+- fi
++#db1-ast/libdb1.a: FORCE
++# @if [ -d db1-ast ]; then \
++# $(MAKE) -C db1-ast libdb1.a ; \
++# else \
++# echo "You need to do a cvs update -d not just cvs update"; \
++# exit 1; \
++# fi
+
+ ifneq ($(wildcard .depend),)
+ include .depend
+@@ -480,10 +477,10 @@
+
+ manpage: asterisk.8
+
+-asterisk.8: asterisk.sgml
+- rm -f asterisk.8
+- docbook2man asterisk.sgml
+- mv ./*.8 asterisk.8
++#asterisk.8: asterisk.sgml
++# rm -f asterisk.8
++# docbook2man asterisk.sgml
++# mv ./*.8 asterisk.8
+
+ asterisk.pdf: asterisk.sgml
+ docbook2pdf asterisk.sgml
+@@ -523,14 +520,14 @@
+ cygwin_a:
+ $(MAKE) -C cygwin all
+
+-asterisk: $(CYGLOADER) editline/libedit.a db1-ast/libdb1.a stdtime/libtime.a $(OBJS)
++asterisk: $(CYGLOADER) editline/libedit.a stdtime/libtime.a $(OBJS)
+ build_tools/make_build_h > include/asterisk/build.h.tmp
+ if cmp -s include/asterisk/build.h.tmp include/asterisk/build.h ; then echo ; else \
+ mv include/asterisk/build.h.tmp include/asterisk/build.h ; \
+ fi
+ rm -f include/asterisk/build.h.tmp
+ $(CC) -c -o buildinfo.o $(CFLAGS) buildinfo.c
+- $(CC) $(DEBUG) $(ASTOBJ) $(ASTLINK) $(OBJS) buildinfo.o $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a $(LIBS)
++ $(CC) $(DEBUG) $(ASTOBJ) $(ASTLINK) $(OBJS) buildinfo.o $(LIBEDIT) stdtime/libtime.a $(LIBS)
+
+ muted: muted.o
+ $(CC) $(AUDIO_LIBS) -o muted muted.o
+@@ -552,12 +549,12 @@
+
+ datafiles: all
+ if [ x`$(ID) -un` = xroot ]; then sh mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
+- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits
+- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/silence
+- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/priv-callerintros
++ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits
++ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/silence
++ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/priv-callerintros
+ for x in sounds/digits/*.gsm; do \
+ if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
+- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits ; \
++ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits ; \
+ else \
+ echo "No description for $$x"; \
+ exit 1; \
+@@ -565,34 +562,34 @@
+ done
+ for x in sounds/silence/*.gsm; do \
+ if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
+- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/silence ; \
++ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/silence ; \
+ else \
+ echo "No description for $$x"; \
+ exit 1; \
+ fi; \
+ done
+- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/dictate
++ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/dictate
+ for x in sounds/dictate/*.gsm; do \
+ if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
+- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/dictate ; \
++ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/dictate ; \
+ else \
+ echo "No description for $$x"; \
+ exit 1; \
+ fi; \
+ done
+- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters
++ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters
+ for x in sounds/letters/*.gsm; do \
+ if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
+- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters ; \
++ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters ; \
+ else \
+ echo "No description for $$x"; \
+ exit 1; \
+ fi; \
+ done
+- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic
++ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic
+ for x in sounds/phonetic/*.gsm; do \
+ if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
+- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic ; \
++ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic ; \
+ else \
+ echo "No description for $$x"; \
+ exit 1; \
+@@ -600,18 +597,18 @@
+ done
+ for x in sounds/demo-* sounds/vm-* sounds/transfer* sounds/pbx-* sounds/ss-* sounds/beep* sounds/dir-* sounds/conf-* sounds/agent-* sounds/invalid* sounds/tt-* sounds/auth-* sounds/privacy-* sounds/queue-* sounds/spy-* sounds/priv-* sounds/screen-* sounds/hello-* sounds/hours* sounds/minute* sounds/second* ; do \
+ if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
+- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
++ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
+ else \
+ echo "No description for $$x"; \
+ exit 1; \
+ fi; \
+ done
+- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/mohmp3
+- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/images
++ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/mohmp3
++ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/images
+ for x in images/*.jpg; do \
+- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/images ; \
++ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/images ; \
+ done
+- mkdir -p $(DESTDIR)$(AGI_DIR)
++ $(MKDIR) $(DESTDIR)$(AGI_DIR)
+
+ update:
+ @if [ -d .svn ]; then \
+@@ -640,47 +637,47 @@
+ OLDHEADERS=$(filter-out $(NEWHEADERS),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h)))
+
+ bininstall: all
+- mkdir -p $(DESTDIR)$(MODULES_DIR)
+- mkdir -p $(DESTDIR)$(ASTSBINDIR)
+- mkdir -p $(DESTDIR)$(ASTETCDIR)
+- mkdir -p $(DESTDIR)$(ASTBINDIR)
+- mkdir -p $(DESTDIR)$(ASTVARRUNDIR)
+- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail
+- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/dictate
+- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/system
+- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/tmp
+- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/meetme
+- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/monitor
+- if [ -f asterisk ]; then $(INSTALL) -m 755 asterisk $(DESTDIR)$(ASTSBINDIR)/; fi
+- if [ -f cygwin/asterisk.exe ]; then $(INSTALL) -m 755 cygwin/asterisk.exe $(DESTDIR)$(ASTSBINDIR)/; fi
+- if [ -f asterisk.dll ]; then $(INSTALL) -m 755 asterisk.dll $(DESTDIR)$(ASTSBINDIR)/; fi
++ $(MKDIR) $(DESTDIR)$(MODULES_DIR)
++ $(MKDIR) $(DESTDIR)$(ASTSBINDIR)
++ $(MKDIR) $(DESTDIR)$(ASTETCDIR)
++ $(MKDIR) $(DESTDIR)$(ASTBINDIR)
++ $(MKDIR) $(DESTDIR)$(ASTVARRUNDIR)
++ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail
++ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/dictate
++ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/system
++ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/tmp
++ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/meetme
++ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/monitor
++ if [ -f asterisk ]; then $(BSD_INSTALL_PROGRAM) asterisk $(DESTDIR)$(ASTSBINDIR)/; fi
++ if [ -f cygwin/asterisk.exe ]; then $(BSD_INSTALL_PROGRAM) cygwin/asterisk.exe $(DESTDIR)$(ASTSBINDIR)/; fi
++ if [ -f asterisk.dll ]; then $(BSD_INSTALL_PROGRAM) asterisk.dll $(DESTDIR)$(ASTSBINDIR)/; fi
+ $(LN) -sf asterisk $(DESTDIR)$(ASTSBINDIR)/rasterisk
+- $(INSTALL) -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
+- $(INSTALL) -m 755 contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/
++ $(BSD_INSTALL_SCRIPT) contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
++ $(BSD_INSTALL_SCRIPT) contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/
+ if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ]; then \
+ cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ;\
+ chmod 755 $(DESTDIR)$(ASTSBINDIR)/safe_asterisk;\
+ fi
+- $(INSTALL) -d $(DESTDIR)$(ASTHEADERDIR)
+- $(INSTALL) -m 644 include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR)
++ $(MKDIR) $(DESTDIR)$(ASTHEADERDIR)
++ $(BSD_INSTALL_DATA) include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR)
+ if [ -n "$(OLDHEADERS)" ]; then \
+ rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\
+ fi
+- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds
+- mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv
+- mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-custom
+- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/keys
+- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/firmware
+- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax
+- mkdir -p $(DESTDIR)$(ASTMANDIR)/man8
+- $(INSTALL) -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
+- $(INSTALL) -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
+- $(INSTALL) -m 644 asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
+- $(INSTALL) -m 644 contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8
+- $(INSTALL) -m 644 contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8
+- $(INSTALL) -m 644 contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
++ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds
++ $(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-csv
++ $(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-custom
++ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/keys
++ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/firmware
++ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax
++ $(MKDIR) $(DESTDIR)$(ASTMANDIR)/man8
++ $(BSD_INSTALL_DATA) keys/iaxtel.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
++ $(BSD_INSTALL_DATA) keys/freeworlddialup.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
++ $(BSD_INSTALL_DATA) asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
++ $(BSD_INSTALL_DATA) contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8
++ $(BSD_INSTALL_DATA) contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8
++ $(BSD_INSTALL_DATA) contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
+ if [ -d contrib/firmware/iax ]; then \
+- $(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax/iaxy.bin; \
++ $(BSD_INSTALL_DATA) contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax/iaxy.bin; \
+ else \
+ echo "You need to do cvs update -d not just cvs update" ; \
+ fi
+@@ -710,46 +707,28 @@
+ echo " WARNING WARNING WARNING" ;\
+ fi
+
+-install: all datafiles bininstall install-subdirs
++install: all datafiles bininstall install-subdirs samples
+ @if [ -x /usr/sbin/asterisk-post-install ]; then \
+ /usr/sbin/asterisk-post-install $(DESTDIR) . ; \
+ fi
+- @echo " +---- Asterisk Installation Complete -------+"
+- @echo " + +"
+- @echo " + YOU MUST READ THE SECURITY DOCUMENT +"
+- @echo " + +"
+- @echo " + Asterisk has successfully been installed. +"
+- @echo " + If you would like to install the sample +"
+- @echo " + configuration files (overwriting any +"
+- @echo " + existing config files), run: +"
+- @echo " + +"
+- @echo " + $(MAKE) samples +"
+- @echo " + +"
+- @echo " +----------------- or ---------------------+"
+- @echo " + +"
+- @echo " + You can go ahead and install the asterisk +"
+- @echo " + program documentation now or later run: +"
+- @echo " + +"
+- @echo " + $(MAKE) progdocs +"
+- @echo " + +"
+- @echo " + **Note** This requires that you have +"
+- @echo " + doxygen installed on your local system +"
+- @echo " +-------------------------------------------+"
+ @$(MAKE) -s oldmodcheck
+
+ upgrade: all bininstall
+
+ adsi:
+- mkdir -p $(DESTDIR)$(ASTETCDIR)
++ $(MKDIR) $(DESTDIR)$(ASTETCDIR)
+ for x in configs/*.adsi; do \
++ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x`-dist; \
+ if [ ! -f $(DESTDIR)$(ASTETCDIRX)/$$x ]; then \
+- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x` ; \
++ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x` ; \
+ fi ; \
+ done
+
+ samples: adsi
+- mkdir -p $(DESTDIR)$(ASTETCDIR)
++ echo ADSI INSTALL $(BSD_INSTALL_DATA)
++ $(MKDIR) $(DESTDIR)$(ASTETCDIR)
+ for x in configs/*.sample; do \
++ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample`-dist;\
+ if [ -f $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ]; then \
+ if [ "$(OVERWRITE)" = "y" ]; then \
+ if cmp -s $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` $$x ; then \
+@@ -762,7 +741,7 @@
+ continue; \
+ fi ;\
+ fi ; \
+- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ;\
++ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ;\
+ done
+ if [ "$(OVERWRITE)" = "y" ] || [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; then \
+ ( \
+@@ -781,25 +760,25 @@
+ echo ";astctlowner = root" ; \
+ echo ";astctlgroup = apache" ; \
+ echo ";astctl = asterisk.ctl" ; \
+- ) > $(DESTDIR)$(ASTCONFPATH) ; \
++ ) > $(DESTDIR)$(ASTCONFPATH)-dist ; \
+ else \
+ echo "Skipping asterisk.conf creation"; \
+ fi
+- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
++ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
+ for x in sounds/demo-*; do \
+ if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
+- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
++ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
+ else \
+ echo "No description for $$x"; \
+ exit 1; \
+ fi; \
+ done
+- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \
++ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \
+ for x in sounds/moh/*.mp3 sounds/moh/LICENSE; do \
+- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \
++ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \
+ done
+ rm -f $(DESTDIR)$(ASTVARLIBDIR)/mohmp3/sample-hold.mp3
+- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
++ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
+ :> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm
+ for x in vm-theperson digits/1 digits/2 digits/3 digits/4 vm-isunavail; do \
+ cat $(DESTDIR)$(ASTVARLIBDIR)/sounds/$$x.gsm >> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm ; \
+@@ -813,9 +792,9 @@
+ @[ -d $(DESTDIR)$(HTTP_DOCSDIR)/ ] || ( printf "http docs directory not found.\nUpdate assignment of variable HTTP_DOCSDIR in Makefile!\n" && exit 1 )
+ @[ -d $(DESTDIR)$(HTTP_CGIDIR) ] || ( printf "cgi-bin directory not found.\nUpdate assignment of variable HTTP_CGIDIR in Makefile!\n" && exit 1 )
+ $(INSTALL) -m 4755 -o root -g root contrib/scripts/vmail.cgi $(DESTDIR)$(HTTP_CGIDIR)/vmail.cgi
+- mkdir -p $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk
++ $(MKDIR) $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk
+ for x in images/*.gif; do \
+- $(INSTALL) -m 644 $$x $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/; \
++ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/; \
+ done
+ @echo " +--------- Asterisk Web Voicemail ----------+"
+ @echo " + +"
+@@ -842,10 +821,10 @@
+
+ __rpm: include/asterisk/version.h spec
+ rm -rf /tmp/asterisk ; \
+- mkdir -p /tmp/asterisk/redhat/RPMS/i386 ; \
++ $(MKDIR) /tmp/asterisk/redhat/RPMS/i386 ; \
+ $(MAKE) DESTDIR=/tmp/asterisk install ; \
+ $(MAKE) DESTDIR=/tmp/asterisk samples ; \
+- mkdir -p /tmp/asterisk/etc/rc.d/init.d ; \
++ $(MKDIR) /tmp/asterisk/etc/rc.d/init.d ; \
+ cp -f contrib/init.d/rc.redhat.asterisk /tmp/asterisk/etc/rc.d/init.d/asterisk ; \
+ rpmbuild --rcfile /usr/lib/rpm/rpmrc:redhat/rpmrc -bb asterisk.spec
+
diff -ruN asterisk12.old/files/patch-Makefile asterisk12/files/patch-Makefile
--- asterisk12.old/files/patch-Makefile 2007-08-01 03:18:09.000000000 +0600
+++ asterisk12/files/patch-Makefile 1970-01-01 05:00:00.000000000 +0500
@@ -1,507 +0,0 @@
-
-$FreeBSD: ports/net/asterisk12/files/patch-Makefile,v 1.19 2007/07/31 21:18:09 sobomax Exp $
-
---- Makefile.orig
-+++ Makefile
-@@ -19,8 +19,8 @@
- # CROSS_COMPILE=/opt/montavista/pro/devkit/arm/xscale_be/bin/xscale_be-
- # CROSS_COMPILE_BIN=/opt/montavista/pro/devkit/arm/xscale_be/bin/
- # CROSS_COMPILE_TARGET=/opt/montavista/pro/devkit/arm/xscale_be/target
--CC=$(CROSS_COMPILE)gcc
--HOST_CC=gcc
-+CC?=$(CROSS_COMPILE)gcc
-+HOST_CC=${CC}
- # CROSS_ARCH=Linux
- # CROSS_PROC=arm
- # SUB_PROC=xscale # or maverick
-@@ -47,14 +47,14 @@
- #K6OPT = -DK6OPT
-
- #Tell gcc to optimize the code
--OPTIMIZE+=-O6
-+#OPTIMIZE+=-O6
- endif
-
- #Overwite config files on "make samples"
--OVERWRITE=y
-+OVERWRITE=n
-
- #Include debug and macro symbols in the executables (-g) and profiling info (-pg)
--DEBUG=-g3 #-pg
-+#DEBUG=-g3 #-pg
-
- #Set NOCRYPTO to yes if you do not want to have crypto support or
- #dependencies
-@@ -88,7 +88,7 @@
-
- # Where to install asterisk after compiling
- # Default -> leave empty
--INSTALL_PREFIX?=
-+INSTALL_PREFIX=$(PREFIX)
-
- # Staging directory
- # Files are copied here temporarily during the install process
-@@ -111,17 +111,17 @@
- BUSYDETECT+= #-DBUSYDETECT_COMPARE_TONE_AND_SILENCE
-
- ifneq ($(OSARCH),SunOS)
-- ASTLIBDIR=$(INSTALL_PREFIX)/usr/lib/asterisk
-- ASTVARLIBDIR=$(INSTALL_PREFIX)/var/lib/asterisk
-+ ASTLIBDIR=$(INSTALL_PREFIX)/lib/asterisk
-+ ASTVARLIBDIR=$(INSTALL_PREFIX)/share/asterisk
- ASTETCDIR=$(INSTALL_PREFIX)/etc/asterisk
-- ASTSPOOLDIR=$(INSTALL_PREFIX)/var/spool/asterisk
-- ASTLOGDIR=$(INSTALL_PREFIX)/var/log/asterisk
-- ASTHEADERDIR=$(INSTALL_PREFIX)/usr/include/asterisk
-+ ASTSPOOLDIR=/var/spool/asterisk
-+ ASTLOGDIR=/var/log/asterisk
-+ ASTHEADERDIR=$(INSTALL_PREFIX)/include/asterisk
- ASTCONFPATH=$(ASTETCDIR)/asterisk.conf
-- ASTBINDIR=$(INSTALL_PREFIX)/usr/bin
-- ASTSBINDIR=$(INSTALL_PREFIX)/usr/sbin
-- ASTVARRUNDIR=$(INSTALL_PREFIX)/var/run
-- ASTMANDIR=$(INSTALL_PREFIX)/usr/share/man
-+ ASTBINDIR=$(INSTALL_PREFIX)/bin
-+ ASTSBINDIR=$(INSTALL_PREFIX)/sbin
-+ ASTVARRUNDIR=/var/run
-+ ASTMANDIR=$(INSTALL_PREFIX)/man
- MODULES_DIR=$(ASTLIBDIR)/modules
- AGI_DIR=$(ASTVARLIBDIR)/agi-bin
- else
-@@ -226,25 +226,25 @@
- endif
-
- INCLUDE+=-Iinclude -I../include
--ASTCFLAGS+=-pipe -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY
--ASTCFLAGS+=$(OPTIMIZE)
-+ASTCFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE -DMAKE_VALGRIND_HAPPY
-+#ASTCFLAGS+=$(OPTIMIZE)
- ASTOBJ=-o asterisk
-
- ifeq ($(findstring BSD,$(OSARCH)),BSD)
- PROC=$(shell uname -m)
-- ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib
-+ ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include -L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/lib
- endif
-
- ifneq ($(PROC),ultrasparc)
-- ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
-+# ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
- endif
-
- ifeq ($(PROC),ppc)
- ASTCFLAGS+=-fsigned-char
- endif
-
--ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/osp/osp.h),)
-- ASTCFLAGS+=-DOSP_SUPPORT -I$(CROSS_COMPILE_TARGET)/usr/local/include/osp
-+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/osp/osp.h),)
-+ ASTCFLAGS+=-DOSP_SUPPORT -I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/osp
- else
- ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/osp/osp.h),)
- ASTCFLAGS+=-DOSP_SUPPORT -I$(CROSS_COMPILE_TARGET)/usr/include/osp
-@@ -253,27 +253,24 @@
-
- ifeq ($(OSARCH),FreeBSD)
- BSDVERSION=$(shell make -V OSVERSION -f $(CROSS_COMPILE_TARGET)/usr/share/mk/bsd.port.subdir.mk)
-- ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)
-- LIBS+=$(shell if test $(BSDVERSION) -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi)
-- ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/spandsp),)
-- ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include/spandsp
-+ ASTCFLAGS+=$(PTHREAD_CFLAGS)
-+ LIBS+=$(PTHREAD_LIBS)
-+ ifneq ($(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/spandsp),)
-+ ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/spandsp
- endif
- MPG123TARG=freebsd
-
-- # XXX FreeBSD paths
-- PREFIX?=/usr/local
-- ASTLIBDIR=$(INSTALL_PREFIX)$(PREFIX)/lib/asterisk
-- ASTVARLIBDIR=$(INSTALL_PREFIX)$(PREFIX)/share/asterisk
-- ASTETCDIR=$(INSTALL_PREFIX)$(PREFIX)/etc/asterisk
-- ASTSPOOLDIR=$(INSTALL_PREFIX)/var/spool/asterisk
-- ASTLOGDIR=$(INSTALL_PREFIX)/var/log/asterisk
-- ASTHEADERDIR=$(INSTALL_PREFIX)$(PREFIX)/include/asterisk
-+ ASTLIBDIR=$(INSTALL_PREFIX)/lib/asterisk
-+ ASTVARLIBDIR=$(INSTALL_PREFIX)/share/asterisk
-+ ASTETCDIR=$(INSTALL_PREFIX)/etc/asterisk
-+ ASTSPOOLDIR=/var/spool/asterisk
-+ ASTLOGDIR=/var/log/asterisk
-+ ASTHEADERDIR=$(INSTALL_PREFIX)/include/asterisk
- ASTCONFPATH=$(ASTETCDIR)/asterisk.conf
-- ASTBINDIR=$(INSTALL_PREFIX)$(PREFIX)/bin
-- ASTSBINDIR=$(INSTALL_PREFIX)$(PREFIX)/sbin
-- ASTVARRUNDIR=$(INSTALL_PREFIX)/var/run
-- ASTMANDIR=$(INSTALL_PREFIX)$(PREFIX)/man
-- # XXX end FreeBSD paths
-+ ASTBINDIR=$(INSTALL_PREFIX)/bin
-+ ASTSBINDIR=$(INSTALL_PREFIX)/sbin
-+ ASTVARRUNDIR=/var/run
-+ ASTMANDIR=$(INSTALL_PREFIX)/man
-
- endif # FreeBSD
-
-@@ -307,7 +304,7 @@
-
- ifndef WITHOUT_ZAPTEL
-
--ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),)
-+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/zaptel/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),)
- ASTCFLAGS+=-DZAPTEL_OPTIMIZATIONS
- endif
-
-@@ -414,7 +411,7 @@
- endif
-
- # This is used when generating the doxygen documentation
--ifneq ($(wildcard /usr/local/bin/dot)$(wildcard /usr/bin/dot),)
-+ifneq ($(wildcard $(LOCALBASE)/bin/dot)$(wildcard /usr/bin/dot),)
- HAVEDOT=yes
- else
- HAVEDOT=no
-@@ -431,7 +428,7 @@
- @echo " + $(MAKE) install +"
- @echo " +-------------------------------------------+"
-
--all: cleantest depend asterisk subdirs
-+all: cleantest depend asterisk subdirs manpage
-
- #ifneq ($(wildcard tags),)
- ctags: tags
-@@ -450,13 +447,13 @@
- cd editline && unset CFLAGS LIBS && test -f config.h || CFLAGS="$(OPTIMIZE)" ./configure
- $(MAKE) -C editline libedit.a
-
--db1-ast/libdb1.a: FORCE
-- @if [ -d db1-ast ]; then \
-- $(MAKE) -C db1-ast libdb1.a ; \
-- else \
-- echo "You need to do a cvs update -d not just cvs update"; \
-- exit 1; \
-- fi
-+#db1-ast/libdb1.a: FORCE
-+# @if [ -d db1-ast ]; then \
-+# $(MAKE) -C db1-ast libdb1.a ; \
-+# else \
-+# echo "You need to do a cvs update -d not just cvs update"; \
-+# exit 1; \
-+# fi
-
- ifneq ($(wildcard .depend),)
- include .depend
-@@ -480,10 +477,10 @@
-
- manpage: asterisk.8
-
--asterisk.8: asterisk.sgml
-- rm -f asterisk.8
-- docbook2man asterisk.sgml
-- mv ./*.8 asterisk.8
-+#asterisk.8: asterisk.sgml
-+# rm -f asterisk.8
-+# docbook2man asterisk.sgml
-+# mv ./*.8 asterisk.8
-
- asterisk.pdf: asterisk.sgml
- docbook2pdf asterisk.sgml
-@@ -523,14 +520,14 @@
- cygwin_a:
- $(MAKE) -C cygwin all
-
--asterisk: $(CYGLOADER) editline/libedit.a db1-ast/libdb1.a stdtime/libtime.a $(OBJS)
-+asterisk: $(CYGLOADER) editline/libedit.a stdtime/libtime.a $(OBJS)
- build_tools/make_build_h > include/asterisk/build.h.tmp
- if cmp -s include/asterisk/build.h.tmp include/asterisk/build.h ; then echo ; else \
- mv include/asterisk/build.h.tmp include/asterisk/build.h ; \
- fi
- rm -f include/asterisk/build.h.tmp
- $(CC) -c -o buildinfo.o $(CFLAGS) buildinfo.c
-- $(CC) $(DEBUG) $(ASTOBJ) $(ASTLINK) $(OBJS) buildinfo.o $(LIBEDIT) db1-ast/libdb1.a stdtime/libtime.a $(LIBS)
-+ $(CC) $(DEBUG) $(ASTOBJ) $(ASTLINK) $(OBJS) buildinfo.o $(LIBEDIT) stdtime/libtime.a $(LIBS)
-
- muted: muted.o
- $(CC) $(AUDIO_LIBS) -o muted muted.o
-@@ -552,12 +549,12 @@
-
- datafiles: all
- if [ x`$(ID) -un` = xroot ]; then sh mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
-- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits
-- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/silence
-- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/priv-callerintros
-+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits
-+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/silence
-+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/priv-callerintros
- for x in sounds/digits/*.gsm; do \
- if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
-- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits ; \
-+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits ; \
- else \
- echo "No description for $$x"; \
- exit 1; \
-@@ -565,34 +562,34 @@
- done
- for x in sounds/silence/*.gsm; do \
- if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
-- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/silence ; \
-+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/silence ; \
- else \
- echo "No description for $$x"; \
- exit 1; \
- fi; \
- done
-- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/dictate
-+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/dictate
- for x in sounds/dictate/*.gsm; do \
- if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
-- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/dictate ; \
-+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/dictate ; \
- else \
- echo "No description for $$x"; \
- exit 1; \
- fi; \
- done
-- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters
-+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters
- for x in sounds/letters/*.gsm; do \
- if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
-- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters ; \
-+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/letters ; \
- else \
- echo "No description for $$x"; \
- exit 1; \
- fi; \
- done
-- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic
-+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic
- for x in sounds/phonetic/*.gsm; do \
- if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
-- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic ; \
-+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds/phonetic ; \
- else \
- echo "No description for $$x"; \
- exit 1; \
-@@ -600,18 +597,18 @@
- done
- for x in sounds/demo-* sounds/vm-* sounds/transfer* sounds/pbx-* sounds/ss-* sounds/beep* sounds/dir-* sounds/conf-* sounds/agent-* sounds/invalid* sounds/tt-* sounds/auth-* sounds/privacy-* sounds/queue-* sounds/spy-* sounds/priv-* sounds/screen-* sounds/hello-* sounds/hours* sounds/minute* sounds/second* ; do \
- if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
-- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
-+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
- else \
- echo "No description for $$x"; \
- exit 1; \
- fi; \
- done
-- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/mohmp3
-- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/images
-+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/mohmp3
-+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/images
- for x in images/*.jpg; do \
-- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/images ; \
-+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/images ; \
- done
-- mkdir -p $(DESTDIR)$(AGI_DIR)
-+ $(MKDIR) $(DESTDIR)$(AGI_DIR)
-
- update:
- @if [ -d .svn ]; then \
-@@ -640,47 +637,47 @@
- OLDHEADERS=$(filter-out $(NEWHEADERS),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h)))
-
- bininstall: all
-- mkdir -p $(DESTDIR)$(MODULES_DIR)
-- mkdir -p $(DESTDIR)$(ASTSBINDIR)
-- mkdir -p $(DESTDIR)$(ASTETCDIR)
-- mkdir -p $(DESTDIR)$(ASTBINDIR)
-- mkdir -p $(DESTDIR)$(ASTVARRUNDIR)
-- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail
-- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/dictate
-- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/system
-- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/tmp
-- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/meetme
-- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/monitor
-- if [ -f asterisk ]; then $(INSTALL) -m 755 asterisk $(DESTDIR)$(ASTSBINDIR)/; fi
-- if [ -f cygwin/asterisk.exe ]; then $(INSTALL) -m 755 cygwin/asterisk.exe $(DESTDIR)$(ASTSBINDIR)/; fi
-- if [ -f asterisk.dll ]; then $(INSTALL) -m 755 asterisk.dll $(DESTDIR)$(ASTSBINDIR)/; fi
-+ $(MKDIR) $(DESTDIR)$(MODULES_DIR)
-+ $(MKDIR) $(DESTDIR)$(ASTSBINDIR)
-+ $(MKDIR) $(DESTDIR)$(ASTETCDIR)
-+ $(MKDIR) $(DESTDIR)$(ASTBINDIR)
-+ $(MKDIR) $(DESTDIR)$(ASTVARRUNDIR)
-+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail
-+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/dictate
-+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/system
-+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/tmp
-+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/meetme
-+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/monitor
-+ if [ -f asterisk ]; then $(BSD_INSTALL_PROGRAM) asterisk $(DESTDIR)$(ASTSBINDIR)/; fi
-+ if [ -f cygwin/asterisk.exe ]; then $(BSD_INSTALL_PROGRAM) cygwin/asterisk.exe $(DESTDIR)$(ASTSBINDIR)/; fi
-+ if [ -f asterisk.dll ]; then $(BSD_INSTALL_PROGRAM) asterisk.dll $(DESTDIR)$(ASTSBINDIR)/; fi
- $(LN) -sf asterisk $(DESTDIR)$(ASTSBINDIR)/rasterisk
-- $(INSTALL) -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
-- $(INSTALL) -m 755 contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/
-+ $(BSD_INSTALL_SCRIPT) contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
-+ $(BSD_INSTALL_SCRIPT) contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/
- if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ]; then \
- cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ;\
- chmod 755 $(DESTDIR)$(ASTSBINDIR)/safe_asterisk;\
- fi
-- $(INSTALL) -d $(DESTDIR)$(ASTHEADERDIR)
-- $(INSTALL) -m 644 include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR)
-+ $(MKDIR) $(DESTDIR)$(ASTHEADERDIR)
-+ $(BSD_INSTALL_DATA) include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR)
- if [ -n "$(OLDHEADERS)" ]; then \
- rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\
- fi
-- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds
-- mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv
-- mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-custom
-- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/keys
-- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/firmware
-- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax
-- mkdir -p $(DESTDIR)$(ASTMANDIR)/man8
-- $(INSTALL) -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
-- $(INSTALL) -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
-- $(INSTALL) -m 644 asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
-- $(INSTALL) -m 644 contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8
-- $(INSTALL) -m 644 contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8
-- $(INSTALL) -m 644 contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
-+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds
-+ $(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-csv
-+ $(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-custom
-+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/keys
-+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/firmware
-+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax
-+ $(MKDIR) $(DESTDIR)$(ASTMANDIR)/man8
-+ $(BSD_INSTALL_DATA) keys/iaxtel.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
-+ $(BSD_INSTALL_DATA) keys/freeworlddialup.pub $(DESTDIR)$(ASTVARLIBDIR)/keys
-+ $(BSD_INSTALL_DATA) asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
-+ $(BSD_INSTALL_DATA) contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8
-+ $(BSD_INSTALL_DATA) contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8
-+ $(BSD_INSTALL_DATA) contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
- if [ -d contrib/firmware/iax ]; then \
-- $(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax/iaxy.bin; \
-+ $(BSD_INSTALL_DATA) contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax/iaxy.bin; \
- else \
- echo "You need to do cvs update -d not just cvs update" ; \
- fi
-@@ -710,46 +707,28 @@
- echo " WARNING WARNING WARNING" ;\
- fi
-
--install: all datafiles bininstall install-subdirs
-+install: all datafiles bininstall install-subdirs samples
- @if [ -x /usr/sbin/asterisk-post-install ]; then \
- /usr/sbin/asterisk-post-install $(DESTDIR) . ; \
- fi
-- @echo " +---- Asterisk Installation Complete -------+"
-- @echo " + +"
-- @echo " + YOU MUST READ THE SECURITY DOCUMENT +"
-- @echo " + +"
-- @echo " + Asterisk has successfully been installed. +"
-- @echo " + If you would like to install the sample +"
-- @echo " + configuration files (overwriting any +"
-- @echo " + existing config files), run: +"
-- @echo " + +"
-- @echo " + $(MAKE) samples +"
-- @echo " + +"
-- @echo " +----------------- or ---------------------+"
-- @echo " + +"
-- @echo " + You can go ahead and install the asterisk +"
-- @echo " + program documentation now or later run: +"
-- @echo " + +"
-- @echo " + $(MAKE) progdocs +"
-- @echo " + +"
-- @echo " + **Note** This requires that you have +"
-- @echo " + doxygen installed on your local system +"
-- @echo " +-------------------------------------------+"
- @$(MAKE) -s oldmodcheck
-
- upgrade: all bininstall
-
- adsi:
-- mkdir -p $(DESTDIR)$(ASTETCDIR)
-+ $(MKDIR) $(DESTDIR)$(ASTETCDIR)
- for x in configs/*.adsi; do \
-+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x`-dist; \
- if [ ! -f $(DESTDIR)$(ASTETCDIRX)/$$x ]; then \
-- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x` ; \
-+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x` ; \
- fi ; \
- done
-
- samples: adsi
-- mkdir -p $(DESTDIR)$(ASTETCDIR)
-+ echo ADSI INSTALL $(BSD_INSTALL_DATA)
-+ $(MKDIR) $(DESTDIR)$(ASTETCDIR)
- for x in configs/*.sample; do \
-+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample`-dist;\
- if [ -f $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ]; then \
- if [ "$(OVERWRITE)" = "y" ]; then \
- if cmp -s $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` $$x ; then \
-@@ -762,7 +741,7 @@
- continue; \
- fi ;\
- fi ; \
-- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ;\
-+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`basename $$x .sample` ;\
- done
- if [ "$(OVERWRITE)" = "y" ] || [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; then \
- ( \
-@@ -822,25 +801,25 @@
- echo "; Default: strict"; \
- echo ";"; \
- echo ";translation_algorithm = strict"; \
-- ) > $(DESTDIR)$(ASTCONFPATH) ; \
-+ ) > $(DESTDIR)$(ASTCONFPATH)-dist ; \
- else \
- echo "Skipping asterisk.conf creation"; \
- fi
-- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
-+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
- for x in sounds/demo-*; do \
- if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
-- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
-+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \
- else \
- echo "No description for $$x"; \
- exit 1; \
- fi; \
- done
-- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \
-+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \
- for x in sounds/moh/*.mp3 sounds/moh/LICENSE; do \
-- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \
-+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \
- done
- rm -f $(DESTDIR)$(ASTVARLIBDIR)/mohmp3/sample-hold.mp3
-- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
-+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
- :> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm
- for x in vm-theperson digits/1 digits/2 digits/3 digits/4 vm-isunavail; do \
- cat $(DESTDIR)$(ASTVARLIBDIR)/sounds/$$x.gsm >> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm ; \
-@@ -854,9 +833,9 @@
- @[ -d $(DESTDIR)$(HTTP_DOCSDIR)/ ] || ( printf "http docs directory not found.\nUpdate assignment of variable HTTP_DOCSDIR in Makefile!\n" && exit 1 )
- @[ -d $(DESTDIR)$(HTTP_CGIDIR) ] || ( printf "cgi-bin directory not found.\nUpdate assignment of variable HTTP_CGIDIR in Makefile!\n" && exit 1 )
- $(INSTALL) -m 4755 -o root -g root contrib/scripts/vmail.cgi $(DESTDIR)$(HTTP_CGIDIR)/vmail.cgi
-- mkdir -p $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk
-+ $(MKDIR) $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk
- for x in images/*.gif; do \
-- $(INSTALL) -m 644 $$x $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/; \
-+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/; \
- done
- @echo " +--------- Asterisk Web Voicemail ----------+"
- @echo " + +"
-@@ -883,10 +862,10 @@
-
- __rpm: include/asterisk/version.h spec
- rm -rf /tmp/asterisk ; \
-- mkdir -p /tmp/asterisk/redhat/RPMS/i386 ; \
-+ $(MKDIR) /tmp/asterisk/redhat/RPMS/i386 ; \
- $(MAKE) DESTDIR=/tmp/asterisk install ; \
- $(MAKE) DESTDIR=/tmp/asterisk samples ; \
-- mkdir -p /tmp/asterisk/etc/rc.d/init.d ; \
-+ $(MKDIR) /tmp/asterisk/etc/rc.d/init.d ; \
- cp -f contrib/init.d/rc.redhat.asterisk /tmp/asterisk/etc/rc.d/init.d/asterisk ; \
- rpmbuild --rcfile /usr/lib/rpm/rpmrc:redhat/rpmrc -bb asterisk.spec
-
diff -ruN asterisk12.old/files/patch-channels::Makefile asterisk12/files/patch-channels::Makefile
--- asterisk12.old/files/patch-channels::Makefile 2007-08-01 03:18:09.000000000 +0600
+++ asterisk12/files/patch-channels::Makefile 2008-01-14 17:37:27.000000000 +0500
@@ -69,7 +69,7 @@
-chan_h323.so: chan_h323.o h323/libchanh323.a
- $(CC) $(SOLINK) -o $@ $< h323/libchanh323.a $(CHANH323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L$(OPENH323DIR)/lib $(H323LIB) -L/usr/lib -lcrypto -lssl -lexpat
+chan_h323.so: chan_h323.o h323/ast_h323.o
-+ $(CXX) $(SOLINK) -o $@ $< h323/ast_h323.o $(CHANH323LIB) -L$(OPENH323DIR)/lib $(H323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L/usr/lib -lcrypto -lssl -lexpat -L$(LOCALBASE)/lib -llber -lldap -lldap_r
++ $(CXX) $(SOLINK) -o $@ $< h323/ast_h323.o $(CHANH323LIB) -L$(OPENH323DIR)/lib $(H323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L/usr/lib -lcrypto -lssl -lexpat -L$(LOCALBASE)/lib
+h323/ast_h323.o:
+ $(MAKE) -C h323 ast_h323.o
endif
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list