diff options
| author | Maxim Sobolev <sobomax@FreeBSD.org> | 2007-04-26 00:11:37 +0000 |
|---|---|---|
| committer | Maxim Sobolev <sobomax@FreeBSD.org> | 2007-04-26 00:11:37 +0000 |
| commit | 559dc947292766686383f7a9e2364746b6be393d (patch) | |
| tree | 1957adcda77ca0f7c9b40ff6c559cba6fda227a5 /net/asterisk12/files/patch-cdr::Makefile | |
| parent | FrostWire is an open-source peer-to-peer (P2P) file-sharing program. It uses (diff) | |
o Update zaptel to 1.4.1;
Submitted by: Oleksandr Tymoshenko <gonzo@pbxpress.com>
o update libpri to 1.4.0;
PR: 111555
Submitted by: "Phillip N." <pneumann@gmail.com>
o update asterisk12 to 1.2.7.
Sponsored by: Sippy Software, Inc. ( http://www.sippysoft.com/ )
The reason it all is going in together is that they are interdependent.
Notes
Notes:
svn path=/head/; revision=190886
Diffstat (limited to 'net/asterisk12/files/patch-cdr::Makefile')
| -rw-r--r-- | net/asterisk12/files/patch-cdr::Makefile | 34 |
1 files changed, 26 insertions, 8 deletions
diff --git a/net/asterisk12/files/patch-cdr::Makefile b/net/asterisk12/files/patch-cdr::Makefile index ff9bae81cfd4..8628383461d2 100644 --- a/net/asterisk12/files/patch-cdr::Makefile +++ b/net/asterisk12/files/patch-cdr::Makefile @@ -1,5 +1,8 @@ ---- cdr/Makefile.orig Thu Sep 21 17:18:19 2006 -+++ cdr/Makefile Thu Oct 19 10:52:51 2006 + +$FreeBSD$ + +--- cdr/Makefile.orig ++++ cdr/Makefile @@ -21,8 +21,8 @@ endif @@ -11,14 +14,16 @@ endif #The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only. -@@ -38,21 +38,21 @@ +@@ -38,21 +38,23 @@ # # unixODBC stuff... # -ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/odbcinst.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/odbcinst.h),) ++ifdef WITH_ODBC +ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/odbcinst.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/odbcinst.h),) MODS+=cdr_odbc.so endif ++endif # # FreeTDS stuff... @@ -38,16 +43,29 @@ CFLAGS += -DFREETDS_0_62 else CFLAGS += -DFREETDS_PRE_0_62 -@@ -65,7 +65,7 @@ +@@ -65,7 +67,7 @@ # # PGSQL stuff... Autoconf anyone?? # --ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/postgresql)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/pgsql/include)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/pgsql)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/pgsql)$(wildcard $(CROSS_COMPILE_TARGET)/opt/pgsql/include)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/libpq-fe.h),) -+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/postgresql)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/pgsql/include)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/pgsql)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/pgsql)$(wildcard $(CROSS_COMPILE_TARGET)/opt/pgsql/include)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/libpq-fe.h),) +-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/postgresql/libpq-fe.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/pgsql/include/libpq-fe.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/pgsql/libpq-fe.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/pgsql/libpq-fe.h)$(wildcard $(CROSS_COMPILE_TARGET)/opt/pgsql/include/libpq-fe.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/libpq-fe.h),) ++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/postgresql/libpq-fe.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/pgsql/include/libpq-fe.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/pgsql/libpq-fe.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/pgsql/libpq-fe.h)$(wildcard $(CROSS_COMPILE_TARGET)/opt/pgsql/include/libpq-fe.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/libpq-fe.h),) MODS+=cdr_pgsql.so endif -@@ -86,9 +86,9 @@ +@@ -76,9 +78,9 @@ + MLFLAGS+=-L$(CROSS_COMPILE_TARGET)/usr/lib/postgresql + endif + +-ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/pgsql/include),) +- CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/pgsql/include +- MLFLAGS+=-L$(CROSS_COMPILE_TARGET)/usr/local/pgsql/lib ++ifneq ($(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/pgsql/include),) ++ CFLAGS+=-I$(CROSS_COMPILE_TARGET)$(LOCALBASE)/pgsql/include ++ MLFLAGS+=-L$(CROSS_COMPILE_TARGET)$(LOCALBASE)/pgsql/lib + endif + + ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/pgsql),) +@@ -86,9 +88,9 @@ MLFLAGS+=-L$(CROSS_COMPILE_TARGET)/usr/lib/pgsql endif @@ -60,7 +78,7 @@ endif ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/opt/pgsql/include),) -@@ -114,7 +114,7 @@ +@@ -114,7 +116,7 @@ all: depend $(MODS) install: all |