Tue Jul 10 19:14:48 2012 UTC ()
Add MirBSD support and unbreak build on MirOS. No-op on other platforms
so no PKGREVISION bump.


(bsiegert)
diff -r1.74 -r1.75 pkgsrc/textproc/icu/Makefile
diff -r1.29 -r1.30 pkgsrc/textproc/icu/distinfo
diff -r0 -r1.1 pkgsrc/textproc/icu/patches/patch-common_putilimp.h
cvs diff -r1.74 -r1.75 pkgsrc/textproc/icu/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/icu/Makefile 2012/07/06 04:54:25 1.74
+++ pkgsrc/textproc/icu/Makefile 2012/07/10 19:14:47 1.75
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.74 2012/07/06 04:54:25 dholland Exp $ 1# $NetBSD: Makefile,v 1.75 2012/07/10 19:14:47 bsiegert Exp $
2 2
3DISTNAME= icu4c-49_1_2-src 3DISTNAME= icu4c-49_1_2-src
4PKGNAME= ${DISTNAME:S/4c//:S/-src//:S/_/./g} 4PKGNAME= ${DISTNAME:S/4c//:S/-src//:S/_/./g}
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= textproc 6CATEGORIES= textproc
7MASTER_SITES= http://download.icu-project.org/files/icu4c/${PKGVERSION_NOREV}/ 7MASTER_SITES= http://download.icu-project.org/files/icu4c/${PKGVERSION_NOREV}/
8EXTRACT_SUFX= .tgz 8EXTRACT_SUFX= .tgz
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.icu-project.org/ 11HOMEPAGE= http://www.icu-project.org/
12COMMENT= Robust and full-featured Unicode services 12COMMENT= Robust and full-featured Unicode services
13LICENSE= mit 13LICENSE= mit
14 14
@@ -21,27 +21,27 @@ TEST_TARGET= check @@ -21,27 +21,27 @@ TEST_TARGET= check
21UNLIMIT_RESOURCES+= datasize 21UNLIMIT_RESOURCES+= datasize
22GNU_CONFIGURE= yes 22GNU_CONFIGURE= yes
23CONFIGURE_ARGS+= --enable-static 23CONFIGURE_ARGS+= --enable-static
24CONFIGURE_ENV+= U_MAKE=${TOOLS_GMAKE} 24CONFIGURE_ENV+= U_MAKE=${TOOLS_GMAKE}
25 25
26.include "../../mk/pthread.buildlink3.mk" 26.include "../../mk/pthread.buildlink3.mk"
27 27
28.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} != "native" 28.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} != "native"
29CONFIGURE_ARGS+= --disable-threads 29CONFIGURE_ARGS+= --disable-threads
30.endif 30.endif
31 31
32.include "../../mk/compiler.mk" 32.include "../../mk/compiler.mk"
33 33
34.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD" || ${OPSYS} == "DragonFly" 34.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD" || ${OPSYS} == "DragonFly" || ${OPSYS} == "MirBSD"
35PLIST_SUBST+= MH_NAME=mh-bsd-gcc 35PLIST_SUBST+= MH_NAME=mh-bsd-gcc
36.elif ${OPSYS} == "Linux" 36.elif ${OPSYS} == "Linux"
37PLIST_SUBST+= MH_NAME=mh-linux 37PLIST_SUBST+= MH_NAME=mh-linux
38.elif ${OPSYS} == "SunOS" 38.elif ${OPSYS} == "SunOS"
39. if !empty(CC_VERSION:Mgcc*) 39. if !empty(CC_VERSION:Mgcc*)
40PLIST_SUBST+= MH_NAME=mh-solaris-gcc 40PLIST_SUBST+= MH_NAME=mh-solaris-gcc
41. else 41. else
42PLIST_SUBST+= MH_NAME=mh-solaris 42PLIST_SUBST+= MH_NAME=mh-solaris
43. endif 43. endif
44. if !empty(CC_VERSION:Mgcc-4.[6-9].*) 44. if !empty(CC_VERSION:Mgcc-4.[6-9].*)
45BUILDLINK_TRANSFORM+= rm:-D__STDC__=0 45BUILDLINK_TRANSFORM+= rm:-D__STDC__=0
46. endif 46. endif
47BUILDLINK_TRANSFORM+= rm:-ansi 47BUILDLINK_TRANSFORM+= rm:-ansi
cvs diff -r1.29 -r1.30 pkgsrc/textproc/icu/distinfo (expand / switch to unified diff)

--- pkgsrc/textproc/icu/distinfo 2012/07/06 04:54:25 1.29
+++ pkgsrc/textproc/icu/distinfo 2012/07/10 19:14:47 1.30
@@ -1,14 +1,15 @@ @@ -1,14 +1,15 @@
1$NetBSD: distinfo,v 1.29 2012/07/06 04:54:25 dholland Exp $ 1$NetBSD: distinfo,v 1.30 2012/07/10 19:14:47 bsiegert Exp $
2 2
3SHA1 (icu4c-49_1_2-src.tgz) = d8cee6d2b2a91a0da7464acd97a5b7b462d93225 3SHA1 (icu4c-49_1_2-src.tgz) = d8cee6d2b2a91a0da7464acd97a5b7b462d93225
4RMD160 (icu4c-49_1_2-src.tgz) = e34aa54f4387ae4c195c72427a2bd25933456e94 4RMD160 (icu4c-49_1_2-src.tgz) = e34aa54f4387ae4c195c72427a2bd25933456e94
5Size (icu4c-49_1_2-src.tgz) = 19010646 bytes 5Size (icu4c-49_1_2-src.tgz) = 19010646 bytes
6SHA1 (patch-aa) = e4020ec11a9754cebb96de754b0982eaa2ad2fe6 6SHA1 (patch-aa) = e4020ec11a9754cebb96de754b0982eaa2ad2fe6
7SHA1 (patch-ab) = e6f4a08d0efabd8e6ae763289d975c1bc70e89c4 7SHA1 (patch-ab) = e6f4a08d0efabd8e6ae763289d975c1bc70e89c4
8SHA1 (patch-ac) = e7cee161315321d2580074054d87714b55319886 8SHA1 (patch-ac) = e7cee161315321d2580074054d87714b55319886
9SHA1 (patch-ad) = f7f20248608e1326359d4464ace32e4ee3031fcb 9SHA1 (patch-ad) = f7f20248608e1326359d4464ace32e4ee3031fcb
10SHA1 (patch-af) = c81168246649f191ebb19a61fb216e172aac3cc2 10SHA1 (patch-af) = c81168246649f191ebb19a61fb216e172aac3cc2
 11SHA1 (patch-common_putilimp.h) = 45aa7bf3fcf1da1bf8705aa64a135f8a1caeba7e
11SHA1 (patch-common_unicode_platform.h) = b95b826d8b1d9104fca71db85b8eaaa6b0c19843 12SHA1 (patch-common_unicode_platform.h) = b95b826d8b1d9104fca71db85b8eaaa6b0c19843
12SHA1 (patch-common_unicode_uset_h) = 4a429952f1ff3ca787217e65eb62198f3d3f967e 13SHA1 (patch-common_unicode_uset_h) = 4a429952f1ff3ca787217e65eb62198f3d3f967e
13SHA1 (patch-common_uposixdefs.h) = abe1989ea4312702e5d0172b662409957b3e2d91 14SHA1 (patch-common_uposixdefs.h) = abe1989ea4312702e5d0172b662409957b3e2d91
14SHA1 (patch-config_icu-config-bottom) = 4a167249d58cb6c729bc164e6abae869dd5e6b1a 15SHA1 (patch-config_icu-config-bottom) = 4a167249d58cb6c729bc164e6abae869dd5e6b1a
File Added: pkgsrc/textproc/icu/patches/patch-common_putilimp.h
$NetBSD: patch-common_putilimp.h,v 1.1 2012/07/10 19:14:48 bsiegert Exp $

--- common/putilimp.h.orig	Fri Jun 22 08:38:46 2012
+++ common/putilimp.h
@@ -119,6 +119,8 @@ typedef size_t uintptr_t;
 #   define U_TIMEZONE _timezone
 #elif U_PLATFORM == U_PF_OS400
    /* not defined */
+#elif defined(__MirBSD__)
+   /* not defined */
 #else
 #   define U_TIMEZONE timezone
 #endif