- Move the inclusion of bsd.port.pre.mk up slightly so ${UNAME} is also

  available in the gcdmaster slave port at the required point in time
  (it's unclear why this was no problem with the cdrdao port before). [1]
- Copy over the cdrtools patches from r427613 in order to fix the build
  with clang 3.9.0.

Reported by:	Jonathan Chen [1]

1 files changed, 37 insertions, 0 deletions

diff --git a/sysutils/cdrdao/files/patch-scsilib_inc_getfp.c b/sysutils/cdrdao/files/patch-scsilib_inc_getfp.c
new file mode 100644
index 000000000000..5152d44295a5
--- /dev/null
+++ b/sysutils/cdrdao/files/patch-scsilib_inc_getfp.c
@@ -0,0 +1,37 @@
+###########################################################################
+# This patch was contributed by Dimitry Andric.
+###########################################################################
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License").  You may not use this file except in compliance
+# with the License.
+#
+# See the file CDDL.Schily.txt in this distribution for details.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file CDDL.Schily.txt from this distribution.
+###########################################################################
+# The file CDDL.Schily.txt can be found in the original cdrtools tarball,
+# which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/.
+###########################################################################
+
+--- scsilib/inc/getfp.c.orig	2003-07-12 23:10:47 UTC
++++ scsilib/inc/getfp.c
+@@ -56,7 +56,7 @@
+ 
+ EXPORT	void	**___fpoff	__PR((char *cp));
+ 
+-EXPORT void **
++EXPORT __noinline void **
+ getfp()
+ {
+ 		long	**dummy[1];
+@@ -73,7 +73,7 @@ getfp()
+  * We need this function to fool GCCs check for returning addresses
+  * from outside the functions local address space.
+  */
+-EXPORT void **
++EXPORT __noinline void **
+ ___fpoff(cp)
+ 	char	*cp;
+ {