Attachment #106388 for bug #146964




# Date created:				17 October 2003
# Whom:					Maxim Sobolev <sobomax@portaone.com>
#
# $FreeBSD: ports/net/asterisk16/Makefile,v 1.132 2010/04/03 10:44:26 roam Exp $
#

PORTNAME=	asterisk
PORTVERSION=	1.6.2.13
PORTREVISION=	4
PKGNAMESUFFIX=	16
CATEGORIES=	net
MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/asterisk/ \
		http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/
PKGNAMESUFFIX=	16

MAINTAINER=	flo@kasimir.com
COMMENT=	An Open Source PBX and telephony toolkit

LIB_DEPENDS=	speex.1:${PORTSDIR}/audio/speex \
		newt.52:${PORTSDIR}/devel/newt \
		execinfo:${PORTSDIR}/devel/libexecinfo

USE_GNOME=	libxml2

RUN_DEPENDS=	mpg123:${PORTSDIR}/audio/mpg123

ONLY_FOR_ARCHS=	i386 amd64

GNU_CONFIGURE=	yes
CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/openh323" \
		LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS=	--with-gsm=${LOCALBASE} --localstatedir=/var
CPPFLAGS=	-I${LOCALBASE}/include -I${LOCALBASE}/include/openh323
USE_GMAKE=	yes
USE_BISON=	build

		GSM		"Enable GSM codec" on \
		CURL		"Enable CURL support" on \
		ILBC		"Enable iLBC codec" off \
		SPANDSP		"Enable Spandsp faxing support" off
#		CODEC_PATCH	"Apply codec negotiation patch" off \
#		MISC_PATCHES	"Apply additional patches" off

.include <bsd.port.pre.mk>

.if ${ARCH} == "i386" || ${ARCH} == "amd64"
OPTIONS+=	DAHDI		"Enable DAHDI support" on

# Include this since we have altered OPTIONS.
.include "$(PORTSDIR)/Mk/bsd.port.options.mk"
.endif

# similarly
.if !defined(WITH_ODBC)
PLIST_SUB+=	WITH_ODBC="@comment "
CONFIGURE_ARGS+= --without-unixodbc
.else
PLIST_SUB+=	WITH_ODBC=""
CONFIGURE_ARGS+= --with-unixodbc --with-ltdl
LIB_DEPENDS+=	odbc.1:${PORTSDIR}/databases/unixODBC
USE_AUTOTOOLS=	libltdl
.endif

.if !defined(WITH_FREETDS)

.else
PLIST_SUB+=	WITH_SNMP=""
CONFIGURE_ARGS+= --with-netsnmp
LIB_DEPENDS+=	netsnmp:${PORTSDIR}/net-mgmt/net-snmp
.endif

.if !defined(WITH_JABBER)


.if !defined(WITH_CURL)
PLIST_SUB+=	WITH_CURL="@comment "
CONFIGURE_ARGS+= --with-libcurl=no
		--with-libcurl=no
.else
PLIST_SUB+=	WITH_CURL=""
CONFIGURE_ARGS+= --with-libcurl
		--with-libcurl
LIB_DEPENDS+=	curl.6:${PORTSDIR}/ftp/curl
.endif


LIB_DEPENDS+=	spandsp.2:${PORTSDIR}/comms/spandsp-devel
.endif

.if defined(WITH_CODEC_PATCH)
PATCHFILES=	asterisk-1.4.22-codec-negotiation-20081110.diff.gz
PATCH_SITES=	http://b2bua.org/chrome/site/
EXTRA_PATCHES+=	${PATCHDIR}/codecnego-patch-Makefile
.else
EXTRA_PATCHES+=	${PATCHDIR}/nocodecnego-patch-Makefile
.endif

.if defined(WITH_MISC_PATCHES)
EXTRA_PATCHES+=	${PATCHDIR}/dtmf_debug.diff
EXTRA_PATCHES+=	${PATCHDIR}/feature_disconnect.diff

Lines 1-3 Link Here

(-)/usr/ports/net/asterisk16/distinfo (-3 / +3 lines)
1	MD5 (asterisk-1.6.0.21.tar.gz) = a172fb030adab50bdff6ae3b5e765283	1	MD5 (asterisk-1.6.2.13.tar.gz) = 1e184a4d9301e2e4b9de3bc98b507d4f
2	SHA256 (asterisk-1.6.0.21.tar.gz) = 0d41a9033934640992da29ee03ae96a208eb3ff8a46440e388920d471ecbbaff	2	SHA256 (asterisk-1.6.2.13.tar.gz) = 28bb18e988d22557ee77220cb33209212af1e618348c3d42666f785da517c01e
3	SIZE (asterisk-1.6.0.21.tar.gz) = 23145584	3	SIZE (asterisk-1.6.2.13.tar.gz) = 23679304

Lines 11-20 Link Here

(-)/usr/ports/net/asterisk16/files/asterisk.sh.in (-3 / +3 lines)
11		11
12	. /etc/rc.subr	12	. /etc/rc.subr
13		13
14	stop_precmd=asterisk_shutdown	14	stop_cmd=asterisk_shutdown
15	sig_stop=KILL
16	asterisk_shutdown () {	15	asterisk_shutdown () {
17	%%PREFIX%%/sbin/asterisk -qrx 'stop now'	16	echo 'Stopping asterisk'
		17	%%PREFIX%%/sbin/asterisk -qrx 'core stop now'
18	sleep 1	18	sleep 1
19	return 0	19	return 0
20	}	20	}




--- Makefile.orig	2008-10-16 17:36:35.000000000 +0300
+++ Makefile	2008-10-16 17:36:36.000000000 +0300
@@ -129,7 +129,7 @@
   ASTMANDIR=$(mandir)
 ifneq ($(findstring BSD,$(OSARCH)),)
   ASTVARLIBDIR=$(prefix)/share/asterisk
-  ASTVARRUNDIR=$(localstatedir)/run/asterisk
+  ASTVARRUNDIR=$(localstatedir)/run
 else
   ASTVARLIBDIR=$(localstatedir)/lib/asterisk
 endif
@@ -214,9 +214,11 @@
   ASTLDFLAGS+=-L/usr/local/lib
 endif
 
+ifneq ($(OSARCH),FreeBSD)
 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)
 endif
+endif
 
 ifeq ($(PROC),ppc)
   ASTCFLAGS+=-fsigned-char
@@ -224,7 +226,7 @@
 
 ifeq ($(OSARCH),FreeBSD)
   # -V is understood by BSD Make, not by GNU make.
-  BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk)
+  BSDVERSION=$(OSVERSION)
   ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)
   AST_LIBS+=$(shell if test  $(BSDVERSION) -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi)
 endif
@@ -401,15 +403,15 @@
 # Should static HTTP be installed during make samples or even with its own target ala
 # webvoicemail?  There are portions here that *could* be customized but might also be
 # improved a lot.  I'll put it here for now.
-	mkdir -p $(DESTDIR)$(ASTDATADIR)/static-http
+	$(MKDIR) $(DESTDIR)$(ASTDATADIR)/static-http
 	for x in static-http/*; do \
-		$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/static-http ; \
+		$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTDATADIR)/static-http ; \
 	done
-	mkdir -p $(DESTDIR)$(ASTDATADIR)/images
+	$(MKDIR) $(DESTDIR)$(ASTDATADIR)/images
 	for x in images/*.jpg; do \
-		$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/images ; \
+		$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTDATADIR)/images ; \
 	done
-	mkdir -p $(DESTDIR)$(AGI_DIR)
+	$(MKDIR) $(DESTDIR)$(AGI_DIR)
 	$(MAKE) -C sounds install
 
 update: 
@@ -430,47 +432,47 @@
 OLDHEADERS=$(filter-out $(NEWHEADERS),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h)))
 
 installdirs:
-	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
+	$(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
 
 bininstall: _all installdirs $(SUBDIRS_INSTALL)
-	$(INSTALL) -m 755 main/asterisk $(DESTDIR)$(ASTSBINDIR)/
+	$(BSD_INSTALL_PROGRAM) main/asterisk $(DESTDIR)$(ASTSBINDIR)/
 	$(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;\
+		cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > contrib/scripts/safe_asterisk.out;\
+		${BSD_INSTALL_SCRIPT} contrib/scripts/safe_asterisk.out $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ;\
 	fi
-	$(INSTALL) -d $(DESTDIR)$(ASTHEADERDIR)
-	$(INSTALL) -m 644 include/asterisk.h $(DESTDIR)$(includedir)
-	$(INSTALL) -m 644 include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR)
+	$(MKDIR) $(DESTDIR)$(ASTHEADERDIR)
+	$(BSD_INSTALL_DATA) include/asterisk.h $(DESTDIR)$(includedir)
+	$(BSD_INSTALL_DATA) include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR)
 	if [ -n "$(OLDHEADERS)" ]; then \
 		rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\
 	fi
-	mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv
-	mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-custom
-	mkdir -p $(DESTDIR)$(ASTDATADIR)/keys
-	mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware
-	mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware/iax
-	mkdir -p $(DESTDIR)$(ASTMANDIR)/man8
-	$(INSTALL) -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys
-	$(INSTALL) -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTDATADIR)/keys
-	$(INSTALL) -m 644 doc/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)$(ASTLOGDIR)/cdr-csv
+	$(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-custom
+	$(MKDIR) $(DESTDIR)$(ASTDATADIR)/keys
+	$(MKDIR) $(DESTDIR)$(ASTDATADIR)/firmware
+	$(MKDIR) $(DESTDIR)$(ASTDATADIR)/firmware/iax
+	$(MKDIR) $(DESTDIR)$(ASTMANDIR)/man8
+	$(BSD_INSTALL_DATA) keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys
+	$(BSD_INSTALL_DATA) keys/freeworlddialup.pub $(DESTDIR)$(ASTDATADIR)/keys
+	$(BSD_INSTALL_MAN) doc/asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
+	$(BSD_INSTALL_MAN) contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8
+	$(BSD_INSTALL_MAN) contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8
+	$(BSD_INSTALL_MAN) contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
 	if [ -f contrib/firmware/iax/iaxy.bin ] ; then \
-		$(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin; \
+		$(BSD_INSTALL_DATA) contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin; \
 	fi
 
 $(SUBDIRS_INSTALL):
@@ -506,7 +508,7 @@
 	@exit 1
 endif
 
-install: badshell datafiles bininstall
+install: badshell datafiles bininstall samples
 	@if [ -x /usr/sbin/asterisk-post-install ]; then \
 		/usr/sbin/asterisk-post-install $(DESTDIR) . ; \
 	fi
@@ -544,31 +546,23 @@
 upgrade: bininstall
 
 adsi:
-	mkdir -p $(DESTDIR)$(ASTETCDIR)
+	$(MKDIR) $(DESTDIR)$(ASTETCDIR)
 	for x in configs/*.adsi; do \
 		if [ ! -f $(DESTDIR)$(ASTETCDIR)/$$x ]; then \
-			$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x` ; \
+			$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x` ; \
 		fi ; \
+		$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`-dist ; \
 	done
 
 samples: adsi
-	mkdir -p $(DESTDIR)$(ASTETCDIR)
+	$(MKDIR) $(DESTDIR)$(ASTETCDIR)
 	for x in configs/*.sample; do \
-		if [ -f $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` ]; then \
-			if [ "$(OVERWRITE)" = "y" ]; then \
-				if cmp -s $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` $$x ; then \
-					echo "Config file $$x is unchanged"; \
-					continue; \
-				fi ; \
-				mv -f $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`.old ; \
-			else \
-				echo "Skipping config file $$x"; \
-				continue; \
-			fi ;\
+		$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`-dist ;\
+		if [ ! -f $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` ]; then \
+			$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`;\
 		fi ; \
-		$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` ;\
 	done
-	if [ "$(OVERWRITE)" = "y" ] || [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; then \
+	if true; then \
 		( \
 		echo "[directories]" ; \
 		echo "astetcdir => $(ASTETCDIR)" ; \
@@ -655,20 +649,23 @@
 		echo "; Default: strict"; \
 		echo ";"; \
 		echo ";translation_algorithm = strict"; \
-		) > $(DESTDIR)$(ASTCONFPATH) ; \
+		) > $(DESTDIR)$(ASTCONFPATH)-dist ; \
+		if [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; then \
+			cp $(DESTDIR)$(ASTCONFPATH)-dist $(DESTDIR)$(ASTCONFPATH); \
+		fi; \
 	else \
 		echo "Skipping asterisk.conf creation"; \
 	fi
-	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
+	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
 	build_tools/make_sample_voicemail $(DESTDIR)/$(ASTDATADIR) $(DESTDIR)/$(ASTSPOOLDIR)
 
 webvmail:
 	@[ -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 " +                                           +"




--- Makefile.orig	2009-11-03 12:00:27.000000000 -0800
+++ Makefile	2009-11-20 13:13:06.000000000 -0800
@@ -118,7 +118,7 @@
 OVERWRITE=y
 
 # Include debug and macro symbols in the executables (-g) and profiling info (-pg)
-DEBUG=-g3
+#DEBUG=-g3
 
 
 # Define standard directories for various platforms
@@ -148,7 +148,7 @@
   ASTMANDIR=$(mandir)
 ifneq ($(findstring BSD,$(OSARCH)),)
   ASTVARLIBDIR=$(prefix)/share/asterisk
-  ASTVARRUNDIR=$(localstatedir)/run/asterisk
+  ASTVARRUNDIR=$(localstatedir)/run
   ASTDBDIR=$(localstatedir)/db/asterisk
 else
   ASTVARLIBDIR=$(localstatedir)/lib/asterisk
@@ -248,9 +248,11 @@
   _ASTCFLAGS+=-isystem /usr/local/include
 endif
 
+ifneq ($(OSARCH),FreeBSD)
 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)
 endif
+endif
 
 ifeq ($(PROC),ppc)
   _ASTCFLAGS+=-fsigned-char
@@ -258,7 +260,7 @@
 
 ifeq ($(OSARCH),FreeBSD)
   # -V is understood by BSD Make, not by GNU make.
-  BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk)
+  BSDVERSION=$(OSVERSION)
   _ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)
 endif
 
@@ -467,21 +469,21 @@
 # Should static HTTP be installed during make samples or even with its own target ala
 # webvoicemail?  There are portions here that *could* be customized but might also be
 # improved a lot.  I'll put it here for now.
-	mkdir -p $(DESTDIR)$(ASTDATADIR)/static-http
+	$(MKDIR) $(DESTDIR)$(ASTDATADIR)/static-http
 	for x in static-http/*; do \
-		$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/static-http ; \
+		$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTDATADIR)/static-http ; \
 	done
 	if [ -d doc/tex/asterisk ] ; then \
-			mkdir -p $(DESTDIR)$(ASTDATADIR)/static-http/docs ; \
+			$(MKDIR) $(DESTDIR)$(DOCSDIR) ; \
 			for n in doc/tex/asterisk/* ; do \
-				$(INSTALL) -m 644 $$n $(DESTDIR)$(ASTDATADIR)/static-http/docs ; \
+				$(BSD_INSTALL_DATA) $$n $(DESTDIR)$(DOCSDIR) ; \
 			done \
 	fi
-	mkdir -p $(DESTDIR)$(ASTDATADIR)/images
+	$(MKDIR) $(DESTDIR)$(DOCSDIR)/images
 	for x in images/*.jpg; do \
-		$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/images ; \
+		$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(DOCSDIR)/images ; \
 	done
-	mkdir -p $(DESTDIR)$(AGI_DIR)
+	$(MKDIR) $(DESTDIR)$(AGI_DIR)
 	$(MAKE) -C sounds install
 
 update: 
@@ -505,47 +507,47 @@
 OLDHEADERS=$(filter-out $(NEWHEADERS),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h)))
 
 installdirs:
-	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
+	$(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
 
 bininstall: _all installdirs $(SUBDIRS_INSTALL)
-	$(INSTALL) -m 755 main/asterisk $(DESTDIR)$(ASTSBINDIR)/
+	$(BSD_INSTALL_PROGRAM) main/asterisk $(DESTDIR)$(ASTSBINDIR)/
 	$(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;\
+		cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > contrib/scripts/safe_asterisk.out;\
+		 ${BSD_INSTALL_SCRIPT} contrib/scripts/safe_asterisk.out $(DESTDIR)$(ASTSBINDIR)/safe_asterisk;\
 	fi
-	$(INSTALL) -d $(DESTDIR)$(ASTHEADERDIR)
-	$(INSTALL) -m 644 include/asterisk.h $(DESTDIR)$(includedir)
-	$(INSTALL) -m 644 include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR)
+	$(MKDIR) $(DESTDIR)$(ASTHEADERDIR)
+	$(BSD_INSTALL_DATA) include/asterisk.h $(DESTDIR)$(includedir)
+	$(BSD_INSTALL_DATA) include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR)
 	if [ -n "$(OLDHEADERS)" ]; then \
 		rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\
 	fi
-	mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv
-	mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-custom
-	mkdir -p $(DESTDIR)$(ASTDATADIR)/keys
-	mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware
-	mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware/iax
-	mkdir -p $(DESTDIR)$(ASTMANDIR)/man8
-	$(INSTALL) -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys
-	$(INSTALL) -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTDATADIR)/keys
-	$(INSTALL) -m 644 doc/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)$(ASTLOGDIR)/cdr-csv
+	$(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-custom
+	$(MKDIR) $(DESTDIR)$(ASTDATADIR)/keys
+	$(MKDIR) $(DESTDIR)$(ASTDATADIR)/firmware
+	$(MKDIR) $(DESTDIR)$(ASTDATADIR)/firmware/iax
+	$(MKDIR) $(DESTDIR)$(ASTMANDIR)/man8
+	$(BSD_INSTALL_DATA) keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys
+	$(BSD_INSTALL_DATA) keys/freeworlddialup.pub $(DESTDIR)$(ASTDATADIR)/keys
+	$(BSD_INSTALL_MAN) doc/asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
+	$(BSD_INSTALL_MAN) contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8
+	$(BSD_INSTALL_MAN) contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8
+	$(BSD_INSTALL_MAN) contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
 	if [ -f contrib/firmware/iax/iaxy.bin ] ; then \
-		$(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin; \
+		$(BSD_INSTALL_DATA) contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin; \
 	fi
 
 $(SUBDIRS_INSTALL):
@@ -579,7 +581,7 @@
 	@exit 1
 endif
 
-install: badshell datafiles bininstall
+install: badshell datafiles bininstall samples
 	@if [ -x /usr/sbin/asterisk-post-install ]; then \
 		/usr/sbin/asterisk-post-install $(DESTDIR) . ; \
 	fi
@@ -611,38 +613,25 @@
 # XXX why *.adsi is installed first ?
 adsi:
 	@echo Installing adsi config files...
-	@mkdir -p $(DESTDIR)$(ASTETCDIR)
+	@$(MKDIR) $(DESTDIR)$(ASTETCDIR)
 	@for x in configs/*.adsi; do \
 		dst="$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`" ; \
 		if [ -f $${dst} ] ; then \
-			echo "Overwriting $$x" ; \
-		else \
-			echo "Installing $$x" ; \
+			$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x` ; \
 		fi ; \
-		$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x` ; \
+		$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`-dist ; \
 	done
 
 samples: adsi
 	@echo Installing other config files...
-	@mkdir -p $(DESTDIR)$(ASTETCDIR)
+	@$(MKDIR) $(DESTDIR)$(ASTETCDIR)
 	@for x in configs/*.sample; do \
-		dst="$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`" ;	\
-		if [ -f $${dst} ]; then \
-			if [ "$(OVERWRITE)" = "y" ]; then \
-				if cmp -s $${dst} $$x ; then \
-					echo "Config file $$x is unchanged"; \
-					continue; \
-				fi ; \
-				mv -f $${dst} $${dst}.old ; \
-			else \
-				echo "Skipping config file $$x"; \
-				continue; \
-			fi ;\
+		$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`-dist ;\
+		if [ ! -f $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` ]; then \
+			$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`;\
 		fi ; \
-		echo "Installing file $$x"; \
-		$(INSTALL) -m 644 $$x $${dst} ;\
 	done
-	@if [ "$(OVERWRITE)" = "y" ] || [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; then \
+	@if true; then \
 		echo "Creating asterisk.conf"; \
 		( \
 		echo "[directories](!) ; remove the (!) to enable this" ; \
@@ -698,13 +687,16 @@
 		echo "pbx_realtime=1.6" ; \
 		echo "res_agi=1.6" ; \
 		echo "app_set=1.6" ; \
-		) > $(DESTDIR)$(ASTCONFPATH) ; \
+		) > $(DESTDIR)$(ASTCONFPATH)-dist ; \
+		if [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; then \
+			$(BSD_INSTALL_DATA) $(DESTDIR)$(ASTCONFPATH)-dist $(DESTDIR)$(ASTCONFPATH); \
+		fi; \
 	else \
 		echo "Skipping asterisk.conf creation"; \
 	fi
-	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
+	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
 	build_tools/make_sample_voicemail $(DESTDIR)/$(ASTDATADIR) $(DESTDIR)/$(ASTSPOOLDIR)
-	@mkdir -p $(DESTDIR)$(ASTDATADIR)/phoneprov
+	@$(MKDIR) $(DESTDIR)$(ASTDATADIR)/phoneprov
 	@for x in phoneprov/*; do \
 		dst="$(DESTDIR)$(ASTDATADIR)/$$x" ;	\
 		if [ -f $${dst} ]; then \
@@ -720,14 +712,14 @@
 			fi ;\
 		fi ; \
 		echo "Installing file $$x"; \
-		$(INSTALL) -m 644 $$x $${dst} ;\
+		$(BSD_INSTALL_DATA) $$x $${dst} ;\
 	done
 
 webvmail:
 	@[ -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/; \
 	done




--- Makefile.orig	2010-06-10 22:35:06.000000000 +0200
+++ Makefile	2010-09-21 13:17:37.000000000 +0200
@@ -121,7 +121,7 @@
 OVERWRITE=y
 
 # Include debug and macro symbols in the executables (-g) and profiling info (-pg)
-DEBUG=-g3
+#DEBUG=-g3
 
 
 # Define standard directories for various platforms
@@ -149,7 +149,7 @@
   ASTMANDIR=$(mandir)
 ifneq ($(findstring BSD,$(OSARCH)),)
   ASTVARLIBDIR=$(prefix)/share/asterisk
-  ASTVARRUNDIR=$(localstatedir)/run/asterisk
+  ASTVARRUNDIR=$(localstatedir)/run
   ASTDBDIR=$(localstatedir)/db/asterisk
 else
   ASTVARLIBDIR=$(localstatedir)/lib/asterisk
@@ -248,12 +248,13 @@
 ifneq ($(findstring BSD,$(OSARCH)),)
   _ASTCFLAGS+=-isystem /usr/local/include
 endif
-
+ifneq ($(OSARCH),FreeBSD)
 ifeq ($(findstring -march,$(_ASTCFLAGS) $(ASTCFLAGS)),)
   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)
   endif
 endif
+endif
 
 ifeq ($(PROC),ppc)
   _ASTCFLAGS+=-fsigned-char
@@ -261,7 +262,7 @@
 
 ifeq ($(OSARCH),FreeBSD)
   # -V is understood by BSD Make, not by GNU make.
-  BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk)
+  BSDVERSION=$(OSVERSION)
   _ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)
 endif
 
@@ -478,21 +479,23 @@
 # Should static HTTP be installed during make samples or even with its own target ala
 # webvoicemail?  There are portions here that *could* be customized but might also be
 # improved a lot.  I'll put it here for now.
-	mkdir -p $(DESTDIR)$(ASTDATADIR)/static-http
+	$(MKDIR) $(DESTDIR)$(ASTDATADIR)/static-http
 	for x in static-http/*; do \
-		$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/static-http ; \
+		$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTDATADIR)/static-http ; \
 	done
 	if [ -d doc/tex/asterisk ] ; then \
-			mkdir -p $(DESTDIR)$(ASTDATADIR)/static-http/docs ; \
+			$(MKDIR) $(DESTDIR)$(DOCSDIR) ; \
 			for n in doc/tex/asterisk/* ; do \
-				$(INSTALL) -m 644 $$n $(DESTDIR)$(ASTDATADIR)/static-http/docs ; \
+				$(BSD_INSTALL_DATA) $$n $(DESTDIR)$(DOCSDIR) ; \
 			done \
 	fi
-	mkdir -p $(DESTDIR)$(ASTDATADIR)/images
+	if [ ! -d $(DESTDIR)$(DOCSDIR)/images ]; then \
+	    $(MKDIR) $(DESTDIR)$(DOCSDIR)/images; \
+	fi
 	for x in images/*.jpg; do \
-		$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/images ; \
+		$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(DOCSDIR)/images ; \
 	done
-	mkdir -p $(DESTDIR)$(AGI_DIR)
+	$(MKDIR) $(DESTDIR)$(AGI_DIR)
 	$(MAKE) -C sounds install
 
 doc/core-en_US.xml: $(foreach dir,$(MOD_SUBDIRS),$(shell $(GREP) -l "language=\"en_US\"" $(dir)/*.c $(dir)/*.cc 2>/dev/null))
@@ -539,50 +542,51 @@
 OLDHEADERS=$(filter-out $(NEWHEADERS),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h)))
 
 installdirs:
-	mkdir -p $(DESTDIR)$(MODULES_DIR)
-	mkdir -p $(DESTDIR)$(ASTSBINDIR)
-	mkdir -p $(DESTDIR)$(ASTETCDIR)
-	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
+	$(MKDIR) $(DESTDIR)$(MODULES_DIR)
+	$(MKDIR) $(DESTDIR)$(ASTSBINDIR)
+	$(MKDIR) $(DESTDIR)$(ASTETCDIR)
+	$(MKDIR) $(DESTDIR)$(ASTVARRUNDIR)
+	$(MKDIR) $(DESTDIR)$(ASTDBDIR)
+	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail
+	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/dictate
+	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/system
+	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/tmp
+	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/meetme
+	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/monitor
 
 bininstall: _all installdirs $(SUBDIRS_INSTALL)
-	$(INSTALL) -m 755 main/asterisk $(DESTDIR)$(ASTSBINDIR)/
+	$(BSD_INSTALL_PROGRAM) main/asterisk $(DESTDIR)$(ASTSBINDIR)/
 	$(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;\
+		cat contrib/scripts/safe_asterisk | sed 's|__ASTERISK_SBIN_DIR__|$(ASTSBINDIR)|;s|__ASTERISK_VARRUN_DIR__|$(ASTVARRUNDIR)|;' > contrib/scripts/safe_asterisk.out;\
+		${BSD_INSTALL_SCRIPT} contrib/scripts/safe_asterisk.out $(DESTDIR)$(ASTSBINDIR)/safe_asterisk;\
 	fi
-	$(INSTALL) -d $(DESTDIR)$(ASTHEADERDIR)
-	$(INSTALL) -m 644 include/asterisk.h $(DESTDIR)$(includedir)
-	$(INSTALL) -m 644 include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR)
+	$(MKDIR) $(DESTDIR)$(ASTHEADERDIR)
+	$(BSD_INSTALL_DATA) include/asterisk.h $(DESTDIR)$(includedir)
+	$(BSD_INSTALL_DATA) include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR)
 	if [ -n "$(OLDHEADERS)" ]; then \
 		rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\
 	fi
-	mkdir -p $(DESTDIR)$(ASTDATADIR)/documentation
-	mkdir -p $(DESTDIR)$(ASTDATADIR)/documentation/thirdparty
-	mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv
-	mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-custom
-	mkdir -p $(DESTDIR)$(ASTDATADIR)/keys
-	mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware
-	mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware/iax
-	mkdir -p $(DESTDIR)$(ASTMANDIR)/man8
-	$(INSTALL) -m 644 doc/core-*.xml $(DESTDIR)$(ASTDATADIR)/documentation
-	$(INSTALL) -m 644 doc/appdocsxml.dtd $(DESTDIR)$(ASTDATADIR)/documentation
-	$(INSTALL) -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys
-	$(INSTALL) -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTDATADIR)/keys
-	$(INSTALL) -m 644 doc/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)$(ASTDATADIR)/documentation
+	$(MKDIR) $(DESTDIR)$(ASTDATADIR)/documentation/thirdparty
+	$(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-csv
+	$(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-custom
+	$(MKDIR) $(DESTDIR)$(ASTDATADIR)/keys
+	$(MKDIR) $(DESTDIR)$(ASTDATADIR)/firmware
+	$(MKDIR) $(DESTDIR)$(ASTDATADIR)/firmware/iax
+	$(MKDIR) $(DESTDIR)$(ASTMANDIR)/man8
+	$(BSD_INSTALL_DATA) doc/core-*.xml $(DESTDIR)$(ASTDATADIR)/documentation
+	$(BSD_INSTALL_DATA) doc/appdocsxml.dtd $(DESTDIR)$(ASTDATADIR)/documentation
+	$(BSD_INSTALL_DATA) keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys
+	$(BSD_INSTALL_DATA) keys/freeworlddialup.pub $(DESTDIR)$(ASTDATADIR)/keys
+	$(BSD_INSTALL_MAN) doc/asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
+	$(BSD_INSTALL_MAN) contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8
+	$(BSD_INSTALL_MAN) contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8
+	$(BSD_INSTALL_MAN) contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
 	if [ -f contrib/firmware/iax/iaxy.bin ] ; then \
-		$(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin; \
+		$(BSD_INSTALL_DATA) contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin; \
 	fi
 
 $(SUBDIRS_INSTALL):
@@ -616,7 +620,7 @@
 	@exit 1
 endif
 
-install: badshell datafiles bininstall
+install: badshell datafiles bininstall samples
 	@if [ -x /usr/sbin/asterisk-post-install ]; then \
 		/usr/sbin/asterisk-post-install $(DESTDIR) . ; \
 	fi
@@ -650,38 +654,25 @@
 # XXX why *.adsi is installed first ?
 adsi:
 	@echo Installing adsi config files...
-	@mkdir -p $(DESTDIR)$(ASTETCDIR)
+	@$(MKDIR) $(DESTDIR)$(ASTETCDIR)
 	@for x in configs/*.adsi; do \
 		dst="$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`" ; \
 		if [ -f $${dst} ] ; then \
-			echo "Overwriting $$x" ; \
-		else \
-			echo "Installing $$x" ; \
+		    $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x` ; \
 		fi ; \
-		$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x` ; \
+		$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`-dist ; \
 	done
 
 samples: adsi
 	@echo Installing other config files...
-	@mkdir -p $(DESTDIR)$(ASTETCDIR)
+	@$(MKDIR) $(DESTDIR)$(ASTETCDIR)
 	@for x in configs/*.sample; do \
-		dst="$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`" ;	\
-		if [ -f $${dst} ]; then \
-			if [ "$(OVERWRITE)" = "y" ]; then \
-				if cmp -s $${dst} $$x ; then \
-					echo "Config file $$x is unchanged"; \
-					continue; \
-				fi ; \
-				mv -f $${dst} $${dst}.old ; \
-			else \
-				echo "Skipping config file $$x"; \
-				continue; \
-			fi ;\
+		$(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`-dist ; \
+		if [ ! -f $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` ]; then \
+		    $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`; \
 		fi ; \
-		echo "Installing file $$x"; \
-		$(INSTALL) -m 644 $$x $${dst} ;\
 	done
-	@if [ "$(OVERWRITE)" = "y" ] || [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; then \
+	@if true; then \
 		echo "Creating asterisk.conf"; \
 		( \
 		echo "[directories](!) ; remove the (!) to enable this" ; \
@@ -745,14 +736,17 @@
 		echo "pbx_realtime=1.6" ; \
 		echo "res_agi=1.6" ; \
 		echo "app_set=1.6" ; \
-		) > $(DESTDIR)$(ASTCONFPATH) ; \
+		) > $(DESTDIR)$(ASTCONFPATH)-dist ; \
+		if [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; then \
+		    $(BSD_INSTALL_DATA) $(DESTDIR)$(ASTCONFPATH)-dist $(DESTDIR)$(ASTCONFPATH); \
+		fi; \
 	else \
 		echo "Skipping asterisk.conf creation"; \
 	fi
-	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
+	$(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
 	build_tools/make_sample_voicemail $(DESTDIR)/$(ASTDATADIR) $(DESTDIR)/$(ASTSPOOLDIR)
-	@mkdir -p $(DESTDIR)$(ASTDATADIR)/phoneprov
-	@for x in phoneprov/*; do \
+	@$(MKDIR) $(DESTDIR)$(ASTDATADIR)/phoneprov
+	for x in phoneprov/*; do \
 		dst="$(DESTDIR)$(ASTDATADIR)/$$x" ;	\
 		if [ -f $${dst} ]; then \
 			if [ "$(OVERWRITE)" = "y" ]; then \
@@ -767,14 +761,14 @@
 			fi ;\
 		fi ; \
 		echo "Installing file $$x"; \
-		$(INSTALL) -m 644 $$x $${dst} ;\
+		$(BSD_INSTALL_DATA) $$x $${dst} ;\
 	done
 
 webvmail:
 	@[ -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/; \
 	done




--- Makefile.rules.orig	2010-05-05 15:59:28.000000000 +0600
+++ Makefile.rules	2010-05-05 15:26:04.000000000 +0600
@@ -43,6 +43,10 @@
   endif
+++ Makefile.rules
@@ -35,7 +35,9 @@
     CMD_PREFIX=
 endif
 
+ifneq ($(OSARCH),FreeBSD)
+ OPTIMIZE?=-O6
+endif
+
 ifeq ($(findstring DONT_OPTIMIZE,$(MENUSELECT_CFLAGS)),)
     _ASTCFLAGS+=$(OPTIMIZE)
 else





$FreeBSD: ports/net/asterisk16/files/patch-Makefile.rules,v 1.3 2009/08/02 19:34:55 mezz Exp $

--- Makefile.rules
+++ Makefile.rules
@@ -35,7 +35,9 @@
     CMD_PREFIX=
 endif
 
+ifneq ($(OSARCH),FreeBSD)
 OPTIMIZE?=-O6
+endif
 
 ifeq ($(findstring DONT_OPTIMIZE,$(MENUSELECT_CFLAGS)),)
     # More GSM codec optimization





$FreeBSD: ports/net/asterisk16/files/patch-agi::Makefile,v 1.10 2009/08/02 19:34:55 mezz Exp $

--- agi/Makefile
+++ agi/Makefile
@@ -13,7 +13,9 @@
 
 .PHONY: clean all uninstall
 
-AGIS=agi-test.agi eagi-test eagi-sphinx-test jukebox.agi
+AGIS_BIN=eagi-test eagi-sphinx-test
+AGIS_SCR=agi-test.agi jukebox.agi
+AGIS=$(AGIS_SCR) $(AGIS_BIN)
 
 ifeq ($(OSARCH),SunOS)
   LIBS+=-lsocket -lnsl
@@ -40,8 +42,9 @@
 eagi-sphinx-test: eagi-sphinx-test.o
 
 install: all
-	mkdir -p $(DESTDIR)$(AGI_DIR)
-	for x in $(AGIS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(AGI_DIR) ; done
+	$(MKDIR) -p $(DESTDIR)$(AGI_DIR)
+	for x in $(AGIS_BIN); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(AGI_DIR) ; done
+	for x in $(AGIS_SCR); do $(BSD_INSTALL_SCRIPT) $$x $(DESTDIR)$(AGI_DIR) ; done
 
 uninstall:
 	for x in $(AGIS); do rm -f $(DESTDIR)$(AGI_DIR)/$$x ; done




--- channels/chan_dahdi.c.orig	2010-05-05 17:50:15.000000000 +0600
+++ channels/chan_dahdi.c	2010-05-05 17:50:09.000000000 +0600
@@ -2672,13 +2672,17 @@
 		return;
 	}
 	if (p->echocancel.head.tap_length) {

 				ast_log(LOG_WARNING, "Unable to enable audio mode on channel %d (%s)\n", p->channel, strerror(errno));
 		}
-		res = ioctl(p->subs[SUB_REAL].dfd, DAHDI_ECHOCANCEL_PARAMS, &p->echocancel);
+		
+		pecp = &p->echocancel.head;
+		res = ioctl(p->subs[SUB_REAL].dfd, DAHDI_ECHOCANCEL_PARAMS, &pecp);
 		if (res) {
 			ast_log(LOG_WARNING, "Unable to enable echo cancellation on channel %d (%s)\n", p->channel, strerror(errno));
 		} else {
@@ -2712,8 +2716,9 @@
 
 	if (p->echocanon) {
 		struct dahdi_echocanparams ecp = { .tap_length = 0 };




--- channels/Makefile.orig	2010-05-05 17:57:22.000000000 +0600
+++ channels/Makefile	2010-05-05 18:01:58.000000000 +0600

--- channels/Makefile.orig
+++ channels/Makefile
@@ -27,9 +27,10 @@
 endif
 

 chan_h323.so: chan_h323.o h323/libchanh323.a
 	$(ECHO_PREFIX) echo "   [LD] $^ -> $@"
+ifeq ($(OSARCH),FreeBSD)
+	$(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) -L$(LOCALBASE)/lib $(H323LDFLAGS) -o $@ $< h323/libchanh323.a $(H323LDLIBS) $(CHANH323LIB)
+else
 	$(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(_ASTLDFLAGS) $(ASTLDFLAGS) $(SOLINK) -o $@ $< h323/libchanh323.a $(CHANH323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L$(OPENH323DIR)/lib $(H323LIB) -L/usr/lib -lcrypto -lssl -lexpat
 endif
 endif
+endif





$FreeBSD: ports/net/asterisk16/files/patch-channels::Makefile,v 1.18 2009/09/10 09:25:25 sobomax Exp $

--- channels/Makefile.orig
+++ channels/Makefile
@@ -27,9 +27,10 @@
 endif
 
 ifeq ($(OSARCH),FreeBSD)
-  PTLIB=-lpt_FreeBSD_x86_r
-  H323LIB=-lh323_FreeBSD_x86_r
+  PTLIB=-lpt_r
+  H323LIB=-lh323_r
   CHANH323LIB=-pthread
+  H323LDLIBS=$(PTLIB) $(H323LIB) $(CHANH323LIB)
 endif
 
 ifeq ($(OSARCH),NetBSD)
@@ -80,9 +81,13 @@
 else
 chan_h323.so: chan_h323.o h323/libchanh323.a
 	$(ECHO_PREFIX) echo "   [LD] $^ -> $@"
+ifeq ($(OSARCH),FreeBSD)
+	$(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) -L$(PREFIX)/lib $(H323LDFLAGS) -o $@ $< h323/libchanh323.a $(H323LDLIBS) $(CHANH323LIB)
+else
 	$(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) -o $@ $< h323/libchanh323.a $(CHANH323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L$(OPENH323DIR)/lib $(H323LIB) -L/usr/lib -lcrypto -lssl -lexpat
 endif
 endif
+endif
 
 chan_misdn.o: _ASTCFLAGS+=-Imisdn
 




--- channels/chan_sip.c.orig	2010-05-28 23:57:40.000000000 +0600
+++ channels/chan_sip.c	2010-08-11 10:47:07.000000000 +0600
@@ -980,7 +980,7 @@
 #define DEFAULT_MOHINTERPRET    "default"	/*!< The default music class */
+++ channels/chan_sip.c
@@ -611,7 +611,7 @@
 #define DEFAULT_MOHINTERPRET    "default"
 #define DEFAULT_MOHSUGGEST      ""
 #define DEFAULT_VMEXTEN 	"asterisk"	/*!< Default voicemail extension */
-#define DEFAULT_CALLERID 	"asterisk"	/*!< Default caller ID */
+#define DEFAULT_CALLERID 	"Unknown"	/*!< Default caller ID */
 #define DEFAULT_NOTIFYMIME 	"application/simple-message-summary"
 #define DEFAULT_ALLOWGUEST	TRUE
 #define DEFAULT_RTPKEEPALIVE	0		/*!< Default RTPkeepalive setting */

Lines 1-18 Link Here

(-)/usr/ports/net/asterisk16/files/patch-configure (-10 / +8 lines)
1		1	--- ./configure.orig 2010-07-17 23:43:50.000000000 +0600
2	$FreeBSD: ports/net/asterisk16/files/patch-configure,v 1.8 2010/01/29 10:32:17 sobomax Exp $	2	+++ ./configure 2010-08-24 09:37:46.000000000 +0600
3		3	@@ -4147,9 +4147,6 @@
4	--- configure.orig	4
5	+++ configure
6	@@ -4432,8 +4432,6 @@
7	case "${host_os}" in	5	case "${host_os}" in
8	freebsd*)	6	freebsd*)
9	ac_default_prefix=/usr/local	7	-
10	- CPPFLAGS=-I/usr/local/include	8	- CPPFLAGS=-I/usr/local/include
11	- LDFLAGS=-L/usr/local/lib	9	- LDFLAGS=-L/usr/local/lib
12	;;	10	;;
		11	openbsd*)
13		12
14	darwin*)	13	@@ -34755,7 +34752,7 @@
15	@@ -18784,7 +18782,7 @@
16		14
17	fi	15	fi
18		16
Lines 20-23 Link Here
20	+ PLATFORM_OPENH323="h323_${OPENH323_SUFFIX}"	18	+ PLATFORM_OPENH323="h323_${OPENH323_SUFFIX}"
21		19
22	if test "${HAS_OPENH323:-unset}" != "unset"; then	20	if test "${HAS_OPENH323:-unset}" != "unset"; then
23	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking OpenH323 installation validity" >&5	21	{ echo "$as_me:$LINENO: checking OpenH323 installation validity" >&5





$FreeBSD: ports/net/asterisk16/files/patch-main::Makefile,v 1.8 2009/11/20 23:43:09 sobomax Exp $

--- main/Makefile.orig
+++ main/Makefile
@@ -101,8 +101,8 @@
 	cd editline && test -f config.h || CFLAGS="$(PTHREAD_CFLAGS) $(subst $(ASTTOPDIR),../../,$(_ASTCFLAGS:-Werror=) $(ASTCFLAGS))" LDFLAGS="$(ASTLDFLAGS)" ./configure --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --with-ncurses=$(NCURSES_DIR) --with-curses=$(CURSES_DIR) --with-termcap=$(TERMCAP_DIR) --with-tinfo=$(TINFO_DIR)
 	$(MAKE) -C editline libedit.a
 
-db1-ast/libdb1.a: CHECK_SUBDIR
-	_ASTCFLAGS="$(_ASTCFLAGS)" ASTCFLAGS="$(ASTCFLAGS) -Wno-strict-aliasing" $(MAKE) -C db1-ast libdb1.a
+#db1-ast/libdb1.a: CHECK_SUBDIR
+#	_ASTCFLAGS="$(_ASTCFLAGS)" ASTCFLAGS="$(ASTCFLAGS) -Wno-strict-aliasing" $(MAKE) -C db1-ast libdb1.a
 
 ast_expr2.c ast_expr2.h:
 	bison -o $@ -d --name-prefix=ast_yy ast_expr2.y
@@ -159,13 +159,13 @@
 GMIMELDFLAGS+=$(GMIME_LIB)
 endif
 
-$(MAIN_TGT): $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS)
+$(MAIN_TGT): $(OBJS) editline/libedit.a $(AST_EMBED_LDSCRIPTS)
 	@$(CC) -c -o buildinfo.o $(_ASTCFLAGS) buildinfo.c $(ASTCFLAGS)
 	$(ECHO_PREFIX) echo "   [LD] $^ -> $@"
 ifneq ($(findstring chan_h323,$(MENUSELECT_CHANNELS)),)
-	$(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS)
+	$(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(LDFLAGS) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS)
 else
-	$(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS)
+	$(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(LDFLAGS) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS)
 endif
 	$(CMD_PREFIX) $(ASTTOPDIR)/build_tools/strip_nonapi $@ || rm $@
 





$FreeBSD: ports/net/asterisk16/files/patch-main::Makefile,v 1.8 2009/11/20 23:43:09 sobomax Exp $

--- main/Makefile.orig
+++ main/Makefile
@@ -101,8 +101,8 @@
 	cd editline && test -f config.h || CFLAGS="$(PTHREAD_CFLAGS) $(subst $(ASTTOPDIR),../../,$(_ASTCFLAGS:-Werror=) $(ASTCFLAGS))" LDFLAGS="$(ASTLDFLAGS)" ./configure --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --with-ncurses=$(NCURSES_DIR) --with-curses=$(CURSES_DIR) --with-termcap=$(TERMCAP_DIR) --with-tinfo=$(TINFO_DIR)
 	$(MAKE) -C editline libedit.a
 
-db1-ast/libdb1.a: CHECK_SUBDIR
-	_ASTCFLAGS="$(_ASTCFLAGS)" ASTCFLAGS="$(ASTCFLAGS) -Wno-strict-aliasing" $(MAKE) -C db1-ast libdb1.a
+#db1-ast/libdb1.a: CHECK_SUBDIR
+#	_ASTCFLAGS="$(_ASTCFLAGS)" ASTCFLAGS="$(ASTCFLAGS) -Wno-strict-aliasing" $(MAKE) -C db1-ast libdb1.a
 
 ast_expr2.c ast_expr2.h:
 	bison -o $@ -d --name-prefix=ast_yy ast_expr2.y
@@ -159,13 +159,13 @@
 GMIMELDFLAGS+=$(GMIME_LIB)
 endif
 
-$(MAIN_TGT): $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS)
+$(MAIN_TGT): $(OBJS) editline/libedit.a $(AST_EMBED_LDSCRIPTS)
 	@$(CC) -c -o buildinfo.o $(_ASTCFLAGS) buildinfo.c $(ASTCFLAGS)
 	$(ECHO_PREFIX) echo "   [LD] $^ -> $@"
 ifneq ($(findstring chan_h323,$(MENUSELECT_CHANNELS)),)
-	$(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS)
+	$(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(LDFLAGS) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS)
 else
-	$(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS)
+	$(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(LDFLAGS) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS)
 endif
 	$(CMD_PREFIX) $(ASTTOPDIR)/build_tools/strip_nonapi $@ || rm $@
 




--- ./main/Makefile.orig	2010-06-26 00:58:37.000000000 +0600
+++ ./main/Makefile	2010-08-24 09:40:39.000000000 +0600
@@ -113,8 +113,8 @@
 	cd editline && test -f config.h || CFLAGS="$(PTHREAD_CFLAGS) $(subst $(ASTTOPDIR),../../,$(_ASTCFLAGS:-Werror=) $(ASTCFLAGS))" LDFLAGS="$(_ASTLDFLAGS) $(ASTLDFLAGS)" ./configure --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --with-ncurses=$(NCURSES_DIR) --with-curses=$(CURSES_DIR) --with-termcap=$(TERMCAP_DIR) --with-tinfo=$(TINFO_DIR)
 	$(MAKE) -C editline libedit.a
 
-db1-ast/libdb1.a: CHECK_SUBDIR
-	_ASTCFLAGS="$(_ASTCFLAGS) -Wno-strict-aliasing" ASTCFLAGS="$(ASTCFLAGS)" $(MAKE) -C db1-ast libdb1.a
+#db1-ast/libdb1.a: CHECK_SUBDIR
+#	_ASTCFLAGS="$(_ASTCFLAGS) -Wno-strict-aliasing" ASTCFLAGS="$(ASTCFLAGS)" $(MAKE) -C db1-ast libdb1.a
 
 ifneq ($(findstring REBUILD_PARSERS,$(MENUSELECT_CFLAGS)),)
 ast_expr2.c ast_expr2.h: ast_expr2.y
@@ -177,13 +177,13 @@
 GMIMELDFLAGS+=$(GMIME_LIB)
 endif
 
-$(MAIN_TGT): $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS)
+$(MAIN_TGT): $(OBJS) editline/libedit.a $(AST_EMBED_LDSCRIPTS)
 	@$(CC) -c -o buildinfo.o $(_ASTCFLAGS) buildinfo.c $(ASTCFLAGS)
 	$(ECHO_PREFIX) echo "   [LD] $^ -> $@"
 ifneq ($(findstring chan_h323,$(MENUSELECT_CHANNELS)),)
-	$(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS)
+	$(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(LDFLAGS) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS)
 else
-	$(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS)
+	$(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(LDFLAGS) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS)
 endif
 	$(CMD_PREFIX) $(ASTTOPDIR)/build_tools/strip_nonapi $@ || rm $@
 

Lines 1-11 Link Here

(-)/usr/ports/net/asterisk16/pkg-plist (-8 / +102 lines)
		1	@unexec if cmp -s %D/etc/asterisk/ais.conf %D/etc/asterisk/ais.conf-dist; then rm -f %D/etc/asterisk/ais.conf; fi
		2	etc/asterisk/ais.conf-dist
1	@unexec if cmp -s %D/etc/asterisk/cdr_adaptive_odbc.conf %D/etc/asterisk/cdr_adaptive_odbc.conf-dist; then rm -f %D/etc/asterisk/cdr_adaptive_odbc.conf; fi	3	@unexec if cmp -s %D/etc/asterisk/cdr_adaptive_odbc.conf %D/etc/asterisk/cdr_adaptive_odbc.conf-dist; then rm -f %D/etc/asterisk/cdr_adaptive_odbc.conf; fi
2	etc/asterisk/cdr_adaptive_odbc.conf-dist	4	etc/asterisk/cdr_adaptive_odbc.conf-dist
3	@unexec if cmp -s %D/etc/asterisk/cdr_sqlite3_custom.conf %D/etc/asterisk/cdr_sqlite3_custom.conf-dist; then rm -f %D/etc/asterisk/cdr_sqlite3_custom.conf; fi	5	@unexec if cmp -s %D/etc/asterisk/cdr_sqlite3_custom.conf %D/etc/asterisk/cdr_sqlite3_custom.conf-dist; then rm -f %D/etc/asterisk/cdr_sqlite3_custom.conf; fi
4	etc/asterisk/cdr_sqlite3_custom.conf-dist	6	etc/asterisk/cdr_sqlite3_custom.conf-dist
5	@unexec if cmp -s %D/etc/asterisk/cli.conf %D/etc/asterisk/cli.conf-dist; then rm -f %D/etc/asterisk/cli.conf; fi	7	@unexec if cmp -s %D/etc/asterisk/cli.conf %D/etc/asterisk/cli.conf-dist; then rm -f %D/etc/asterisk/cli.conf; fi
6	etc/asterisk/cli.conf-dist	8	etc/asterisk/cli.conf-dist
		9	@unexec if cmp -s %D/etc/asterisk/cli_aliases.conf %D/etc/asterisk/cli_aliases.conf-dist; then rm -f %D/etc/asterisk/cli_aliases.conf; fi
		10	etc/asterisk/cli_aliases.conf-dist
		11	@unexec if cmp -s %D/etc/asterisk/cli_permissions.conf %D/etc/asterisk/cli_permissions.conf-dist; then rm -f %D/etc/asterisk/cli_permissions.conf; fi
		12	etc/asterisk/cli_permissions.conf-dist
7	@unexec if cmp -s %D/etc/asterisk/console.conf %D/etc/asterisk/console.conf-dist; then rm -f %D/etc/asterisk/console.conf; fi	13	@unexec if cmp -s %D/etc/asterisk/console.conf %D/etc/asterisk/console.conf-dist; then rm -f %D/etc/asterisk/console.conf; fi
8	etc/asterisk/console.conf-dist	14	etc/asterisk/console.conf-dist
		15	@unexec if cmp -s %D/etc/asterisk/dbsep.conf %D/etc/asterisk/dbsep.conf-dist; then rm -f %D/etc/asterisk/dbsep.conf; fi
		16	etc/asterisk/dbsep.conf-dist
		17	@unexec if cmp -s %D/etc/asterisk/dsp.conf %D/etc/asterisk/dsp.conf-dist; then rm -f %D/etc/asterisk/dsp.conf; fi
		18	etc/asterisk/dsp.conf-dist
9	@unexec if cmp -s %D/etc/asterisk/extensions.lua %D/etc/asterisk/extensions.lua-dist; then rm -f %D/etc/asterisk/extensions.lua; fi	19	@unexec if cmp -s %D/etc/asterisk/extensions.lua %D/etc/asterisk/extensions.lua-dist; then rm -f %D/etc/asterisk/extensions.lua; fi
10	etc/asterisk/extensions.lua-dist	20	etc/asterisk/extensions.lua-dist
11	@unexec if cmp -s %D/etc/asterisk/extensions_minivm.conf %D/etc/asterisk/extensions_minivm.conf-dist; then rm -f %D/etc/asterisk/extensions_minivm.conf; fi	21	@unexec if cmp -s %D/etc/asterisk/extensions_minivm.conf %D/etc/asterisk/extensions_minivm.conf-dist; then rm -f %D/etc/asterisk/extensions_minivm.conf; fi
Lines 146-151 Link Here
146	etc/asterisk/followme.conf-dist	156	etc/asterisk/followme.conf-dist
147	@unexec if cmp -s %D/etc/asterisk/amd.conf %D/etc/asterisk/amd.conf-dist; then rm -f %D/etc/asterisk/amd.conf; fi	157	@unexec if cmp -s %D/etc/asterisk/amd.conf %D/etc/asterisk/amd.conf-dist; then rm -f %D/etc/asterisk/amd.conf; fi
148	etc/asterisk/amd.conf-dist	158	etc/asterisk/amd.conf-dist
		159	@unexec if cmp -s %D/etc/asterisk/res_config_sqlite.conf %D/etc/asterisk/res_config_sqlite.conf-dist; then rm -f %D/etc/asterisk/res_config_sqlite.conf; fi
		160	etc/asterisk/res_config_sqlite.conf-dist
149	@exec if test ! -e %D/etc/asterisk/cdr_adaptive_odbc.conf; then cp -p %D/etc/asterisk/cdr_adaptive_odbc.conf-dist %D/etc/asterisk/cdr_adaptive_odbc.conf; fi	161	@exec if test ! -e %D/etc/asterisk/cdr_adaptive_odbc.conf; then cp -p %D/etc/asterisk/cdr_adaptive_odbc.conf-dist %D/etc/asterisk/cdr_adaptive_odbc.conf; fi
150	@exec if test ! -e %D/etc/asterisk/cdr_sqlite3_custom.conf; then cp -p %D/etc/asterisk/cdr_sqlite3_custom.conf-dist %D/etc/asterisk/cdr_sqlite3_custom.conf; fi	162	@exec if test ! -e %D/etc/asterisk/cdr_sqlite3_custom.conf; then cp -p %D/etc/asterisk/cdr_sqlite3_custom.conf-dist %D/etc/asterisk/cdr_sqlite3_custom.conf; fi
151	@exec if test ! -e %D/etc/asterisk/cli.conf; then cp -p %D/etc/asterisk/cli.conf-dist %D/etc/asterisk/cli.conf; fi	163	@exec if test ! -e %D/etc/asterisk/cli.conf; then cp -p %D/etc/asterisk/cli.conf-dist %D/etc/asterisk/cli.conf; fi
Lines 250-256 Link Here
250	include/asterisk/astosp.h	262	include/asterisk/astosp.h
251	include/asterisk/audiohook.h	263	include/asterisk/audiohook.h
252	include/asterisk/autoconfig.h	264	include/asterisk/autoconfig.h
		265	include/asterisk/bridging.h
		266	include/asterisk/bridging_features.h
		267	include/asterisk/bridging_technology.h
253	include/asterisk/build.h	268	include/asterisk/build.h
		269	include/asterisk/buildinfo.h
254	include/asterisk/buildopts.h	270	include/asterisk/buildopts.h
255	include/asterisk/callerid.h	271	include/asterisk/callerid.h
256	include/asterisk/causes.h	272	include/asterisk/causes.h
Lines 262-269 Link Here
262	include/asterisk/compiler.h	278	include/asterisk/compiler.h
263	include/asterisk/config.h	279	include/asterisk/config.h
264	include/asterisk/crypto.h	280	include/asterisk/crypto.h
		281	include/asterisk/datastore.h
265	include/asterisk/devicestate.h	282	include/asterisk/devicestate.h
266	include/asterisk/dial.h	283	include/asterisk/dial.h
		284	include/asterisk/dlinkedlists.h
267	include/asterisk/dns.h	285	include/asterisk/dns.h
268	include/asterisk/dnsmgr.h	286	include/asterisk/dnsmgr.h
269	include/asterisk/doxyref.h	287	include/asterisk/doxyref.h
Lines 276-281 Link Here
276	include/asterisk/frame.h	294	include/asterisk/frame.h
277	include/asterisk/fskmodem.h	295	include/asterisk/fskmodem.h
278	include/asterisk/global_datastores.h	296	include/asterisk/global_datastores.h
		297	include/asterisk/heap.h
279	include/asterisk/http.h	298	include/asterisk/http.h
280	include/asterisk/image.h	299	include/asterisk/image.h
281	include/asterisk/indications.h	300	include/asterisk/indications.h
Lines 304-319 Link Here
304	include/asterisk/say.h	323	include/asterisk/say.h
305	include/asterisk/sched.h	324	include/asterisk/sched.h
306	include/asterisk/sha1.h	325	include/asterisk/sha1.h
		326	include/asterisk/slin.h
307	include/asterisk/slinfactory.h	327	include/asterisk/slinfactory.h
308	include/asterisk/smdi.h	328	include/asterisk/smdi.h
309	include/asterisk/speech.h	329	include/asterisk/speech.h
310	include/asterisk/srv.h	330	include/asterisk/srv.h
311	include/asterisk/stringfields.h	331	include/asterisk/stringfields.h
312	include/asterisk/strings.h	332	include/asterisk/strings.h
		333	include/asterisk/taskprocessor.h
313	include/asterisk/tdd.h	334	include/asterisk/tdd.h
314	include/asterisk/term.h	335	include/asterisk/term.h
		336	include/asterisk/test.h
315	include/asterisk/threadstorage.h	337	include/asterisk/threadstorage.h
316	include/asterisk/time.h	338	include/asterisk/time.h
		339	include/asterisk/timing.h
317	include/asterisk/transcap.h	340	include/asterisk/transcap.h
318	include/asterisk/translate.h	341	include/asterisk/translate.h
319	include/asterisk/udptl.h	342	include/asterisk/udptl.h
Lines 321-337 Link Here
321	include/asterisk/unaligned.h	344	include/asterisk/unaligned.h
322	include/asterisk/utils.h	345	include/asterisk/utils.h
323	include/asterisk/version.h	346	include/asterisk/version.h
		347	include/asterisk/xml.h
		348	include/asterisk/xmldoc.h
		349	lib/asterisk/modules/app_confbridge.so
324	lib/asterisk/modules/app_minivm.so	350	lib/asterisk/modules/app_minivm.so
325	lib/asterisk/modules/app_pickupchan.so	351	lib/asterisk/modules/app_originate.so
		352	lib/asterisk/modules/app_playtones.so
326	lib/asterisk/modules/app_readexten.so	353	lib/asterisk/modules/app_readexten.so
327	lib/asterisk/modules/app_waituntil.so	354	lib/asterisk/modules/app_waituntil.so
		355	lib/asterisk/modules/bridge_builtin_features.so
		356	lib/asterisk/modules/bridge_multiplexed.so
		357	lib/asterisk/modules/bridge_simple.so
		358	lib/asterisk/modules/bridge_softmix.so
328	%%WITH_ODBC%%lib/asterisk/modules/cdr_adaptive_odbc.so	359	%%WITH_ODBC%%lib/asterisk/modules/cdr_adaptive_odbc.so
329	%%WITH_JABBER%%lib/asterisk/modules/chan_jingle.so	360	%%WITH_JABBER%%lib/asterisk/modules/chan_jingle.so
		361	lib/asterisk/modules/chan_bridge.so
330	lib/asterisk/modules/chan_unistim.so	362	lib/asterisk/modules/chan_unistim.so
331	lib/asterisk/modules/codec_g722.so	363	lib/asterisk/modules/codec_g722.so
332	lib/asterisk/modules/format_sln16.so	364	lib/asterisk/modules/format_sln16.so
		365	lib/asterisk/modules/format_siren14.so
		366	lib/asterisk/modules/format_siren7.so
		367	lib/asterisk/modules/func_aes.so
333	lib/asterisk/modules/func_audiohookinherit.so	368	lib/asterisk/modules/func_audiohookinherit.so
334	lib/asterisk/modules/func_blacklist.so	369	lib/asterisk/modules/func_blacklist.so
		370	lib/asterisk/modules/func_config.so
335	lib/asterisk/modules/func_devstate.so	371	lib/asterisk/modules/func_devstate.so
336	lib/asterisk/modules/func_dialgroup.so	372	lib/asterisk/modules/func_dialgroup.so
337	lib/asterisk/modules/func_dialplan.so	373	lib/asterisk/modules/func_dialplan.so
Lines 340-356 Link Here
340	lib/asterisk/modules/func_lock.so	376	lib/asterisk/modules/func_lock.so
341	lib/asterisk/modules/func_module.so	377	lib/asterisk/modules/func_module.so
342	lib/asterisk/modules/func_shell.so	378	lib/asterisk/modules/func_shell.so
		379	lib/asterisk/modules/func_speex.so
		380	lib/asterisk/modules/func_sprintf.so
343	lib/asterisk/modules/func_sysinfo.so	381	lib/asterisk/modules/func_sysinfo.so
344	lib/asterisk/modules/func_version.so	382	lib/asterisk/modules/func_version.so
345	lib/asterisk/modules/func_vmcount.so	383	lib/asterisk/modules/func_vmcount.so
346	lib/asterisk/modules/func_volume.so	384	lib/asterisk/modules/func_volume.so
347	lib/asterisk/modules/res_ael_share.so	385	lib/asterisk/modules/res_ael_share.so
		386	lib/asterisk/modules/res_clialiases.so
		387	%%WITH_CURL%%lib/asterisk/modules/res_curl.so
348	%%WITH_CURL%%lib/asterisk/modules/res_config_curl.so	388	%%WITH_CURL%%lib/asterisk/modules/res_config_curl.so
349	lib/asterisk/modules/res_config_ldap.so	389	lib/asterisk/modules/res_config_ldap.so
350	%%WITH_SQLITE%%lib/asterisk/modules/res_config_sqlite.so	390	%%WITH_SQLITE%%lib/asterisk/modules/res_config_sqlite.so
351	lib/asterisk/modules/res_limit.so	391	lib/asterisk/modules/res_limit.so
352	lib/asterisk/modules/res_phoneprov.so	392	lib/asterisk/modules/res_phoneprov.so
353	lib/asterisk/modules/res_realtime.so	393	lib/asterisk/modules/res_realtime.so
		394	%%WITH_DAHDI%%lib/asterisk/modules/res_timing_dahdi.so
		395	lib/asterisk/modules/res_timing_pthread.so
354	lib/asterisk/modules/app_adsiprog.so	396	lib/asterisk/modules/app_adsiprog.so
355	lib/asterisk/modules/app_alarmreceiver.so	397	lib/asterisk/modules/app_alarmreceiver.so
356	lib/asterisk/modules/app_amd.so	398	lib/asterisk/modules/app_amd.so
Lines 481-487 Link Here
481	%%WITH_POSTGRES%%lib/asterisk/modules/res_config_pgsql.so	523	%%WITH_POSTGRES%%lib/asterisk/modules/res_config_pgsql.so
482	lib/asterisk/modules/res_convert.so	524	lib/asterisk/modules/res_convert.so
483	lib/asterisk/modules/res_crypto.so	525	lib/asterisk/modules/res_crypto.so
484	lib/asterisk/modules/res_indications.so
485	%%WITH_JABBER%%lib/asterisk/modules/res_jabber.so	526	%%WITH_JABBER%%lib/asterisk/modules/res_jabber.so
486	lib/asterisk/modules/res_monitor.so	527	lib/asterisk/modules/res_monitor.so
487	lib/asterisk/modules/res_musiconhold.so	528	lib/asterisk/modules/res_musiconhold.so
Lines 498-503 Link Here
498	sbin/astman	539	sbin/astman
499	sbin/autosupport	540	sbin/autosupport
500	sbin/muted	541	sbin/muted
		542	sbin/refcounter
501	sbin/rasterisk	543	sbin/rasterisk
502	sbin/safe_asterisk	544	sbin/safe_asterisk
503	sbin/smsq	545	sbin/smsq
Lines 507-515 Link Here
507	share/asterisk/agi-bin/eagi-sphinx-test	549	share/asterisk/agi-bin/eagi-sphinx-test
508	share/asterisk/agi-bin/eagi-test	550	share/asterisk/agi-bin/eagi-test
509	share/asterisk/agi-bin/jukebox.agi	551	share/asterisk/agi-bin/jukebox.agi
		552	share/asterisk/documentation/appdocsxml.dtd
		553	share/asterisk/documentation/core-en_US.xml
510	share/asterisk/keys/freeworlddialup.pub	554	share/asterisk/keys/freeworlddialup.pub
511	share/asterisk/keys/iaxtel.pub	555	share/asterisk/keys/iaxtel.pub
512	share/asterisk/moh/.asterisk-moh-opsound-wav	556	share/asterisk/moh/.asterisk-moh-opsound-wav-2.03
513	share/asterisk/moh/CHANGES-asterisk-moh-opsound-wav	557	share/asterisk/moh/CHANGES-asterisk-moh-opsound-wav
514	share/asterisk/moh/CREDITS-asterisk-moh-opsound-wav	558	share/asterisk/moh/CREDITS-asterisk-moh-opsound-wav
515	share/asterisk/moh/LICENSE-asterisk-moh-opsound-wav	559	share/asterisk/moh/LICENSE-asterisk-moh-opsound-wav
Lines 522-533 Link Here
522	share/asterisk/phoneprov/000000000000-phone.cfg	566	share/asterisk/phoneprov/000000000000-phone.cfg
523	share/asterisk/phoneprov/000000000000.cfg	567	share/asterisk/phoneprov/000000000000.cfg
524	share/asterisk/phoneprov/polycom.xml	568	share/asterisk/phoneprov/polycom.xml
525	share/asterisk/sounds/.asterisk-core-sounds-en-gsm-1.4.17	569	share/asterisk/phoneprov/polycom_line.xml
526	share/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.17	570	share/asterisk/sounds/.asterisk-core-sounds-en-gsm-1.4.19
		571	share/asterisk/sounds/en/LICENSE-asterisk-core-en-1.4.19
		572	share/asterisk/sounds/en/ascending-2tone.gsm
527	share/asterisk/sounds/en/conf-adminmenu-162.gsm	573	share/asterisk/sounds/en/conf-adminmenu-162.gsm
528	share/asterisk/sounds/en/conf-extended.gsm	574	share/asterisk/sounds/en/conf-extended.gsm
529	share/asterisk/sounds/en/conf-nonextended.gsm	575	share/asterisk/sounds/en/conf-nonextended.gsm
		576	share/asterisk/sounds/en/conf-now-muted.gsm
		577	share/asterisk/sounds/en/conf-now-recording.gsm
		578	share/asterisk/sounds/en/conf-now-unmuted.gsm
		579	share/asterisk/sounds/en/conf-roll-callcomplete.gsm
530	share/asterisk/sounds/en/conf-usermenu-162.gsm	580	share/asterisk/sounds/en/conf-usermenu-162.gsm
		581	share/asterisk/sounds/en/descending-2tone.gsm
531	share/asterisk/sounds/en/spy-dahdi.gsm	582	share/asterisk/sounds/en/spy-dahdi.gsm
532	share/asterisk/sounds/en/vm-Urgent.gsm	583	share/asterisk/sounds/en/vm-Urgent.gsm
533	share/asterisk/sounds/en/vm-forward-multiple.gsm	584	share/asterisk/sounds/en/vm-forward-multiple.gsm
Lines 538-545 Link Here
538	share/asterisk/sounds/en/vm-record-prepend.gsm	589	share/asterisk/sounds/en/vm-record-prepend.gsm
539	share/asterisk/sounds/en/vm-review-nonurgent.gsm	590	share/asterisk/sounds/en/vm-review-nonurgent.gsm
540	share/asterisk/sounds/en/vm-review-urgent.gsm	591	share/asterisk/sounds/en/vm-review-urgent.gsm
541	share/asterisk/sounds/en/CHANGES-asterisk-core-en-1.4.17	592	share/asterisk/sounds/en/CHANGES-asterisk-core-en-1.4.19
542	share/asterisk/sounds/en/CREDITS-asterisk-core-en-1.4.17	593	share/asterisk/sounds/en/CREDITS-asterisk-core-en-1.4.19
543	share/asterisk/sounds/en/dir-usingkeypad.gsm	594	share/asterisk/sounds/en/dir-usingkeypad.gsm
544	share/asterisk/sounds/en/dir-welcome.gsm	595	share/asterisk/sounds/en/dir-welcome.gsm
545	share/asterisk/sounds/en/agent-alreadyon.gsm	596	share/asterisk/sounds/en/agent-alreadyon.gsm
Lines 633-638 Link Here
633	share/asterisk/sounds/en/digits/90.gsm	684	share/asterisk/sounds/en/digits/90.gsm
634	share/asterisk/sounds/en/digits/a-m.gsm	685	share/asterisk/sounds/en/digits/a-m.gsm
635	share/asterisk/sounds/en/digits/at.gsm	686	share/asterisk/sounds/en/digits/at.gsm
		687	share/asterisk/sounds/en/digits/billion.gsm
636	share/asterisk/sounds/en/digits/day-0.gsm	688	share/asterisk/sounds/en/digits/day-0.gsm
637	share/asterisk/sounds/en/digits/day-1.gsm	689	share/asterisk/sounds/en/digits/day-1.gsm
638	share/asterisk/sounds/en/digits/day-2.gsm	690	share/asterisk/sounds/en/digits/day-2.gsm
Lines 657-667 Link Here
657	share/asterisk/sounds/en/digits/h-3.gsm	709	share/asterisk/sounds/en/digits/h-3.gsm
658	share/asterisk/sounds/en/digits/h-30.gsm	710	share/asterisk/sounds/en/digits/h-30.gsm
659	share/asterisk/sounds/en/digits/h-4.gsm	711	share/asterisk/sounds/en/digits/h-4.gsm
		712	share/asterisk/sounds/en/digits/h-40.gsm
660	share/asterisk/sounds/en/digits/h-5.gsm	713	share/asterisk/sounds/en/digits/h-5.gsm
		714	share/asterisk/sounds/en/digits/h-50.gsm
661	share/asterisk/sounds/en/digits/h-6.gsm	715	share/asterisk/sounds/en/digits/h-6.gsm
		716	share/asterisk/sounds/en/digits/h-60.gsm
662	share/asterisk/sounds/en/digits/h-7.gsm	717	share/asterisk/sounds/en/digits/h-7.gsm
		718	share/asterisk/sounds/en/digits/h-70.gsm
663	share/asterisk/sounds/en/digits/h-8.gsm	719	share/asterisk/sounds/en/digits/h-8.gsm
		720	share/asterisk/sounds/en/digits/h-80.gsm
664	share/asterisk/sounds/en/digits/h-9.gsm	721	share/asterisk/sounds/en/digits/h-9.gsm
		722	share/asterisk/sounds/en/digits/h-90.gsm
		723	share/asterisk/sounds/en/digits/h-billion.gsm
		724	share/asterisk/sounds/en/digits/h-hundred.gsm
		725	share/asterisk/sounds/en/digits/h-million.gsm
		726	share/asterisk/sounds/en/digits/h-thousand.gsm
665	share/asterisk/sounds/en/digits/hundred.gsm	727	share/asterisk/sounds/en/digits/hundred.gsm
666	share/asterisk/sounds/en/digits/million.gsm	728	share/asterisk/sounds/en/digits/million.gsm
667	share/asterisk/sounds/en/digits/minus.gsm	729	share/asterisk/sounds/en/digits/minus.gsm
Lines 772-777 Link Here
772	share/asterisk/sounds/en/minutes.gsm	834	share/asterisk/sounds/en/minutes.gsm
773	share/asterisk/sounds/en/pbx-invalid.gsm	835	share/asterisk/sounds/en/pbx-invalid.gsm
774	share/asterisk/sounds/en/pbx-invalidpark.gsm	836	share/asterisk/sounds/en/pbx-invalidpark.gsm
		837	share/asterisk/sounds/en/pbx-parkingfailed.gsm
775	share/asterisk/sounds/en/pbx-transfer.gsm	838	share/asterisk/sounds/en/pbx-transfer.gsm
776	share/asterisk/sounds/en/phonetic/9_p.gsm	839	share/asterisk/sounds/en/phonetic/9_p.gsm
777	share/asterisk/sounds/en/phonetic/a_p.gsm	840	share/asterisk/sounds/en/phonetic/a_p.gsm
Lines 811-816 Link Here
811	share/asterisk/sounds/en/queue-callswaiting.gsm	874	share/asterisk/sounds/en/queue-callswaiting.gsm
812	share/asterisk/sounds/en/queue-holdtime.gsm	875	share/asterisk/sounds/en/queue-holdtime.gsm
813	share/asterisk/sounds/en/queue-less-than.gsm	876	share/asterisk/sounds/en/queue-less-than.gsm
		877	share/asterisk/sounds/en/queue-minute.gsm
814	share/asterisk/sounds/en/queue-minutes.gsm	878	share/asterisk/sounds/en/queue-minutes.gsm
815	share/asterisk/sounds/en/queue-periodic-announce.gsm	879	share/asterisk/sounds/en/queue-periodic-announce.gsm
816	share/asterisk/sounds/en/queue-quantity1.gsm	880	share/asterisk/sounds/en/queue-quantity1.gsm
Lines 991-996 Link Here
991	%%DOCSDIR%%/img3.png	1055	%%DOCSDIR%%/img3.png
992	%%DOCSDIR%%/img4.png	1056	%%DOCSDIR%%/img4.png
993	%%DOCSDIR%%/img5.png	1057	%%DOCSDIR%%/img5.png
		1058	%%DOCSDIR%%/img6.png
		1059	%%DOCSDIR%%/img7.png
		1060	%%DOCSDIR%%/img8.png
		1061	%%DOCSDIR%%/img9.png
994	%%DOCSDIR%%/index.html	1062	%%DOCSDIR%%/index.html
995	%%DOCSDIR%%/internals.pl	1063	%%DOCSDIR%%/internals.pl
996	%%DOCSDIR%%/labels.pl	1064	%%DOCSDIR%%/labels.pl
Lines 1195-1200 Link Here
1195	%%DOCSDIR%%/node278.html	1263	%%DOCSDIR%%/node278.html
1196	%%DOCSDIR%%/node279.html	1264	%%DOCSDIR%%/node279.html
1197	%%DOCSDIR%%/node28.html	1265	%%DOCSDIR%%/node28.html
		1266	%%DOCSDIR%%/node280.html
		1267	%%DOCSDIR%%/node281.html
		1268	%%DOCSDIR%%/node282.html
		1269	%%DOCSDIR%%/node283.html
		1270	%%DOCSDIR%%/node284.html
		1271	%%DOCSDIR%%/node285.html
		1272	%%DOCSDIR%%/node286.html
		1273	%%DOCSDIR%%/node287.html
		1274	%%DOCSDIR%%/node288.html
		1275	%%DOCSDIR%%/node289.html
		1276	%%DOCSDIR%%/node290.html
		1277	%%DOCSDIR%%/node291.html
		1278	%%DOCSDIR%%/node292.html
		1279	%%DOCSDIR%%/node293.html
		1280	%%DOCSDIR%%/node294.html
		1281	%%DOCSDIR%%/node295.html
		1282	%%DOCSDIR%%/node296.html
		1283	%%DOCSDIR%%/node297.html
		1284	%%DOCSDIR%%/node298.html
1198	%%DOCSDIR%%/node29.html	1285	%%DOCSDIR%%/node29.html
1199	%%DOCSDIR%%/node3.html	1286	%%DOCSDIR%%/node3.html
1200	%%DOCSDIR%%/node30.html	1287	%%DOCSDIR%%/node30.html
Lines 1291-1302 Link Here
1291	@dirrm share/asterisk/keys	1378	@dirrm share/asterisk/keys
1292	@dirrm share/asterisk/firmware/iax	1379	@dirrm share/asterisk/firmware/iax
1293	@dirrm share/asterisk/firmware	1380	@dirrm share/asterisk/firmware
		1381	@dirrm share/asterisk/documentation/thirdparty
		1382	@dirrm share/asterisk/documentation
1294	@dirrm share/asterisk/agi-bin	1383	@dirrm share/asterisk/agi-bin
1295	@dirrm share/asterisk	1384	@dirrm share/asterisk
1296	@dirrm lib/asterisk/modules	1385	@dirrm lib/asterisk/modules
1297	@dirrm lib/asterisk	1386	@dirrm lib/asterisk
1298	@dirrm include/asterisk	1387	@dirrm include/asterisk
1299	@dirrmtry etc/asterisk	1388	@dirrmtry etc/asterisk
		1389	@exec mkdir -p %D/share/asterisk/firmware/iax
		1390	@exec mkdir -p %D/share/asterisk/documentation/thirdparty
1300	@exec mkdir -p %D/share/asterisk/sounds/es	1391	@exec mkdir -p %D/share/asterisk/sounds/es
1301	@exec mkdir -p %D/share/asterisk/sounds/fr	1392	@exec mkdir -p %D/share/asterisk/sounds/fr
1302	@cwd /var	1393	@cwd /var
Lines 1304-1318 Link Here
1304	spool/asterisk/voicemail/default/1234/en/unavail.gsm	1395	spool/asterisk/voicemail/default/1234/en/unavail.gsm
1305	@exec mkdir -p %D/log/asterisk/cdr-csv	1396	@exec mkdir -p %D/log/asterisk/cdr-csv
1306	@exec mkdir -p %D/log/asterisk/cdr-custom	1397	@exec mkdir -p %D/log/asterisk/cdr-custom
1307	@exec mkdir -p %D/spool/asterisk/voicemail/default/1234/INBOX
1308	@exec mkdir -p %D/spool/asterisk/dictate	1398	@exec mkdir -p %D/spool/asterisk/dictate
1309	@exec mkdir -p %D/spool/asterisk/meetme	1399	@exec mkdir -p %D/spool/asterisk/meetme
1310	@exec mkdir -p %D/spool/asterisk/monitor	1400	@exec mkdir -p %D/spool/asterisk/monitor
1311	@exec mkdir -p %D/spool/asterisk/system	1401	@exec mkdir -p %D/spool/asterisk/system
		1402	@exec mkdir -p %D/spool/asterisk/voicemail/default/1234/INBOX
		1403	@exec mkdir -p %D/spool/asterisk/voicemail/default/1234/en
1312	@exec mkdir -p %D/spool/asterisk/tmp	1404	@exec mkdir -p %D/spool/asterisk/tmp
		1405	@exec mkdir -p %D/db/asterisk
1313	@dirrm spool/asterisk/dictate	1406	@dirrm spool/asterisk/dictate
1314	@dirrm spool/asterisk/meetme	1407	@dirrm spool/asterisk/meetme
1315	@dirrm spool/asterisk/monitor	1408	@dirrm spool/asterisk/monitor
		1409	@dirrm spool/asterisk/outgoing
1316	@dirrm spool/asterisk/system	1410	@dirrm spool/asterisk/system
1317	@dirrm spool/asterisk/voicemail/default/1234/INBOX	1411	@dirrm spool/asterisk/voicemail/default/1234/INBOX
1318	@dirrm spool/asterisk/voicemail/default/1234/en	1412	@dirrm spool/asterisk/voicemail/default/1234/en

Return to bug 146964

Lines 2-17 Link Here

(-)/usr/ports/net/asterisk16/Makefile (-26 / +15 lines)
2	# Date created: 17 October 2003	2	# Date created: 17 October 2003
3	# Whom: Maxim Sobolev <sobomax@portaone.com>	3	# Whom: Maxim Sobolev <sobomax@portaone.com>
4	#	4	#
5	# $FreeBSD: ports/net/asterisk16/Makefile,v 1.136 2010/09/17 08:32:54 linimon Exp $	5	# $FreeBSD: ports/net/asterisk16/Makefile,v 1.132 2010/04/03 10:44:26 roam Exp $
6	#	6	#
7		7
8	PORTNAME= asterisk	8	PORTNAME= asterisk
9	PORTVERSION= 1.6.0.21	9	PORTVERSION= 1.6.2.13
10	PORTREVISION= 4
11	PKGNAMESUFFIX= 16
12	CATEGORIES= net	10	CATEGORIES= net
13	MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \	11	MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \
14	http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/	12	http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/
		13	PKGNAMESUFFIX= 16
15		14
16	MAINTAINER= flo@kasimir.com	15	MAINTAINER= flo@kasimir.com
17	COMMENT= An Open Source PBX and telephony toolkit	16	COMMENT= An Open Source PBX and telephony toolkit
Lines 19-24 Link Here
19	LIB_DEPENDS= speex.1:${PORTSDIR}/audio/speex \	18	LIB_DEPENDS= speex.1:${PORTSDIR}/audio/speex \
20	newt.52:${PORTSDIR}/devel/newt \	19	newt.52:${PORTSDIR}/devel/newt \
21	execinfo:${PORTSDIR}/devel/libexecinfo	20	execinfo:${PORTSDIR}/devel/libexecinfo
		21
		22	USE_GNOME= libxml2
		23
22	RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123	24	RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123
23		25
24	ONLY_FOR_ARCHS= i386 amd64	26	ONLY_FOR_ARCHS= i386 amd64
Lines 26-32 Link Here
26	GNU_CONFIGURE= yes	28	GNU_CONFIGURE= yes
27	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/openh323" \	29	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/openh323" \
28	LDFLAGS="-L${LOCALBASE}/lib"	30	LDFLAGS="-L${LOCALBASE}/lib"
29	CONFIGURE_ARGS= --with-gsm=${LOCALBASE}	31	CONFIGURE_ARGS= --with-gsm=${LOCALBASE} --localstatedir=/var
30	CPPFLAGS= -I${LOCALBASE}/include -I${LOCALBASE}/include/openh323	32	CPPFLAGS= -I${LOCALBASE}/include -I${LOCALBASE}/include/openh323
31	USE_GMAKE= yes	33	USE_GMAKE= yes
32	USE_BISON= build	34	USE_BISON= build
Lines 55-69 Link Here
55	GSM "Enable GSM codec" on \	57	GSM "Enable GSM codec" on \
56	CURL "Enable CURL support" on \	58	CURL "Enable CURL support" on \
57	ILBC "Enable iLBC codec" off \	59	ILBC "Enable iLBC codec" off \
58	SPANDSP "Enable Spandsp faxing support" off \	60	SPANDSP "Enable Spandsp faxing support" off
59	# CODEC_PATCH "Apply codec negotiation patch" off \
60	# MISC_PATCHES "Apply additional patches" off
61		61
62	.include <bsd.port.pre.mk>	62	.include <bsd.port.pre.mk>
63		63
64	.if ${ARCH} == "i386" \|\| ${ARCH} == "amd64"	64	.if ${ARCH} == "i386" \|\| ${ARCH} == "amd64"
65	OPTIONS+= DAHDI "Enable DAHDI support" on	65	OPTIONS+= DAHDI "Enable DAHDI support" on
66
67	# Include this since we have altered OPTIONS.	66	# Include this since we have altered OPTIONS.
68	.include "$(PORTSDIR)/Mk/bsd.port.options.mk"	67	.include "$(PORTSDIR)/Mk/bsd.port.options.mk"
69	.endif	68	.endif
Lines 95-106 Link Here
95	# similarly	94	# similarly
96	.if !defined(WITH_ODBC)	95	.if !defined(WITH_ODBC)
97	PLIST_SUB+= WITH_ODBC="@comment "	96	PLIST_SUB+= WITH_ODBC="@comment "
98	CONFIGURE_ARGS+= --without-odbc	97	CONFIGURE_ARGS+= --without-unixodbc
99	.else	98	.else
100	PLIST_SUB+= WITH_ODBC=""	99	PLIST_SUB+= WITH_ODBC=""
101	CONFIGURE_ARGS+= --with-odbc --with-ltdl	100	CONFIGURE_ARGS+= --with-unixodbc --with-ltdl
102	LIB_DEPENDS+= odbc.1:${PORTSDIR}/databases/unixODBC \	101	LIB_DEPENDS+= odbc.1:${PORTSDIR}/databases/unixODBC
103	ltdl.7:${PORTSDIR}/devel/libltdl22	102	USE_AUTOTOOLS= libltdl
104	.endif	103	.endif
105		104
106	.if !defined(WITH_FREETDS)	105	.if !defined(WITH_FREETDS)
Lines 145-151 Link Here
145	.else	144	.else
146	PLIST_SUB+= WITH_SNMP=""	145	PLIST_SUB+= WITH_SNMP=""
147	CONFIGURE_ARGS+= --with-netsnmp	146	CONFIGURE_ARGS+= --with-netsnmp
148	LIB_DEPENDS+= netsnmp.20:${PORTSDIR}/net-mgmt/net-snmp	147	LIB_DEPENDS+= netsnmp:${PORTSDIR}/net-mgmt/net-snmp
149	.endif	148	.endif
150		149
151	.if !defined(WITH_JABBER)	150	.if !defined(WITH_JABBER)
Lines 186-197 Link Here
186		185
187	.if !defined(WITH_CURL)	186	.if !defined(WITH_CURL)
188	PLIST_SUB+= WITH_CURL="@comment "	187	PLIST_SUB+= WITH_CURL="@comment "
189	CONFIGURE_ARGS+= --with-curl=no \	188	CONFIGURE_ARGS+= --with-libcurl=no
190	--with-libcurl=no
191	.else	189	.else
192	PLIST_SUB+= WITH_CURL=""	190	PLIST_SUB+= WITH_CURL=""
193	CONFIGURE_ARGS+= --with-curl \	191	CONFIGURE_ARGS+= --with-libcurl
194	--with-libcurl
195	LIB_DEPENDS+= curl.6:${PORTSDIR}/ftp/curl	192	LIB_DEPENDS+= curl.6:${PORTSDIR}/ftp/curl
196	.endif	193	.endif
197		194
Lines 204-217 Link Here
204	LIB_DEPENDS+= spandsp.2:${PORTSDIR}/comms/spandsp-devel	201	LIB_DEPENDS+= spandsp.2:${PORTSDIR}/comms/spandsp-devel
205	.endif	202	.endif
206		203
207	.if defined(WITH_CODEC_PATCH)
208	PATCHFILES= asterisk-1.4.22-codec-negotiation-20081110.diff.gz
209	PATCH_SITES= http://b2bua.org/chrome/site/
210	EXTRA_PATCHES+= ${PATCHDIR}/codecnego-patch-Makefile
211	.else
212	EXTRA_PATCHES+= ${PATCHDIR}/nocodecnego-patch-Makefile
213	.endif
214
215	.if defined(WITH_MISC_PATCHES)	204	.if defined(WITH_MISC_PATCHES)
216	EXTRA_PATCHES+= ${PATCHDIR}/dtmf_debug.diff	205	EXTRA_PATCHES+= ${PATCHDIR}/dtmf_debug.diff
217	EXTRA_PATCHES+= ${PATCHDIR}/feature_disconnect.diff	206	EXTRA_PATCHES+= ${PATCHDIR}/feature_disconnect.diff

Lines 1-210 Link Here

(-)/usr/ports/net/asterisk16/files/codecnego-patch-Makefile (-210 lines)
1	--- Makefile.orig 2008-10-16 17:36:35.000000000 +0300
2	+++ Makefile 2008-10-16 17:36:36.000000000 +0300
3	@@ -129,7 +129,7 @@
4	ASTMANDIR=$(mandir)
5	ifneq ($(findstring BSD,$(OSARCH)),)
6	ASTVARLIBDIR=$(prefix)/share/asterisk
7	- ASTVARRUNDIR=$(localstatedir)/run/asterisk
8	+ ASTVARRUNDIR=$(localstatedir)/run
9	else
10	ASTVARLIBDIR=$(localstatedir)/lib/asterisk
11	endif
12	@@ -214,9 +214,11 @@
13	ASTLDFLAGS+=-L/usr/local/lib
14	endif
15
16	+ifneq ($(OSARCH),FreeBSD)
17	ifneq ($(PROC),ultrasparc)
18	ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
19	endif
20	+endif
21
22	ifeq ($(PROC),ppc)
23	ASTCFLAGS+=-fsigned-char
24	@@ -224,7 +226,7 @@
25
26	ifeq ($(OSARCH),FreeBSD)
27	# -V is understood by BSD Make, not by GNU make.
28	- BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk)
29	+ BSDVERSION=$(OSVERSION)
30	ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)
31	AST_LIBS+=$(shell if test $(BSDVERSION) -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi)
32	endif
33	@@ -401,15 +403,15 @@
34	# Should static HTTP be installed during make samples or even with its own target ala
35	# webvoicemail? There are portions here that could be customized but might also be
36	# improved a lot. I'll put it here for now.
37	- mkdir -p $(DESTDIR)$(ASTDATADIR)/static-http
38	+ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/static-http
39	for x in static-http/*; do \
40	- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/static-http ; \
41	+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTDATADIR)/static-http ; \
42	done
43	- mkdir -p $(DESTDIR)$(ASTDATADIR)/images
44	+ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/images
45	for x in images/*.jpg; do \
46	- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/images ; \
47	+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTDATADIR)/images ; \
48	done
49	- mkdir -p $(DESTDIR)$(AGI_DIR)
50	+ $(MKDIR) $(DESTDIR)$(AGI_DIR)
51	$(MAKE) -C sounds install
52
53	update:
54	@@ -430,47 +432,47 @@
55	OLDHEADERS=$(filter-out $(NEWHEADERS),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h)))
56
57	installdirs:
58	- mkdir -p $(DESTDIR)$(MODULES_DIR)
59	- mkdir -p $(DESTDIR)$(ASTSBINDIR)
60	- mkdir -p $(DESTDIR)$(ASTETCDIR)
61	- mkdir -p $(DESTDIR)$(ASTBINDIR)
62	- mkdir -p $(DESTDIR)$(ASTVARRUNDIR)
63	- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail
64	- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/dictate
65	- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/system
66	- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/tmp
67	- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/meetme
68	- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/monitor
69	+ $(MKDIR) $(DESTDIR)$(MODULES_DIR)
70	+ $(MKDIR) $(DESTDIR)$(ASTSBINDIR)
71	+ $(MKDIR) $(DESTDIR)$(ASTETCDIR)
72	+ $(MKDIR) $(DESTDIR)$(ASTBINDIR)
73	+ $(MKDIR) $(DESTDIR)$(ASTVARRUNDIR)
74	+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail
75	+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/dictate
76	+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/system
77	+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/tmp
78	+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/meetme
79	+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/monitor
80
81	bininstall: _all installdirs $(SUBDIRS_INSTALL)
82	- $(INSTALL) -m 755 main/asterisk $(DESTDIR)$(ASTSBINDIR)/
83	+ $(BSD_INSTALL_PROGRAM) main/asterisk $(DESTDIR)$(ASTSBINDIR)/
84	$(LN) -sf asterisk $(DESTDIR)$(ASTSBINDIR)/rasterisk
85	- $(INSTALL) -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
86	- $(INSTALL) -m 755 contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/
87	+ $(BSD_INSTALL_SCRIPT) contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
88	+ $(BSD_INSTALL_SCRIPT) contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/
89	if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ]; then \
90	- cat contrib/scripts/safe_asterisk \| sed 's\|__ASTERISK_SBIN_DIR__\|$(ASTSBINDIR)\|;s\|__ASTERISK_VARRUN_DIR__\|$(ASTVARRUNDIR)\|;' > $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ;\
91	- chmod 755 $(DESTDIR)$(ASTSBINDIR)/safe_asterisk;\
92	+ cat contrib/scripts/safe_asterisk \| sed 's\|__ASTERISK_SBIN_DIR__\|$(ASTSBINDIR)\|;s\|__ASTERISK_VARRUN_DIR__\|$(ASTVARRUNDIR)\|;' > contrib/scripts/safe_asterisk.out;\
93	+ ${BSD_INSTALL_SCRIPT} contrib/scripts/safe_asterisk.out $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ;\
94	fi
95	- $(INSTALL) -d $(DESTDIR)$(ASTHEADERDIR)
96	- $(INSTALL) -m 644 include/asterisk.h $(DESTDIR)$(includedir)
97	- $(INSTALL) -m 644 include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR)
98	+ $(MKDIR) $(DESTDIR)$(ASTHEADERDIR)
99	+ $(BSD_INSTALL_DATA) include/asterisk.h $(DESTDIR)$(includedir)
100	+ $(BSD_INSTALL_DATA) include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR)
101	if [ -n "$(OLDHEADERS)" ]; then \
102	rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\
103	fi
104	- mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv
105	- mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-custom
106	- mkdir -p $(DESTDIR)$(ASTDATADIR)/keys
107	- mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware
108	- mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware/iax
109	- mkdir -p $(DESTDIR)$(ASTMANDIR)/man8
110	- $(INSTALL) -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys
111	- $(INSTALL) -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTDATADIR)/keys
112	- $(INSTALL) -m 644 doc/asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
113	- $(INSTALL) -m 644 contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8
114	- $(INSTALL) -m 644 contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8
115	- $(INSTALL) -m 644 contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
116	+ $(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-csv
117	+ $(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-custom
118	+ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/keys
119	+ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/firmware
120	+ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/firmware/iax
121	+ $(MKDIR) $(DESTDIR)$(ASTMANDIR)/man8
122	+ $(BSD_INSTALL_DATA) keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys
123	+ $(BSD_INSTALL_DATA) keys/freeworlddialup.pub $(DESTDIR)$(ASTDATADIR)/keys
124	+ $(BSD_INSTALL_MAN) doc/asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
125	+ $(BSD_INSTALL_MAN) contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8
126	+ $(BSD_INSTALL_MAN) contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8
127	+ $(BSD_INSTALL_MAN) contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
128	if [ -f contrib/firmware/iax/iaxy.bin ] ; then \
129	- $(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin; \
130	+ $(BSD_INSTALL_DATA) contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin; \
131	fi
132
133	$(SUBDIRS_INSTALL):
134	@@ -506,7 +508,7 @@
135	@exit 1
136	endif
137
138	-install: badshell datafiles bininstall
139	+install: badshell datafiles bininstall samples
140	@if [ -x /usr/sbin/asterisk-post-install ]; then \
141	/usr/sbin/asterisk-post-install $(DESTDIR) . ; \
142	fi
143	@@ -544,31 +546,23 @@
144	upgrade: bininstall
145
146	adsi:
147	- mkdir -p $(DESTDIR)$(ASTETCDIR)
148	+ $(MKDIR) $(DESTDIR)$(ASTETCDIR)
149	for x in configs/*.adsi; do \
150	if [ ! -f $(DESTDIR)$(ASTETCDIR)/$$x ]; then \
151	- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x` ; \
152	+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x` ; \
153	fi ; \
154	+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`-dist ; \
155	done
156
157	samples: adsi
158	- mkdir -p $(DESTDIR)$(ASTETCDIR)
159	+ $(MKDIR) $(DESTDIR)$(ASTETCDIR)
160	for x in configs/*.sample; do \
161	- if [ -f $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` ]; then \
162	- if [ "$(OVERWRITE)" = "y" ]; then \
163	- if cmp -s $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` $$x ; then \
164	- echo "Config file $$x is unchanged"; \
165	- continue; \
166	- fi ; \
167	- mv -f $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`.old ; \
168	- else \
169	- echo "Skipping config file $$x"; \
170	- continue; \
171	- fi ;\
172	+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`-dist ;\
173	+ if [ ! -f $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` ]; then \
174	+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`;\
175	fi ; \
176	- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` ;\
177	done
178	- if [ "$(OVERWRITE)" = "y" ] \|\| [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; then \
179	+ if true; then \
180	( \
181	echo "[directories]" ; \
182	echo "astetcdir => $(ASTETCDIR)" ; \
183	@@ -655,20 +649,23 @@
184	echo "; Default: strict"; \
185	echo ";"; \
186	echo ";translation_algorithm = strict"; \
187	- ) > $(DESTDIR)$(ASTCONFPATH) ; \
188	+ ) > $(DESTDIR)$(ASTCONFPATH)-dist ; \
189	+ if [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; then \
190	+ cp $(DESTDIR)$(ASTCONFPATH)-dist $(DESTDIR)$(ASTCONFPATH); \
191	+ fi; \
192	else \
193	echo "Skipping asterisk.conf creation"; \
194	fi
195	- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
196	+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
197	build_tools/make_sample_voicemail $(DESTDIR)/$(ASTDATADIR) $(DESTDIR)/$(ASTSPOOLDIR)
198
199	webvmail:
200	@[ -d $(DESTDIR)$(HTTP_DOCSDIR)/ ] \|\| ( printf "http docs directory not found.\nUpdate assignment of variable HTTP_DOCSDIR in Makefile!\n" && exit 1 )
201	@[ -d $(DESTDIR)$(HTTP_CGIDIR) ] \|\| ( printf "cgi-bin directory not found.\nUpdate assignment of variable HTTP_CGIDIR in Makefile!\n" && exit 1 )
202	$(INSTALL) -m 4755 -o root -g root contrib/scripts/vmail.cgi $(DESTDIR)$(HTTP_CGIDIR)/vmail.cgi
203	- mkdir -p $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk
204	+ $(MKDIR) $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk
205	for x in images/*.gif; do \
206	- $(INSTALL) -m 644 $$x $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/; \
207	+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/; \
208	done
209	@echo " +--------- Asterisk Web Voicemail ----------+"
210	@echo " + +"

Lines 1-243 Link Here

(-)/usr/ports/net/asterisk16/files/nocodecnego-patch-Makefile (-243 lines)
1	--- Makefile.orig 2009-11-03 12:00:27.000000000 -0800
2	+++ Makefile 2009-11-20 13:13:06.000000000 -0800
3	@@ -118,7 +118,7 @@
4	OVERWRITE=y
5
6	# Include debug and macro symbols in the executables (-g) and profiling info (-pg)
7	-DEBUG=-g3
8	+#DEBUG=-g3
9
10
11	# Define standard directories for various platforms
12	@@ -148,7 +148,7 @@
13	ASTMANDIR=$(mandir)
14	ifneq ($(findstring BSD,$(OSARCH)),)
15	ASTVARLIBDIR=$(prefix)/share/asterisk
16	- ASTVARRUNDIR=$(localstatedir)/run/asterisk
17	+ ASTVARRUNDIR=$(localstatedir)/run
18	ASTDBDIR=$(localstatedir)/db/asterisk
19	else
20	ASTVARLIBDIR=$(localstatedir)/lib/asterisk
21	@@ -248,9 +248,11 @@
22	_ASTCFLAGS+=-isystem /usr/local/include
23	endif
24
25	+ifneq ($(OSARCH),FreeBSD)
26	ifneq ($(PROC),ultrasparc)
27	_ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
28	endif
29	+endif
30
31	ifeq ($(PROC),ppc)
32	_ASTCFLAGS+=-fsigned-char
33	@@ -258,7 +260,7 @@
34
35	ifeq ($(OSARCH),FreeBSD)
36	# -V is understood by BSD Make, not by GNU make.
37	- BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk)
38	+ BSDVERSION=$(OSVERSION)
39	_ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)
40	endif
41
42	@@ -467,21 +469,21 @@
43	# Should static HTTP be installed during make samples or even with its own target ala
44	# webvoicemail? There are portions here that could be customized but might also be
45	# improved a lot. I'll put it here for now.
46	- mkdir -p $(DESTDIR)$(ASTDATADIR)/static-http
47	+ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/static-http
48	for x in static-http/*; do \
49	- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/static-http ; \
50	+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTDATADIR)/static-http ; \
51	done
52	if [ -d doc/tex/asterisk ] ; then \
53	- mkdir -p $(DESTDIR)$(ASTDATADIR)/static-http/docs ; \
54	+ $(MKDIR) $(DESTDIR)$(DOCSDIR) ; \
55	for n in doc/tex/asterisk/* ; do \
56	- $(INSTALL) -m 644 $$n $(DESTDIR)$(ASTDATADIR)/static-http/docs ; \
57	+ $(BSD_INSTALL_DATA) $$n $(DESTDIR)$(DOCSDIR) ; \
58	done \
59	fi
60	- mkdir -p $(DESTDIR)$(ASTDATADIR)/images
61	+ $(MKDIR) $(DESTDIR)$(DOCSDIR)/images
62	for x in images/*.jpg; do \
63	- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/images ; \
64	+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(DOCSDIR)/images ; \
65	done
66	- mkdir -p $(DESTDIR)$(AGI_DIR)
67	+ $(MKDIR) $(DESTDIR)$(AGI_DIR)
68	$(MAKE) -C sounds install
69
70	update:
71	@@ -505,47 +507,47 @@
72	OLDHEADERS=$(filter-out $(NEWHEADERS),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h)))
73
74	installdirs:
75	- mkdir -p $(DESTDIR)$(MODULES_DIR)
76	- mkdir -p $(DESTDIR)$(ASTSBINDIR)
77	- mkdir -p $(DESTDIR)$(ASTETCDIR)
78	- mkdir -p $(DESTDIR)$(ASTBINDIR)
79	- mkdir -p $(DESTDIR)$(ASTVARRUNDIR)
80	- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail
81	- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/dictate
82	- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/system
83	- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/tmp
84	- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/meetme
85	- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/monitor
86	+ $(MKDIR) $(DESTDIR)$(MODULES_DIR)
87	+ $(MKDIR) $(DESTDIR)$(ASTSBINDIR)
88	+ $(MKDIR) $(DESTDIR)$(ASTETCDIR)
89	+ $(MKDIR) $(DESTDIR)$(ASTBINDIR)
90	+ $(MKDIR) $(DESTDIR)$(ASTVARRUNDIR)
91	+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail
92	+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/dictate
93	+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/system
94	+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/tmp
95	+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/meetme
96	+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/monitor
97
98	bininstall: _all installdirs $(SUBDIRS_INSTALL)
99	- $(INSTALL) -m 755 main/asterisk $(DESTDIR)$(ASTSBINDIR)/
100	+ $(BSD_INSTALL_PROGRAM) main/asterisk $(DESTDIR)$(ASTSBINDIR)/
101	$(LN) -sf asterisk $(DESTDIR)$(ASTSBINDIR)/rasterisk
102	- $(INSTALL) -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
103	- $(INSTALL) -m 755 contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/
104	+ $(BSD_INSTALL_SCRIPT) contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
105	+ $(BSD_INSTALL_SCRIPT) contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/
106	if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ]; then \
107	- cat contrib/scripts/safe_asterisk \| sed 's\|__ASTERISK_SBIN_DIR__\|$(ASTSBINDIR)\|;s\|__ASTERISK_VARRUN_DIR__\|$(ASTVARRUNDIR)\|;' > $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ;\
108	- chmod 755 $(DESTDIR)$(ASTSBINDIR)/safe_asterisk;\
109	+ cat contrib/scripts/safe_asterisk \| sed 's\|__ASTERISK_SBIN_DIR__\|$(ASTSBINDIR)\|;s\|__ASTERISK_VARRUN_DIR__\|$(ASTVARRUNDIR)\|;' > contrib/scripts/safe_asterisk.out;\
110	+ ${BSD_INSTALL_SCRIPT} contrib/scripts/safe_asterisk.out $(DESTDIR)$(ASTSBINDIR)/safe_asterisk;\
111	fi
112	- $(INSTALL) -d $(DESTDIR)$(ASTHEADERDIR)
113	- $(INSTALL) -m 644 include/asterisk.h $(DESTDIR)$(includedir)
114	- $(INSTALL) -m 644 include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR)
115	+ $(MKDIR) $(DESTDIR)$(ASTHEADERDIR)
116	+ $(BSD_INSTALL_DATA) include/asterisk.h $(DESTDIR)$(includedir)
117	+ $(BSD_INSTALL_DATA) include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR)
118	if [ -n "$(OLDHEADERS)" ]; then \
119	rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\
120	fi
121	- mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv
122	- mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-custom
123	- mkdir -p $(DESTDIR)$(ASTDATADIR)/keys
124	- mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware
125	- mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware/iax
126	- mkdir -p $(DESTDIR)$(ASTMANDIR)/man8
127	- $(INSTALL) -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys
128	- $(INSTALL) -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTDATADIR)/keys
129	- $(INSTALL) -m 644 doc/asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
130	- $(INSTALL) -m 644 contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8
131	- $(INSTALL) -m 644 contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8
132	- $(INSTALL) -m 644 contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
133	+ $(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-csv
134	+ $(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-custom
135	+ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/keys
136	+ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/firmware
137	+ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/firmware/iax
138	+ $(MKDIR) $(DESTDIR)$(ASTMANDIR)/man8
139	+ $(BSD_INSTALL_DATA) keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys
140	+ $(BSD_INSTALL_DATA) keys/freeworlddialup.pub $(DESTDIR)$(ASTDATADIR)/keys
141	+ $(BSD_INSTALL_MAN) doc/asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
142	+ $(BSD_INSTALL_MAN) contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8
143	+ $(BSD_INSTALL_MAN) contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8
144	+ $(BSD_INSTALL_MAN) contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
145	if [ -f contrib/firmware/iax/iaxy.bin ] ; then \
146	- $(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin; \
147	+ $(BSD_INSTALL_DATA) contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin; \
148	fi
149
150	$(SUBDIRS_INSTALL):
151	@@ -579,7 +581,7 @@
152	@exit 1
153	endif
154
155	-install: badshell datafiles bininstall
156	+install: badshell datafiles bininstall samples
157	@if [ -x /usr/sbin/asterisk-post-install ]; then \
158	/usr/sbin/asterisk-post-install $(DESTDIR) . ; \
159	fi
160	@@ -611,38 +613,25 @@
161	# XXX why *.adsi is installed first ?
162	adsi:
163	@echo Installing adsi config files...
164	- @mkdir -p $(DESTDIR)$(ASTETCDIR)
165	+ @$(MKDIR) $(DESTDIR)$(ASTETCDIR)
166	@for x in configs/*.adsi; do \
167	dst="$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`" ; \
168	if [ -f $${dst} ] ; then \
169	- echo "Overwriting $$x" ; \
170	- else \
171	- echo "Installing $$x" ; \
172	+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x` ; \
173	fi ; \
174	- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x` ; \
175	+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`-dist ; \
176	done
177
178	samples: adsi
179	@echo Installing other config files...
180	- @mkdir -p $(DESTDIR)$(ASTETCDIR)
181	+ @$(MKDIR) $(DESTDIR)$(ASTETCDIR)
182	@for x in configs/*.sample; do \
183	- dst="$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`" ; \
184	- if [ -f $${dst} ]; then \
185	- if [ "$(OVERWRITE)" = "y" ]; then \
186	- if cmp -s $${dst} $$x ; then \
187	- echo "Config file $$x is unchanged"; \
188	- continue; \
189	- fi ; \
190	- mv -f $${dst} $${dst}.old ; \
191	- else \
192	- echo "Skipping config file $$x"; \
193	- continue; \
194	- fi ;\
195	+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`-dist ;\
196	+ if [ ! -f $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` ]; then \
197	+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`;\
198	fi ; \
199	- echo "Installing file $$x"; \
200	- $(INSTALL) -m 644 $$x $${dst} ;\
201	done
202	- @if [ "$(OVERWRITE)" = "y" ] \|\| [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; then \
203	+ @if true; then \
204	echo "Creating asterisk.conf"; \
205	( \
206	echo "[directories](!) ; remove the (!) to enable this" ; \
207	@@ -698,13 +687,16 @@
208	echo "pbx_realtime=1.6" ; \
209	echo "res_agi=1.6" ; \
210	echo "app_set=1.6" ; \
211	- ) > $(DESTDIR)$(ASTCONFPATH) ; \
212	+ ) > $(DESTDIR)$(ASTCONFPATH)-dist ; \
213	+ if [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; then \
214	+ $(BSD_INSTALL_DATA) $(DESTDIR)$(ASTCONFPATH)-dist $(DESTDIR)$(ASTCONFPATH); \
215	+ fi; \
216	else \
217	echo "Skipping asterisk.conf creation"; \
218	fi
219	- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
220	+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
221	build_tools/make_sample_voicemail $(DESTDIR)/$(ASTDATADIR) $(DESTDIR)/$(ASTSPOOLDIR)
222	- @mkdir -p $(DESTDIR)$(ASTDATADIR)/phoneprov
223	+ @$(MKDIR) $(DESTDIR)$(ASTDATADIR)/phoneprov
224	@for x in phoneprov/*; do \
225	dst="$(DESTDIR)$(ASTDATADIR)/$$x" ; \
226	if [ -f $${dst} ]; then \
227	@@ -720,14 +712,14 @@
228	fi ;\
229	fi ; \
230	echo "Installing file $$x"; \
231	- $(INSTALL) -m 644 $$x $${dst} ;\
232	+ $(BSD_INSTALL_DATA) $$x $${dst} ;\
233	done
234
235	webvmail:
236	@[ -d $(DESTDIR)$(HTTP_DOCSDIR)/ ] \|\| ( printf "http docs directory not found.\nUpdate assignment of variable HTTP_DOCSDIR in Makefile!\n" && exit 1 )
237	@[ -d $(DESTDIR)$(HTTP_CGIDIR) ] \|\| ( printf "cgi-bin directory not found.\nUpdate assignment of variable HTTP_CGIDIR in Makefile!\n" && exit 1 )
238	$(INSTALL) -m 4755 -o root -g root contrib/scripts/vmail.cgi $(DESTDIR)$(HTTP_CGIDIR)/vmail.cgi
239	- mkdir -p $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk
240	+ $(MKDIR) $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk
241	for x in images/*.gif; do \
242	$(INSTALL) -m 644 $$x $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/; \
243	done

Line 0 Link Here

(-)/usr/ports/net/asterisk16/files/patch-Makefile (+257 lines)
		1	--- Makefile.orig 2010-06-10 22:35:06.000000000 +0200
		2	+++ Makefile 2010-09-21 13:17:37.000000000 +0200
		3	@@ -121,7 +121,7 @@
		4	OVERWRITE=y
		5
		6	# Include debug and macro symbols in the executables (-g) and profiling info (-pg)
		7	-DEBUG=-g3
		8	+#DEBUG=-g3
		9
		10
		11	# Define standard directories for various platforms
		12	@@ -149,7 +149,7 @@
		13	ASTMANDIR=$(mandir)
		14	ifneq ($(findstring BSD,$(OSARCH)),)
		15	ASTVARLIBDIR=$(prefix)/share/asterisk
		16	- ASTVARRUNDIR=$(localstatedir)/run/asterisk
		17	+ ASTVARRUNDIR=$(localstatedir)/run
		18	ASTDBDIR=$(localstatedir)/db/asterisk
		19	else
		20	ASTVARLIBDIR=$(localstatedir)/lib/asterisk
		21	@@ -248,12 +248,13 @@
		22	ifneq ($(findstring BSD,$(OSARCH)),)
		23	_ASTCFLAGS+=-isystem /usr/local/include
		24	endif
		25	-
		26	+ifneq ($(OSARCH),FreeBSD)
		27	ifeq ($(findstring -march,$(_ASTCFLAGS) $(ASTCFLAGS)),)
		28	ifneq ($(PROC),ultrasparc)
		29	_ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
		30	endif
		31	endif
		32	+endif
		33
		34	ifeq ($(PROC),ppc)
		35	_ASTCFLAGS+=-fsigned-char
		36	@@ -261,7 +262,7 @@
		37
		38	ifeq ($(OSARCH),FreeBSD)
		39	# -V is understood by BSD Make, not by GNU make.
		40	- BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk)
		41	+ BSDVERSION=$(OSVERSION)
		42	_ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)
		43	endif
		44
		45	@@ -478,21 +479,23 @@
		46	# Should static HTTP be installed during make samples or even with its own target ala
		47	# webvoicemail? There are portions here that could be customized but might also be
		48	# improved a lot. I'll put it here for now.
		49	- mkdir -p $(DESTDIR)$(ASTDATADIR)/static-http
		50	+ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/static-http
		51	for x in static-http/*; do \
		52	- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/static-http ; \
		53	+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTDATADIR)/static-http ; \
		54	done
		55	if [ -d doc/tex/asterisk ] ; then \
		56	- mkdir -p $(DESTDIR)$(ASTDATADIR)/static-http/docs ; \
		57	+ $(MKDIR) $(DESTDIR)$(DOCSDIR) ; \
		58	for n in doc/tex/asterisk/* ; do \
		59	- $(INSTALL) -m 644 $$n $(DESTDIR)$(ASTDATADIR)/static-http/docs ; \
		60	+ $(BSD_INSTALL_DATA) $$n $(DESTDIR)$(DOCSDIR) ; \
		61	done \
		62	fi
		63	- mkdir -p $(DESTDIR)$(ASTDATADIR)/images
		64	+ if [ ! -d $(DESTDIR)$(DOCSDIR)/images ]; then \
65	+ $(MKDIR) $(DESTDIR)$(DOCSDIR)/images; \
66	+ fi
67	for x in images/*.jpg; do \
68	- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/images ; \
69	+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(DOCSDIR)/images ; \
70	done
71	- mkdir -p $(DESTDIR)$(AGI_DIR)
72	+ $(MKDIR) $(DESTDIR)$(AGI_DIR)
73	$(MAKE) -C sounds install
74
75	doc/core-en_US.xml: $(foreach dir,$(MOD_SUBDIRS),$(shell $(GREP) -l "language=\"en_US\"" $(dir)/.c $(dir)/.cc 2>/dev/null))
76	@@ -539,50 +542,51 @@
77	OLDHEADERS=$(filter-out $(NEWHEADERS),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h)))
78
79	installdirs:
80	- mkdir -p $(DESTDIR)$(MODULES_DIR)
81	- mkdir -p $(DESTDIR)$(ASTSBINDIR)
82	- mkdir -p $(DESTDIR)$(ASTETCDIR)
83	- mkdir -p $(DESTDIR)$(ASTVARRUNDIR)
84	- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail
85	- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/dictate
86	- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/system
87	- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/tmp
88	- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/meetme
89	- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/monitor
90	+ $(MKDIR) $(DESTDIR)$(MODULES_DIR)
91	+ $(MKDIR) $(DESTDIR)$(ASTSBINDIR)
92	+ $(MKDIR) $(DESTDIR)$(ASTETCDIR)
93	+ $(MKDIR) $(DESTDIR)$(ASTVARRUNDIR)
94	+ $(MKDIR) $(DESTDIR)$(ASTDBDIR)
95	+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail
96	+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/dictate
97	+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/system
98	+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/tmp
99	+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/meetme
100	+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/monitor
101
102	bininstall: _all installdirs $(SUBDIRS_INSTALL)
103	- $(INSTALL) -m 755 main/asterisk $(DESTDIR)$(ASTSBINDIR)/
104	+ $(BSD_INSTALL_PROGRAM) main/asterisk $(DESTDIR)$(ASTSBINDIR)/
105	$(LN) -sf asterisk $(DESTDIR)$(ASTSBINDIR)/rasterisk
106	- $(INSTALL) -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
107	- $(INSTALL) -m 755 contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/
108	+ $(BSD_INSTALL_SCRIPT) contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
109	+ $(BSD_INSTALL_SCRIPT) contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/
110	if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ]; then \
111	- cat contrib/scripts/safe_asterisk \| sed 's\|__ASTERISK_SBIN_DIR__\|$(ASTSBINDIR)\|;s\|__ASTERISK_VARRUN_DIR__\|$(ASTVARRUNDIR)\|;' > $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ;\
112	- chmod 755 $(DESTDIR)$(ASTSBINDIR)/safe_asterisk;\
113	+ cat contrib/scripts/safe_asterisk \| sed 's\|__ASTERISK_SBIN_DIR__\|$(ASTSBINDIR)\|;s\|__ASTERISK_VARRUN_DIR__\|$(ASTVARRUNDIR)\|;' > contrib/scripts/safe_asterisk.out;\
114	+ ${BSD_INSTALL_SCRIPT} contrib/scripts/safe_asterisk.out $(DESTDIR)$(ASTSBINDIR)/safe_asterisk;\
115	fi
116	- $(INSTALL) -d $(DESTDIR)$(ASTHEADERDIR)
117	- $(INSTALL) -m 644 include/asterisk.h $(DESTDIR)$(includedir)
118	- $(INSTALL) -m 644 include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR)
119	+ $(MKDIR) $(DESTDIR)$(ASTHEADERDIR)
120	+ $(BSD_INSTALL_DATA) include/asterisk.h $(DESTDIR)$(includedir)
121	+ $(BSD_INSTALL_DATA) include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR)
122	if [ -n "$(OLDHEADERS)" ]; then \
123	rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\
124	fi
125	- mkdir -p $(DESTDIR)$(ASTDATADIR)/documentation
126	- mkdir -p $(DESTDIR)$(ASTDATADIR)/documentation/thirdparty
127	- mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv
128	- mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-custom
129	- mkdir -p $(DESTDIR)$(ASTDATADIR)/keys
130	- mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware
131	- mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware/iax
132	- mkdir -p $(DESTDIR)$(ASTMANDIR)/man8
133	- $(INSTALL) -m 644 doc/core-*.xml $(DESTDIR)$(ASTDATADIR)/documentation
134	- $(INSTALL) -m 644 doc/appdocsxml.dtd $(DESTDIR)$(ASTDATADIR)/documentation
135	- $(INSTALL) -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys
136	- $(INSTALL) -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTDATADIR)/keys
137	- $(INSTALL) -m 644 doc/asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
138	- $(INSTALL) -m 644 contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8
139	- $(INSTALL) -m 644 contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8
140	- $(INSTALL) -m 644 contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
141	+ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/documentation
142	+ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/documentation/thirdparty
143	+ $(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-csv
144	+ $(MKDIR) $(DESTDIR)$(ASTLOGDIR)/cdr-custom
145	+ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/keys
146	+ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/firmware
147	+ $(MKDIR) $(DESTDIR)$(ASTDATADIR)/firmware/iax
148	+ $(MKDIR) $(DESTDIR)$(ASTMANDIR)/man8
149	+ $(BSD_INSTALL_DATA) doc/core-*.xml $(DESTDIR)$(ASTDATADIR)/documentation
150	+ $(BSD_INSTALL_DATA) doc/appdocsxml.dtd $(DESTDIR)$(ASTDATADIR)/documentation
151	+ $(BSD_INSTALL_DATA) keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys
152	+ $(BSD_INSTALL_DATA) keys/freeworlddialup.pub $(DESTDIR)$(ASTDATADIR)/keys
153	+ $(BSD_INSTALL_MAN) doc/asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
154	+ $(BSD_INSTALL_MAN) contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8
155	+ $(BSD_INSTALL_MAN) contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8
156	+ $(BSD_INSTALL_MAN) contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
157	if [ -f contrib/firmware/iax/iaxy.bin ] ; then \
158	- $(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin; \
159	+ $(BSD_INSTALL_DATA) contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin; \
160	fi
161
162	$(SUBDIRS_INSTALL):
163	@@ -616,7 +620,7 @@
164	@exit 1
165	endif
166
167	-install: badshell datafiles bininstall
168	+install: badshell datafiles bininstall samples
169	@if [ -x /usr/sbin/asterisk-post-install ]; then \
170	/usr/sbin/asterisk-post-install $(DESTDIR) . ; \
171	fi
172	@@ -650,38 +654,25 @@
173	# XXX why *.adsi is installed first ?
174	adsi:
175	@echo Installing adsi config files...
176	- @mkdir -p $(DESTDIR)$(ASTETCDIR)
177	+ @$(MKDIR) $(DESTDIR)$(ASTETCDIR)
178	@for x in configs/*.adsi; do \
179	dst="$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`" ; \
180	if [ -f $${dst} ] ; then \
181	- echo "Overwriting $$x" ; \
182	- else \
183	- echo "Installing $$x" ; \
184	+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x` ; \
185	fi ; \
186	- $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x` ; \
187	+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`-dist ; \
188	done
189
190	samples: adsi
191	@echo Installing other config files...
192	- @mkdir -p $(DESTDIR)$(ASTETCDIR)
193	+ @$(MKDIR) $(DESTDIR)$(ASTETCDIR)
194	@for x in configs/*.sample; do \
195	- dst="$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`" ; \
196	- if [ -f $${dst} ]; then \
197	- if [ "$(OVERWRITE)" = "y" ]; then \
198	- if cmp -s $${dst} $$x ; then \
199	- echo "Config file $$x is unchanged"; \
200	- continue; \
201	- fi ; \
202	- mv -f $${dst} $${dst}.old ; \
203	- else \
204	- echo "Skipping config file $$x"; \
205	- continue; \
206	- fi ;\
207	+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`-dist ; \
208	+ if [ ! -f $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` ]; then \
209	+ $(BSD_INSTALL_DATA) $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`; \
210	fi ; \
211	- echo "Installing file $$x"; \
212	- $(INSTALL) -m 644 $$x $${dst} ;\
213	done
214	- @if [ "$(OVERWRITE)" = "y" ] \|\| [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; then \
215	+ @if true; then \
216	echo "Creating asterisk.conf"; \
217	( \
218	echo "[directories](!) ; remove the (!) to enable this" ; \
219	@@ -745,14 +736,17 @@
220	echo "pbx_realtime=1.6" ; \
221	echo "res_agi=1.6" ; \
222	echo "app_set=1.6" ; \
223	- ) > $(DESTDIR)$(ASTCONFPATH) ; \
224	+ ) > $(DESTDIR)$(ASTCONFPATH)-dist ; \
225	+ if [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; then \
226	+ $(BSD_INSTALL_DATA) $(DESTDIR)$(ASTCONFPATH)-dist $(DESTDIR)$(ASTCONFPATH); \
227	+ fi; \
228	else \
229	echo "Skipping asterisk.conf creation"; \
230	fi
231	- mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
232	+ $(MKDIR) $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
233	build_tools/make_sample_voicemail $(DESTDIR)/$(ASTDATADIR) $(DESTDIR)/$(ASTSPOOLDIR)
234	- @mkdir -p $(DESTDIR)$(ASTDATADIR)/phoneprov
235	- @for x in phoneprov/*; do \
236	+ @$(MKDIR) $(DESTDIR)$(ASTDATADIR)/phoneprov
237	+ for x in phoneprov/*; do \
238	dst="$(DESTDIR)$(ASTDATADIR)/$$x" ; \
239	if [ -f $${dst} ]; then \
240	if [ "$(OVERWRITE)" = "y" ]; then \
241	@@ -767,14 +761,14 @@
242	fi ;\
243	fi ; \
244	echo "Installing file $$x"; \
245	- $(INSTALL) -m 644 $$x $${dst} ;\
246	+ $(BSD_INSTALL_DATA) $$x $${dst} ;\
247	done
248
249	webvmail:
250	@[ -d $(DESTDIR)$(HTTP_DOCSDIR)/ ] \|\| ( printf "http docs directory not found.\nUpdate assignment of variable HTTP_DOCSDIR in Makefile!\n" && exit 1 )
251	@[ -d $(DESTDIR)$(HTTP_CGIDIR) ] \|\| ( printf "cgi-bin directory not found.\nUpdate assignment of variable HTTP_CGIDIR in Makefile!\n" && exit 1 )
252	$(INSTALL) -m 4755 -o root -g root contrib/scripts/vmail.cgi $(DESTDIR)$(HTTP_CGIDIR)/vmail.cgi
253	- mkdir -p $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk
254	+ $(MKDIR) $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk
255	for x in images/*.gif; do \
256	$(INSTALL) -m 644 $$x $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/; \
257	done

Lines 1-15 Link Here

(-)/usr/ports/net/asterisk16/files/patch-Makefile.rules (-10 / +8 lines)
1		1	--- Makefile.rules.orig 2010-05-05 15:59:28.000000000 +0600
2	$FreeBSD: ports/net/asterisk16/files/patch-Makefile.rules,v 1.3 2009/08/02 19:34:55 mezz Exp $	2	+++ Makefile.rules 2010-05-05 15:26:04.000000000 +0600
3		3	@@ -43,6 +43,10 @@
4	--- Makefile.rules	4	endif
5	+++ Makefile.rules
6	@@ -35,7 +35,9 @@
7	CMD_PREFIX=
8	endif	5	endif
9		6
10	+ifneq ($(OSARCH),FreeBSD)	7	+ifneq ($(OSARCH),FreeBSD)
11	OPTIMIZE?=-O6	8	+ OPTIMIZE?=-O6
12	+endif	9	+endif
13		10	+
14	ifeq ($(findstring DONT_OPTIMIZE,$(MENUSELECT_CFLAGS)),)	11	ifeq ($(findstring DONT_OPTIMIZE,$(MENUSELECT_CFLAGS)),)
15	# More GSM codec optimization	12	_ASTCFLAGS+=$(OPTIMIZE)
		13	else

Line 0 Link Here

(-)/usr/ports/net/asterisk16/files/patch-agi::Makefile.orig (+28 lines)
	1
	2	$FreeBSD: ports/net/asterisk16/files/patch-agi::Makefile,v 1.10 2009/08/02 19:34:55 mezz Exp $
	3
	4	--- agi/Makefile
	5	+++ agi/Makefile
	6	@@ -13,7 +13,9 @@
	7
	8	.PHONY: clean all uninstall
	9
	10	-AGIS=agi-test.agi eagi-test eagi-sphinx-test jukebox.agi
	11	+AGIS_BIN=eagi-test eagi-sphinx-test
	12	+AGIS_SCR=agi-test.agi jukebox.agi
	13	+AGIS=$(AGIS_SCR) $(AGIS_BIN)
	14
	15	ifeq ($(OSARCH),SunOS)
	16	LIBS+=-lsocket -lnsl
	17	@@ -40,8 +42,9 @@
	18	eagi-sphinx-test: eagi-sphinx-test.o
	19
	20	install: all
	21	- mkdir -p $(DESTDIR)$(AGI_DIR)
	22	- for x in $(AGIS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(AGI_DIR) ; done
	23	+ $(MKDIR) -p $(DESTDIR)$(AGI_DIR)
	24	+ for x in $(AGIS_BIN); do $(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(AGI_DIR) ; done
	25	+ for x in $(AGIS_SCR); do $(BSD_INSTALL_SCRIPT) $$x $(DESTDIR)$(AGI_DIR) ; done
	26
	27	uninstall:
	28	for x in $(AGIS); do rm -f $(DESTDIR)$(AGI_DIR)/$$x ; done

Lines 1-6 Link Here

(-)/usr/ports/net/asterisk16/files/patch-channels-chan_dahdi.c (-6 / +6 lines)
1	--- channels/chan_dahdi.c.orig 2009-10-22 17:19:21.568250985 +0000	1	--- channels/chan_dahdi.c.orig 2010-05-05 17:50:15.000000000 +0600
2	+++ channels/chan_dahdi.c 2009-10-22 17:26:26.261584076 +0000	2	+++ channels/chan_dahdi.c 2010-05-05 17:50:09.000000000 +0600
3	@@ -1997,13 +1997,17 @@	3	@@ -2672,13 +2672,17 @@
4	return;	4	return;
5	}	5	}
6	if (p->echocancel.head.tap_length) {	6	if (p->echocancel.head.tap_length) {
Lines 13-25 Link Here
13	ast_log(LOG_WARNING, "Unable to enable audio mode on channel %d (%s)\n", p->channel, strerror(errno));	13	ast_log(LOG_WARNING, "Unable to enable audio mode on channel %d (%s)\n", p->channel, strerror(errno));
14	}	14	}
15	- res = ioctl(p->subs[SUB_REAL].dfd, DAHDI_ECHOCANCEL_PARAMS, &p->echocancel);	15	- res = ioctl(p->subs[SUB_REAL].dfd, DAHDI_ECHOCANCEL_PARAMS, &p->echocancel);
16	+	16	+
17	+ pecp = &p->echocancel.head;	17	+ pecp = &p->echocancel.head;
18	+ res = ioctl(p->subs[SUB_REAL].dfd, DAHDI_ECHOCANCEL_PARAMS, &pecp);	18	+ res = ioctl(p->subs[SUB_REAL].dfd, DAHDI_ECHOCANCEL_PARAMS, &pecp);
19	if (res) {	19	if (res) {
20	ast_log(LOG_WARNING, "Unable to enable echo cancellation on channel %d (%s)\n", p->channel, strerror(errno));	20	ast_log(LOG_WARNING, "Unable to enable echo cancellation on channel %d (%s)\n", p->channel, strerror(errno));
21	} else {	21	} else {
22	@@ -2037,8 +2041,9 @@	22	@@ -2712,8 +2716,9 @@
23		23
24	if (p->echocanon) {	24	if (p->echocanon) {
25	struct dahdi_echocanparams ecp = { .tap_length = 0 };	25	struct dahdi_echocanparams ecp = { .tap_length = 0 };

Lines 1-8 Link Here

(-)/usr/ports/net/asterisk16/files/patch-channels::Makefile (-7 / +4 lines)
1		1	--- channels/Makefile.orig 2010-05-05 17:57:22.000000000 +0600
2	$FreeBSD: ports/net/asterisk16/files/patch-channels::Makefile,v 1.18 2009/09/10 09:25:25 sobomax Exp $	2	+++ channels/Makefile 2010-05-05 18:01:58.000000000 +0600
3
4	--- channels/Makefile.orig
5	+++ channels/Makefile
6	@@ -27,9 +27,10 @@	3	@@ -27,9 +27,10 @@
7	endif	4	endif
8		5
Lines 21-29 Link Here
21	chan_h323.so: chan_h323.o h323/libchanh323.a	18	chan_h323.so: chan_h323.o h323/libchanh323.a
22	$(ECHO_PREFIX) echo " [LD] $^ -> $@"	19	$(ECHO_PREFIX) echo " [LD] $^ -> $@"
23	+ifeq ($(OSARCH),FreeBSD)	20	+ifeq ($(OSARCH),FreeBSD)
24	+ $(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) -L$(PREFIX)/lib $(H323LDFLAGS) -o $@ $< h323/libchanh323.a $(H323LDLIBS) $(CHANH323LIB)	21	+ $(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) -L$(LOCALBASE)/lib $(H323LDFLAGS) -o $@ $< h323/libchanh323.a $(H323LDLIBS) $(CHANH323LIB)
25	+else	22	+else
26	$(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) -o $@ $< h323/libchanh323.a $(CHANH323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L$(OPENH323DIR)/lib $(H323LIB) -L/usr/lib -lcrypto -lssl -lexpat	23	$(CMD_PREFIX) $(CXX) $(PTHREAD_CFLAGS) $(_ASTLDFLAGS) $(ASTLDFLAGS) $(SOLINK) -o $@ $< h323/libchanh323.a $(CHANH323LIB) -L$(PWLIBDIR)/lib $(PTLIB) -L$(OPENH323DIR)/lib $(H323LIB) -L/usr/lib -lcrypto -lssl -lexpat
27	endif	24	endif
28	endif	25	endif
29	+endif	26	+endif

Lines 1-14 Link Here

(-)/usr/ports/net/asterisk16/files/patch-channels::chan_sip.c (-11 / +8 lines)
1		1	--- channels/chan_sip.c.orig 2010-05-28 23:57:40.000000000 +0600
2	$FreeBSD: ports/net/asterisk16/files/patch-channels::chan_sip.c,v 1.13 2009/08/02 19:34:55 mezz Exp $	2	+++ channels/chan_sip.c 2010-08-11 10:47:07.000000000 +0600
3		3	@@ -980,7 +980,7 @@
4	--- channels/chan_sip.c	4	#define DEFAULT_MOHINTERPRET "default" /!< The default music class /
5	+++ channels/chan_sip.c
6	@@ -611,7 +611,7 @@
7	#define DEFAULT_MOHINTERPRET "default"
8	#define DEFAULT_MOHSUGGEST ""	5	#define DEFAULT_MOHSUGGEST ""
9	#define DEFAULT_VMEXTEN "asterisk"	6	#define DEFAULT_VMEXTEN "asterisk" /!< Default voicemail extension /
10	-#define DEFAULT_CALLERID "asterisk"	7	-#define DEFAULT_CALLERID "asterisk" /!< Default caller ID /
11	+#define DEFAULT_CALLERID "Unknown"	8	+#define DEFAULT_CALLERID "Unknown" /!< Default caller ID /
12	#define DEFAULT_NOTIFYMIME "application/simple-message-summary"	9	#define DEFAULT_NOTIFYMIME "application/simple-message-summary"
13	#define DEFAULT_ALLOWGUEST TRUE	10	#define DEFAULT_ALLOWGUEST TRUE
14	#define DEFAULT_CALLCOUNTER FALSE	11	#define DEFAULT_RTPKEEPALIVE 0 /!< Default RTPkeepalive setting /

Lines 1-33 Link Here

(-)/usr/ports/net/asterisk16/files/patch-main::Makefile (-33 lines)
1
2	$FreeBSD: ports/net/asterisk16/files/patch-main::Makefile,v 1.8 2009/11/20 23:43:09 sobomax Exp $
3
4	--- main/Makefile.orig
5	+++ main/Makefile
6	@@ -101,8 +101,8 @@
7	cd editline && test -f config.h \|\| CFLAGS="$(PTHREAD_CFLAGS) $(subst $(ASTTOPDIR),../../,$(_ASTCFLAGS:-Werror=) $(ASTCFLAGS))" LDFLAGS="$(ASTLDFLAGS)" ./configure --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --with-ncurses=$(NCURSES_DIR) --with-curses=$(CURSES_DIR) --with-termcap=$(TERMCAP_DIR) --with-tinfo=$(TINFO_DIR)
8	$(MAKE) -C editline libedit.a
9
10	-db1-ast/libdb1.a: CHECK_SUBDIR
11	- _ASTCFLAGS="$(_ASTCFLAGS)" ASTCFLAGS="$(ASTCFLAGS) -Wno-strict-aliasing" $(MAKE) -C db1-ast libdb1.a
12	+#db1-ast/libdb1.a: CHECK_SUBDIR
13	+# _ASTCFLAGS="$(_ASTCFLAGS)" ASTCFLAGS="$(ASTCFLAGS) -Wno-strict-aliasing" $(MAKE) -C db1-ast libdb1.a
14
15	ast_expr2.c ast_expr2.h:
16	bison -o $@ -d --name-prefix=ast_yy ast_expr2.y
17	@@ -159,13 +159,13 @@
18	GMIMELDFLAGS+=$(GMIME_LIB)
19	endif
20
21	-$(MAIN_TGT): $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS)
22	+$(MAIN_TGT): $(OBJS) editline/libedit.a $(AST_EMBED_LDSCRIPTS)
23	@$(CC) -c -o buildinfo.o $(_ASTCFLAGS) buildinfo.c $(ASTCFLAGS)
24	$(ECHO_PREFIX) echo " [LD] $^ -> $@"
25	ifneq ($(findstring chan_h323,$(MENUSELECT_CHANNELS)),)
26	- $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS)
27	+ $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(LDFLAGS) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS)
28	else
29	- $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS)
30	+ $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(LDFLAGS) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS)
31	endif
32	$(CMD_PREFIX) $(ASTTOPDIR)/build_tools/strip_nonapi $@ \|\| rm $@
33

Line 0 Link Here

(-)/usr/ports/net/asterisk16/files/patch-main__Makefile (+30 lines)
	1	--- ./main/Makefile.orig 2010-06-26 00:58:37.000000000 +0600
	2	+++ ./main/Makefile 2010-08-24 09:40:39.000000000 +0600
	3	@@ -113,8 +113,8 @@
	4	cd editline && test -f config.h \|\| CFLAGS="$(PTHREAD_CFLAGS) $(subst $(ASTTOPDIR),../../,$(_ASTCFLAGS:-Werror=) $(ASTCFLAGS))" LDFLAGS="$(_ASTLDFLAGS) $(ASTLDFLAGS)" ./configure --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --with-ncurses=$(NCURSES_DIR) --with-curses=$(CURSES_DIR) --with-termcap=$(TERMCAP_DIR) --with-tinfo=$(TINFO_DIR)
	5	$(MAKE) -C editline libedit.a
	6
	7	-db1-ast/libdb1.a: CHECK_SUBDIR
	8	- _ASTCFLAGS="$(_ASTCFLAGS) -Wno-strict-aliasing" ASTCFLAGS="$(ASTCFLAGS)" $(MAKE) -C db1-ast libdb1.a
	9	+#db1-ast/libdb1.a: CHECK_SUBDIR
	10	+# _ASTCFLAGS="$(_ASTCFLAGS) -Wno-strict-aliasing" ASTCFLAGS="$(ASTCFLAGS)" $(MAKE) -C db1-ast libdb1.a
	11
	12	ifneq ($(findstring REBUILD_PARSERS,$(MENUSELECT_CFLAGS)),)
	13	ast_expr2.c ast_expr2.h: ast_expr2.y
	14	@@ -177,13 +177,13 @@
	15	GMIMELDFLAGS+=$(GMIME_LIB)
	16	endif
	17
	18	-$(MAIN_TGT): $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS)
	19	+$(MAIN_TGT): $(OBJS) editline/libedit.a $(AST_EMBED_LDSCRIPTS)
	20	@$(CC) -c -o buildinfo.o $(_ASTCFLAGS) buildinfo.c $(ASTCFLAGS)
	21	$(ECHO_PREFIX) echo " [LD] $^ -> $@"
	22	ifneq ($(findstring chan_h323,$(MENUSELECT_CHANNELS)),)
	23	- $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS)
	24	+ $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(LDFLAGS) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS)
	25	else
	26	- $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS)
	27	+ $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(LDFLAGS) $(AST_EMBED_LDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $^ buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS)
	28	endif
	29	$(CMD_PREFIX) $(ASTTOPDIR)/build_tools/strip_nonapi $@ \|\| rm $@
	30