diff options
Diffstat (limited to 'net/asterisk16/files/nocodecnego-patch-Makefile')
| -rw-r--r-- | net/asterisk16/files/nocodecnego-patch-Makefile | 115 |
1 files changed, 74 insertions, 41 deletions
diff --git a/net/asterisk16/files/nocodecnego-patch-Makefile b/net/asterisk16/files/nocodecnego-patch-Makefile index cf5e1df564b0..12f4d8a0fe17 100644 --- a/net/asterisk16/files/nocodecnego-patch-Makefile +++ b/net/asterisk16/files/nocodecnego-patch-Makefile @@ -1,36 +1,45 @@ ---- Makefile.orig 2008-05-05 13:17:55.000000000 -0700 -+++ Makefile 2008-06-10 01:07:09.000000000 -0700 -@@ -129,7 +129,7 @@ +--- Makefile.orig 2008-12-02 16:53:56.000000000 -0800 ++++ Makefile 2009-02-14 12:36:45.000000000 -0800 +@@ -117,7 +117,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 +@@ -147,7 +147,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 - endif -@@ -214,9 +214,11 @@ +@@ -242,9 +242,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 +224,7 @@ +@@ -252,7 +254,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 -@@ -404,15 +404,15 @@ + +@@ -461,21 +463,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. @@ -40,6 +49,14 @@ - $(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)$(ASTDATADIR)/images for x in images/*.jpg; do \ @@ -51,7 +68,7 @@ $(MAKE) -C sounds install update: -@@ -433,47 +433,47 @@ +@@ -499,47 +501,47 @@ OLDHEADERS=$(filter-out $(NEWHEADERS),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h))) installdirs: @@ -90,7 +107,7 @@ - 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 ;\ ++ ${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) @@ -131,7 +148,7 @@ fi $(SUBDIRS_INSTALL): -@@ -507,7 +507,7 @@ +@@ -573,7 +575,7 @@ @exit 1 endif @@ -140,31 +157,37 @@ @if [ -x /usr/sbin/asterisk-post-install ]; then \ /usr/sbin/asterisk-post-install $(DESTDIR) . ; \ fi -@@ -545,31 +545,23 @@ - upgrade: bininstall - +@@ -605,38 +607,25 @@ + # XXX why *.adsi is installed first ? 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` ; \ + @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 -- mkdir -p $(DESTDIR)$(ASTETCDIR) -+ $(MKDIR) $(DESTDIR)$(ASTETCDIR) - for x in configs/*.sample; do \ -- if [ -f $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` ]; then \ + @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 $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` $$x ; then \ +- if cmp -s $${dst} $$x ; then \ - echo "Config file $$x is unchanged"; \ - continue; \ - fi ; \ -- mv -f $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample` $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`.old ; \ +- mv -f $${dst} $${dst}.old ; \ - else \ - echo "Skipping config file $$x"; \ - continue; \ @@ -173,21 +196,22 @@ + 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` ;\ +- echo "Installing file $$x"; \ +- $(INSTALL) -m 644 $$x $${dst} ;\ done -- if [ "$(OVERWRITE)" = "y" ] || [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; then \ -+ if true; then \ +- @if [ "$(OVERWRITE)" = "y" ] || [ ! -f $(DESTDIR)$(ASTCONFPATH) ]; then \ ++ @if true; then \ + echo "Creating asterisk.conf"; \ ( \ - echo "[directories]" ; \ - echo "astetcdir => $(ASTETCDIR)" ; \ -@@ -614,20 +606,23 @@ - echo ";astctlowner = root" ; \ - echo ";astctlgroup = apache" ; \ - echo ";astctl = asterisk.ctl" ; \ + echo "[directories](!) ; remove the (!) to enable this" ; \ +@@ -692,13 +681,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 \ -+ cp $(DESTDIR)$(ASTCONFPATH)-dist $(DESTDIR)$(ASTCONFPATH); \ ++ $(BSD_INSTALL_DATA) $(DESTDIR)$(ASTCONFPATH)-dist $(DESTDIR)$(ASTCONFPATH); \ + fi; \ else \ echo "Skipping asterisk.conf creation"; \ @@ -195,6 +219,18 @@ - 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 \ +@@ -714,14 +706,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 ) @@ -203,8 +239,5 @@ - 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/; \ + $(INSTALL) -m 644 $$x $(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/; \ done - @echo " +--------- Asterisk Web Voicemail ----------+" - @echo " + +" |
