textproc/icu

textproc/icu/Makefile

@@ -27,6 +27,7 @@ CONFIGURE_ARGS+=	--disable-threads
 .endif
 
 .include "../../mk/compiler.mk"
+.include "../../mk/bsd.prefs.mk" # To get OPSYS
 
 # from ICU_CHECK_MH_FRAG in source/acinclude.m4
 .if ${OPSYS} == "SunOS"

textproc/icu/distinfo

@@ -19,3 +19,11 @@ SHA1 (patch-config_mh-scoosr5) = 47703dcc184f58c0382da3225f849424ab74d472
 SHA1 (patch-configure) = 430389c77d35b93f1831e0444598eb86f61e315b
 SHA1 (patch-configure.ac) = babf9edd0bef353e9fb8c47917658c0a65af5a36
 SHA1 (patch-tools-toolutil-pkg_genc.c) = b5a9eb679908d9f579ff095c5389ec1aa8df8e1e
+SHA1 (patch-zz-minix-a) = 1723b3ee4c3389baae626ce684bbf0574556595d
+SHA1 (patch-zz-minix-b) = 12bc29bfdc26a54b3b6e01683beba67d0ae93bbb
+SHA1 (patch-zz-minix-c) = f19e834de1ecb89aad620b22cb190fb54d09a0c8
+SHA1 (patch-zz-minix-d) = 502769bb99c8c5947573ac1d28eebd2ce73bc2fa
+SHA1 (patch-zz-minix-e) = 188db8c6ee222001a6720025d99bb19025ca0c0d
+SHA1 (patch-zz-minix-f) = d585461d155881d79d3fd7e8c58644c99e1ad006
+SHA1 (patch-zz-minix-g) = 4710f198fc19d6e9c61d5de85cd9a62117d90409
+SHA1 (patch-zz-minix-h) = c5cdb1b575ba00d001070ae398c96ca64e81f134

textproc/icu/patches/patch-zz-minix-a

@@ -0,0 +1,38 @@
+--- configure.orig	Sun Oct 25 18:41:51 2015
++++ configure	Sun Oct 25 18:44:42 2015
+@@ -5147,7 +5147,7 @@
+ 		*-*-cygwin) icu_cv_host_frag=mh-cygwin-msvc ;;
+ 		esac
+ 	fi ;;
+-*-*-*bsd*|*-*-dragonfly*|*-*-bitrig*) 	icu_cv_host_frag=mh-bsd-gcc ;;
++*-*-*bsd*|*-*-dragonfly*|*-*-bitrig*|*-*-minix*) 	icu_cv_host_frag=mh-bsd-gcc ;;
+ *-*-aix*)
+ 	if test "$GCC" = yes; then
+ 		icu_cv_host_frag=mh-aix-gcc
+@@ -5697,7 +5697,7 @@
+ done
+ 
+ case "${host}" in
+-*-netbsd*)
++*-minix*|*-netbsd*)
+ if test "x$ac_cv_header_sys_atomic_h" = "xyes"; then
+     CONFIG_CPPFLAGS="$CONFIG_CPPFLAGS -DU_HAVE_NETBSD_ATOMIC_OPS=1";
+ fi
+@@ -6286,7 +6286,7 @@
+ # Check to see if genccode can generate simple assembly.
+ GENCCODE_ASSEMBLY=
+ case "${host}" in
+-*-linux*|*-kfreebsd*-gnu*|i*86-*-*bsd*|i*86-pc-gnu)
++*-linux*|*-kfreebsd*-gnu*|i*86-*-*bsd*|i*86-*-minix*|i*86-pc-gnu)
+     if test "$GCC" = yes; then
+         # We're using gcc, and the simple -a gcc command line works for genccode
+         GENCCODE_ASSEMBLY="-a gcc"
+@@ -7679,7 +7679,7 @@
+ case "${host}" in
+ 	*-*-solaris*) 	platform=U_SOLARIS ;;
+ 	*-*-linux*|*-*-gnu|*-*-k*bsd*-gnu|*-*-kopensolaris*-gnu)        platform=U_LINUX ;;
+-	*-*-*bsd*|*-*-dragonfly*|*-*-bitrig*) 	platform=U_BSD ;;
++	*-*-*bsd*|*-*-dragonfly*|*-*-bitrig*|*-*-minix*) 	platform=U_BSD ;;
+ 	*-*-aix*) 	platform=U_AIX ;;
+ 	*-*-hpux*) 	platform=U_HPUX ;;
+ 	*-apple-darwin*|*-apple-rhapsody*)	platform=U_DARWIN ;;

textproc/icu/patches/patch-zz-minix-b

@@ -0,0 +1,11 @@
+--- common/unicode/platform.h.orig	Sun Apr 26 15:42:43 2015
++++ common/unicode/platform.h	Sun Apr 26 15:43:12 2015
+@@ -149,7 +149,7 @@
+ #   else
+ #       define U_PLATFORM U_PF_DARWIN
+ #   endif
+-#elif defined(BSD) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__MirBSD__) || defined(__DragonFly__)
++#elif defined(BSD) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__minix) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__MirBSD__) || defined(__DragonFly__)
+ #   define U_PLATFORM U_PF_BSD
+ #elif defined(sun) || defined(__sun)
+     /* Check defined(__SVR4) || defined(__svr4__) to distinguish Solaris from SunOS? */

textproc/icu/patches/patch-zz-minix-c

@@ -0,0 +1,13 @@
+--- common/umutex.h.orig	Sun Apr 26 15:45:11 2015
++++ common/umutex.h	Sun Apr 26 15:45:32 2015
+@@ -375,6 +375,10 @@
+  */
+ 
+ #include <pthread.h>
++#ifdef __minix
++/* LSC: Once more, an example of why macros are a bad thing. */
++#undef select
++#endif
+ 
+ struct UMutex {
+     pthread_mutex_t  fMutex;

textproc/icu/patches/patch-zz-minix-d

@@ -0,0 +1,11 @@
+--- common/putilimp.h.orig	Sun Apr 26 15:46:47 2015
++++ common/putilimp.h	Sun Apr 26 15:47:20 2015
+@@ -126,7 +126,7 @@
+ #   endif
+ #elif U_PLATFORM_USES_ONLY_WIN32_API
+ #   define U_TIMEZONE _timezone
+-#elif U_PLATFORM == U_PF_BSD && !defined(__NetBSD__)
++#elif U_PLATFORM == U_PF_BSD && !defined(__minix) && !defined(__NetBSD__)
+    /* not defined */
+ #elif U_PLATFORM == U_PF_OS400
+    /* not defined */

textproc/icu/patches/patch-zz-minix-e

@@ -0,0 +1,11 @@
+--- runConfigureICU.orig	Sun Oct 25 18:39:40 2015
++++ runConfigureICU	Sun Oct 25 18:40:29 2015
+@@ -327,7 +327,7 @@
+         DEBUG_CXXFLAGS='-Zi -MDd'
+         DEBUG_LDFLAGS='-DEBUG'
+         ;;
+-    *BSD | DragonFly | Bitrig)
++    *BSD | DragonFly | Bitrig | Minix)
+         THE_OS="BSD"
+         THE_COMP="the GNU C++"
+         DEBUG_CFLAGS='-g -O0'

textproc/icu/patches/patch-zz-minix-f

@@ -0,0 +1,14 @@
+--- i18n/ucol_res.cpp.orig	Sun Apr 26 16:05:53 2015
++++ i18n/ucol_res.cpp	Sun Apr 26 16:07:22 2015
+@@ -51,6 +51,11 @@
+ #include "ustrenum.h"
+ #include "utracimp.h"
+ 
++#if defined(__minix)
++/* LSC: Yet another example why macros are evil. */
++#undef read
++#endif /* defined(__minix) */
++
+ U_NAMESPACE_BEGIN
+ 
+ namespace {

textproc/icu/patches/patch-zz-minix-g

@@ -0,0 +1,14 @@
+--- i18n/collationdatareader.cpp.orig	Sun Apr 26 16:14:39 2015
++++ i18n/collationdatareader.cpp	Sun Apr 26 16:15:55 2015
+@@ -30,6 +30,11 @@
+ #include "ucmndata.h"
+ #include "utrie2.h"
+ 
++#if defined(__minix)
++/* LSC: Yet another example of why macros are evil. */
++#undef read
++#endif /* defined(__minix) */
++
+ U_NAMESPACE_BEGIN
+ 
+ namespace {

textproc/icu/patches/patch-zz-minix-h

@@ -0,0 +1,14 @@
+--- i18n/collationdatareader.h.orig	Sun Apr 26 16:23:14 2015
++++ i18n/collationdatareader.h	Sun Apr 26 16:24:21 2015
+@@ -18,6 +18,11 @@
+ 
+ #include "unicode/udata.h"
+ 
++#if defined(__minix)
++/* LSC: Yet another proof for the evilness of macros. */
++#undef read
++#endif /* defined(__minix) */
++
+ struct UDataMemory;
+ 
+ U_NAMESPACE_BEGIN