diff options
| author | spz <spz> | 2011-01-16 20:55:53 +0000 |
|---|---|---|
| committer | spz <spz> | 2011-01-16 20:55:53 +0000 |
| commit | 2218495d5e574224a1806561007d499949f0227c (patch) | |
| tree | eb01c19e104f6c7c00753fe1235d72f446475d70 | |
| parent | d66d1955b374d90cf7e2dea62edf19fc2e93ea0a (diff) | |
| download | pkgsrc-2218495d5e574224a1806561007d499949f0227c.tar.gz | |
Pullup ticket 3326 - requested by tron
build fix
Revisions pulled up:
- pkgsrc/archivers/star/distinfo 1.11
Files added:
pkgsrc/archivers/star/patches/patch-ae
pkgsrc/archivers/star/patches/patch-af
-------------------------------------------------------------------------
Module Name: pkgsrc
Committed By: tron
Date: Sat Jan 15 17:46:02 UTC 2011
Modified Files:
pkgsrc/archivers/star: distinfo
Added Files:
pkgsrc/archivers/star/patches: patch-ae patch-af
Log Message:
Fix build under NetBSD-currenty removing unused custom function "getline"
which conflicts with getline(3).
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/archivers/star/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/archivers/star/patches/patch-ae \
pkgsrc/archivers/star/patches/patch-af
| -rw-r--r-- | archivers/star/distinfo | 4 | ||||
| -rw-r--r-- | archivers/star/patches/patch-ae | 15 | ||||
| -rw-r--r-- | archivers/star/patches/patch-af | 19 |
3 files changed, 37 insertions, 1 deletions
diff --git a/archivers/star/distinfo b/archivers/star/distinfo index 00f1491066b..be1b250471b 100644 --- a/archivers/star/distinfo +++ b/archivers/star/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.10 2010/09/28 17:50:07 tnn Exp $ +$NetBSD: distinfo,v 1.10.4.1 2011/01/16 20:55:53 spz Exp $ SHA1 (star-1.4.3.tar.gz) = c59b68d97edba77a9ac6000be04d457ded1eefe9 RMD160 (star-1.4.3.tar.gz) = f7ec71bfab1723c994e5eed7e6818394a41d44d9 @@ -7,3 +7,5 @@ SHA1 (patch-aa) = 4fe4af396adf23eb7ac071b02a7bf726ab1e4318 SHA1 (patch-ab) = aea3af88d3bedf2ce7a7744c90062ba4e57bb79f SHA1 (patch-ac) = 81e6361db3903e5b04fae4e70ad3a37f9a2f4fa7 SHA1 (patch-ad) = 2be98feac17350b37c242a6f84f539e81330ee14 +SHA1 (patch-ae) = 34786fc3c51ef14ca2ae9250d8d12d12788abdc5 +SHA1 (patch-af) = b28ca20dd8cd5326a9d9836880f09740abca7525 diff --git a/archivers/star/patches/patch-ae b/archivers/star/patches/patch-ae new file mode 100644 index 00000000000..238d98671b6 --- /dev/null +++ b/archivers/star/patches/patch-ae @@ -0,0 +1,15 @@ +$NetBSD: patch-ae,v 1.1.2.2 2011/01/16 20:55:53 spz Exp $ + +Remove unused custom function "getline" which conflicts with getline(3) +which is part of the POSIX standard. + +--- include/schily.h.orig 2002-12-24 18:28:01.000000000 +0000 ++++ include/schily.h 2011-01-15 17:41:23.000000000 +0000 +@@ -183,7 +183,6 @@ + extern char *findbytes __PR((const void *, int, char)); + extern int findline __PR((const char *, char, const char *, + int, char **, int)); +-extern int getline __PR((char *, int)); + extern int getstr __PR((char *, int)); + extern int breakline __PR((char *, char, char **, int)); + extern int getallargs __PR((int *, char * const**, const char *, ...)); diff --git a/archivers/star/patches/patch-af b/archivers/star/patches/patch-af new file mode 100644 index 00000000000..4b6bebae4bb --- /dev/null +++ b/archivers/star/patches/patch-af @@ -0,0 +1,19 @@ +$NetBSD: patch-af,v 1.1.2.2 2011/01/16 20:55:53 spz Exp $ + +Remove unused custom function "getline" which conflicts with getline(3) +which is part of the POSIX standard. + +--- lib/stdio/fgetline.c.orig 2000-12-03 11:19:29.000000000 +0000 ++++ lib/stdio/fgetline.c 2011-01-15 17:42:18.000000000 +0000 +@@ -62,11 +62,3 @@ + + return (bp - buf); + } +- +-EXPORT int +-getline(buf, len) +- char *buf; +- int len; +-{ +- return (fgetline(stdin, buf, len)); +-} |