From a843f113c224086c625167812ceee941c7f0ccf8 Mon Sep 17 00:00:00 2001 From: jperkin Date: Fri, 22 Feb 2013 21:38:06 +0000 Subject: [PATCH] Re-arrange include ordering. Fixes build on SunOS. --- sysutils/rox/distinfo | 3 +- .../rox/patches/patch-ROX-Filer_src_mount.c | 28 +++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 sysutils/rox/patches/patch-ROX-Filer_src_mount.c diff --git a/sysutils/rox/distinfo b/sysutils/rox/distinfo index 39d73b5e0849..ac9e01d32ca3 100644 --- a/sysutils/rox/distinfo +++ b/sysutils/rox/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.12 2012/01/08 03:39:25 sbd Exp $ +$NetBSD: distinfo,v 1.13 2013/02/22 21:38:06 jperkin Exp $ SHA1 (rox/rox-filer-2.10.tar.bz2) = 691297d18be69a883db0a38130f5df99f9e1bc29 RMD160 (rox/rox-filer-2.10.tar.bz2) = 48b64ccaceb96b59fbd2467aa65d8e128ebd960d Size (rox/rox-filer-2.10.tar.bz2) = 1903129 bytes +SHA1 (patch-ROX-Filer_src_mount.c) = 19d820cf74d57dbfeb255b21522639ac2fc41574 SHA1 (patch-aa) = 20cf42090c9cd3149af6e7be59f826624062d759 SHA1 (patch-ab) = bec4e64a5f54109fab55f89b8da9a55d0465d0ab SHA1 (patch-ac) = fc78b2208cb052bedaab4ae3c1e59677bc299f6e diff --git a/sysutils/rox/patches/patch-ROX-Filer_src_mount.c b/sysutils/rox/patches/patch-ROX-Filer_src_mount.c new file mode 100644 index 000000000000..7a5f0997aa82 --- /dev/null +++ b/sysutils/rox/patches/patch-ROX-Filer_src_mount.c @@ -0,0 +1,28 @@ +$NetBSD: patch-ROX-Filer_src_mount.c,v 1.1 2013/02/22 21:38:06 jperkin Exp $ + +Re-order includes so the correct ones are used on SunOS. + +--- ROX-Filer/src/mount.c.orig 2009-07-18 14:23:18.000000000 +0000 ++++ ROX-Filer/src/mount.c +@@ -29,6 +29,10 @@ + #ifdef HAVE_MNTENT_H + /* Linux, etc */ + # include ++#elif HAVE_SYS_MNTENT_H ++ /* SunOS */ ++# include ++# include + #elif HAVE_SYS_UCRED_H + /* NetBSD, OSF1, etc */ + # include +@@ -37,10 +41,6 @@ + # include + # include + # include +-#elif HAVE_SYS_MNTENT_H +- /* SunOS */ +-# include +-# include + #endif + #include + #ifdef HAVE_SYS_VFS_H