svn commit: r439345 - in head/sysutils/cdrdao: . files

[Marius Strobl]

Author: marius
Date: Mon Apr 24 20:23:23 2017
New Revision: 439345
URL: https://svnweb.freebsd.org/changeset/ports/439345

Log:
  - 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]

Added:
  head/sysutils/cdrdao/files/patch-scsilib_inc_avoffset.c
     - copied, changed from r439266, head/sysutils/cdrtools/files/patch-inc_avoffset.c
  head/sysutils/cdrdao/files/patch-scsilib_inc_getfp.c
     - copied, changed from r439266, head/sysutils/cdrtools/files/patch-inc_getfp.c
  head/sysutils/cdrdao/files/patch-scsilib_libschily_getfp.c
     - copied, changed from r439343, head/sysutils/cdrtools/files/patch-libschily_getfp.c
Modified:
  head/sysutils/cdrdao/Makefile

Modified: head/sysutils/cdrdao/Makefile
==============================================================================
--- head/sysutils/cdrdao/Makefile	Mon Apr 24 20:12:59 2017	(r439344)
+++ head/sysutils/cdrdao/Makefile	Mon Apr 24 20:23:23 2017	(r439345)
@@ -65,13 +65,13 @@ CONFIGURE_ARGS+=	--with-mp3-support=no -
 .endif
 .endif
 
+.include <bsd.port.pre.mk>
+
 CONFIGURE_ARGS+=	--without-pcctsbin --without-pcctsinc \
 			--with-posix-threads=no --with-scglib
 MAKE_ENV=		CCOM=cc
 SCSILIBXARCH!=		${UNAME} -m
 
-.include <bsd.port.pre.mk>
-
 post-extract:
 	@(cd ${WRKSRC}/scsilib/RULES && ${CP} os-freebsd.id os-dragonfly.id)
 .if ${SCSILIBXARCH} != "i386"

Copied and modified: head/sysutils/cdrdao/files/patch-scsilib_inc_avoffset.c (from r439266, head/sysutils/cdrtools/files/patch-inc_avoffset.c)
==============================================================================
--- head/sysutils/cdrtools/files/patch-inc_avoffset.c	Mon Apr 24 07:43:07 2017	(r439266, copy source)
+++ head/sysutils/cdrdao/files/patch-scsilib_inc_avoffset.c	Mon Apr 24 20:23:23 2017	(r439345)
@@ -15,9 +15,9 @@
 # which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/.
 ###########################################################################
 
---- inc/avoffset.c.orig	2011-11-28 19:28:41 UTC
-+++ inc/avoffset.c
-@@ -60,7 +60,7 @@ main(ac, av)
+--- scsilib/inc/avoffset.c.orig	2009-10-05 11:58:21 UTC
++++ scsilib/inc/avoffset.c
+@@ -61,7 +61,7 @@ main(ac, av)
  {
  	int		stdir;
  #ifdef	HAVE_SCANSTACK

Copied and modified: head/sysutils/cdrdao/files/patch-scsilib_inc_getfp.c (from r439266, head/sysutils/cdrtools/files/patch-inc_getfp.c)
==============================================================================
--- head/sysutils/cdrtools/files/patch-inc_getfp.c	Mon Apr 24 07:43:07 2017	(r439266, copy source)
+++ head/sysutils/cdrdao/files/patch-scsilib_inc_getfp.c	Mon Apr 24 20:23:23 2017	(r439345)
@@ -15,9 +15,9 @@
 # which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/.
 ###########################################################################
 
---- inc/getfp.c.orig	2008-06-13 22:32:03 UTC
-+++ inc/getfp.c
-@@ -52,7 +52,7 @@
+--- 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));
  
@@ -26,7 +26,7 @@
  getfp()
  {
  		long	**dummy[1];
-@@ -69,7 +69,7 @@ getfp()
+@@ -73,7 +73,7 @@ getfp()
   * We need this function to fool GCCs check for returning addresses
   * from outside the functions local address space.
   */

Copied and modified: head/sysutils/cdrdao/files/patch-scsilib_libschily_getfp.c (from r439343, head/sysutils/cdrtools/files/patch-libschily_getfp.c)
==============================================================================
--- head/sysutils/cdrtools/files/patch-libschily_getfp.c	Mon Apr 24 19:33:00 2017	(r439343, copy source)
+++ head/sysutils/cdrdao/files/patch-scsilib_libschily_getfp.c	Mon Apr 24 20:23:23 2017	(r439345)
@@ -15,9 +15,17 @@
 # which is mirrored at ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/.
 ###########################################################################
 
---- libschily/getfp.c.orig	2008-06-13 22:32:03 UTC
-+++ libschily/getfp.c
-@@ -52,7 +52,7 @@
+--- scsilib/libschily/getfp.c.orig	2003-07-12 23:10:47 UTC
++++ scsilib/libschily/getfp.c
+@@ -23,6 +23,7 @@
+ #include <mconfig.h>
+ #include <standard.h>
+ #include <schily.h>
++#include <sys/cdefs.h>
+ 
+ #ifndef	IS_AVOFFSET
+ /*
+@@ -56,7 +57,7 @@
  
  EXPORT	void	**___fpoff	__PR((char *cp));
  
@@ -26,7 +34,7 @@
  getfp()
  {
  		long	**dummy[1];
-@@ -69,7 +69,7 @@ getfp()
+@@ -73,7 +74,7 @@ getfp()
   * We need this function to fool GCCs check for returning addresses
   * from outside the functions local address space.
   */