diff options
| author | obache <obache> | 2011-01-06 11:23:21 +0000 |
|---|---|---|
| committer | obache <obache> | 2011-01-06 11:23:21 +0000 |
| commit | 907b9be39ab020d29a23fba0b1f6b37b756a3d8e (patch) | |
| tree | 8472032cf41e96fa99de764052eaed56f97ebc5e /sysutils | |
| parent | fe128d7f9d5cb840ae8fc292cd168da70af7562d (diff) | |
| download | pkgsrc-907b9be39ab020d29a23fba0b1f6b37b756a3d8e.tar.gz | |
for the case MIN macro is already defined somewhere else.
PR#44328.
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/ftwin/distinfo | 3 | ||||
| -rw-r--r-- | sysutils/ftwin/patches/patch-aa | 16 |
2 files changed, 18 insertions, 1 deletions
diff --git a/sysutils/ftwin/distinfo b/sysutils/ftwin/distinfo index 7414f0e10d6..eb523cd1baf 100644 --- a/sysutils/ftwin/distinfo +++ b/sysutils/ftwin/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.2 2009/06/09 08:37:04 imil Exp $ +$NetBSD: distinfo,v 1.3 2011/01/06 11:23:21 obache Exp $ SHA1 (ftwin-0.8.5.tar.bz2) = 23a1da8d8029a4965e93dd3464c853f5b52e57d0 RMD160 (ftwin-0.8.5.tar.bz2) = fd8685fa6d01b266ef65cf37d204a8269556ddc4 Size (ftwin-0.8.5.tar.bz2) = 164234 bytes +SHA1 (patch-aa) = 11f80bee5df07c2b3390c36790def4a7a00b563a diff --git a/sysutils/ftwin/patches/patch-aa b/sysutils/ftwin/patches/patch-aa new file mode 100644 index 00000000000..dcca5c996bc --- /dev/null +++ b/sysutils/ftwin/patches/patch-aa @@ -0,0 +1,16 @@ +$NetBSD: patch-aa,v 1.1 2011/01/06 11:23:21 obache Exp $ + +* for the case MIN is aready defined somewhere else. + +--- src/ft_file.h.orig 2009-05-20 17:57:08.000000000 +0000 ++++ src/ft_file.h +@@ -20,7 +20,9 @@ + + #include <apr_pools.h> + ++#ifndef MIN + #define MIN(a,b) ((a)<(b)) ? (a) : (b) ++#endif + + /* hash result is not the same for a same file whether it is considered as big or small, so use carefully */ + apr_status_t checksum_file(const char *filename, apr_off_t size, apr_off_t excess_size, apr_uint32_t *state, |