diff options
Diffstat (limited to 'net/asterisk11/files/patch-Makefile')
| -rw-r--r-- | net/asterisk11/files/patch-Makefile | 137 |
1 files changed, 0 insertions, 137 deletions
diff --git a/net/asterisk11/files/patch-Makefile b/net/asterisk11/files/patch-Makefile deleted file mode 100644 index fcf836a2a627..000000000000 --- a/net/asterisk11/files/patch-Makefile +++ /dev/null @@ -1,137 +0,0 @@ ---- Makefile.orig 2015-07-24 22:06:05 UTC -+++ Makefile -@@ -126,7 +126,7 @@ ASTTOPDIR:=$(subst $(space),\$(space),$( - OVERWRITE=y - - # Include debug and macro symbols in the executables (-g) and profiling info (-pg) --DEBUG=-g3 -+#DEBUG=-g3 - - # Asterisk.conf is located in ASTETCDIR or by using the -C flag - # when starting Asterisk -@@ -209,7 +209,7 @@ endif - - 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) - # flag to tell 'ldconfig' to only process specified directories - LDCONFIG_FLAGS=-m -@@ -466,8 +466,12 @@ datafiles: _all doc/core-en_US.xml - $(INSTALL) -m 644 $$n "$(DESTDIR)$(ASTDATADIR)/static-http/docs" ; \ - done \ - fi -+ if [ ! -d $(DESTDIR)$(DOCSDIR)/images ]; then \ -+ $(MKDIR) $(DESTDIR)$(DOCSDIR)/images; \ -+ fi -+ - for x in images/*.jpg; do \ -- $(INSTALL) -m 644 $$x "$(DESTDIR)$(ASTDATADIR)/images" ; \ -+ $(INSTALL) -m 644 $$x "$(DESTDIR)$(DOCSDIR)/images" ; \ - done - $(MAKE) -C sounds install - -@@ -547,7 +551,7 @@ INSTALLDIRS="$(ASTLIBDIR)" "$(ASTMODDIR) - "$(ASTDATADIR)/documentation/thirdparty" "$(ASTDATADIR)/firmware" \ - "$(ASTDATADIR)/firmware/iax" "$(ASTDATADIR)/images" "$(ASTDATADIR)/keys" \ - "$(ASTDATADIR)/phoneprov" "$(ASTDATADIR)/static-http" "$(ASTDATADIR)/sounds" \ -- "$(ASTDATADIR)/moh" "$(ASTMANDIR)/man8" "$(AGI_DIR)" "$(ASTDBDIR)" -+ "$(ASTDATADIR)/moh" "$(ASTMANDIR)/man8" "$(AGI_DIR)" "$(ASTDBDIR)" "$(ASTSPOOLDIR)/outgoing" - - installdirs: - @for i in $(INSTALLDIRS); do \ -@@ -616,7 +620,7 @@ ifneq ($(filter ~%,$(DESTDIR)),) - @exit 1 - endif - --install: badshell bininstall datafiles -+install: badshell bininstall datafiles samples - @if [ -x /usr/sbin/asterisk-post-install ]; then \ - /usr/sbin/asterisk-post-install "$(DESTDIR)" . ; \ - fi -@@ -625,21 +629,7 @@ install: badshell bininstall datafiles - @echo " + YOU MUST READ THE SECURITY DOCUMENT +" - @echo " + +" - @echo " + Asterisk has successfully been installed. +" -- @echo " + If you would like to install the sample +" -- @echo " + configuration files (overwriting any +" -- @echo " + existing config files), run: +" - @echo " + +" -- @echo " + $(mK) samples +" -- @echo " + +" -- @echo " +----------------- or ---------------------+" -- @echo " + +" -- @echo " + You can go ahead and install the asterisk +" -- @echo " + program documentation now or later run: +" -- @echo " + +" -- @echo " + $(mK) progdocs +" -- @echo " + +" -- @echo " + **Note** This requires that you have +" -- @echo " + doxygen installed on your local system +" - @echo " +-------------------------------------------+" - @$(MAKE) -s oldmodcheck - -@@ -658,45 +648,30 @@ adsi: - else \ - echo "Installing $$x" ; \ - fi ; \ -- $(INSTALL) -m 644 "$$x" "$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`" ; \ -+ $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x`.sample ; \ - done - - samples: adsi - @echo Installing other config files... - @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 ;\ -- fi ; \ - echo "Installing file $$x"; \ -- $(INSTALL) -m 644 "$$x" "$${dst}" ;\ -+ $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x` ;\ - done -- if [ "$(OVERWRITE)" = "y" ]; then \ -- echo "Updating asterisk.conf" ; \ -- sed -e 's|^astetcdir.*$$|astetcdir => $(ASTETCDIR)|' \ -- -e 's|^astmoddir.*$$|astmoddir => $(ASTMODDIR)|' \ -- -e 's|^astvarlibdir.*$$|astvarlibdir => $(ASTVARLIBDIR)|' \ -- -e 's|^astdbdir.*$$|astdbdir => $(ASTDBDIR)|' \ -- -e 's|^astkeydir.*$$|astkeydir => $(ASTKEYDIR)|' \ -- -e 's|^astdatadir.*$$|astdatadir => $(ASTDATADIR)|' \ -- -e 's|^astagidir.*$$|astagidir => $(AGI_DIR)|' \ -- -e 's|^astspooldir.*$$|astspooldir => $(ASTSPOOLDIR)|' \ -- -e 's|^astrundir.*$$|astrundir => $(ASTVARRUNDIR)|' \ -- -e 's|^astlogdir.*$$|astlogdir => $(ASTLOGDIR)|' \ -- -e 's|^astsbindir.*$$|astsbindir => $(ASTSBINDIR)|' \ -- "$(DESTDIR)$(ASTCONFPATH)" > "$(DESTDIR)$(ASTCONFPATH).tmp" ; \ -- $(INSTALL) -m 644 "$(DESTDIR)$(ASTCONFPATH).tmp" "$(DESTDIR)$(ASTCONFPATH)" ; \ -- rm -f "$(DESTDIR)$(ASTCONFPATH).tmp" ; \ -- fi ; \ -+ echo "Updating asterisk.conf" ; \ -+ sed -e 's|^astetcdir.*$$|astetcdir => $(ASTETCDIR)|' \ -+ -e 's|^astmoddir.*$$|astmoddir => $(ASTMODDIR)|' \ -+ -e 's|^astvarlibdir.*$$|astvarlibdir => $(ASTVARLIBDIR)|' \ -+ -e 's|^astdbdir.*$$|astdbdir => $(ASTDBDIR)|' \ -+ -e 's|^astkeydir.*$$|astkeydir => $(ASTKEYDIR)|' \ -+ -e 's|^astdatadir.*$$|astdatadir => $(ASTDATADIR)|' \ -+ -e 's|^astagidir.*$$|astagidir => $(AGI_DIR)|' \ -+ -e 's|^astspooldir.*$$|astspooldir => $(ASTSPOOLDIR)|' \ -+ -e 's|^astrundir.*$$|astrundir => $(ASTVARRUNDIR)|' \ -+ -e 's|^astlogdir.*$$|astlogdir => $(ASTLOGDIR)|' \ -+ -e 's|^astsbindir.*$$|astsbindir => $(ASTSBINDIR)|' \ -+ "$(DESTDIR)$(ASTCONFPATH).sample" > "$(DESTDIR)$(ASTCONFPATH).tmp" ; \ -+ $(INSTALL) -m 644 "$(DESTDIR)$(ASTCONFPATH).tmp" "$(DESTDIR)$(ASTCONFPATH).sample" ; \ -+ rm -f "$(DESTDIR)$(ASTCONFPATH).tmp" ; \ - $(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX" - build_tools/make_sample_voicemail "$(DESTDIR)/$(ASTDATADIR)" "$(DESTDIR)/$(ASTSPOOLDIR)" - |