diff options
| author | Florian Smeets <flo@FreeBSD.org> | 2011-05-22 17:09:50 +0000 |
|---|---|---|
| committer | Florian Smeets <flo@FreeBSD.org> | 2011-05-22 17:09:50 +0000 |
| commit | 189dfe429ce3f694116f8b0c13a1fb967acc64b8 (patch) | |
| tree | 5dbf1be38acfb43490a3fd4a9c62d00fd9e68996 /net/asterisk/files/patch-Makefile | |
| parent | - Switch back to mythplugins distfile because they rerolled it and included m... (diff) | |
- prevent deletion of asterisk.conf, it was mistakenly added to pkg-plist
- make sure asterisk.conf and asterisk.conf-dist are identicall on install
PR: ports/156775, ports/156992
Notes
Notes:
svn path=/head/; revision=274461
Diffstat (limited to 'net/asterisk/files/patch-Makefile')
| -rw-r--r-- | net/asterisk/files/patch-Makefile | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/net/asterisk/files/patch-Makefile b/net/asterisk/files/patch-Makefile index 28033ba65dca..b18b820d1949 100644 --- a/net/asterisk/files/patch-Makefile +++ b/net/asterisk/files/patch-Makefile @@ -1,5 +1,5 @@ --- Makefile.orig 2011-02-01 19:02:06.000000000 +0100 -+++ Makefile 2011-05-10 20:05:28.666173614 +0200 ++++ Makefile 2011-05-22 18:45:02.809438425 +0200 @@ -122,7 +122,7 @@ OVERWRITE=y @@ -32,24 +32,21 @@ _ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi) endif -@@ -462,9 +464,14 @@ +@@ -462,8 +464,13 @@ $(INSTALL) -m 644 $$x "$(DESTDIR)$(ASTDATADIR)/static-http" ; \ done $(INSTALL) -m 644 doc/core-en_US.xml "$(DESTDIR)$(ASTDATADIR)/static-http"; -- 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 \ + for x in images/*.jpg; do \ +- $(INSTALL) -m 644 $$x "$(DESTDIR)$(ASTDATADIR)/images" ; \ + $(INSTALL) -m 644 $$x $(DESTDIR)$(DOCSDIR)/images ; \ -+ done + done $(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)) @@ -523,6 +530,7 @@ $(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/dictate" $(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/meetme" @@ -110,3 +107,11 @@ echo "Updating asterisk.conf" ; \ sed -e 's|^astetcdir.*$$|astetcdir => $(ASTETCDIR)|' \ -e 's|^astmoddir.*$$|astmoddir => $(MODULES_DIR)|' \ +@@ -681,6 +679,7 @@ + -e 's|^astlogdir.*$$|astlogdir => $(ASTLOGDIR)|' \ + $(DESTDIR)$(ASTCONFPATH) > $(DESTDIR)$(ASTCONFPATH).tmp ; \ + $(INSTALL) -m 644 $(DESTDIR)$(ASTCONFPATH).tmp $(DESTDIR)$(ASTCONFPATH) ; \ ++ $(INSTALL) -m 644 $(DESTDIR)$(ASTCONFPATH).tmp $(DESTDIR)$(ASTCONFPATH)-dist ; \ + rm -f $(DESTDIR)$(ASTCONFPATH).tmp ; \ + fi ; \ + $(INSTALL) -d $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX |