From 414711836f64b9e55b18d3abc50145fb704397cd Mon Sep 17 00:00:00 2001 From: Max Khon Date: Fri, 15 Jul 2005 12:21:58 +0000 Subject: [PATCH] Fix build on RELENG_4 (fix res_watchdog, do not build fax support). Bump PORTREVISION. Approved by: MAINTAINER --- net/asterisk-bristuff/Makefile | 3 ++- .../files/patch-res-res_watchdog.c | 13 +++++++++++++ net/asterisk-devel/Makefile | 3 ++- net/asterisk-devel/files/patch-res-res_watchdog.c | 13 +++++++++++++ net/asterisk/Makefile | 3 ++- net/asterisk/files/patch-res-res_watchdog.c | 13 +++++++++++++ net/asterisk10/Makefile | 3 ++- net/asterisk10/files/patch-res-res_watchdog.c | 13 +++++++++++++ net/asterisk12/Makefile | 3 ++- net/asterisk12/files/patch-res-res_watchdog.c | 13 +++++++++++++ net/asterisk14/Makefile | 3 ++- net/asterisk14/files/patch-res-res_watchdog.c | 13 +++++++++++++ net/asterisk16/Makefile | 3 ++- net/asterisk16/files/patch-res-res_watchdog.c | 13 +++++++++++++ 14 files changed, 105 insertions(+), 7 deletions(-) create mode 100644 net/asterisk-bristuff/files/patch-res-res_watchdog.c create mode 100644 net/asterisk-devel/files/patch-res-res_watchdog.c create mode 100644 net/asterisk/files/patch-res-res_watchdog.c create mode 100644 net/asterisk10/files/patch-res-res_watchdog.c create mode 100644 net/asterisk12/files/patch-res-res_watchdog.c create mode 100644 net/asterisk14/files/patch-res-res_watchdog.c create mode 100644 net/asterisk16/files/patch-res-res_watchdog.c diff --git a/net/asterisk-bristuff/Makefile b/net/asterisk-bristuff/Makefile index 1ea4517f1202..c422a6454243 100644 --- a/net/asterisk-bristuff/Makefile +++ b/net/asterisk-bristuff/Makefile @@ -7,6 +7,7 @@ PORTNAME= asterisk PORTVERSION= 1.0.9 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= ftp://ftp.asterisk.org/pub/telephony/asterisk/ \ ftp://ftp.asterisk.org/pub/telephony/asterisk/old-releases/ @@ -73,7 +74,7 @@ PLIST_SUB+= WITH_ZAPTEL="" USE_MYSQL= yes .endif -.if !defined(WITHOUT_FAX) +.if !defined(WITHOUT_FAX) && ${OSVERSION} >= 500000 MAKE_ENV+= WITH_FAX=1 LIB_DEPENDS+= spandsp.0:${PORTSDIR}/comms/spandsp PLIST_SUB+= WITH_FAX="" diff --git a/net/asterisk-bristuff/files/patch-res-res_watchdog.c b/net/asterisk-bristuff/files/patch-res-res_watchdog.c new file mode 100644 index 000000000000..51e4b0ae6c71 --- /dev/null +++ b/net/asterisk-bristuff/files/patch-res-res_watchdog.c @@ -0,0 +1,13 @@ +--- res/res_watchdog.c.orig Fri Jul 15 13:24:24 2005 ++++ res/res_watchdog.c Fri Jul 15 13:24:42 2005 +@@ -40,6 +40,10 @@ + + /* Registrar for operations */ + ++#ifndef O_SYNC ++#define O_SYNC O_FSYNC ++#endif ++ + static struct watchdog_pvt *watchdogs = NULL; + + STANDARD_LOCAL_USER; diff --git a/net/asterisk-devel/Makefile b/net/asterisk-devel/Makefile index 1ea4517f1202..c422a6454243 100644 --- a/net/asterisk-devel/Makefile +++ b/net/asterisk-devel/Makefile @@ -7,6 +7,7 @@ PORTNAME= asterisk PORTVERSION= 1.0.9 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= ftp://ftp.asterisk.org/pub/telephony/asterisk/ \ ftp://ftp.asterisk.org/pub/telephony/asterisk/old-releases/ @@ -73,7 +74,7 @@ PLIST_SUB+= WITH_ZAPTEL="" USE_MYSQL= yes .endif -.if !defined(WITHOUT_FAX) +.if !defined(WITHOUT_FAX) && ${OSVERSION} >= 500000 MAKE_ENV+= WITH_FAX=1 LIB_DEPENDS+= spandsp.0:${PORTSDIR}/comms/spandsp PLIST_SUB+= WITH_FAX="" diff --git a/net/asterisk-devel/files/patch-res-res_watchdog.c b/net/asterisk-devel/files/patch-res-res_watchdog.c new file mode 100644 index 000000000000..51e4b0ae6c71 --- /dev/null +++ b/net/asterisk-devel/files/patch-res-res_watchdog.c @@ -0,0 +1,13 @@ +--- res/res_watchdog.c.orig Fri Jul 15 13:24:24 2005 ++++ res/res_watchdog.c Fri Jul 15 13:24:42 2005 +@@ -40,6 +40,10 @@ + + /* Registrar for operations */ + ++#ifndef O_SYNC ++#define O_SYNC O_FSYNC ++#endif ++ + static struct watchdog_pvt *watchdogs = NULL; + + STANDARD_LOCAL_USER; diff --git a/net/asterisk/Makefile b/net/asterisk/Makefile index 1ea4517f1202..c422a6454243 100644 --- a/net/asterisk/Makefile +++ b/net/asterisk/Makefile @@ -7,6 +7,7 @@ PORTNAME= asterisk PORTVERSION= 1.0.9 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= ftp://ftp.asterisk.org/pub/telephony/asterisk/ \ ftp://ftp.asterisk.org/pub/telephony/asterisk/old-releases/ @@ -73,7 +74,7 @@ PLIST_SUB+= WITH_ZAPTEL="" USE_MYSQL= yes .endif -.if !defined(WITHOUT_FAX) +.if !defined(WITHOUT_FAX) && ${OSVERSION} >= 500000 MAKE_ENV+= WITH_FAX=1 LIB_DEPENDS+= spandsp.0:${PORTSDIR}/comms/spandsp PLIST_SUB+= WITH_FAX="" diff --git a/net/asterisk/files/patch-res-res_watchdog.c b/net/asterisk/files/patch-res-res_watchdog.c new file mode 100644 index 000000000000..51e4b0ae6c71 --- /dev/null +++ b/net/asterisk/files/patch-res-res_watchdog.c @@ -0,0 +1,13 @@ +--- res/res_watchdog.c.orig Fri Jul 15 13:24:24 2005 ++++ res/res_watchdog.c Fri Jul 15 13:24:42 2005 +@@ -40,6 +40,10 @@ + + /* Registrar for operations */ + ++#ifndef O_SYNC ++#define O_SYNC O_FSYNC ++#endif ++ + static struct watchdog_pvt *watchdogs = NULL; + + STANDARD_LOCAL_USER; diff --git a/net/asterisk10/Makefile b/net/asterisk10/Makefile index 1ea4517f1202..c422a6454243 100644 --- a/net/asterisk10/Makefile +++ b/net/asterisk10/Makefile @@ -7,6 +7,7 @@ PORTNAME= asterisk PORTVERSION= 1.0.9 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= ftp://ftp.asterisk.org/pub/telephony/asterisk/ \ ftp://ftp.asterisk.org/pub/telephony/asterisk/old-releases/ @@ -73,7 +74,7 @@ PLIST_SUB+= WITH_ZAPTEL="" USE_MYSQL= yes .endif -.if !defined(WITHOUT_FAX) +.if !defined(WITHOUT_FAX) && ${OSVERSION} >= 500000 MAKE_ENV+= WITH_FAX=1 LIB_DEPENDS+= spandsp.0:${PORTSDIR}/comms/spandsp PLIST_SUB+= WITH_FAX="" diff --git a/net/asterisk10/files/patch-res-res_watchdog.c b/net/asterisk10/files/patch-res-res_watchdog.c new file mode 100644 index 000000000000..51e4b0ae6c71 --- /dev/null +++ b/net/asterisk10/files/patch-res-res_watchdog.c @@ -0,0 +1,13 @@ +--- res/res_watchdog.c.orig Fri Jul 15 13:24:24 2005 ++++ res/res_watchdog.c Fri Jul 15 13:24:42 2005 +@@ -40,6 +40,10 @@ + + /* Registrar for operations */ + ++#ifndef O_SYNC ++#define O_SYNC O_FSYNC ++#endif ++ + static struct watchdog_pvt *watchdogs = NULL; + + STANDARD_LOCAL_USER; diff --git a/net/asterisk12/Makefile b/net/asterisk12/Makefile index 1ea4517f1202..c422a6454243 100644 --- a/net/asterisk12/Makefile +++ b/net/asterisk12/Makefile @@ -7,6 +7,7 @@ PORTNAME= asterisk PORTVERSION= 1.0.9 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= ftp://ftp.asterisk.org/pub/telephony/asterisk/ \ ftp://ftp.asterisk.org/pub/telephony/asterisk/old-releases/ @@ -73,7 +74,7 @@ PLIST_SUB+= WITH_ZAPTEL="" USE_MYSQL= yes .endif -.if !defined(WITHOUT_FAX) +.if !defined(WITHOUT_FAX) && ${OSVERSION} >= 500000 MAKE_ENV+= WITH_FAX=1 LIB_DEPENDS+= spandsp.0:${PORTSDIR}/comms/spandsp PLIST_SUB+= WITH_FAX="" diff --git a/net/asterisk12/files/patch-res-res_watchdog.c b/net/asterisk12/files/patch-res-res_watchdog.c new file mode 100644 index 000000000000..51e4b0ae6c71 --- /dev/null +++ b/net/asterisk12/files/patch-res-res_watchdog.c @@ -0,0 +1,13 @@ +--- res/res_watchdog.c.orig Fri Jul 15 13:24:24 2005 ++++ res/res_watchdog.c Fri Jul 15 13:24:42 2005 +@@ -40,6 +40,10 @@ + + /* Registrar for operations */ + ++#ifndef O_SYNC ++#define O_SYNC O_FSYNC ++#endif ++ + static struct watchdog_pvt *watchdogs = NULL; + + STANDARD_LOCAL_USER; diff --git a/net/asterisk14/Makefile b/net/asterisk14/Makefile index 1ea4517f1202..c422a6454243 100644 --- a/net/asterisk14/Makefile +++ b/net/asterisk14/Makefile @@ -7,6 +7,7 @@ PORTNAME= asterisk PORTVERSION= 1.0.9 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= ftp://ftp.asterisk.org/pub/telephony/asterisk/ \ ftp://ftp.asterisk.org/pub/telephony/asterisk/old-releases/ @@ -73,7 +74,7 @@ PLIST_SUB+= WITH_ZAPTEL="" USE_MYSQL= yes .endif -.if !defined(WITHOUT_FAX) +.if !defined(WITHOUT_FAX) && ${OSVERSION} >= 500000 MAKE_ENV+= WITH_FAX=1 LIB_DEPENDS+= spandsp.0:${PORTSDIR}/comms/spandsp PLIST_SUB+= WITH_FAX="" diff --git a/net/asterisk14/files/patch-res-res_watchdog.c b/net/asterisk14/files/patch-res-res_watchdog.c new file mode 100644 index 000000000000..51e4b0ae6c71 --- /dev/null +++ b/net/asterisk14/files/patch-res-res_watchdog.c @@ -0,0 +1,13 @@ +--- res/res_watchdog.c.orig Fri Jul 15 13:24:24 2005 ++++ res/res_watchdog.c Fri Jul 15 13:24:42 2005 +@@ -40,6 +40,10 @@ + + /* Registrar for operations */ + ++#ifndef O_SYNC ++#define O_SYNC O_FSYNC ++#endif ++ + static struct watchdog_pvt *watchdogs = NULL; + + STANDARD_LOCAL_USER; diff --git a/net/asterisk16/Makefile b/net/asterisk16/Makefile index 1ea4517f1202..c422a6454243 100644 --- a/net/asterisk16/Makefile +++ b/net/asterisk16/Makefile @@ -7,6 +7,7 @@ PORTNAME= asterisk PORTVERSION= 1.0.9 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= ftp://ftp.asterisk.org/pub/telephony/asterisk/ \ ftp://ftp.asterisk.org/pub/telephony/asterisk/old-releases/ @@ -73,7 +74,7 @@ PLIST_SUB+= WITH_ZAPTEL="" USE_MYSQL= yes .endif -.if !defined(WITHOUT_FAX) +.if !defined(WITHOUT_FAX) && ${OSVERSION} >= 500000 MAKE_ENV+= WITH_FAX=1 LIB_DEPENDS+= spandsp.0:${PORTSDIR}/comms/spandsp PLIST_SUB+= WITH_FAX="" diff --git a/net/asterisk16/files/patch-res-res_watchdog.c b/net/asterisk16/files/patch-res-res_watchdog.c new file mode 100644 index 000000000000..51e4b0ae6c71 --- /dev/null +++ b/net/asterisk16/files/patch-res-res_watchdog.c @@ -0,0 +1,13 @@ +--- res/res_watchdog.c.orig Fri Jul 15 13:24:24 2005 ++++ res/res_watchdog.c Fri Jul 15 13:24:42 2005 +@@ -40,6 +40,10 @@ + + /* Registrar for operations */ + ++#ifndef O_SYNC ++#define O_SYNC O_FSYNC ++#endif ++ + static struct watchdog_pvt *watchdogs = NULL; + + STANDARD_LOCAL_USER;