pkg/44328: ftwin compilation fix on DragonFlyBSD

[zakne0ne%gmail.com@localhost]

>Number:         44328
>Category:       pkg
>Synopsis:       ftwin compilation fix on DragonFlyBSD
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Wed Jan 05 16:25:00 +0000 2011
>Originator:     Ilia
>Release:        DragonFly 2.9.1
>Organization:
>Environment:
DragonFly 2.9-DEVELOPMENT DragonFly v2.9.1.370.g78775c-DEVELOPMENT #0: Sun Jan 
2 12:34:32 2011    root@:/usr/obj/usr/src/sys/GENERIC i386
>Description:
In file included from src/ftwin.c:45:
src/ft_file.h:23:1: error: "MIN" redefined
In file included from /usr/include/sys/uio.h:47,
                 from 
/usr/pkgsrc/sysutils/ftwin/work/.buildlink/include/apr-1/apr_file_info.h:33,
                 from src/ftwin.c:25:
/usr/include/sys/param.h:218:1: error: this is the location of the previous 
definition

>How-To-Repeat:

>Fix:
--- distinfob   2011-01-05 17:16:35 -0600
+++ distinfo    2011-01-05 17:16:42 -0600
@@ -3,3 +3,4 @@
 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) = 8128529762da4b43ecb623f107a4a9da506e05a6


$NetBSD$

--- ft_file.h.orig      2011-01-05 23:11:25 +0000
+++ 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,