ports/55214: Maintainer-update: samba-libsmbclient build fix for amd64

[Koop Mast]

>Number:         55214
>Category:       ports
>Synopsis:       Maintainer-update: samba-libsmbclient build fix for amd64
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Aug 03 12:30:11 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Koop Mast
>Release:        FreeBSD 5.1-CURRENT i386
>Organization:
>Environment:
System: FreeBSD prisma.quccc.org 5.1-CURRENT FreeBSD 5.1-CURRENT #0: Mon Jul 14 18:54:50 CEST 2003 root at prisma.quccc.org:/usr/obj/usr/src/sys/rainbow i386


	
>Description:
	2 patches to fix building on amd64.	

	Noticed by: bento & kris
	
>How-To-Repeat:
	
>Fix:

	

--- patch-configure begins here ---
--- configure.in.orig	Wed Jul 16 22:45:47 2003
+++ configure.in	Sun Aug  3 12:49:35 2003
@@ -1310,12 +1310,20 @@
     AC_DEFINE(HAVE_GETTIMEOFDAY_TZ,1,[Whether gettimeofday() is available])
 fi
 
-AC_CACHE_CHECK([for __va_copy],samba_cv_HAVE_VA_COPY,[
+AC_CACHE_CHECK([for va_copy],samba_cv_HAVE_VA_COPY,[
 AC_TRY_LINK([#include <stdarg.h>
-va_list ap1,ap2;], [__va_copy(ap1,ap2);],
+va_list ap1,ap2;], [va_copy(ap1,ap2);],
 samba_cv_HAVE_VA_COPY=yes,samba_cv_HAVE_VA_COPY=no)])
 if test x"$samba_cv_HAVE_VA_COPY" = x"yes"; then
-    AC_DEFINE(HAVE_VA_COPY,1,[Whether __va_copy() is available])
+    AC_DEFINE(HAVE_VA_COPY,1,[Whether va_copy() is available])
+fi
+
+AC_CACHE_CHECK([for __va_copy],samba_cv_HAVE__VA_COPY,[
+AC_TRY_LINK([#include <stdarg.h>
+va_list ap1,ap2;], [__va_copy(ap1,ap2);],
+samba_cv_HAVE__VA_COPY=yes,samba_cv_HAVE__VA_COPY=no)])
+if test x"$samba_cv_HAVE__VA_COPY" = x"yes"; then
+    AC_DEFINE(HAVE__VA_COPY,1,[Whether __va_copy() is available])
 fi
 
 AC_CACHE_CHECK([for C99 vsnprintf],samba_cv_HAVE_C99_VSNPRINTF,[
--- patch-configure ends here ---

--- patch-include_includes.h begins here ---
--- include/includes.h.orig	Tue Jul  1 22:44:25 2003
+++ include/includes.h	Sun Aug  3 12:05:23 2003
@@ -1248,10 +1248,14 @@
 
 
 /* we need to use __va_copy() on some platforms */
-#ifdef HAVE_VA_COPY
+#ifdef HAVE__VA_COPY
 #define VA_COPY(dest, src) __va_copy(dest, src)
 #else
+#ifdef HAVE_VA_COPY
+#define VA_COPY(dest, src) va_copy(dest, src)
+#else
 #define VA_COPY(dest, src) (dest) = (src)
+#endif
 #endif
 
 #ifndef HAVE_TIMEGM
--- patch-include_includes.h ends here ---

--- Makefile.diff begins here ---
--- Makefile.orig	Fri Jul 25 06:42:08 2003
+++ Makefile	Sun Aug  3 19:37:48 2003
@@ -7,6 +7,7 @@
 
 PORTNAME=	samba
 PORTVERSION=	3.0.0.b3
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://us4.samba.org/samba/ftp/%SUBDIR%/
 MASTER_SITE_SUBDIR=	beta alpha old
--- Makefile.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: