diff options
-rw-r--r-- | comms/asterisk/distinfo | 3 | ||||
-rw-r--r-- | comms/asterisk/patches/patch-include_asterisk_inline__api.h | 17 | ||||
-rw-r--r-- | comms/asterisk10/Makefile | 3 | ||||
-rw-r--r-- | comms/asterisk10/distinfo | 3 | ||||
-rw-r--r-- | comms/asterisk10/patches/patch-include_asterisk_inline__api.h | 17 | ||||
-rw-r--r-- | comms/asterisk16/Makefile | 3 | ||||
-rw-r--r-- | comms/asterisk16/distinfo | 3 | ||||
-rw-r--r-- | comms/asterisk16/patches/patch-include_asterisk_inline__api.h | 17 | ||||
-rw-r--r-- | comms/asterisk18/Makefile | 3 | ||||
-rw-r--r-- | comms/asterisk18/distinfo | 3 | ||||
-rw-r--r-- | comms/asterisk18/patches/patch-include_asterisk_inline__api.h | 17 |
11 files changed, 82 insertions, 7 deletions
diff --git a/comms/asterisk/distinfo b/comms/asterisk/distinfo index 278bca508e8..8de4287c921 100644 --- a/comms/asterisk/distinfo +++ b/comms/asterisk/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.46 2012/02/16 16:21:36 hans Exp $ +$NetBSD: distinfo,v 1.47 2012/05/04 16:06:13 joerg Exp $ SHA1 (asterisk-1.2.37.tar.gz) = c9a3c4684e021f62b4d19f6e0c8fc11f64db19d6 RMD160 (asterisk-1.2.37.tar.gz) = 1de7ff96d3b1fd8d89f3ef7b3bb9e35bedccfb33 @@ -17,3 +17,4 @@ SHA1 (patch-al) = 1457c9a12eb5c5621eb244423c2190fb430866e7 SHA1 (patch-am) = a652b091462673390e19ab47e17500d055779094 SHA1 (patch-an) = 5bfb86853e868bc78eb0061871f4abce0df1ba2c SHA1 (patch-include_asterisk_channel.h) = a651103dcb9267569dcf6d08ff05e596463606e6 +SHA1 (patch-include_asterisk_inline__api.h) = ff43d14e2608dd08d7d03799dfe9847f9f7f5666 diff --git a/comms/asterisk/patches/patch-include_asterisk_inline__api.h b/comms/asterisk/patches/patch-include_asterisk_inline__api.h new file mode 100644 index 00000000000..fbb941453ba --- /dev/null +++ b/comms/asterisk/patches/patch-include_asterisk_inline__api.h @@ -0,0 +1,17 @@ +$NetBSD: patch-include_asterisk_inline__api.h,v 1.1 2012/05/04 16:06:13 joerg Exp $ + +--- include/asterisk/inline_api.h.orig 2006-02-14 19:14:15.000000000 +0000 ++++ include/asterisk/inline_api.h +@@ -46,7 +46,11 @@ + #if !defined(LOW_MEMORY) + + #if !defined(AST_API_MODULE) +-#define AST_INLINE_API(hdr, body) hdr; extern inline hdr body ++# ifndef __GNUC_STDC_INLINE__ ++# define AST_INLINE_API(hdr, body) hdr; extern inline hdr body ++# else ++# define AST_INLINE_API(hdr, body) inline hdr body ++# endif + #else + #define AST_INLINE_API(hdr, body) hdr; hdr body + #endif diff --git a/comms/asterisk10/Makefile b/comms/asterisk10/Makefile index 5cfa61146f2..e387ffff1d1 100644 --- a/comms/asterisk10/Makefile +++ b/comms/asterisk10/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2012/05/03 06:23:37 jnemeth Exp $ +# $NetBSD: Makefile,v 1.15 2012/05/04 16:06:13 joerg Exp $ # # NOTE: when updating this package, there are two places that sound # tarballs need to be checked @@ -89,6 +89,7 @@ MAKE_FLAGS+= WRKSRC=${WRKSRC} MAKE_FLAGS+= LDOPTS=${LDFLAGS:M*:Q} MAKE_FLAGS+= HTTP_DOCSDIR=${PREFIX}/share/httpd/htdocs MAKE_FLAGS+= HTTP_CGIDIR=${PREFIX}/libexec/cgi-bin +MAKE_FLAGS+= OPTIMIZE= .if !empty(MACHINE_PLATFORM:MSunOS-*-i386) BUILDLINK_TRANSFORM+= rm:-march=i386 diff --git a/comms/asterisk10/distinfo b/comms/asterisk10/distinfo index 1cdaaed1fa0..b715755ba59 100644 --- a/comms/asterisk10/distinfo +++ b/comms/asterisk10/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.10 2012/05/03 06:23:37 jnemeth Exp $ +$NetBSD: distinfo,v 1.11 2012/05/04 16:06:13 joerg Exp $ SHA1 (asterisk-10.4.0/asterisk-10.4.0.tar.gz) = c39ef62f03368663fd00c81138c9f4efc1c496fa RMD160 (asterisk-10.4.0/asterisk-10.4.0.tar.gz) = dd767c256773cc2a6c33a3c270d6213f64b04358 @@ -20,6 +20,7 @@ SHA1 (patch-contrib_scripts_autosupport) = c6c1d917dd0544c4f54ae760f68cbcd1f3503 SHA1 (patch-contrib_scripts_vmail.cgi) = 650b9bbf3e322d1ad351932cfe6f747baa8f35e4 SHA1 (patch-include_asterisk_autoconfig.h.in) = 7d6e3443ce3f0741c72a5f2178895598e79e83c9 SHA1 (patch-include_asterisk_endian.h) = 41c1a9a9e02fe394bc9261f5559e931b1378ea28 +SHA1 (patch-include_asterisk_inline__api.h) = ff43d14e2608dd08d7d03799dfe9847f9f7f5666 SHA1 (patch-include_asterisk_lock.h) = fc7b4934e5f53a09066802daa054300895cf7bcf SHA1 (patch-main_Makefile) = 4b80898802c75937510acf5252c5e82d379f578e SHA1 (patch-main_acl.c) = 85cea968f3c3a2651a687661bba2d8131c342d5a diff --git a/comms/asterisk10/patches/patch-include_asterisk_inline__api.h b/comms/asterisk10/patches/patch-include_asterisk_inline__api.h new file mode 100644 index 00000000000..fbb941453ba --- /dev/null +++ b/comms/asterisk10/patches/patch-include_asterisk_inline__api.h @@ -0,0 +1,17 @@ +$NetBSD: patch-include_asterisk_inline__api.h,v 1.1 2012/05/04 16:06:13 joerg Exp $ + +--- include/asterisk/inline_api.h.orig 2006-02-14 19:14:15.000000000 +0000 ++++ include/asterisk/inline_api.h +@@ -46,7 +46,11 @@ + #if !defined(LOW_MEMORY) + + #if !defined(AST_API_MODULE) +-#define AST_INLINE_API(hdr, body) hdr; extern inline hdr body ++# ifndef __GNUC_STDC_INLINE__ ++# define AST_INLINE_API(hdr, body) hdr; extern inline hdr body ++# else ++# define AST_INLINE_API(hdr, body) inline hdr body ++# endif + #else + #define AST_INLINE_API(hdr, body) hdr; hdr body + #endif diff --git a/comms/asterisk16/Makefile b/comms/asterisk16/Makefile index 9d76e20d21a..7c2d87216ca 100644 --- a/comms/asterisk16/Makefile +++ b/comms/asterisk16/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2012/04/30 03:19:40 jnemeth Exp $ +# $NetBSD: Makefile,v 1.42 2012/05/04 16:06:13 joerg Exp $ # # NOTE: when updating this package, there are two places that sound # tarballs need to be checked @@ -89,6 +89,7 @@ MAKE_FLAGS+= WRKSRC=${WRKSRC} MAKE_FLAGS+= LDOPTS=${LDFLAGS:M*:Q} MAKE_FLAGS+= HTTP_DOCSDIR=${PREFIX}/share/httpd/htdocs MAKE_FLAGS+= HTTP_CGIDIR=${PREFIX}/libexec/cgi-bin +MAKE_FLAGS+= OPTIMIZE= .if !empty(MACHINE_PLATFORM:MSunOS-*-i386) BUILDLINK_TRANSFORM+= rm:-march=i386 diff --git a/comms/asterisk16/distinfo b/comms/asterisk16/distinfo index be8b1d65b6a..b4decf96e65 100644 --- a/comms/asterisk16/distinfo +++ b/comms/asterisk16/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.27 2012/04/30 03:19:40 jnemeth Exp $ +$NetBSD: distinfo,v 1.28 2012/05/04 16:06:13 joerg Exp $ SHA1 (asterisk-1.6.2.24/asterisk-1.6.2.24.tar.gz) = ebd36990cbb2f1455165ff12079739b235feaa42 RMD160 (asterisk-1.6.2.24/asterisk-1.6.2.24.tar.gz) = 15f5982d9cdbb0580d6b8fb0252323f1ea9c72f4 @@ -37,5 +37,6 @@ SHA1 (patch-bb) = 3b78ed3c8233e2db38d09ca81f1768d018ffd2e2 SHA1 (patch-bc) = 0efc99595d1ef82a879361e8bf3b2ef7fd84af62 SHA1 (patch-bd) = c827419664f78230556e43607d1abf6b156dcc88 SHA1 (patch-be) = b9d1e891b1d1d45612b5b02067393e2845663030 +SHA1 (patch-include_asterisk_inline__api.h) = ff43d14e2608dd08d7d03799dfe9847f9f7f5666 SHA1 (patch-main_editline_sys.h) = e0325242fcfadc35f7803438fec536691654e623 SHA1 (patch-main_editline_term.c) = 74144a7a467f84c66b98d498b556a51f1161faad diff --git a/comms/asterisk16/patches/patch-include_asterisk_inline__api.h b/comms/asterisk16/patches/patch-include_asterisk_inline__api.h new file mode 100644 index 00000000000..97c45ab8621 --- /dev/null +++ b/comms/asterisk16/patches/patch-include_asterisk_inline__api.h @@ -0,0 +1,17 @@ +$NetBSD: patch-include_asterisk_inline__api.h,v 1.1 2012/05/04 16:06:14 joerg Exp $ + +--- include/asterisk/inline_api.h.orig 2006-02-14 19:14:15.000000000 +0000 ++++ include/asterisk/inline_api.h +@@ -46,7 +46,11 @@ + #if !defined(LOW_MEMORY) + + #if !defined(AST_API_MODULE) +-#define AST_INLINE_API(hdr, body) hdr; extern inline hdr body ++# ifndef __GNUC_STDC_INLINE__ ++# define AST_INLINE_API(hdr, body) hdr; extern inline hdr body ++# else ++# define AST_INLINE_API(hdr, body) inline hdr body ++# endif + #else + #define AST_INLINE_API(hdr, body) hdr; hdr body + #endif diff --git a/comms/asterisk18/Makefile b/comms/asterisk18/Makefile index d3d4f61cad5..5e64ed4157f 100644 --- a/comms/asterisk18/Makefile +++ b/comms/asterisk18/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2012/04/30 02:33:21 jnemeth Exp $ +# $NetBSD: Makefile,v 1.33 2012/05/04 16:06:14 joerg Exp $ # # NOTE: when updating this package, there are two places that sound # tarballs need to be checked @@ -90,6 +90,7 @@ MAKE_FLAGS+= WRKSRC=${WRKSRC} MAKE_FLAGS+= LDOPTS=${LDFLAGS:M*:Q} MAKE_FLAGS+= HTTP_DOCSDIR=${PREFIX}/share/httpd/htdocs MAKE_FLAGS+= HTTP_CGIDIR=${PREFIX}/libexec/cgi-bin +MAKE_FLAGS+= OPTIMIZE= .if !empty(MACHINE_PLATFORM:MSunOS-*-i386) BUILDLINK_TRANSFORM+= rm:-march=i386 diff --git a/comms/asterisk18/distinfo b/comms/asterisk18/distinfo index afdec6ec6e6..3824b6eea10 100644 --- a/comms/asterisk18/distinfo +++ b/comms/asterisk18/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.27 2012/04/30 02:33:21 jnemeth Exp $ +$NetBSD: distinfo,v 1.28 2012/05/04 16:06:14 joerg Exp $ SHA1 (asterisk-1.8.11.1/asterisk-1.8.11.1.tar.gz) = 401be7f99665bc423cbafd8ae4c0d7d76769b3db RMD160 (asterisk-1.8.11.1/asterisk-1.8.11.1.tar.gz) = 5f1cc9449c243e56be4d778bc262e5cd931aa29e @@ -39,3 +39,4 @@ SHA1 (patch-bk) = 93679dfb04d26c99ac9c2822e0d74d869d16369f SHA1 (patch-bl) = 35cede8f5c253baed3d3983f58986c7c662e35e2 SHA1 (patch-bm) = 284b34e20091b3427cd67b835fc7aa62c9d92a6c SHA1 (patch-bn) = 51d14bde5591bd4a68c8074838196e05ac86f2f2 +SHA1 (patch-include_asterisk_inline__api.h) = ff43d14e2608dd08d7d03799dfe9847f9f7f5666 diff --git a/comms/asterisk18/patches/patch-include_asterisk_inline__api.h b/comms/asterisk18/patches/patch-include_asterisk_inline__api.h new file mode 100644 index 00000000000..97c45ab8621 --- /dev/null +++ b/comms/asterisk18/patches/patch-include_asterisk_inline__api.h @@ -0,0 +1,17 @@ +$NetBSD: patch-include_asterisk_inline__api.h,v 1.1 2012/05/04 16:06:14 joerg Exp $ + +--- include/asterisk/inline_api.h.orig 2006-02-14 19:14:15.000000000 +0000 ++++ include/asterisk/inline_api.h +@@ -46,7 +46,11 @@ + #if !defined(LOW_MEMORY) + + #if !defined(AST_API_MODULE) +-#define AST_INLINE_API(hdr, body) hdr; extern inline hdr body ++# ifndef __GNUC_STDC_INLINE__ ++# define AST_INLINE_API(hdr, body) hdr; extern inline hdr body ++# else ++# define AST_INLINE_API(hdr, body) inline hdr body ++# endif + #else + #define AST_INLINE_API(hdr, body) hdr; hdr body + #endif |