diff options
| author | Florian Smeets <flo@FreeBSD.org> | 2011-05-10 21:19:34 +0000 |
|---|---|---|
| committer | Florian Smeets <flo@FreeBSD.org> | 2011-05-10 21:19:34 +0000 |
| commit | dc8be637687924bf10b03d7ce310e519d9c19501 (patch) | |
| tree | 76e56deb317981cf32c6d42fb21a879e690c7546 /net/asterisk/files/patch-Makefile | |
| parent | ftp.uni-koeln.de no longer carriers util/arc/, mirror locally. (diff) | |
- update to 1.8.4
- add lua support [1]
- add libsrtp support [2]
PR: ports/156775 [2]
Submitted by: Andre Luiz dos Santo [1]
Alexander Brovikov [2]
Diffstat (limited to 'net/asterisk/files/patch-Makefile')
| -rw-r--r-- | net/asterisk/files/patch-Makefile | 34 |
1 files changed, 15 insertions, 19 deletions
diff --git a/net/asterisk/files/patch-Makefile b/net/asterisk/files/patch-Makefile index 9dc24fa96ebe..28033ba65dca 100644 --- a/net/asterisk/files/patch-Makefile +++ b/net/asterisk/files/patch-Makefile @@ -1,5 +1,5 @@ ---- Makefile.orig 2011-01-12 16:57:43.000000000 +0100 -+++ Makefile 2011-03-02 11:34:26.000000000 +0100 +--- Makefile.orig 2011-02-01 19:02:06.000000000 +0100 ++++ Makefile 2011-05-10 20:05:28.666173614 +0200 @@ -122,7 +122,7 @@ OVERWRITE=y @@ -32,29 +32,25 @@ _ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi) endif -@@ -463,13 +465,18 @@ +@@ -462,9 +464,14 @@ + $(INSTALL) -m 644 $$x "$(DESTDIR)$(ASTDATADIR)/static-http" ; \ done $(INSTALL) -m 644 doc/core-en_US.xml "$(DESTDIR)$(ASTDATADIR)/static-http"; - if [ -d doc/tex/asterisk ] ; then \ -- $(INSTALL) -d "$(DESTDIR)$(ASTDATADIR)/static-http/docs" ; \ -+ $(INSTALL) -d $(DESTDIR)$(DOCSDIR) ; \ -+ $(INSTALL) -d $(DESTDIR)$(DOCSDIR)/images ; \ - for n in doc/tex/asterisk/* ; do \ -- $(INSTALL) -m 644 $$n "$(DESTDIR)$(ASTDATADIR)/static-http/docs" ; \ -+ $(INSTALL) -m 644 $$n $(DESTDIR)$(DOCSDIR) ; \ - done \ - fi +- for x in images/*.jpg; do \ +- $(INSTALL) -m 644 $$x "$(DESTDIR)$(ASTDATADIR)/images" ; \ +- done ++ + if [ ! -d $(DESTDIR)$(DOCSDIR)/images ]; then \ + $(MKDIR) $(DESTDIR)$(DOCSDIR)/images; \ + fi + - for x in images/*.jpg; do \ -- $(INSTALL) -m 644 $$x "$(DESTDIR)$(ASTDATADIR)/images" ; \ ++ for x in images/*.jpg; do \ + $(INSTALL) -m 644 $$x $(DESTDIR)$(DOCSDIR)/images ; \ - done ++ done $(MAKE) -C sounds install -@@ -529,6 +536,7 @@ + doc/core-en_US.xml: $(foreach dir,$(MOD_SUBDIRS),$(shell $(GREP) -l "language=\"en_US\"" $(dir)/*.c $(dir)/*.cc 2>/dev/null)) +@@ -523,6 +530,7 @@ $(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/dictate" $(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/meetme" $(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/monitor" @@ -62,7 +58,7 @@ $(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/system" $(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/tmp" $(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/voicemail" -@@ -550,6 +558,7 @@ +@@ -544,6 +552,7 @@ $(INSTALL) -d "$(DESTDIR)$(ASTDATADIR)/static-http" $(INSTALL) -d "$(DESTDIR)$(ASTMANDIR)/man8" $(INSTALL) -d "$(DESTDIR)$(AGI_DIR)" @@ -70,7 +66,7 @@ bininstall: _all installdirs $(SUBDIRS_INSTALL) $(INSTALL) -m 755 main/asterisk $(DESTDIR)$(ASTSBINDIR)/ -@@ -609,7 +618,7 @@ +@@ -603,7 +612,7 @@ @exit 1 endif @@ -79,7 +75,7 @@ @if [ -x /usr/sbin/asterisk-post-install ]; then \ /usr/sbin/asterisk-post-install $(DESTDIR) . ; \ fi -@@ -651,29 +660,18 @@ +@@ -645,29 +654,18 @@ else \ echo "Installing $$x" ; \ fi ; \ |