Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1542788602242010"
MIME-Version: 1.0
Date: Wed, 21 Nov 2018 08:23:22 +0000
From: "Maya Rashish" <maya@netbsd.org>
Subject: CVS commit: pkgsrc/x11/fltk2
To: pkgsrc-changes@NetBSD.org
Reply-To: maya@netbsd.org
Message-Id: <20181121082322.777AAFB1F@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1542788602242010
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	maya
Date:		Wed Nov 21 08:23:22 UTC 2018

Modified Files:
	pkgsrc/x11/fltk2: distinfo
Added Files:
	pkgsrc/x11/fltk2/patches: patch-fltk_string.h

Log Message:
fltk2: don't provide declarations if we know they exist.

Fixes build failure:
https://mail-index.netbsd.org/pkgsrc-users/2018/11/16/msg027701.html


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/x11/fltk2/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/fltk2/patches/patch-fltk_string.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1542788602242010
Content-Disposition: inline
Content-Length: 2500
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/x11/fltk2/distinfo
diff -u pkgsrc/x11/fltk2/distinfo:1.10 pkgsrc/x11/fltk2/distinfo:1.11
--- pkgsrc/x11/fltk2/distinfo:1.10	Wed Dec 21 13:40:24 2016
+++ pkgsrc/x11/fltk2/distinfo	Wed Nov 21 08:23:22 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2016/12/21 13:40:24 joerg Exp $
+$NetBSD: distinfo,v 1.11 2018/11/21 08:23:22 maya Exp $
 
 SHA1 (fltk-2.0.x-r6129.tar.bz2) = fafb9e5309127e5dd3e127ecf83f410312a427b5
 RMD160 (fltk-2.0.x-r6129.tar.bz2) = a43d9603fdbf12fd0deefbad7e5ef5dd8f0a1c6f
@@ -12,4 +12,5 @@ SHA1 (patch-ae) = 8711184bfcbc2882d115e0
 SHA1 (patch-af) = ff5648e8c6b935bccb77a8afe09d247f3313c76a
 SHA1 (patch-ag) = de60c4a5a2c9ad28e35eebe83a8f06fc298be748
 SHA1 (patch-ah) = 47eddca382caa8ecc0b393609990290fd18dea7a
+SHA1 (patch-fltk_string.h) = cc3614127bbf3a47b8c65b34941af9ae41434dff
 SHA1 (patch-fluid_FluidType.h) = 9fe195316f12794c0fc1a38f47a48e1168437153

Added files:

Index: pkgsrc/x11/fltk2/patches/patch-fltk_string.h
diff -u /dev/null pkgsrc/x11/fltk2/patches/patch-fltk_string.h:1.1
--- /dev/null	Wed Nov 21 08:23:22 2018
+++ pkgsrc/x11/fltk2/patches/patch-fltk_string.h	Wed Nov 21 08:23:22 2018
@@ -0,0 +1,34 @@
+$NetBSD: patch-fltk_string.h,v 1.1 2018/11/21 08:23:22 maya Exp $
+
+Don't provide a declaration if we already detected one.
+
+--- fltk/string.h.orig	2007-10-17 20:54:58.000000000 +0000
++++ fltk/string.h
+@@ -43,6 +43,7 @@
+ # include <string.h>
+ # include <stdarg.h> /* for va_list */
+ # include <stdio.h> /* for sprintf, vsprintf, snprintf and vsnprintf */
++# include <config.h>
+ 
+ /* Windows has equivalent functions, but being Microsoft they added
+    gratuitoius changes to the names to stop code from being portable: */
+@@ -68,13 +69,17 @@ FL_API extern int strcasecmp(const char 
+ FL_API extern int strncasecmp(const char *, const char *, size_t);
+ #endif
+ 
+-#if defined(DOXYGEN) || !defined(__linux) && !defined(_WIN32) && !defined(__FreeBSD__) && !defined(__APPLE__)
++#if !HAVE_SNPRINTF && defined(DOXYGEN)
+ FL_API extern int snprintf(char *, size_t, const char *, ...);
++#endif
++#if !HAVE_VSNPRINTF && defined(DOXYGEN)
+ FL_API extern int vsnprintf(char *, size_t, const char *, va_list ap);
+ #endif
+ 
+-#if defined(DOXYGEN) || !defined(__FreeBSD__) && !defined(__APPLE__)
++#if !HAVE_STRLCAT && defined(DOXYGEN)
+ FL_API extern size_t strlcat(char *, const char *, size_t);
++#endif
++#if !HAVE_STRLCPY && defined(DOXYGEN)
+ FL_API extern size_t strlcpy(char *, const char *, size_t);
+ #endif
+ 


--_----------=_1542788602242010--