summaryrefslogtreecommitdiff
path: root/net/asterisk/files/patch-Makefile
diff options
context:
space:
mode:
authorKubilay Kocak <koobs@FreeBSD.org>2015-08-30 10:36:13 +0000
committerKubilay Kocak <koobs@FreeBSD.org>2015-08-30 10:36:13 +0000
commit56978384560efd07a8e601f8ed2552e3c4fb1b92 (patch)
treee269994bc33f2d692150c6f368252aadc7dba2ce /net/asterisk/files/patch-Makefile
parent- Update to 2.4.0 (diff)
net/asterisk: Overhaul & Add *BONUS* user feature
This port now supports custom Asterisk configurations using a *user-supplied* menuselect.makeopt file. This feature is of most value for users that want to disable or override default functionality that they dont want or need, particular in space and/or resource constrained, or embedded environments. For more information see this ports pkg-message file. OPTIONS Changes: - Make speex, libexecinfo and mpg123 OPTION'al - Make menuselect backends (curses/newt) OPTION'al - Re-order, sort and group all OPTIONS - Rename MP3 option to MP3PLAYER (ambiguous with format_mp3 module) - Remove override-able OPTION descriptions (dont appear necessary) - Add CODECS, SOUNDS and DATABASE options groups for better UX - Improve OPTION descriptions - Temporarily disable ICONV option until libxml2 is fixed [1][2] General Changes: - Add support for fetching G.279 Core and MOH sounds - Re-do patches using makepatch (portlint) - Use %%DATADIR%% in pkg-plist (portlint) - Make DATADIR-safe (portlint) - Re-order Makefile sections (portlint) - Reset @owner/@group after pkg-plist entries - Simplify post-install: find files/dirs pkg-plist commands - De-scope global use of LDFLAGS and CPPFLAGS - Use OPTIONS helpers for openh323 CPPFLAGS and MAKE_ENV - Use USE_OPENSSL and its respective variables in CONFIGURE_ARGS - Modify build to be verbose (NOISY_BUILD) - Pass CFLAGS/LDFLAGS to ASTCFLAGS/ASTLDFLAGS respectively in MAKE_ENV - Update and cleanup pkg-plist - Bump PORTREVISION Note: These changes will be merged into net/asterisk11 and net/asterisk13 ports in the near future. [1] https://reviews.freebsd.org/D3261 [2] https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=202006 Reviewed by: madpilot (maintainer) Approved by: madpilot (maintainer) Differential Revision: https://reviews.freebsd.org/D3262
Notes
Notes: svn path=/head/; revision=395609
Diffstat (limited to 'net/asterisk/files/patch-Makefile')
-rw-r--r--net/asterisk/files/patch-Makefile18
1 files changed, 9 insertions, 9 deletions
diff --git a/net/asterisk/files/patch-Makefile b/net/asterisk/files/patch-Makefile
index 2392878bdc50..996f729331ca 100644
--- a/net/asterisk/files/patch-Makefile
+++ b/net/asterisk/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig 2012-06-13 16:27:57.000000000 +0200
-+++ Makefile 2012-08-02 00:02:38.030569971 +0200
-@@ -121,7 +121,7 @@
+--- Makefile.orig 2014-10-31 16:37:55 UTC
++++ Makefile
+@@ -121,7 +121,7 @@ ASTTOPDIR:=$(subst $(space),\$(space),$(
OVERWRITE=y
# Include debug and macro symbols in the executables (-g) and profiling info (-pg)
@@ -9,7 +9,7 @@
# Asterisk.conf is located in ASTETCDIR or by using the -C flag
# when starting Asterisk
-@@ -188,7 +188,7 @@
+@@ -187,7 +187,7 @@ endif
ifeq ($(OSARCH),FreeBSD)
# -V is understood by BSD Make, not by GNU make.
@@ -18,7 +18,7 @@
_ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)
endif
-@@ -415,8 +415,13 @@
+@@ -418,8 +418,13 @@ datafiles: _all doc/core-en_US.xml
$(INSTALL) -m 644 $$x "$(DESTDIR)$(ASTDATADIR)/static-http" ; \
done
$(INSTALL) -m 644 doc/core-en_US.xml "$(DESTDIR)$(ASTDATADIR)/static-http";
@@ -33,7 +33,7 @@
done
$(MAKE) -C sounds install
-@@ -475,7 +480,7 @@
+@@ -478,7 +483,7 @@ INSTALLDIRS="$(ASTLIBDIR)" "$(MODULES_DI
"$(ASTDATADIR)/documentation/thirdparty" "$(ASTDATADIR)/firmware" \
"$(ASTDATADIR)/firmware/iax" "$(ASTDATADIR)/images" "$(ASTDATADIR)/keys" \
"$(ASTDATADIR)/phoneprov" "$(ASTDATADIR)/static-http" "$(ASTDATADIR)/sounds" \
@@ -42,7 +42,7 @@
installdirs:
@for i in $(INSTALLDIRS); do \
-@@ -542,7 +547,7 @@
+@@ -545,7 +550,7 @@ ifneq ($(filter ~%,$(DESTDIR)),)
@exit 1
endif
@@ -51,7 +51,7 @@
@if [ -x /usr/sbin/asterisk-post-install ]; then \
/usr/sbin/asterisk-post-install "$(DESTDIR)" . ; \
fi
-@@ -584,29 +589,18 @@
+@@ -587,29 +592,18 @@ adsi:
else \
echo "Installing $$x" ; \
fi ; \
@@ -87,7 +87,7 @@
echo "Updating asterisk.conf" ; \
sed -e 's|^astetcdir.*$$|astetcdir => $(ASTETCDIR)|' \
-e 's|^astmoddir.*$$|astmoddir => $(MODULES_DIR)|' \
-@@ -620,6 +614,7 @@
+@@ -623,6 +617,7 @@ samples: adsi
-e 's|^astlogdir.*$$|astlogdir => $(ASTLOGDIR)|' \
"$(DESTDIR)$(ASTCONFPATH)" > "$(DESTDIR)$(ASTCONFPATH).tmp" ; \
$(INSTALL) -m 644 "$(DESTDIR)$(ASTCONFPATH).tmp" "$(DESTDIR)$(ASTCONFPATH)" ; \