# This is a shell archive. Save it in a file, remove anything before # this line, and then unpack it by entering "sh file". Note, it may # create directories; files and directories will be owned by you and # have default permissions. # # This archive contains: # # ./pkg-descr # ./distinfo # ./Makefile # ./pkg-plist # ./files/patch-make.py # ./files/patch-stack_trace_posix.cc # ./files/patch-base.gypi # ./files/patch-pthread_shared_mem.cc # ./files/patch-ptypes.h # ./files/patch-install_apxs.sh # ./files/patch-debugger_posix.cc # ./files/patch-libpng_image_library.cc # ./files/patch-resource_manager_test.cc # ./files/patch-common.h # ./files/patch-platform.h # ./files/patch-utypes.h # echo x - ./pkg-descr sed 's/^X//' >./pkg-descr << '0e313719ff012ceaf97a028d51caa8f5' Xmod_pagespeed is an open-source Apache module that automatically optimizes web Xpages and resources on them. It does this by rewriting the resources using Xfilters that implement web performance best practices. Webmasters and web Xdevelopers can use mod_pagespeed to improve the performance of their web pages Xwhen serving content with the Apache HTTP Server. X X XWWW: http://code.google.com/speed/page-speed/docs/module.html 0e313719ff012ceaf97a028d51caa8f5 echo x - ./distinfo sed 's/^X//' >./distinfo << 'aec8793adfd5b7c3f00e62ae41a09ac2' XSHA256 (mod_pagespeed_source_20110927.tar.xz) = 6a81d2d24ad3726861b44626a259e0722bbf6ea86a78cd20ae4ceac58e596fb3 XSIZE (mod_pagespeed_source_20110927.tar.xz) = 11240812 aec8793adfd5b7c3f00e62ae41a09ac2 echo x - ./Makefile sed 's/^X//' >./Makefile << '464ef7c6571951809b23e262cbe26e19' X# New ports collection makefile for: mod_pagespeed X# Date created: 2011-09-27 X# Whom: Steve Wills X# X# $FreeBSD$ X# X XPORTNAME= mod_pagespeed XPORTVERSION= 20110927 XPORTREVISION= 1 XCATEGORIES= www XMASTER_SITES= ${MASTER_SITE_LOCAL} XMASTER_SITE_SUBDIR= swills X#PKGNAMEPREFIX= X#PKGNAMESUFFIX= XDISTNAME= mod_pagespeed_source_${PORTVERSION} X#EXTRACT_SUFX= X#DISTFILES= X#DIST_SUBDIR= ${PORTNAME} X#EXTRACT_ONLY= X XMAINTAINER= swills@FreeBSD.org XCOMMENT= An Apache module that automatically optimizes web pages X XBUILD_DEPENDS= bash:${PORTSDIR}/shells/bash \ X greadlink:${PORTSDIR}/sysutils/coreutils \ X gsed:${PORTSDIR}/textproc/gsed \ X svn:${PORTSDIR}/devel/subversion \ X flock:${PORTSDIR}/sysutils/flock XLIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \ X jpeg.11:${PORTSDIR}/graphics/jpeg \ X execinfo.1:${PORTSDIR}/devel/libexecinfo X X# TODO: when opencv 2.3 works, use it X# opencv_core.2:${PORTSDIR}/graphics/opencv-core \ X# opencv_legacy.2:${PORTSDIR}/graphics/opencv \ X X# TODO: use system icu X# icuuc.48:${PORTSDIR}/devel/icu X X# TODO: use system serf X XUSE_XZ= yes XUSE_BINUTILS= yes XUSE_APACHE= 22+ XUSE_PYTHON= 2.6+ XUSE_GMAKE= yes X XLDFLAGS+= -L${LOCALBASE}/lib X X# TODO: when opencv 2.3 works, use system opencv X# use_system_opencv=1 \ X# opencv_system_include=${LOCALBASE}/include/opencv \ X# opencv_core_system_include=${LOCALBASE}/include \ X X# TODO: when opencv 2.3 works, switch to this X# GYP_DEFINES+= use_system_libs=1 \ X XGYP_DEFINES+= \ X use_system_apache_dev=1 \ X use_system_libjpeg=1 \ X use_system_libpng=1 \ X use_system_zlib=1 \ X system_include_path_httpd=${LOCALBASE}/include/apache22 \ X system_include_path_apr=${LOCALBASE}/include/apr-1 \ X system_include_path_aprutil=${LOCALBASE}/include/apr-1 \ X system_include_path_execinfo=${LOCALBASE}/include \ X include_dirs=${LOCALBASE}/include X XMAKE_ENV+= BUILDTYPE=Release X X# handy for troubleshooting X# MAKE_ENV+= V=1 X# MAKE_JOBS_UNSAFE= yes X XWRKSRC= ${WRKDIR}/${PORTNAME}_source_${PORTVERSION}/mod_pagespeed/src X X.include X Xdo-configure: X cd ${WRKSRC} && \ X GYP_DEFINES="${GYP_DEFINES}" ${PYTHON_CMD} \ X ../../depot_tools/gclient.py runhooks X Xdo-install: X #${INSTALL} out/Release/libmod_pagespeed.so ${PREFIX}/${APACHEMODDIR}/mod_pagespeed.so X cd ${WRKSRC}/install && \ X ${SETENV} NO_PROMPT=yes APXS_BIN=${LOCALBASE}/sbin/apxs NO_SUDO=1 bash install_apxs.sh X X.include 464ef7c6571951809b23e262cbe26e19 echo x - ./pkg-plist sed 's/^X//' >./pkg-plist << 'ef3e7f63841ae908ba397c2bef1fbad6' Xetc/apache22/pagespeed.conf Xlibexec/apache22/mod_pagespeed.so ef3e7f63841ae908ba397c2bef1fbad6 echo x - ./files/patch-make.py sed 's/^X//' >./files/patch-make.py << 'fd6360aef77847ab7af4e1d574724a09' X--- tools/gyp/pylib/gyp/generator/make.py.orig 2011-09-29 21:00:14.000000000 +0000 X+++ tools/gyp/pylib/gyp/generator/make.py 2011-09-29 21:00:28.000000000 +0000 X@@ -153,11 +153,11 @@ X ARFLAGS.target := $(call detect_arflags,target) X endif X X-CC.host ?= gcc X+CC.host ?= cc X CFLAGS.host ?= X-CXX.host ?= g++ X+CXX.host ?= c++ X CXXFLAGS.host ?= X-LINK.host ?= g++ X+LINK.host ?= c++ X LDFLAGS.host ?= X AR.host ?= ar X # See the description for ARFLAGS.target. fd6360aef77847ab7af4e1d574724a09 echo x - ./files/patch-stack_trace_posix.cc sed 's/^X//' >./files/patch-stack_trace_posix.cc << '4ed980e2a3bdd131623ff6cf3b2abde2' X--- third_party/chromium/src/base/debug/stack_trace_posix.cc.orig X+++ third_party/chromium/src/base/debug/stack_trace_posix.cc X@@ -126,7 +126,7 @@ X trace_strings->push_back(base::StringPrintf("%p", trace[i])); X } X } X-#else X+#elif defined(OS_LINUX) X scoped_ptr_malloc trace_symbols(backtrace_symbols(trace, size)); X if (trace_symbols.get()) { X for (int i = 0; i < size; ++i) { X@@ -155,10 +155,13 @@ X count_ = 0; X return; X } X-#endif X+#elif defined(OS_LINUX) X // Though the backtrace API man page does not list any possible negative X // return values, we take no chance. X count_ = std::max(backtrace(trace_, arraysize(trace_)), 0); X+#else X+ count_ = 0; X+#endif X } X X void StackTrace::PrintBacktrace() { 4ed980e2a3bdd131623ff6cf3b2abde2 echo x - ./files/patch-base.gypi sed 's/^X//' >./files/patch-base.gypi << '85ea454bf07d48d81b6d94cf36ca005f' X--- base/base.gypi.orig 2011-09-29 19:59:56.000000000 +0000 X+++ base/base.gypi 2011-09-29 20:00:44.000000000 +0000 X@@ -8,6 +8,7 @@ X 'base_target': 0, X 'base_extra_target': 0, X 'chromium_root': '<(DEPTH)/third_party/chromium/src', X+ 'system_include_path_execinfo%': '/usr/local/include', X }, X 'target_conditions': [ X # This part is shared between the targets defined below. Only files and X@@ -110,6 +111,7 @@ X 'include_dirs': [ X '<(chromium_root)', X '<(DEPTH)', X+ '<(system_include_path_execinfo)', X ], X # These warnings are needed for the files in third_party\dmg_fp. X 'msvs_disabled_warnings': [ 85ea454bf07d48d81b6d94cf36ca005f echo x - ./files/patch-pthread_shared_mem.cc sed 's/^X//' >./files/patch-pthread_shared_mem.cc << '80f7cd9d080a2df6e3ff218b3354b75a' X--- net/instaweb/util/pthread_shared_mem.cc.orig X+++ net/instaweb/util/pthread_shared_mem.cc X@@ -24,6 +24,7 @@ X #include X #include X #include X+#include X #include "net/instaweb/util/public/abstract_shared_mem.h" X #include "net/instaweb/util/public/abstract_mutex.h" X #include "net/instaweb/util/public/basictypes.h" X@@ -70,12 +71,34 @@ X DISALLOW_COPY_AND_ASSIGN(PthreadSharedMemMutex); X }; X X+// Some OSs does not support PTHREAD_PROCESS_SHARED attribute. (ex. FreeBSD < 9R, MacOS) X+// So, we use the semaphore instead. But nested lock is not supported. X+class SemSharedMemMutex : public AbstractMutex { X+ public: X+ explicit SemSharedMemMutex(sem_t* sem) X+ : sem_(sem) {} X+ X+ virtual void Lock() { X+ sem_wait(sem_); X+ } X+ X+ virtual void Unlock() { X+ sem_post(sem_); X+ } X+ X+private: X+ sem_t* sem_; X+ DISALLOW_COPY_AND_ASSIGN(SemSharedMemMutex); X+}; X+ X class PthreadSharedMemSegment : public AbstractSharedMemSegment { X public: X // We will be representing memory mapped in the [base, base + size) range. X- PthreadSharedMemSegment(char* base, size_t size, MessageHandler* handler) X+ PthreadSharedMemSegment(char* base, size_t size, MessageHandler* handler, const char* name) X : base_(base), X- size_(size) { X+ size_(size), X+ sem_(NULL) { X+ std::sprintf(name_, "/%s_sem", name); X } X X virtual ~PthreadSharedMemSegment() { X@@ -86,10 +109,15 @@ X } X X virtual size_t SharedMutexSize() const { X+#if 0 X return sizeof(pthread_mutex_t); X+#else X+ return 0; X+#endif X } X X virtual bool InitializeSharedMutex(size_t offset, MessageHandler* handler) { X+#if 0 X pthread_mutexattr_t attr; X if (pthread_mutexattr_init(&attr) != 0) { X handler->Message(kError, "pthread_mutexattr_init failed with errno:%d", X@@ -113,19 +141,33 @@ X X pthread_mutexattr_destroy(&attr); X return true; X+#else X+//std::printf("sem: %s\n", name_); X+ sem_ = sem_open(name_, O_CREAT, 0755, 1); X+ return sem_ ? true : false; X+#endif X } X X virtual AbstractMutex* AttachToSharedMutex(size_t offset) { X+#if 0 X return new PthreadSharedMemMutex(MutexPtr(offset)); X+#else X+ sem_ = sem_open(name_, O_EXCL); X+ return new SemSharedMemMutex(sem_); X+#endif X } X X private: X+#if 0 X pthread_mutex_t* MutexPtr(size_t offset) { X return reinterpret_cast(base_ + offset); X } X+#endif X X char* const base_; X const size_t size_; X+ char name_[256]; X+ sem_t* sem_; X X DISALLOW_COPY_AND_ASSIGN(PthreadSharedMemSegment); X }; X@@ -143,7 +185,11 @@ X } X X size_t PthreadSharedMem::SharedMutexSize() const { X+#if 0 X return sizeof(pthread_mutex_t); X+#else X+ return 0; X+#endif X } X X AbstractSharedMemSegment* PthreadSharedMem::CreateSegment( X@@ -167,7 +213,7 @@ X SegmentBaseMap* bases = AcquireSegmentBases(); X (*bases)[name] = base; X UnlockSegmentBases(); X- return new PthreadSharedMemSegment(base, size, handler); X+ return new PthreadSharedMemSegment(base, size, handler, name.c_str()); X } X X AbstractSharedMemSegment* PthreadSharedMem::AttachToSegment( X@@ -182,7 +228,7 @@ X } X char* base = i->second; X UnlockSegmentBases(); X- return new PthreadSharedMemSegment(base, size, handler); X+ return new PthreadSharedMemSegment(base, size, handler, name.c_str()); X } X X void PthreadSharedMem::DestroySegment(const GoogleString& name, 80f7cd9d080a2df6e3ff218b3354b75a echo x - ./files/patch-ptypes.h sed 's/^X//' >./files/patch-ptypes.h << 'c01d744851f5ecdaf6c9678111dceecd' X--- third_party/icu/public/common/unicode/ptypes.h.orig 2011-09-28 02:41:36.000000000 +0000 X+++ third_party/icu/public/common/unicode/ptypes.h 2011-09-28 02:41:50.000000000 +0000 X@@ -0,0 +1,92 @@ X+/* X+****************************************************************************** X+* X+* Copyright (C) 1997-2010, International Business Machines X+* Corporation and others. All Rights Reserved. X+* X+****************************************************************************** X+* X+* FILE NAME : ptypes.h X+* X+* Date Name Description X+* 05/13/98 nos Creation (content moved here from ptypes.h). X+* 03/02/99 stephen Added AS400 support. X+* 03/30/99 stephen Added Linux support. X+* 04/13/99 stephen Reworked for autoconf. X+* 09/18/08 srl Moved basic types back to ptypes.h from platform.h X+****************************************************************************** X+*/ X+ X+#ifndef _PTYPES_H X+#define _PTYPES_H X+ X+#include X+ X+#include "unicode/platform.h" X+ X+/*===========================================================================*/ X+/* Generic data types */ X+/*===========================================================================*/ X+ X+/* If your platform does not have the header, you may X+ need to edit the typedefs below. */ X+#if U_HAVE_INTTYPES_H X+ X+/* autoconf 2.13 sometimes can't properly find the data types in */ X+/* os/390 needs , but it doesn't have int8_t, and it sometimes */ X+/* doesn't have uint8_t depending on the OS version. */ X+/* So we have this work around. */ X+#ifdef OS390 X+/* The features header is needed to get (u)int64_t sometimes. */ X+#include X+#if ! U_HAVE_INT8_T X+typedef signed char int8_t; X+#endif X+#if !defined(__uint8_t) X+#define __uint8_t 1 X+typedef unsigned char uint8_t; X+#endif X+#endif /* OS390 */ X+ X+#include X+ X+#else /* U_HAVE_INTTYPES_H */ X+ X+#if ! U_HAVE_INT8_T X+typedef signed char int8_t; X+#endif X+ X+#if ! U_HAVE_UINT8_T X+typedef unsigned char uint8_t; X+#endif X+ X+#if ! U_HAVE_INT16_T X+typedef signed short int16_t; X+#endif X+ X+#if ! U_HAVE_UINT16_T X+typedef unsigned short uint16_t; X+#endif X+ X+#if ! U_HAVE_INT32_T X+typedef signed int int32_t; X+#endif X+ X+#if ! U_HAVE_UINT32_T X+typedef unsigned int uint32_t; X+#endif X+ X+#if ! U_HAVE_INT64_T X+ typedef signed long long int64_t; X+/* else we may not have a 64-bit type */ X+#endif X+ X+#if ! U_HAVE_UINT64_T X+ typedef unsigned long long uint64_t; X+/* else we may not have a 64-bit type */ X+#endif X+ X+#endif /* U_HAVE_INTTYPES_H */ X+ X+#endif /* _PTYPES_H */ X+ c01d744851f5ecdaf6c9678111dceecd echo x - ./files/patch-install_apxs.sh sed 's/^X//' >./files/patch-install_apxs.sh << 'f08d17aa8d53173076624f94713a56a8' X--- install/install_apxs.sh.orig 2011-09-28 01:19:38.000000000 +0000 X+++ install/install_apxs.sh 2011-09-29 14:24:06.000000000 +0000 X@@ -84,7 +84,7 @@ X if [ ! -z "${APACHE_CONF_LINE}" ]; then X local SED_REGEX="s/^.*${1}=?[\"\'\ ]*//" X EXTRACTED_COMPILE_SETTING=$(echo "${APACHE_CONF_LINE}" | X- sed -r "${SED_REGEX}" | X+ sed -E "${SED_REGEX}" | X sed "s/[\"\'\ ]*$//") X fi X } X@@ -149,7 +149,7 @@ X APACHE_USER_LINE=$(egrep -i "^[[:blank:]]*User[[:blank:]]+" "${APACHE_CONF_FILE}") X if [ ! -z "${APACHE_USER_LINE}" ]; then X APACHE_USER=$(echo "${APACHE_USER_LINE}" | X- sed -r s/^.*User[[:blank:]]+[\"\']*// | X+ sed -E s/^.*User[[:blank:]]+[\"\']*// | X sed s/[\"\'[:blank:]]*$//) X fi X fi X@@ -159,7 +159,7 @@ X APACHE_GROUP_LINE=$(egrep -i "^[[:blank:]]*Group[[:blank:]]+" "${APACHE_CONF_FILE}") X if [ ! -z "${APACHE_GROUP_LINE}" ]; then X APACHE_GROUP=$(echo "${APACHE_GROUP_LINE}" | X- sed -r s/^.*Group[[:blank:]]+[\"\']*// | X+ sed -E s/^.*Group[[:blank:]]+[\"\']*// | X sed s/[\"\'[:blank:]]*$//) X fi X fi X@@ -180,11 +180,11 @@ X X echo "mod_pagespeed needs to cache optimized resources on the file system." X echo "The default location for this cache is '${MODPAGESPEED_CACHE_ROOT}'." X-read -p "Would you like to specify a different location? (y/N) " -n1 PROMPT X-if [ "${PROMPT}" = "y" -o "${PROMPT}" = "Y" ]; then X- echo "" X- read -p "Location for mod_pagespeed file cache: " MODPAGESPEED_CACHE_ROOT X-fi X+#read -p "Would you like to specify a different location? (y/N) " -n1 PROMPT X+#if [ "${PROMPT}" = "y" -o "${PROMPT}" = "Y" ]; then X+# echo "" X+# read -p "Location for mod_pagespeed file cache: " MODPAGESPEED_CACHE_ROOT X+#fi X X if [ -z "${MODPAGESPEED_CACHE_ROOT}" ]; then X echo "" f08d17aa8d53173076624f94713a56a8 echo x - ./files/patch-debugger_posix.cc sed 's/^X//' >./files/patch-debugger_posix.cc << 'd14a07dc70cd587498c5dbb5c231609b' X--- third_party/chromium/src/base/debug/debugger_posix.cc.orig X+++ third_party/chromium/src/base/debug/debugger_posix.cc X@@ -137,7 +137,7 @@ X X #elif defined(OS_FREEBSD) X X-bool DebugUtil::BeingDebugged() { X+bool BeingDebugged() { X // TODO(benl): can we determine this under FreeBSD? X NOTIMPLEMENTED(); X return false; d14a07dc70cd587498c5dbb5c231609b echo x - ./files/patch-libpng_image_library.cc sed 's/^X//' >./files/patch-libpng_image_library.cc << '3ad9f5d86c72b7ce4fd28432deb3f34e' X--- net/instaweb/spriter/libpng_image_library.cc.orig 2011-09-29 17:45:52.000000000 +0000 X+++ net/instaweb/spriter/libpng_image_library.cc 2011-09-29 17:46:17.000000000 +0000 X@@ -235,7 +235,7 @@ X png_set_palette_to_rgb(png_struct); X } X if ((color_type == PNG_COLOR_TYPE_GRAY) && (bit_depth < 8)) { X- png_set_gray_1_2_4_to_8(png_struct); X+ png_set_expand_gray_1_2_4_to_8(png_struct); X } X if (png_get_valid(png_struct, png_info, PNG_INFO_tRNS)) { X png_set_tRNS_to_alpha(png_struct); 3ad9f5d86c72b7ce4fd28432deb3f34e echo x - ./files/patch-resource_manager_test.cc sed 's/^X//' >./files/patch-resource_manager_test.cc << '107c4fbe93d884aa6d06290321d3e0a8' X--- net/instaweb/rewriter/resource_manager_test.cc.orig 2011-09-29 13:52:19.000000000 +0000 X+++ net/instaweb/rewriter/resource_manager_test.cc 2011-09-29 13:52:27.000000000 +0000 X@@ -323,7 +323,7 @@ X void VerifyWithinSecond(int64 time_a_ms, int64 time_b_ms) { X // Note: need to pass in 1 * since otherwise we get a link failure X // due to conversion of compile-time constant to const reference X- EXPECT_GE(1 * Timer::kSecondMs, std::abs(time_a_ms - time_b_ms)); X+ EXPECT_GE(1 * Timer::kSecondMs, llabs(time_a_ms - time_b_ms)); X } X X void VerifyValidCachedResult(const char* subtest_name, bool test_meta_data, 107c4fbe93d884aa6d06290321d3e0a8 echo x - ./files/patch-common.h sed 's/^X//' >./files/patch-common.h << 'b4977a3695674313702be725767b1950' X--- third_party/protobuf/src/google/protobuf/stubs/common.h.orig X+++ third_party/protobuf/src/google/protobuf/stubs/common.h X@@ -47,6 +47,8 @@ X #elif !defined(_MSC_VER) X #include X #endif X+#undef major X+#undef minor X X #if defined(_WIN32) && defined(GetMessage) X // Allow GetMessage to be used as a valid method name in protobuf classes. b4977a3695674313702be725767b1950 echo x - ./files/patch-platform.h sed 's/^X//' >./files/patch-platform.h << '60592d7c62e203148198ea6e56bb5964' X--- third_party/icu/public/common/unicode/platform.h.orig 2011-09-28 02:41:41.000000000 +0000 X+++ third_party/icu/public/common/unicode/platform.h 2011-09-28 02:41:53.000000000 +0000 X@@ -0,0 +1,402 @@ X+/* X+****************************************************************************** X+* X+* Copyright (C) 1997-2011, International Business Machines X+* Corporation and others. All Rights Reserved. X+* X+****************************************************************************** X+* X+* Note: autoconf creates platform.h from platform.h.in at configure time. X+* X+****************************************************************************** X+* X+* FILE NAME : platform.h X+* X+* Date Name Description X+* 05/13/98 nos Creation (content moved here from ptypes.h). X+* 03/02/99 stephen Added AS400 support. X+* 03/30/99 stephen Added Linux support. X+* 04/13/99 stephen Reworked for autoconf. X+****************************************************************************** X+*/ X+ X+#ifndef _PLATFORM_H X+#define _PLATFORM_H X+ X+/** X+ * \file X+ * \brief Basic types for the platform X+ */ X+ X+/* This file should be included before uvernum.h. */ X+#if defined(UVERNUM_H) X+# error Do not include unicode/uvernum.h before #including unicode/platform.h. Instead of unicode/uvernum.h, #include unicode/uversion.h X+#endif X+ X+/** X+ * Determine wheter to enable auto cleanup of libraries. X+ * @internal X+ */ X+#ifndef UCLN_NO_AUTO_CLEANUP X+#define UCLN_NO_AUTO_CLEANUP 1 X+#endif X+ X+#if 0 X+#define CYGWINMSVC X+#endif X+ X+/* Need platform.h when using CYGWINMSVC to get definitions above. Ignore everything else. */ X+#ifndef CYGWINMSVC X+ X+/** Define the platform we're on. */ X+#ifndef U_BSD X+#define U_BSD X+#endif X+ X+/** X+ * \def U_HAVE_DIRENT_H X+ * Define whether dirent.h is available X+ * @internal X+ */ X+#ifndef U_HAVE_DIRENT_H X+#define U_HAVE_DIRENT_H 1 X+#endif X+ X+/** Define whether inttypes.h is available */ X+#ifndef U_HAVE_INTTYPES_H X+#define U_HAVE_INTTYPES_H 1 X+#endif X+ X+/** X+ * Define what support for C++ streams is available. X+ * If U_IOSTREAM_SOURCE is set to 199711, then <iostream> is available X+ * (1997711 is the date the ISO/IEC C++ FDIS was published), and then X+ * one should qualify streams using the std namespace in ICU header X+ * files. X+ * If U_IOSTREAM_SOURCE is set to 198506, then <iostream.h> is X+ * available instead (198506 is the date when Stroustrup published X+ * "An Extensible I/O Facility for C++" at the summer USENIX conference). X+ * If U_IOSTREAM_SOURCE is 0, then C++ streams are not available and X+ * support for them will be silently suppressed in ICU. X+ * X+ */ X+ X+#ifndef U_IOSTREAM_SOURCE X+#define U_IOSTREAM_SOURCE 199711 X+#endif X+ X+/** X+ * \def U_HAVE_STD_STRING X+ * Define whether the standard C++ (STL) <string> header is available. X+ * For platforms that do not use platform.h and do not define this constant X+ * in their platform-specific headers, std_string.h defaults X+ * U_HAVE_STD_STRING to 1. X+ * @internal X+ */ X+#ifndef U_HAVE_STD_STRING X+#define U_HAVE_STD_STRING 1 X+#endif X+ X+/** @{ Determines whether specific types are available */ X+#ifndef U_HAVE_INT8_T X+#define U_HAVE_INT8_T 1 X+#endif X+ X+#ifndef U_HAVE_UINT8_T X+#define U_HAVE_UINT8_T 1 X+#endif X+ X+#ifndef U_HAVE_INT16_T X+#define U_HAVE_INT16_T 1 X+#endif X+ X+#ifndef U_HAVE_UINT16_T X+#define U_HAVE_UINT16_T 1 X+#endif X+ X+#ifndef U_HAVE_INT32_T X+#define U_HAVE_INT32_T 1 X+#endif X+ X+#ifndef U_HAVE_UINT32_T X+#define U_HAVE_UINT32_T 1 X+#endif X+ X+#ifndef U_HAVE_INT64_T X+#define U_HAVE_INT64_T 1 X+#endif X+ X+#ifndef U_HAVE_UINT64_T X+#define U_HAVE_UINT64_T 1 X+#endif X+ X+/** @} */ X+ X+/*===========================================================================*/ X+/** @{ Compiler and environment features */ X+/*===========================================================================*/ X+ X+/* Define whether namespace is supported */ X+#ifndef U_HAVE_NAMESPACE X+#define U_HAVE_NAMESPACE 1 X+#endif X+ X+/* Determines the endianness of the platform X+ It's done this way in case multiple architectures are being built at once. X+ For example, Darwin supports fat binaries, which can be both PPC and x86 based. */ X+#if defined(BYTE_ORDER) && defined(BIG_ENDIAN) X+#define U_IS_BIG_ENDIAN (BYTE_ORDER == BIG_ENDIAN) X+#else X+#define U_IS_BIG_ENDIAN 0 X+#endif X+ X+/* 1 or 0 to enable or disable threads. If undefined, default is: enable threads. */ X+#ifndef ICU_USE_THREADS X+#define ICU_USE_THREADS 1 X+#endif X+ X+#ifndef U_DEBUG X+#define U_DEBUG 0 X+#endif X+ X+#ifndef U_RELEASE X+#define U_RELEASE 1 X+#endif X+ X+/* Determine whether to disable renaming or not. This overrides the X+ setting in umachine.h which is for all platforms. */ X+#ifndef U_DISABLE_RENAMING X+#define U_DISABLE_RENAMING 0 X+#endif X+ X+/* Determine whether to override new and delete. */ X+#ifndef U_OVERRIDE_CXX_ALLOCATION X+#define U_OVERRIDE_CXX_ALLOCATION 1 X+#endif X+/* Determine whether to override placement new and delete for STL. */ X+#ifndef U_HAVE_PLACEMENT_NEW X+#define U_HAVE_PLACEMENT_NEW 1 X+#endif X+ X+/* Determine whether to enable tracing. */ X+#ifndef U_ENABLE_TRACING X+#define U_ENABLE_TRACING 0 X+#endif X+ X+/** X+ * Whether to enable Dynamic loading in ICU X+ * @internal X+ */ X+#ifndef U_ENABLE_DYLOAD X+#define U_ENABLE_DYLOAD 1 X+#endif X+ X+/** X+ * Whether to test Dynamic loading as an OS capabilty X+ * @internal X+ */ X+#ifndef U_CHECK_DYLOAD X+#define U_CHECK_DYLOAD 1 X+#endif X+ X+ X+/** Do we allow ICU users to use the draft APIs by default? */ X+#ifndef U_DEFAULT_SHOW_DRAFT X+#define U_DEFAULT_SHOW_DRAFT 1 X+#endif X+ X+/** @} */ X+ X+/*===========================================================================*/ X+/** @{ Character data types */ X+/*===========================================================================*/ X+ X+#if ((defined(OS390) && (!defined(__CHARSET_LIB) || !__CHARSET_LIB))) || defined(OS400) X+# define U_CHARSET_FAMILY 1 X+#endif X+ X+/** @} */ X+ X+/*===========================================================================*/ X+/** @{ Information about wchar support */ X+/*===========================================================================*/ X+ X+#ifndef U_HAVE_WCHAR_H X+#define U_HAVE_WCHAR_H 1 X+#endif X+ X+#ifndef U_SIZEOF_WCHAR_T X+#define U_SIZEOF_WCHAR_T 4 X+#endif X+ X+#ifndef U_HAVE_WCSCPY X+#define U_HAVE_WCSCPY 1 X+#endif X+ X+/** @} */ X+ X+/** X+ * @{ X+ * \def U_DECLARE_UTF16 X+ * Do not use this macro. Use the UNICODE_STRING or U_STRING_DECL macros X+ * instead. X+ * @internal X+ * X+ * \def U_GNUC_UTF16_STRING X+ * @internal X+ */ X+#ifndef U_GNUC_UTF16_STRING X+#define U_GNUC_UTF16_STRING 0 X+#endif X+#if 1 || defined(U_CHECK_UTF16_STRING) X+#if (defined(__xlC__) && defined(__IBM_UTF_LITERAL) && U_SIZEOF_WCHAR_T != 2) \ X+ || (defined(__HP_aCC) && __HP_aCC >= 035000) \ X+ || (defined(__HP_cc) && __HP_cc >= 111106) \ X+ || U_GNUC_UTF16_STRING X+#define U_DECLARE_UTF16(string) u ## string X+#elif (defined(__SUNPRO_CC) && __SUNPRO_CC >= 0x550) X+/* || (defined(__SUNPRO_C) && __SUNPRO_C >= 0x580) */ X+/* Sun's C compiler has issues with this notation, and it's unreliable. */ X+#define U_DECLARE_UTF16(string) U ## string X+#elif U_SIZEOF_WCHAR_T == 2 \ X+ && (U_CHARSET_FAMILY == 0 || ((defined(OS390) || defined(OS400)) && defined(__UCS2__))) X+#define U_DECLARE_UTF16(string) L ## string X+#endif X+#endif X+ X+/** @} */ X+ X+/*===========================================================================*/ X+/** @{ Information about POSIX support */ X+/*===========================================================================*/ X+ X+#ifndef U_HAVE_NL_LANGINFO_CODESET X+#define U_HAVE_NL_LANGINFO_CODESET 1 X+#endif X+ X+#ifndef U_NL_LANGINFO_CODESET X+#define U_NL_LANGINFO_CODESET CODESET X+#endif X+ X+#if 1 X+#define U_TZSET tzset X+#endif X+#if 0 X+#define U_TIMEZONE X+#endif X+#if 1 X+#define U_TZNAME tzname X+#endif X+ X+#define U_HAVE_MMAP 1 X+#define U_HAVE_POPEN 1 X+ X+/** @} */ X+ X+/*===========================================================================*/ X+/** @{ Symbol import-export control */ X+/*===========================================================================*/ X+ X+#ifdef U_STATIC_IMPLEMENTATION X+#define U_EXPORT X+#elif 1 X+#define U_EXPORT __attribute__((visibility("default"))) X+#elif (defined(__SUNPRO_CC) && __SUNPRO_CC >= 0x550) \ X+ || (defined(__SUNPRO_C) && __SUNPRO_C >= 0x550) X+#define U_EXPORT __global X+/*#elif defined(__HP_aCC) || defined(__HP_cc) X+#define U_EXPORT __declspec(dllexport)*/ X+#else X+#define U_EXPORT X+#endif X+ X+/* U_CALLCONV is releated to U_EXPORT2 */ X+#define U_EXPORT2 X+ X+/* cygwin needs to export/import data */ X+#if defined(U_CYGWIN) && !defined(__GNUC__) X+#define U_IMPORT __declspec(dllimport) X+#else X+#define U_IMPORT X+#endif X+ X+/* @} */ X+ X+/*===========================================================================*/ X+/** @{ Code alignment and C function inlining */ X+/*===========================================================================*/ X+ X+#ifndef U_INLINE X+# ifdef __cplusplus X+# define U_INLINE inline X+# else X+# define U_INLINE __inline__ X+# endif X+#endif X+ X+#ifndef U_ALIGN_CODE X+#define U_ALIGN_CODE(n) X+#endif X+ X+/** @} */ X+ X+/*===========================================================================*/ X+/** @{ GCC built in functions for atomic memory operations */ X+/*===========================================================================*/ X+ X+/** X+ * \def U_HAVE_GCC_ATOMICS X+ * @internal X+ */ X+#ifndef U_HAVE_GCC_ATOMICS X+#define U_HAVE_GCC_ATOMICS 1 X+#endif X+ X+/** @} */ X+ X+/*===========================================================================*/ X+/** @{ Programs used by ICU code */ X+/*===========================================================================*/ X+ X+/** X+ * \def U_MAKE X+ * What program to execute to run 'make' X+ */ X+#ifndef U_MAKE X+#define U_MAKE "/usr/local/bin/gmake" X+#endif X+ X+/** @} */ X+ X+#endif /* CYGWINMSVC */ X+ X+/*===========================================================================*/ X+/* Custom icu entry point renaming */ X+/*===========================================================================*/ X+ X+/** X+ * Define the library suffix with C syntax. X+ * @internal X+ */ X+# define U_LIB_SUFFIX_C_NAME X+/** X+ * Define the library suffix as a string with C syntax X+ * @internal X+ */ X+# define U_LIB_SUFFIX_C_NAME_STRING "" X+/** X+ * 1 if a custom library suffix is set X+ * @internal X+ */ X+# define U_HAVE_LIB_SUFFIX 0 X+ X+#if U_HAVE_LIB_SUFFIX X+# ifndef U_ICU_ENTRY_POINT_RENAME X+/* Renaming pattern: u_strcpy_41_suffix */ X+# define U_ICU_ENTRY_POINT_RENAME(x) x ## _ ## 48 ## X+# define U_DEF_ICUDATA_ENTRY_POINT(major, minor) icudt####major##minor##_dat X+ X+# endif X+#endif X+ X+#endif 60592d7c62e203148198ea6e56bb5964 echo x - ./files/patch-utypes.h sed 's/^X//' >./files/patch-utypes.h << 'f6cc0b21a8bccc3f6e2fd3d8f3d2cfc9' X--- third_party/icu/public/common/unicode/utypes.h.orig 2011-09-28 02:40:04.000000000 +0000 X+++ third_party/icu/public/common/unicode/utypes.h 2011-09-28 02:41:11.000000000 +0000 X@@ -32,7 +32,7 @@ X #ifndef UTYPES_H X #define UTYPES_H X X- X+#include X #include "unicode/umachine.h" X #include "unicode/utf.h" X #include "unicode/uversion.h" f6cc0b21a8bccc3f6e2fd3d8f3d2cfc9 exit