diff options
| author | Marcus Alves Grando <mnag@FreeBSD.org> | 2006-10-20 15:03:02 +0000 |
|---|---|---|
| committer | Marcus Alves Grando <mnag@FreeBSD.org> | 2006-10-20 15:03:02 +0000 |
| commit | 1cc6d00e51982ad5113aa397ebfa50591683579c (patch) | |
| tree | 3182a2a3c55289c57fedf8c508087d494b88ee25 /net/asterisk/files | |
| parent | - Mark as forbidden (diff) | |
- Update to 1.2.13
PR: 104567
Submitted by: Thomas Sandford <freebsduser___paradisegreen.co.uk>
Approved by: portmgr (secteam blanket), maintainer timeout (1 day, security bypass)
With hat: secteam
Security: http://www.vuxml.org/freebsd/1c0def84-5fb1-11db-b2e9-0008c79fa3d2.html
Notes
Notes:
svn path=/head/; revision=175434
Diffstat (limited to 'net/asterisk/files')
| -rw-r--r-- | net/asterisk/files/patch-cdr::Makefile | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/net/asterisk/files/patch-cdr::Makefile b/net/asterisk/files/patch-cdr::Makefile index 506db2fedcf9..ff9bae81cfd4 100644 --- a/net/asterisk/files/patch-cdr::Makefile +++ b/net/asterisk/files/patch-cdr::Makefile @@ -1,8 +1,5 @@ - -$FreeBSD$ - ---- cdr/Makefile.orig Tue Nov 29 20:24:39 2005 -+++ cdr/Makefile Thu Jan 12 17:56:23 2006 +--- cdr/Makefile.orig Thu Sep 21 17:18:19 2006 ++++ cdr/Makefile Thu Oct 19 10:52:51 2006 @@ -21,8 +21,8 @@ endif @@ -14,7 +11,7 @@ $FreeBSD$ endif #The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only. -@@ -38,18 +38,18 @@ +@@ -38,21 +38,21 @@ # # unixODBC stuff... # @@ -27,17 +24,21 @@ $FreeBSD$ # FreeTDS stuff... # -ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/tds.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/tds.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/freetds/tds.h),) -- ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/local/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/include/freetds/tdsver.h | grep -c 0.63),1) +- ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/local/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/include/freetds/tdsver.h | grep -c 0.64),1) +ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/tds.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/tds.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/freetds/tds.h),) -+ ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/include/freetds/tdsver.h | grep -c 0.63),1) - CFLAGS += -DFREETDS_0_63 ++ ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/include/freetds/tdsver.h | grep -c 0.64),1) + CFLAGS += -DFREETDS_0_64 else -- ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/local/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/include/freetds/tdsver.h | grep -c 0.62),1) -+ ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/include/freetds/tdsver.h | grep -c 0.62),1) - CFLAGS += -DFREETDS_0_62 +- ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/local/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/include/freetds/tdsver.h | grep -c 0.63),1) ++ ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/include/freetds/tdsver.h | grep -c 0.63),1) + CFLAGS += -DFREETDS_0_63 else - CFLAGS += -DFREETDS_PRE_0_62 -@@ -61,7 +61,7 @@ +- ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/local/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/include/freetds/tdsver.h | grep -c 0.62),1) ++ ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/include/freetds/tdsver.h | grep -c 0.62),1) + CFLAGS += -DFREETDS_0_62 + else + CFLAGS += -DFREETDS_PRE_0_62 +@@ -65,7 +65,7 @@ # # PGSQL stuff... Autoconf anyone?? # @@ -46,7 +47,7 @@ $FreeBSD$ MODS+=cdr_pgsql.so endif -@@ -82,9 +82,9 @@ +@@ -86,9 +86,9 @@ MLFLAGS+=-L$(CROSS_COMPILE_TARGET)/usr/lib/pgsql endif @@ -59,7 +60,7 @@ $FreeBSD$ endif ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/opt/pgsql/include),) -@@ -110,7 +110,7 @@ +@@ -114,7 +114,7 @@ all: depend $(MODS) install: all |