Import of pkgsrc-2015Q3

This commit is contained in:
2016-01-21 23:42:40 +01:00
committed by sambuc
parent f641581404
commit 9d819b6d54
7578 changed files with 228313 additions and 80017 deletions
-17
View File
@@ -1,17 +0,0 @@
$NetBSD: patch-Makefile.in,v 1.2 2013/04/22 21:18:45 zafer Exp $
Fix destdir build.
--- Makefile.in.orig 2004-05-12 17:53:07.000000000 +0200
+++ Makefile.in 2012-01-21 01:44:49.816033366 +0100
@@ -216,8 +216,8 @@ installdirs:
installhelp:
$(INSTALL_HELP_CMD)
- find $(HELP_DIR) -type d -print | xargs chmod a+rx
- find $(HELP_DIR) -type f -print | xargs chmod a+r
+ find $(DESTDIR)/$(HELP_DIR) -type d -print | xargs chmod a+rx
+ find $(DESTDIR)$(HELP_DIR) -type f -print | xargs chmod a+r
installtranslation: installdirs
$(INSTALL_TRANSLATION_CMD)
+3 -3
View File
@@ -1,9 +1,9 @@
$NetBSD: patch-aa,v 1.4 2007/09/29 12:18:16 rillig Exp $
$NetBSD: patch-aa,v 1.5 2015/07/27 22:31:30 wiz Exp $
Prototypes must match exactly, says gcc4.
--- source/rijndael-alg-ref.c.orig 2002-01-21 22:37:36.000000000 +0100
+++ source/rijndael-alg-ref.c 2007-09-29 14:16:54.000000000 +0200
--- source/rijndael-alg-ref.c.orig 2011-04-29 08:21:18.000000000 +0000
+++ source/rijndael-alg-ref.c
@@ -36,11 +36,11 @@ static word8 shifts[3][4][2] = {
};
+26
View File
@@ -0,0 +1,26 @@
$NetBSD: patch-source_input.c,v 1.1 2015/07/27 22:31:30 wiz Exp $
Fixes incompatible pointer type error.
--- source/input.c.orig 2011-04-29 08:21:18.000000000 +0000
+++ source/input.c
@@ -857,8 +857,8 @@ re_encode:
else
/****************************************************************************/
retval = iconv(mbdata.conv_in,
- &iptr, &isize,
- (char **)&optr, &osize);
+ (const char**)&iptr, &isize,
+ &optr, &osize);
if (retval == (size_t)-1)
{
@@ -1010,7 +1010,7 @@ get_input()
size_t retval;
retval = iconv(conv,
- &source, &left,
+ (const char**)&source, &left,
&dest, &space);
if (retval == (size_t)-1)
{
@@ -0,0 +1,15 @@
$NetBSD: patch-source_screen.c,v 1.1 2015/07/27 22:31:30 wiz Exp $
Fixes incompatible pointer type error.
--- source/screen.c.orig 2011-04-29 08:21:18.000000000 +0000
+++ source/screen.c
@@ -613,7 +613,7 @@ display_text(ustr, length)
else
{
retval = iconv(converter,
- &str, &length,
+ (const char**)&str, &length,
&outptr, &outsize);
}
@@ -0,0 +1,24 @@
$NetBSD: patch-source_translat.c,v 1.1 2015/07/27 22:31:30 wiz Exp $
Fixes incompatible pointer type error.
--- source/translat.c.orig 2011-04-29 08:21:18.000000000 +0000
+++ source/translat.c
@@ -379,7 +379,7 @@ displayable_unival(unsigned unival, icon
/* *outptr = '\0'; */
retval = iconv(conv_out,
- (iconv_const char**)&utfptr, &utfspace,
+ (const char**)&utfptr, &utfspace,
(char **)&outptr, &outspace);
/*
@@ -598,7 +598,7 @@ decode_mb(ptr, dest, data)
cptr = (char *)ptr;
cutfptr = (char *)utfptr;
retval = iconv(data->conv_in,
- (iconv_const char**)&ptr, &is,
+ (const char**)&ptr, &is,
(char **)&utfptr, &utfspace);
data->input_bytes += gave-is;