diff options
| author | hans <hans@pkgsrc.org> | 2012-02-16 13:39:26 +0000 |
|---|---|---|
| committer | hans <hans@pkgsrc.org> | 2012-02-16 13:39:26 +0000 |
| commit | 5da1ac0872b8bf2e13f2726a514c2659c6b6079d (patch) | |
| tree | d4b4c073be02fb528c148b54048f86e578e1f63b /chat/atheme | |
| parent | 0baa2212bb584555435e338527bfae6306e29578 (diff) | |
| download | pkgsrc-5da1ac0872b8bf2e13f2726a514c2659c6b6079d.tar.gz | |
Fix build on SunOS.
Diffstat (limited to 'chat/atheme')
| -rw-r--r-- | chat/atheme/Makefile | 4 | ||||
| -rw-r--r-- | chat/atheme/distinfo | 4 | ||||
| -rw-r--r-- | chat/atheme/patches/patch-include_common.h | 15 | ||||
| -rw-r--r-- | chat/atheme/patches/patch-include_stdinc.h | 15 |
4 files changed, 36 insertions, 2 deletions
diff --git a/chat/atheme/Makefile b/chat/atheme/Makefile index 239083f6c61..e3484b91d4a 100644 --- a/chat/atheme/Makefile +++ b/chat/atheme/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2010/01/28 19:32:48 joerg Exp $ +# $NetBSD: Makefile,v 1.6 2012/02/16 13:46:52 hans Exp $ # DISTNAME= atheme-services-3.0.4 @@ -40,6 +40,8 @@ FILES_SUBST+= ATHEME_GROUP=${ATHEME_GROUP} .include "options.mk" +CFLAGS.SunOS+= -Dfaultcode_t=foo_faultcode_t -Dboolean_t=foo_boolean_t + CONFIGURE_ARGS+= --localstatedir=${VARBASE} CONFIGURE_ARGS+= --enable-fhs-paths CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} diff --git a/chat/atheme/distinfo b/chat/atheme/distinfo index 021b9a7bb95..a8967b16e0c 100644 --- a/chat/atheme/distinfo +++ b/chat/atheme/distinfo @@ -1,7 +1,9 @@ -$NetBSD: distinfo,v 1.1.1.1 2008/06/16 10:38:27 adrianp Exp $ +$NetBSD: distinfo,v 1.2 2012/02/16 13:46:52 hans Exp $ SHA1 (atheme-services-3.0.4.tbz2) = 1ba73fa07377f3ec31d03b0ac588141e10ad35b3 RMD160 (atheme-services-3.0.4.tbz2) = cca06369a1fd6989178b760efdbf745de28c9b60 Size (atheme-services-3.0.4.tbz2) = 580786 bytes SHA1 (patch-aa) = ea2122cbe3dc1f7ddbc62aa9bcc695a384dc575e SHA1 (patch-ab) = 49c72c026c24f0e2b5054a2297d80256ca37ed1d +SHA1 (patch-include_common.h) = ee4ab38b65f954d8a545e7f6d58f41b964b301e5 +SHA1 (patch-include_stdinc.h) = a7d2898581addaf7730270003b0f0eb30a455de9 diff --git a/chat/atheme/patches/patch-include_common.h b/chat/atheme/patches/patch-include_common.h new file mode 100644 index 00000000000..42d3e371b61 --- /dev/null +++ b/chat/atheme/patches/patch-include_common.h @@ -0,0 +1,15 @@ +$NetBSD: patch-include_common.h,v 1.1 2012/02/16 13:46:52 hans Exp $ + +--- include/common.h.orig 2008-02-11 03:58:08.000000000 +0100 ++++ include/common.h 2012-01-20 00:50:51.945230165 +0100 +@@ -111,6 +111,10 @@ enum faultcode_ + fault_unimplemented = 14 + }; + ++#ifdef __sun ++#undef faultcode_t ++#endif ++ + typedef enum faultcode_ faultcode_t; + + #if defined(__GNUC__) || defined(__INTEL_COMPILER) diff --git a/chat/atheme/patches/patch-include_stdinc.h b/chat/atheme/patches/patch-include_stdinc.h new file mode 100644 index 00000000000..0451e4b65d0 --- /dev/null +++ b/chat/atheme/patches/patch-include_stdinc.h @@ -0,0 +1,15 @@ +$NetBSD: patch-include_stdinc.h,v 1.1 2012/02/16 13:46:52 hans Exp $ + +--- include/stdinc.h.orig 2008-02-11 03:58:08.000000000 +0100 ++++ include/stdinc.h 2012-01-20 00:50:03.416296368 +0100 +@@ -46,6 +46,10 @@ + #include <libgen.h> + #include <dirent.h> + ++#ifdef __sun ++#undef boolean_t ++#endif ++ + typedef mowgli_boolean_t boolean_t; + + #endif |