summaryrefslogtreecommitdiff
path: root/net/asterisk16/files
diff options
context:
space:
mode:
Diffstat (limited to 'net/asterisk16/files')
-rw-r--r--net/asterisk16/files/patch-Makefile30
-rw-r--r--net/asterisk16/files/patch-agi::Makefile4
-rw-r--r--net/asterisk16/files/patch-apps::Makefile2
-rw-r--r--net/asterisk16/files/patch-cdr::Makefile12
-rw-r--r--net/asterisk16/files/patch-channels::Makefile10
-rw-r--r--net/asterisk16/files/patch-channels::h323::ast_h323.cpp16
-rw-r--r--net/asterisk16/files/patch-channels::h323::ast_h323.h16
-rw-r--r--net/asterisk16/files/patch-res-res_watchdog.c13
8 files changed, 30 insertions, 73 deletions
diff --git a/net/asterisk16/files/patch-Makefile b/net/asterisk16/files/patch-Makefile
index 708a356041a3..61a2c51190b5 100644
--- a/net/asterisk16/files/patch-Makefile
+++ b/net/asterisk16/files/patch-Makefile
@@ -160,15 +160,6 @@ $FreeBSD$
ASTCFLAGS+=-DZAPTEL_OPTIMIZATIONS
endif
-@@ -323,7 +320,7 @@
- ASTERISKVERSIONNUM=999999
- ASTERISKVERSION=SVN-$(shell build_tools/make_svn_branch_name)
- else
-- ASTERISKVERSIONNUM=000000
-+ ASTERISKVERSIONNUM?=000000
- endif
- endif
-
@@ -388,10 +385,10 @@
endif
@@ -221,6 +212,21 @@ $FreeBSD$
ifneq ($(wildcard .depend),)
include .depend
+@@ -470,10 +467,10 @@
+
+ manpage: asterisk.8
+
+-asterisk.8: asterisk.sgml
+- rm -f asterisk.8
+- docbook2man asterisk.sgml
+- mv ./*.8 asterisk.8
++#asterisk.8: asterisk.sgml
++# rm -f asterisk.8
++# docbook2man asterisk.sgml
++# mv ./*.8 asterisk.8
+
+ asterisk.pdf: asterisk.sgml
+ docbook2pdf asterisk.sgml
@@ -510,14 +507,14 @@
cygwin_a:
$(MAKE) -C cygwin all
@@ -241,7 +247,7 @@ $FreeBSD$
@@ -539,38 +536,38 @@
datafiles: all
- if [ x`whoami` = xroot ]; then sh mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
+ if [ x`$(ID) -un` = xroot ]; then sh mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits
- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds/priv-callerintros
+ $(MKDIR) $(DESTDIR)$(ASTVARLIBDIR)/sounds/digits
@@ -310,7 +316,7 @@ $FreeBSD$
update:
@if [ -d .svn ]; then \
-@@ -618,75 +615,53 @@
+@@ -618,73 +615,51 @@
OLDHEADERS=$(filter-out $(NEWHEADERS),$(notdir $(wildcard $(DESTDIR)$(ASTHEADERDIR)/*.h)))
bininstall: all
@@ -359,7 +365,6 @@ $FreeBSD$
if [ -n "$(OLDHEADERS)" ]; then \
rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\
fi
- rm -f $(DESTDIR)$(ASTVARLIBDIR)/sounds/voicemail
- mkdir -p $(DESTDIR)$(ASTVARLIBDIR)/sounds
- mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv
- mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-custom
@@ -392,7 +397,6 @@ $FreeBSD$
else \
echo "You need to do cvs update -d not just cvs update" ; \
fi
- ( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds ; ln -s $(ASTSPOOLDIR)/voicemail . )
- if [ -f mpg123-0.59r/mpg123 ]; then $(MAKE) -C mpg123-0.59r install; fi
- @echo " +---- Asterisk Installation Complete -------+"
- @echo " + +"
diff --git a/net/asterisk16/files/patch-agi::Makefile b/net/asterisk16/files/patch-agi::Makefile
index 82b11dbfde30..4615eef8ec94 100644
--- a/net/asterisk16/files/patch-agi::Makefile
+++ b/net/asterisk16/files/patch-agi::Makefile
@@ -4,8 +4,8 @@
# the GNU General Public License
#
--AGIS=agi-test.agi eagi-test eagi-sphinx-test xagi-test
-+AGIS_BIN=eagi-test eagi-sphinx-test xagi-test
+-AGIS=agi-test.agi eagi-test eagi-sphinx-test
++AGIS_BIN=eagi-test eagi-sphinx-test
+AGIS_SCR=agi-test.agi
+AGIS=$(AGIS_SCR) $(AGIS_BIN)
diff --git a/net/asterisk16/files/patch-apps::Makefile b/net/asterisk16/files/patch-apps::Makefile
index ee7d560bed69..2b0de4d3381c 100644
--- a/net/asterisk16/files/patch-apps::Makefile
+++ b/net/asterisk16/files/patch-apps::Makefile
@@ -61,7 +61,7 @@ $FreeBSD$
+endif
+
app_sql_postgres.o: app_sql_postgres.c
-- $(CC) -pipe -I/usr/local/pgsql/include $(CFLAGS) -c -o app_sql_postgres.o app_sql_postgres.c
+- $(CC) -pipe -I$(CROSS_COMPILE_TARGET)/usr/local/pgsql/include -I$(CROSS_COMPILE_TARGET)/usr/include/postgresql $(CFLAGS) -c -o app_sql_postgres.o app_sql_postgres.c
+ $(CC) -I$(LOCALBASE)/include/pgsql $(CFLAGS) -c -o app_sql_postgres.o app_sql_postgres.c
app_sql_postgres.so: app_sql_postgres.o
diff --git a/net/asterisk16/files/patch-cdr::Makefile b/net/asterisk16/files/patch-cdr::Makefile
index da16b609d5f2..506db2fedcf9 100644
--- a/net/asterisk16/files/patch-cdr::Makefile
+++ b/net/asterisk16/files/patch-cdr::Makefile
@@ -26,14 +26,14 @@ $FreeBSD$
#
# FreeTDS stuff...
#
--ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/tds.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/tds.h),)
-- ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/local/include/tdsver.h | grep -c 0.63),1)
-+ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/tds.h)$(wildcard $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/tds.h),)
-+ ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)$(LOCALBASE)/include/tdsver.h | grep -c 0.63),1)
+-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)
++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
else
-- ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/local/include/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 | grep -c 0.62),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.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
diff --git a/net/asterisk16/files/patch-channels::Makefile b/net/asterisk16/files/patch-channels::Makefile
index edca9b1e7694..872026dfdca2 100644
--- a/net/asterisk16/files/patch-channels::Makefile
+++ b/net/asterisk16/files/patch-channels::Makefile
@@ -3,19 +3,17 @@ $FreeBSD$
--- channels/Makefile.orig
+++ channels/Makefile
-@@ -48,9 +48,9 @@
+@@ -48,8 +48,8 @@
endif
ifeq (${OSARCH},FreeBSD)
- PTLIB=-lpt_FreeBSD_x86_r
- H323LIB=-lh323_FreeBSD_x86_r
-- CHANH323LIB=-pthread
-+ PTLIB=-lpt_FreeBSD_x86_r_s
-+ H323LIB=-lh323_FreeBSD_x86_r_s
-+ CHANH323LIB=
++ PTLIB=-lpt_r
++ H323LIB=-lh323_r
+ CHANH323LIB=-pthread
endif
- ifeq (${OSARCH},NetBSD)
@@ -73,11 +73,11 @@
SOLINK+=-lrt
endif
diff --git a/net/asterisk16/files/patch-channels::h323::ast_h323.cpp b/net/asterisk16/files/patch-channels::h323::ast_h323.cpp
deleted file mode 100644
index feb79e586e91..000000000000
--- a/net/asterisk16/files/patch-channels::h323::ast_h323.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-
-$FreeBSD$
-
---- channels/h323/ast_h323.cpp.orig Thu Jan 12 18:16:08 2006
-+++ channels/h323/ast_h323.cpp Thu Jan 12 18:16:35 2006
-@@ -953,8 +953,8 @@ BOOL MyH323Connection::OnReceivedCapabil
- H323Channel * MyH323Connection::CreateRealTimeLogicalChannel(const H323Capability & capability,
- H323Channel::Directions dir,
- unsigned sessionID,
-- const H245_H2250LogicalChannelParameters * /*param*/,
-- RTP_QOS * /*param*/ )
-+ const H245_H2250LogicalChannelParameters * /*param*/ /*,
-+ RTP_QOS * */ /*param*/ )
- {
- return new MyH323_ExternalRTPChannel(*this, capability, dir, sessionID);
- }
diff --git a/net/asterisk16/files/patch-channels::h323::ast_h323.h b/net/asterisk16/files/patch-channels::h323::ast_h323.h
deleted file mode 100644
index 606bb0123173..000000000000
--- a/net/asterisk16/files/patch-channels::h323::ast_h323.h
+++ /dev/null
@@ -1,16 +0,0 @@
-
-$FreeBSD$
-
---- channels/h323/ast_h323.h.orig Thu Jan 12 18:14:49 2006
-+++ channels/h323/ast_h323.h Thu Jan 12 18:15:02 2006
-@@ -155,8 +155,8 @@ class MyH323Connection : public H323Conn
- H323Channel * CreateRealTimeLogicalChannel(const H323Capability &,
- H323Channel::Directions,
- unsigned,
-- const H245_H2250LogicalChannelParameters *,
-- RTP_QOS *);
-+ const H245_H2250LogicalChannelParameters * /* ,
-+ RTP_QOS * */);
- H323Connection::AnswerCallResponse OnAnswerCall(const PString &,
- const H323SignalPDU &,
- H323SignalPDU &);
diff --git a/net/asterisk16/files/patch-res-res_watchdog.c b/net/asterisk16/files/patch-res-res_watchdog.c
deleted file mode 100644
index 8372764ed3e4..000000000000
--- a/net/asterisk16/files/patch-res-res_watchdog.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- res/res_watchdog.c.orig Mon Jan 23 23:55:25 2006
-+++ res/res_watchdog.c Mon Jan 23 23:55:10 2006
-@@ -37,6 +37,10 @@
- #include <asterisk/utils.h>
- #include <asterisk/adsi.h>
-
-+#if defined(__FreeBSD__) && !defined(O_SYNC)
-+#define O_SYNC O_FSYNC
-+#endif
-+
- static struct watchdog_pvt *watchdogs = NULL;
-
- STANDARD_LOCAL_USER;
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-03 04:20:55 +0000