diff options
| author | Maxim Sobolev <sobomax@FreeBSD.org> | 2007-09-18 03:18:10 +0000 |
|---|---|---|
| committer | Maxim Sobolev <sobomax@FreeBSD.org> | 2007-09-18 03:18:10 +0000 |
| commit | 1bddf2590603a62202dc3e9ea98303fb83557b89 (patch) | |
| tree | 6c4c5ea6952fac23c9e37de7cf4e3ac75bca6ec0 /net/asterisk14/files/nocodecnego-patch-Makefile | |
| parent | C99 modernization of the original Portable C Compiler by S. C. Johnson, (diff) | |
Make sure to set astrundir to /var/run in the default asterisk.conf, so that
it matches rc.d startup script. Bump PORTREVISION.
Reported by: Steve Clement
Notes
Notes:
svn path=/head/; revision=199647
Diffstat (limited to 'net/asterisk14/files/nocodecnego-patch-Makefile')
| -rw-r--r-- | net/asterisk14/files/nocodecnego-patch-Makefile | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/net/asterisk14/files/nocodecnego-patch-Makefile b/net/asterisk14/files/nocodecnego-patch-Makefile index b14d76ff7330..680c226dc42d 100644 --- a/net/asterisk14/files/nocodecnego-patch-Makefile +++ b/net/asterisk14/files/nocodecnego-patch-Makefile @@ -1,8 +1,14 @@ - -$FreeBSD: /tmp/pcvs/ports/net/asterisk14/files/nocodecnego-patch-Makefile,v 1.1 2007-08-10 16:30:40 sobomax Exp $ - ---- Makefile.orig -+++ Makefile +--- Makefile.orig Thu Aug 9 16:10:46 2007 ++++ Makefile Mon Sep 17 11:40:51 2007 +@@ -119,7 +119,7 @@ + ASTMANDIR=$(mandir) + ifneq ($(findstring BSD,$(OSARCH)),) + ASTVARLIBDIR=$(prefix)/share/asterisk +- ASTVARRUNDIR=$(localstatedir)/run/asterisk ++ ASTVARRUNDIR=$(localstatedir)/run + else + ASTVARLIBDIR=$(localstatedir)/lib/asterisk + endif @@ -210,7 +210,7 @@ ifeq ($(OSARCH),FreeBSD) @@ -12,7 +18,7 @@ $FreeBSD: /tmp/pcvs/ports/net/asterisk14/files/nocodecnego-patch-Makefile,v 1.1 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 -@@ -375,15 +375,15 @@ +@@ -379,15 +379,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. @@ -33,7 +39,7 @@ $FreeBSD: /tmp/pcvs/ports/net/asterisk14/files/nocodecnego-patch-Makefile,v 1.1 $(MAKE) -C sounds install update: -@@ -404,45 +404,45 @@ +@@ -408,45 +408,45 @@ OLDHEADERS=$(filter-out $(NEWHEADERS),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h))) bininstall: _all @@ -109,7 +115,7 @@ $FreeBSD: /tmp/pcvs/ports/net/asterisk14/files/nocodecnego-patch-Makefile,v 1.1 fi $(SUBDIRS_INSTALL): -@@ -469,7 +469,7 @@ +@@ -473,7 +473,7 @@ echo " WARNING WARNING WARNING" ;\ fi @@ -118,7 +124,7 @@ $FreeBSD: /tmp/pcvs/ports/net/asterisk14/files/nocodecnego-patch-Makefile,v 1.1 @if [ -x /usr/sbin/asterisk-post-install ]; then \ /usr/sbin/asterisk-post-install $(DESTDIR) . ; \ fi -@@ -499,31 +499,23 @@ +@@ -511,31 +511,23 @@ upgrade: bininstall adsi: @@ -158,7 +164,7 @@ $FreeBSD: /tmp/pcvs/ports/net/asterisk14/files/nocodecnego-patch-Makefile,v 1.1 ( \ echo "[directories]" ; \ echo "astetcdir => $(ASTETCDIR)" ; \ -@@ -544,20 +536,23 @@ +@@ -556,20 +548,23 @@ echo ";astctlowner = root" ; \ echo ";astctlgroup = apache" ; \ echo ";astctl = asterisk.ctl" ; \ @@ -186,7 +192,7 @@ $FreeBSD: /tmp/pcvs/ports/net/asterisk14/files/nocodecnego-patch-Makefile,v 1.1 done @echo " +--------- Asterisk Web Voicemail ----------+" @echo " + +" -@@ -584,10 +579,10 @@ +@@ -596,10 +591,10 @@ __rpm: include/asterisk/version.h include/asterisk/buildopts.h spec rm -rf /tmp/asterisk ; \ @@ -199,7 +205,7 @@ $FreeBSD: /tmp/pcvs/ports/net/asterisk14/files/nocodecnego-patch-Makefile,v 1.1 cp -f contrib/init.d/rc.redhat.asterisk /tmp/asterisk/etc/rc.d/init.d/asterisk ; \ rpmbuild --rcfile /usr/lib/rpm/rpmrc:redhat/rpmrc -bb asterisk.spec -@@ -598,19 +593,19 @@ +@@ -610,19 +605,19 @@ config: @if [ "${OSARCH}" = "linux-gnu" ]; then \ if [ -f /etc/redhat-release -o -f /etc/fedora-release ]; then \ |