diff options
| author | Kurt Jaeger <pi@FreeBSD.org> | 2014-11-09 11:34:41 +0000 |
|---|---|---|
| committer | Kurt Jaeger <pi@FreeBSD.org> | 2014-11-09 11:34:41 +0000 |
| commit | db3f9a1bfc48751d0f9c46c3f788b8d14a225c9f (patch) | |
| tree | ad7128dcb9727fd359165948d614b92d743128c9 /net/kamailio/files | |
| parent | net-mgmt/zabbix2: Upgrade version 2.0.12 => 2.0.13 (diff) | |
net/kamailio: 4.1.6 -> 4.2.0
Changelog: http://www.kamailio.org/w/kamailio-v4-2-0-release-notes/
Diffstat (limited to 'net/kamailio/files')
| -rw-r--r-- | net/kamailio/files/patch-Makefile | 24 | ||||
| -rw-r--r-- | net/kamailio/files/patch-Makefile.defs | 22 |
2 files changed, 24 insertions, 22 deletions
diff --git a/net/kamailio/files/patch-Makefile b/net/kamailio/files/patch-Makefile index a5a88fe0b6d3..73c014cf6030 100644 --- a/net/kamailio/files/patch-Makefile +++ b/net/kamailio/files/patch-Makefile @@ -1,5 +1,5 @@ ---- Makefile.orig 2014-08-06 15:29:50 UTC -+++ Makefile +--- Makefile.orig 2014-10-16 14:46:22.000000000 +0200 ++++ Makefile 2014-11-09 11:52:07.000000000 +0100 @@ -95,7 +95,7 @@ # whether or not to install $(MAIN_NAME).cfg or just $(MAIN_NAME).cfg.default # ($(MAIN_NAME).cfg will never be overwritten by make install, this is usefull @@ -9,14 +9,18 @@ #extra modules to exclude skip_modules?= -@@ -820,8 +820,8 @@ +@@ -819,10 +819,10 @@ + fi ; \ fi ; \ - done; true - # radius dictionary -- $(INSTALL_TOUCH) $(cfg_prefix)/$(cfg_dir)/dictionary.$(CFG_NAME) -- $(INSTALL_CFG) etc/dictionary.$(CFG_NAME) $(cfg_prefix)/$(cfg_dir) -+ $(INSTALL_TOUCH) $(cfg_prefix)/$(cfg_dir)/dictionary.$(CFG_NAME).sample -+ $(INSTALL_CFG) etc/dictionary.$(CFG_NAME) $(cfg_prefix)/$(cfg_dir)/dictionary.$(CFG_NAME).sample + : ; done; true +- @# radius dictionary +- @$(INSTALL_TOUCH) $(cfg_prefix)/$(cfg_dir)/dictionary.$(CFG_NAME) +- @$(INSTALL_CFG) etc/dictionary.$(CFG_NAME) $(cfg_prefix)/$(cfg_dir) +- @echo "config files installed" ++ # radius dictionary ++ $(INSTALL_TOUCH) $(cfg_prefix)/$(cfg_dir)/dictionary.$(CFG_NAME).sample ++ $(INSTALL_CFG) etc/dictionary.$(CFG_NAME) $(cfg_prefix)/$(cfg_dir)/dictionary.$(CFG_NAME).sample ++ echo "config files installed" install-bin: $(bin_prefix)/$(bin_dir) $(NAME) - $(INSTALL_TOUCH) $(bin_prefix)/$(bin_dir)/$(NAME) + $(INSTALL_TOUCH) $(bin_prefix)/$(bin_dir)/$(NAME) diff --git a/net/kamailio/files/patch-Makefile.defs b/net/kamailio/files/patch-Makefile.defs index 0602f291f932..ada442d3a67e 100644 --- a/net/kamailio/files/patch-Makefile.defs +++ b/net/kamailio/files/patch-Makefile.defs @@ -1,6 +1,6 @@ ---- Makefile.defs.orig 2014-09-18 16:09:15.000000000 +0200 -+++ Makefile.defs 2014-09-19 08:27:49.000000000 +0200 -@@ -265,7 +265,7 @@ +--- Makefile.defs.orig 2014-10-16 14:46:23.000000000 +0200 ++++ Makefile.defs 2014-11-09 11:54:46.000000000 +0100 +@@ -264,7 +264,7 @@ # find compiler name & version ifeq ($(CC),) @@ -9,7 +9,7 @@ endif LD= $(CC) CC_LONGVER:=$(shell if $(CC) -v 2>/dev/null; then \ -@@ -279,7 +279,7 @@ +@@ -278,7 +278,7 @@ #find-out the compiler's name ifneq (,$(findstring gcc, $(CC_LONGVER))) @@ -18,7 +18,7 @@ RPAREN=) CC_VER:=$(word 1,$(CC)) $(shell $(CC) - --version|head -n 1|\ sed -e 's/([^$(RPAREN)]*)//g' \ -@@ -432,7 +432,7 @@ +@@ -431,7 +431,7 @@ ifeq ($(LIBDIR),) ARCHBSZ= $(shell echo $(ARCH) | sed -e 's/.*64.*/64b/') ifeq ($(ARCHBSZ),64b) @@ -27,21 +27,19 @@ else LIBDIR = lib endif -@@ -946,11 +946,8 @@ +@@ -945,10 +945,7 @@ ifeq ($(CC_NAME), clang) $(call set_if_empty,CPU,athlon64) C_DEFS+=-DCC_GCC_LIKE_ASM -- CFLAGS+=-m32 +- CFLAGS+=-g -m32 - $(CC_OPT) \ - \ - -mtune=$(CPU) -- LDFLAGS+=-m32 -+ CFLAGS+=-m32 $(CC_OPT) -mtune=$(CPU) -+ LDFLAGS+=-m32 ++ CFLAGS+=-g -m32 $(CC_OPT) -mtune=$(CPU) + LDFLAGS+=-m32 else # CC_NAME, clang ifeq ($(CC_NAME), icc) - C_DEFS+=-DCC_GCC_LIKE_ASM -@@ -1745,7 +1742,7 @@ +@@ -1744,7 +1741,7 @@ endif YACC_FLAGS=-d -b cfg # on solaris add -lxnet (e.g. LIBS= -lxnet) |