diff options
| author | tnn <tnn> | 2016-03-09 06:52:02 +0000 |
|---|---|---|
| committer | tnn <tnn> | 2016-03-09 06:52:02 +0000 |
| commit | 9ad4b1a13bf4482abbe4f96282a01e09d89d8665 (patch) | |
| tree | 1c371ca21d023c9bb274093ecbd259f22635ccf1 /x11 | |
| parent | 2f8161d1f5dde3d766dc77110624b7989825a6dc (diff) | |
| download | pkgsrc-9ad4b1a13bf4482abbe4f96282a01e09d89d8665.tar.gz | |
fix build on Linux
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/xp/distinfo | 6 | ||||
| -rw-r--r-- | x11/xp/patches/patch-ab | 27 | ||||
| -rw-r--r-- | x11/xp/patches/patch-readfile.c | 16 |
3 files changed, 32 insertions, 17 deletions
diff --git a/x11/xp/distinfo b/x11/xp/distinfo index 34ce6b83870..a4798f60692 100644 --- a/x11/xp/distinfo +++ b/x11/xp/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.6 2015/11/04 03:29:10 agc Exp $ +$NetBSD: distinfo,v 1.7 2016/03/09 06:52:02 tnn Exp $ SHA1 (xp-1.2b10.tar.gz) = 70b232966ee2483ceb8f0ae8f0ef0cf7b899104b RMD160 (xp-1.2b10.tar.gz) = 035f6f7dd3143e220ab454388d1632788e9e2bd3 SHA512 (xp-1.2b10.tar.gz) = 6c45b91dccdf1a9dc5b836f7ed38a3abd5e309671c19011b0d3d3333049071ec3236bc531a1fada919ca7c43c54f48802b51644971d864860e1250f969073cae Size (xp-1.2b10.tar.gz) = 43036 bytes -SHA1 (patch-aa) = 0d6fa753ff8010ba6264b0bfc19e44c3a5f723ce -SHA1 (patch-ab) = 62b440dd9e5ee419113589d3758a1a6bcba35f5d +SHA1 (patch-ab) = 770f89ca133df9827370caf47280815d9923d52c SHA1 (patch-ac) = 4451ed9962f98c2dbaae4c4dcd2a3d0e369a72d6 SHA1 (patch-ad) = 40cba728947de06e1fb118527a940b9cdea4fb48 +SHA1 (patch-readfile.c) = d72c2c0f2fd0d21ff8c73e134ea9080e0966d68d diff --git a/x11/xp/patches/patch-ab b/x11/xp/patches/patch-ab index 2216b2f5cef..c4daeec53d0 100644 --- a/x11/xp/patches/patch-ab +++ b/x11/xp/patches/patch-ab @@ -1,23 +1,22 @@ -$NetBSD: patch-ab,v 1.1.1.1 1999/08/13 19:35:45 tron Exp $ +$NetBSD: patch-ab,v 1.2 2016/03/09 06:52:02 tnn Exp $ ---- utils.c.orig Thu Feb 11 13:44:15 1999 -+++ utils.c Fri Aug 13 21:30:56 1999 -@@ -1,13 +1,18 @@ +It's 2016. Everyone has strerror. + +--- utils.c.orig 1999-02-11 12:44:15.000000000 +0000 ++++ utils.c +@@ -1,13 +1,8 @@ #include <errno.h> +-#define NULL 0 +#include <string.h> - #define NULL 0 char * uerror() { -+#ifdef HAS_STRERROR +- extern int sys_nerr; +- extern char *sys_errlist[]; +- if (errno > sys_nerr) +- return NULL; +- else +- return sys_errlist[errno]; + return strerror(errno); -+#else - extern int sys_nerr; - extern char *sys_errlist[]; - if (errno > sys_nerr) - return NULL; - else - return sys_errlist[errno]; -+#endif } diff --git a/x11/xp/patches/patch-readfile.c b/x11/xp/patches/patch-readfile.c new file mode 100644 index 00000000000..b97ae52ec1e --- /dev/null +++ b/x11/xp/patches/patch-readfile.c @@ -0,0 +1,16 @@ +$NetBSD: patch-readfile.c,v 1.1 2016/03/09 06:52:02 tnn Exp $ + +use proper malloc prototypes + +--- readfile.c.orig 1999-02-11 10:34:04.000000000 +0000 ++++ readfile.c +@@ -34,8 +34,7 @@ + #include <X11/Xos.h> /* get types.h */ + #include <sys/stat.h> + +-extern char *malloc(); +-extern char *realloc(); ++#include <stdlib.h> + + /* + * readinlump - read data from a file into a single buffer in 1 go |