From 3a78a390f98083a42a5a9af3a6d4f2c3d8084e7a Mon Sep 17 00:00:00 2001 From: hans Date: Wed, 7 Mar 2012 11:39:39 +0000 Subject: Fix build on SunOS. - include sys/cdefs.h in bundled proplib - use nbcompat/endian.h if available --- net/mtftpd/Makefile | 4 +++- net/mtftpd/distinfo | 11 ++++++++++- net/mtftpd/patches/patch-dist_include_prop_prop__array.h | 13 +++++++++++++ net/mtftpd/patches/patch-dist_include_prop_prop__bool.h | 13 +++++++++++++ net/mtftpd/patches/patch-dist_include_prop_prop__data.h | 13 +++++++++++++ .../patches/patch-dist_include_prop_prop__dictionary.h | 13 +++++++++++++ net/mtftpd/patches/patch-dist_include_prop_prop__ingest.h | 13 +++++++++++++ net/mtftpd/patches/patch-dist_include_prop_prop__number.h | 13 +++++++++++++ net/mtftpd/patches/patch-dist_include_prop_prop__object.h | 13 +++++++++++++ net/mtftpd/patches/patch-dist_include_prop_prop__string.h | 13 +++++++++++++ net/mtftpd/patches/patch-dist_libprop_prop__rb__impl.h | 13 +++++++++++++ 11 files changed, 130 insertions(+), 2 deletions(-) create mode 100644 net/mtftpd/patches/patch-dist_include_prop_prop__array.h create mode 100644 net/mtftpd/patches/patch-dist_include_prop_prop__bool.h create mode 100644 net/mtftpd/patches/patch-dist_include_prop_prop__data.h create mode 100644 net/mtftpd/patches/patch-dist_include_prop_prop__dictionary.h create mode 100644 net/mtftpd/patches/patch-dist_include_prop_prop__ingest.h create mode 100644 net/mtftpd/patches/patch-dist_include_prop_prop__number.h create mode 100644 net/mtftpd/patches/patch-dist_include_prop_prop__object.h create mode 100644 net/mtftpd/patches/patch-dist_include_prop_prop__string.h create mode 100644 net/mtftpd/patches/patch-dist_libprop_prop__rb__impl.h (limited to 'net') diff --git a/net/mtftpd/Makefile b/net/mtftpd/Makefile index 6d928101dbb..0177b20e964 100644 --- a/net/mtftpd/Makefile +++ b/net/mtftpd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2012/03/02 16:32:47 hans Exp $ +# $NetBSD: Makefile,v 1.5 2012/03/07 11:39:39 hans Exp $ DISTNAME= mtftpd-20080229 CATEGORIES= net @@ -17,6 +17,8 @@ USE_BSD_MAKEFILE= yes .include "../../mk/bsd.prefs.mk" CFLAGS+= -DPKG_SYSCONFDIR=\"${PKG_SYSCONFDIR}\" +CFLAGS.SunOS+= -DMAP_FILE=0 +LDFLAGS.SunOS+= -lsocket -lnsl INSTALLATION_DIRS+= bin share/examples/mtftpd diff --git a/net/mtftpd/distinfo b/net/mtftpd/distinfo index 10b899c9bb2..c5b92deeb9a 100644 --- a/net/mtftpd/distinfo +++ b/net/mtftpd/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2010/12/31 16:39:22 obache Exp $ +$NetBSD: distinfo,v 1.3 2012/03/07 11:39:39 hans Exp $ SHA1 (mtftpd-20080229.tar.gz) = f4ca14fa9dfd3ba6fa92abe9b87bcc1b4f071810 RMD160 (mtftpd-20080229.tar.gz) = af3d046ea7a57fcc00d7955a7707d8c007e7aeca @@ -7,3 +7,12 @@ SHA1 (patch-aa) = 2a6c77a7481500fcf41b4fe89905447b346c5569 SHA1 (patch-ab) = e368d65598fffb7db71e853977e9d1885228c43e SHA1 (patch-ac) = 325bf7ce42d84939cecff288d385875e5bda6fea SHA1 (patch-ad) = c8da2390a0c287860240f5bf4044d7f3c92f3ad6 +SHA1 (patch-dist_include_prop_prop__array.h) = 09e6b91f197a6c39e6776420720aeb4f5a01995a +SHA1 (patch-dist_include_prop_prop__bool.h) = 4df36267cd080b15fcfbbd8d0eaaf8650b4c7b0c +SHA1 (patch-dist_include_prop_prop__data.h) = c37a1ddd954b8fc1c6526cb5344a017cef895dd4 +SHA1 (patch-dist_include_prop_prop__dictionary.h) = 73096e676c964eda59508f3ad156b6a45c352b75 +SHA1 (patch-dist_include_prop_prop__ingest.h) = 1f489f6d67f77f728e2c8179e7822bfcdb18f51d +SHA1 (patch-dist_include_prop_prop__number.h) = 132b2336d7e2b7599c779bc617884bae6dcc93ba +SHA1 (patch-dist_include_prop_prop__object.h) = 882de2e7a1f111d86a76d47f571f4e922a8244db +SHA1 (patch-dist_include_prop_prop__string.h) = f9dd0eff7276a8235b7a84b9baa6b01b7b059932 +SHA1 (patch-dist_libprop_prop__rb__impl.h) = f78b98352d36a456aefd29feeb40e25a0f995fb2 diff --git a/net/mtftpd/patches/patch-dist_include_prop_prop__array.h b/net/mtftpd/patches/patch-dist_include_prop_prop__array.h new file mode 100644 index 00000000000..43e928cc9e9 --- /dev/null +++ b/net/mtftpd/patches/patch-dist_include_prop_prop__array.h @@ -0,0 +1,13 @@ +$NetBSD: patch-dist_include_prop_prop__array.h,v 1.1 2012/03/07 11:39:40 hans Exp $ + +--- dist/include/prop/prop_array.h.orig 2008-02-29 19:25:58.000000000 +0100 ++++ dist/include/prop/prop_array.h 2012-03-02 20:15:04.196726515 +0100 +@@ -43,6 +43,8 @@ + + typedef struct _prop_array *prop_array_t; + ++#include ++ + __BEGIN_DECLS + prop_array_t prop_array_create(void); + prop_array_t prop_array_create_with_capacity(unsigned int); diff --git a/net/mtftpd/patches/patch-dist_include_prop_prop__bool.h b/net/mtftpd/patches/patch-dist_include_prop_prop__bool.h new file mode 100644 index 00000000000..d4b4ca578ed --- /dev/null +++ b/net/mtftpd/patches/patch-dist_include_prop_prop__bool.h @@ -0,0 +1,13 @@ +$NetBSD: patch-dist_include_prop_prop__bool.h,v 1.1 2012/03/07 11:39:40 hans Exp $ + +--- dist/include/prop/prop_bool.h.orig 2008-02-29 19:25:58.000000000 +0100 ++++ dist/include/prop/prop_bool.h 2012-03-02 20:18:07.993901094 +0100 +@@ -43,6 +43,8 @@ + + typedef struct _prop_bool *prop_bool_t; + ++#include ++ + __BEGIN_DECLS + prop_bool_t prop_bool_create(bool); + prop_bool_t prop_bool_copy(prop_bool_t); diff --git a/net/mtftpd/patches/patch-dist_include_prop_prop__data.h b/net/mtftpd/patches/patch-dist_include_prop_prop__data.h new file mode 100644 index 00000000000..1b08bd30de2 --- /dev/null +++ b/net/mtftpd/patches/patch-dist_include_prop_prop__data.h @@ -0,0 +1,13 @@ +$NetBSD: patch-dist_include_prop_prop__data.h,v 1.1 2012/03/07 11:39:40 hans Exp $ + +--- dist/include/prop/prop_data.h.orig 2008-02-29 19:25:58.000000000 +0100 ++++ dist/include/prop/prop_data.h 2012-03-02 20:14:27.311989501 +0100 +@@ -43,6 +43,8 @@ + + typedef struct _prop_data *prop_data_t; + ++#include ++ + __BEGIN_DECLS + prop_data_t prop_data_create_data(const void *, size_t); + prop_data_t prop_data_create_data_nocopy(const void *, size_t); diff --git a/net/mtftpd/patches/patch-dist_include_prop_prop__dictionary.h b/net/mtftpd/patches/patch-dist_include_prop_prop__dictionary.h new file mode 100644 index 00000000000..050f3b3c450 --- /dev/null +++ b/net/mtftpd/patches/patch-dist_include_prop_prop__dictionary.h @@ -0,0 +1,13 @@ +$NetBSD: patch-dist_include_prop_prop__dictionary.h,v 1.1 2012/03/07 11:39:40 hans Exp $ + +--- dist/include/prop/prop_dictionary.h.orig 2008-02-29 19:25:58.000000000 +0100 ++++ dist/include/prop/prop_dictionary.h 2012-03-02 20:16:51.097919841 +0100 +@@ -44,6 +44,8 @@ + typedef struct _prop_dictionary *prop_dictionary_t; + typedef struct _prop_dictionary_keysym *prop_dictionary_keysym_t; + ++#include ++ + __BEGIN_DECLS + prop_dictionary_t prop_dictionary_create(void); + prop_dictionary_t prop_dictionary_create_with_capacity(unsigned int); diff --git a/net/mtftpd/patches/patch-dist_include_prop_prop__ingest.h b/net/mtftpd/patches/patch-dist_include_prop_prop__ingest.h new file mode 100644 index 00000000000..ab6354a4717 --- /dev/null +++ b/net/mtftpd/patches/patch-dist_include_prop_prop__ingest.h @@ -0,0 +1,13 @@ +$NetBSD: patch-dist_include_prop_prop__ingest.h,v 1.1 2012/03/07 11:39:40 hans Exp $ + +--- dist/include/prop/prop_ingest.h.orig 2008-02-29 19:25:58.000000000 +0100 ++++ dist/include/prop/prop_ingest.h 2012-03-02 20:17:16.790210908 +0100 +@@ -78,6 +78,8 @@ typedef struct { + #define PROP_INGEST_END \ + { .pite_key = NULL } + ++#include ++ + __BEGIN_DECLS + prop_ingest_context_t + prop_ingest_context_alloc(void *); diff --git a/net/mtftpd/patches/patch-dist_include_prop_prop__number.h b/net/mtftpd/patches/patch-dist_include_prop_prop__number.h new file mode 100644 index 00000000000..99f65cfbc9c --- /dev/null +++ b/net/mtftpd/patches/patch-dist_include_prop_prop__number.h @@ -0,0 +1,13 @@ +$NetBSD: patch-dist_include_prop_prop__number.h,v 1.1 2012/03/07 11:39:40 hans Exp $ + +--- dist/include/prop/prop_number.h.orig 2008-02-29 19:25:58.000000000 +0100 ++++ dist/include/prop/prop_number.h 2012-03-02 20:17:44.973100443 +0100 +@@ -46,6 +46,8 @@ + + typedef struct _prop_number *prop_number_t; + ++#include ++ + __BEGIN_DECLS + prop_number_t prop_number_create_integer(int64_t); + prop_number_t prop_number_create_unsigned_integer(uint64_t); diff --git a/net/mtftpd/patches/patch-dist_include_prop_prop__object.h b/net/mtftpd/patches/patch-dist_include_prop_prop__object.h new file mode 100644 index 00000000000..de17aa82e0e --- /dev/null +++ b/net/mtftpd/patches/patch-dist_include_prop_prop__object.h @@ -0,0 +1,13 @@ +$NetBSD: patch-dist_include_prop_prop__object.h,v 1.1 2012/03/07 11:39:40 hans Exp $ + +--- dist/include/prop/prop_object.h.orig 2008-02-29 19:25:58.000000000 +0100 ++++ dist/include/prop/prop_object.h 2012-03-02 20:14:02.076547621 +0100 +@@ -59,6 +59,8 @@ typedef enum { + PROP_TYPE_DICT_KEYSYM = 0x646b6579 /* 'dkey' */ + } prop_type_t; + ++#include ++ + __BEGIN_DECLS + void prop_object_retain(prop_object_t); + void prop_object_release(prop_object_t); diff --git a/net/mtftpd/patches/patch-dist_include_prop_prop__string.h b/net/mtftpd/patches/patch-dist_include_prop_prop__string.h new file mode 100644 index 00000000000..876562fe30b --- /dev/null +++ b/net/mtftpd/patches/patch-dist_include_prop_prop__string.h @@ -0,0 +1,13 @@ +$NetBSD: patch-dist_include_prop_prop__string.h,v 1.1 2012/03/07 11:39:40 hans Exp $ + +--- dist/include/prop/prop_string.h.orig 2008-02-29 19:25:58.000000000 +0100 ++++ dist/include/prop/prop_string.h 2012-03-02 20:18:31.107164376 +0100 +@@ -43,6 +43,8 @@ + + typedef struct _prop_string *prop_string_t; + ++#include ++ + __BEGIN_DECLS + prop_string_t prop_string_create(void); + prop_string_t prop_string_create_cstring(const char *); diff --git a/net/mtftpd/patches/patch-dist_libprop_prop__rb__impl.h b/net/mtftpd/patches/patch-dist_libprop_prop__rb__impl.h new file mode 100644 index 00000000000..c77f02795e9 --- /dev/null +++ b/net/mtftpd/patches/patch-dist_libprop_prop__rb__impl.h @@ -0,0 +1,13 @@ +$NetBSD: patch-dist_libprop_prop__rb__impl.h,v 1.1 2012/03/07 11:39:40 hans Exp $ + +--- dist/libprop/prop_rb_impl.h.orig 2008-02-29 19:25:59.000000000 +0100 ++++ dist/libprop/prop_rb_impl.h 2012-03-02 20:19:45.277472499 +0100 +@@ -43,6 +43,8 @@ + #include + #ifdef __linux__ + #include ++#elif defined(HAVE_NBCOMPAT_H) ++#include + #else + #include + #endif -- cgit v1.2.3