Index: head/www/mod_pagespeed/Makefile =================================================================== --- head/www/mod_pagespeed/Makefile (revision 284984) +++ head/www/mod_pagespeed/Makefile (revision 284985) @@ -1,75 +1,75 @@ # New ports collection makefile for: mod_pagespeed # Date created: 2011-09-27 # Whom: Steve Wills # # $FreeBSD$ # PORTNAME= mod_pagespeed -PORTVERSION= 20110927 +PORTVERSION= 20111031 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= swills DISTNAME= mod_pagespeed_source_${PORTVERSION} MAINTAINER= swills@FreeBSD.org COMMENT= An Apache module that automatically optimizes web pages BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash \ greadlink:${PORTSDIR}/sysutils/coreutils \ gsed:${PORTSDIR}/textproc/gsed \ svn:${PORTSDIR}/devel/subversion \ flock:${PORTSDIR}/sysutils/flock LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \ jpeg.11:${PORTSDIR}/graphics/jpeg \ execinfo.1:${PORTSDIR}/devel/libexecinfo USE_XZ= yes USE_BINUTILS= yes USE_APACHE= 22+ USE_PYTHON= 2.6+ USE_GMAKE= yes MAKE_JOBS_SAFE= yes LDFLAGS+= -L${LOCALBASE}/lib PLIST_SUB= WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} MAKE_ENV+= BUILDTYPE=Release WRKSRC= ${WRKDIR}/${PORTNAME}_source_${PORTVERSION}/mod_pagespeed/src GYP_DEFINES+= \ use_system_apache_dev=1 \ use_system_libjpeg=1 \ use_system_libpng=1 \ use_system_zlib=1 \ system_include_path_httpd=${LOCALBASE}/include/apache22 \ system_include_path_apr=${LOCALBASE}/include/apr-1 \ system_include_path_aprutil=${LOCALBASE}/include/apr-1 \ system_include_path_execinfo=${LOCALBASE}/include \ include_dirs=${LOCALBASE}/include .include do-configure: cd ${WRKSRC} && \ GYP_DEFINES="${GYP_DEFINES}" ${PYTHON_CMD} \ ../../depot_tools/gclient.py runhooks do-install: cd ${WRKSRC} && \ ${INSTALL} out/Release/libmod_pagespeed.so ${PREFIX}/${APACHEMODDIR}/mod_pagespeed.so if [ ! -f ${PREFIX}/${APACHEETCDIR}/pagespeed.conf-dist ] ; then \ cd ${WRKSRC}/install && \ ${CAT} common/pagespeed.load.template common/pagespeed.conf.template | \ ${SED} -e "s,@@COMMENT_OUT_DEFLATE@@,," \ -e "s,@@APACHE_MODULEDIR@@,${APACHEMODDIR}," \ -e "s,@@MODPAGESPEED_CACHE_ROOT@@,/var/mod_pagespeed/,g" \ > ${PREFIX}/${APACHEETCDIR}/pagespeed.conf-dist ; \ fi post-install: ${INSTALL} -d -o ${WWWOWN} -g ${WWWGRP} -m 755 /var/mod_pagespeed/cache ${INSTALL} -d -o ${WWWOWN} -g ${WWWGRP} -m 755 /var/mod_pagespeed/files @if [ ! -f ${PREFIX}/etc/pagespeed.conf ]; then \ ${CP} -p ${PREFIX}/${APACHEETCDIR}/pagespeed.conf-dist ${PREFIX}/${APACHEETCDIR}/pagespeed.conf ; \ fi @${CAT} ${PKGMESSAGE} .include Property changes on: head/www/mod_pagespeed/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/www/mod_pagespeed/distinfo =================================================================== --- head/www/mod_pagespeed/distinfo (revision 284984) +++ head/www/mod_pagespeed/distinfo (revision 284985) @@ -1,2 +1,2 @@ -SHA256 (mod_pagespeed_source_20110927.tar.xz) = 6a81d2d24ad3726861b44626a259e0722bbf6ea86a78cd20ae4ceac58e596fb3 -SIZE (mod_pagespeed_source_20110927.tar.xz) = 11240812 +SHA256 (mod_pagespeed_source_20111031.tar.xz) = e81b8566ec5591aea2804637ab10492f99882e134a1b59f384fe8e0f8497b054 +SIZE (mod_pagespeed_source_20111031.tar.xz) = 12390600 Property changes on: head/www/mod_pagespeed/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/www/mod_pagespeed/files/patch-debugger_posix.cc =================================================================== --- head/www/mod_pagespeed/files/patch-debugger_posix.cc (revision 284984) +++ head/www/mod_pagespeed/files/patch-debugger_posix.cc (nonexistent) @@ -1,11 +0,0 @@ ---- third_party/chromium/src/base/debug/debugger_posix.cc.orig -+++ third_party/chromium/src/base/debug/debugger_posix.cc -@@ -137,7 +137,7 @@ - - #elif defined(OS_FREEBSD) - --bool DebugUtil::BeingDebugged() { -+bool BeingDebugged() { - // TODO(benl): can we determine this under FreeBSD? - NOTIMPLEMENTED(); - return false; Property changes on: head/www/mod_pagespeed/files/patch-debugger_posix.cc ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/www/mod_pagespeed/files/patch-ptypes.h =================================================================== --- head/www/mod_pagespeed/files/patch-ptypes.h (revision 284984) +++ head/www/mod_pagespeed/files/patch-ptypes.h (nonexistent) @@ -1,95 +0,0 @@ ---- third_party/icu/public/common/unicode/ptypes.h.orig 2011-09-28 02:41:36.000000000 +0000 -+++ third_party/icu/public/common/unicode/ptypes.h 2011-09-28 02:41:50.000000000 +0000 -@@ -0,0 +1,92 @@ -+/* -+****************************************************************************** -+* -+* Copyright (C) 1997-2010, International Business Machines -+* Corporation and others. All Rights Reserved. -+* -+****************************************************************************** -+* -+* FILE NAME : ptypes.h -+* -+* Date Name Description -+* 05/13/98 nos Creation (content moved here from ptypes.h). -+* 03/02/99 stephen Added AS400 support. -+* 03/30/99 stephen Added Linux support. -+* 04/13/99 stephen Reworked for autoconf. -+* 09/18/08 srl Moved basic types back to ptypes.h from platform.h -+****************************************************************************** -+*/ -+ -+#ifndef _PTYPES_H -+#define _PTYPES_H -+ -+#include -+ -+#include "unicode/platform.h" -+ -+/*===========================================================================*/ -+/* Generic data types */ -+/*===========================================================================*/ -+ -+/* If your platform does not have the header, you may -+ need to edit the typedefs below. */ -+#if U_HAVE_INTTYPES_H -+ -+/* autoconf 2.13 sometimes can't properly find the data types in */ -+/* os/390 needs , but it doesn't have int8_t, and it sometimes */ -+/* doesn't have uint8_t depending on the OS version. */ -+/* So we have this work around. */ -+#ifdef OS390 -+/* The features header is needed to get (u)int64_t sometimes. */ -+#include -+#if ! U_HAVE_INT8_T -+typedef signed char int8_t; -+#endif -+#if !defined(__uint8_t) -+#define __uint8_t 1 -+typedef unsigned char uint8_t; -+#endif -+#endif /* OS390 */ -+ -+#include -+ -+#else /* U_HAVE_INTTYPES_H */ -+ -+#if ! U_HAVE_INT8_T -+typedef signed char int8_t; -+#endif -+ -+#if ! U_HAVE_UINT8_T -+typedef unsigned char uint8_t; -+#endif -+ -+#if ! U_HAVE_INT16_T -+typedef signed short int16_t; -+#endif -+ -+#if ! U_HAVE_UINT16_T -+typedef unsigned short uint16_t; -+#endif -+ -+#if ! U_HAVE_INT32_T -+typedef signed int int32_t; -+#endif -+ -+#if ! U_HAVE_UINT32_T -+typedef unsigned int uint32_t; -+#endif -+ -+#if ! U_HAVE_INT64_T -+ typedef signed long long int64_t; -+/* else we may not have a 64-bit type */ -+#endif -+ -+#if ! U_HAVE_UINT64_T -+ typedef unsigned long long uint64_t; -+/* else we may not have a 64-bit type */ -+#endif -+ -+#endif /* U_HAVE_INTTYPES_H */ -+ -+#endif /* _PTYPES_H */ -+ Property changes on: head/www/mod_pagespeed/files/patch-ptypes.h ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/www/mod_pagespeed/files/patch-install_apxs.sh =================================================================== --- head/www/mod_pagespeed/files/patch-install_apxs.sh (revision 284984) +++ head/www/mod_pagespeed/files/patch-install_apxs.sh (nonexistent) @@ -1,46 +0,0 @@ ---- install/install_apxs.sh.orig 2011-09-28 01:19:38.000000000 +0000 -+++ install/install_apxs.sh 2011-09-29 14:24:06.000000000 +0000 -@@ -84,7 +84,7 @@ - if [ ! -z "${APACHE_CONF_LINE}" ]; then - local SED_REGEX="s/^.*${1}=?[\"\'\ ]*//" - EXTRACTED_COMPILE_SETTING=$(echo "${APACHE_CONF_LINE}" | -- sed -r "${SED_REGEX}" | -+ sed -E "${SED_REGEX}" | - sed "s/[\"\'\ ]*$//") - fi - } -@@ -149,7 +149,7 @@ - APACHE_USER_LINE=$(egrep -i "^[[:blank:]]*User[[:blank:]]+" "${APACHE_CONF_FILE}") - if [ ! -z "${APACHE_USER_LINE}" ]; then - APACHE_USER=$(echo "${APACHE_USER_LINE}" | -- sed -r s/^.*User[[:blank:]]+[\"\']*// | -+ sed -E s/^.*User[[:blank:]]+[\"\']*// | - sed s/[\"\'[:blank:]]*$//) - fi - fi -@@ -159,7 +159,7 @@ - APACHE_GROUP_LINE=$(egrep -i "^[[:blank:]]*Group[[:blank:]]+" "${APACHE_CONF_FILE}") - if [ ! -z "${APACHE_GROUP_LINE}" ]; then - APACHE_GROUP=$(echo "${APACHE_GROUP_LINE}" | -- sed -r s/^.*Group[[:blank:]]+[\"\']*// | -+ sed -E s/^.*Group[[:blank:]]+[\"\']*// | - sed s/[\"\'[:blank:]]*$//) - fi - fi -@@ -180,11 +180,11 @@ - - echo "mod_pagespeed needs to cache optimized resources on the file system." - echo "The default location for this cache is '${MODPAGESPEED_CACHE_ROOT}'." --read -p "Would you like to specify a different location? (y/N) " -n1 PROMPT --if [ "${PROMPT}" = "y" -o "${PROMPT}" = "Y" ]; then -- echo "" -- read -p "Location for mod_pagespeed file cache: " MODPAGESPEED_CACHE_ROOT --fi -+#read -p "Would you like to specify a different location? (y/N) " -n1 PROMPT -+#if [ "${PROMPT}" = "y" -o "${PROMPT}" = "Y" ]; then -+# echo "" -+# read -p "Location for mod_pagespeed file cache: " MODPAGESPEED_CACHE_ROOT -+#fi - - if [ -z "${MODPAGESPEED_CACHE_ROOT}" ]; then - echo "" Property changes on: head/www/mod_pagespeed/files/patch-install_apxs.sh ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/www/mod_pagespeed/files/patch-python_arch.sh =================================================================== --- head/www/mod_pagespeed/files/patch-python_arch.sh (revision 284984) +++ head/www/mod_pagespeed/files/patch-python_arch.sh (nonexistent) @@ -1,11 +0,0 @@ ---- build/linux/python_arch.sh.orig 2011-09-27 21:20:46.000000000 -0400 -+++ build/linux/python_arch.sh 2011-10-11 19:20:09.472740606 -0400 -@@ -10,7 +10,7 @@ - # python_arch.sh /path/to/sysroot/usr/lib/libpython2.4.so.1.0 - # - --python=$(readlink -f "$1") -+python=$(greadlink -f "$1") - if [ ! -r "$python" ]; then - echo unknown - exit 0; Property changes on: head/www/mod_pagespeed/files/patch-python_arch.sh ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/www/mod_pagespeed/files/patch-common.h =================================================================== --- head/www/mod_pagespeed/files/patch-common.h (revision 284984) +++ head/www/mod_pagespeed/files/patch-common.h (revision 284985) @@ -1,11 +1,13 @@ ---- third_party/protobuf/src/google/protobuf/stubs/common.h.orig -+++ third_party/protobuf/src/google/protobuf/stubs/common.h -@@ -47,6 +47,8 @@ +--- third_party/protobuf/src/google/protobuf/stubs/common.h.orig 2011-10-31 14:25:22.000000000 +0000 ++++ third_party/protobuf/src/google/protobuf/stubs/common.h 2011-10-31 17:54:21.000000000 +0000 +@@ -47,6 +47,10 @@ #elif !defined(_MSC_VER) #include #endif ++#if defined(__FreeBSD__) +#undef major +#undef minor ++#endif - #if defined(_WIN32) && defined(GetMessage) - // Allow GetMessage to be used as a valid method name in protobuf classes. + #if defined(_MSC_VER) && defined(_CPPUNWIND) + #define PROTOBUF_USE_EXCEPTIONS Property changes on: head/www/mod_pagespeed/files/patch-common.h ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/www/mod_pagespeed/files/patch-libpng_image_library.cc =================================================================== --- head/www/mod_pagespeed/files/patch-libpng_image_library.cc (revision 284984) +++ head/www/mod_pagespeed/files/patch-libpng_image_library.cc (revision 284985) @@ -1,11 +1,14 @@ ---- net/instaweb/spriter/libpng_image_library.cc.orig 2011-09-29 17:45:52.000000000 +0000 -+++ net/instaweb/spriter/libpng_image_library.cc 2011-09-29 17:46:17.000000000 +0000 -@@ -235,7 +235,7 @@ +--- net/instaweb/spriter/libpng_image_library.cc.orig 2011-10-31 14:25:06.000000000 +0000 ++++ net/instaweb/spriter/libpng_image_library.cc 2011-10-31 18:18:29.000000000 +0000 +@@ -235,7 +235,11 @@ png_set_palette_to_rgb(png_struct); } if ((color_type == PNG_COLOR_TYPE_GRAY) && (bit_depth < 8)) { -- png_set_gray_1_2_4_to_8(png_struct); ++#if ((PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=4) || PNG_LIBPNG_VER_MAJOR>1) + png_set_expand_gray_1_2_4_to_8(png_struct); ++#else + png_set_gray_1_2_4_to_8(png_struct); ++#endif } if (png_get_valid(png_struct, png_info, PNG_INFO_tRNS)) { png_set_tRNS_to_alpha(png_struct); Property changes on: head/www/mod_pagespeed/files/patch-libpng_image_library.cc ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/www/mod_pagespeed/files/patch-make.py =================================================================== --- head/www/mod_pagespeed/files/patch-make.py (revision 284984) +++ head/www/mod_pagespeed/files/patch-make.py (revision 284985) @@ -1,17 +1,17 @@ ---- tools/gyp/pylib/gyp/generator/make.py.orig 2011-09-29 21:00:14.000000000 +0000 -+++ tools/gyp/pylib/gyp/generator/make.py 2011-09-29 21:00:28.000000000 +0000 -@@ -153,11 +153,11 @@ - ARFLAGS.target := $(call detect_arflags,target) - endif - +--- tools/gyp/pylib/gyp/generator/make.py.orig Mon Oct 31 10:37:12 2011 ++++ tools/gyp/pylib/gyp/generator/make.py Mon Oct 31 10:39:06 2011 +@@ -129,11 +129,11 @@ + # in gyp's make.py where ARFLAGS.host etc. is computed. + # TODO(evan): move all cross-compilation logic to gyp-time so we don't need + # to replicate this environment fallback in make as well. -CC.host ?= gcc +CC.host ?= cc CFLAGS.host ?= -CXX.host ?= g++ +CXX.host ?= c++ CXXFLAGS.host ?= -LINK.host ?= g++ +LINK.host ?= c++ LDFLAGS.host ?= AR.host ?= ar - # See the description for ARFLAGS.target. + ARFLAGS.host := %(ARFLAGS.host)s Property changes on: head/www/mod_pagespeed/files/patch-make.py ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/www/mod_pagespeed/files/patch-pthread_rw_lock.cc =================================================================== --- head/www/mod_pagespeed/files/patch-pthread_rw_lock.cc (nonexistent) +++ head/www/mod_pagespeed/files/patch-pthread_rw_lock.cc (revision 284985) @@ -0,0 +1,13 @@ +--- net/instaweb/util/pthread_rw_lock.cc.orig 2011-10-31 15:25:58.000000000 +0000 ++++ net/instaweb/util/pthread_rw_lock.cc 2011-10-31 15:30:18.000000000 +0000 +@@ -27,8 +27,10 @@ + // New writer lock call is given preference over existing reader lock calls, + // so that writer lock call will never get starved. However, it is not allowed + // if there exists any recursive reader lock call to prevent deadlocks. ++#ifdef PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP + pthread_rwlockattr_setkind_np(&attr_, + PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP); ++#endif + pthread_rwlock_init(&rwlock_, &attr_); + } + Property changes on: head/www/mod_pagespeed/files/patch-pthread_rw_lock.cc ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/www/mod_pagespeed/files/patch-pthread_shared_mem.cc =================================================================== --- head/www/mod_pagespeed/files/patch-pthread_shared_mem.cc (revision 284984) +++ head/www/mod_pagespeed/files/patch-pthread_shared_mem.cc (revision 284985) @@ -1,127 +1,146 @@ ---- net/instaweb/util/pthread_shared_mem.cc.orig -+++ net/instaweb/util/pthread_shared_mem.cc -@@ -24,6 +24,7 @@ +--- net/instaweb/util/pthread_shared_mem.cc.orig 2011-10-31 14:25:06.000000000 +0000 ++++ net/instaweb/util/pthread_shared_mem.cc 2011-10-31 22:04:15.000000000 +0000 +@@ -24,6 +24,9 @@ #include #include #include ++#if defined(__FreeBSD__) +#include ++#endif #include "net/instaweb/util/public/abstract_shared_mem.h" #include "net/instaweb/util/public/abstract_mutex.h" #include "net/instaweb/util/public/basictypes.h" -@@ -70,12 +71,34 @@ +@@ -70,13 +73,45 @@ DISALLOW_COPY_AND_ASSIGN(PthreadSharedMemMutex); }; ++#if defined(__FreeBSD__) +// Some OSs does not support PTHREAD_PROCESS_SHARED attribute. (ex. FreeBSD < 9R, MacOS) -+// So, we use the semaphore instead. But nested lock is not supported. ++// FreeBSD lacks PTHREAD_PROCESS_SHARED support before 9.0R, so we use a semaphore ++// instead. But nested locking is not supported. +class SemSharedMemMutex : public AbstractMutex { + public: + explicit SemSharedMemMutex(sem_t* sem) + : sem_(sem) {} + + virtual void Lock() { + sem_wait(sem_); + } + + virtual void Unlock() { + sem_post(sem_); + } + +private: + sem_t* sem_; + DISALLOW_COPY_AND_ASSIGN(SemSharedMemMutex); +}; ++#endif + class PthreadSharedMemSegment : public AbstractSharedMemSegment { public: // We will be representing memory mapped in the [base, base + size) range. -- PthreadSharedMemSegment(char* base, size_t size, MessageHandler* handler) ++#if defined(__FreeBSD__) + PthreadSharedMemSegment(char* base, size_t size, MessageHandler* handler, const char* name) - : base_(base), -- size_(size) { ++ : base_(base), + size_(size), + sem_(NULL) { + std::sprintf(name_, "/%s_sem", name); ++ } ++#else + PthreadSharedMemSegment(char* base, size_t size, MessageHandler* handler) + : base_(base), + size_(size) { } ++#endif virtual ~PthreadSharedMemSegment() { -@@ -86,10 +109,15 @@ } +@@ -86,10 +121,18 @@ + } virtual size_t SharedMutexSize() const { -+#if 0 - return sizeof(pthread_mutex_t); -+#else ++#if defined(__FreeBSD__) + return 0; ++#else + return sizeof(pthread_mutex_t); +#endif } virtual bool InitializeSharedMutex(size_t offset, MessageHandler* handler) { -+#if 0 ++#if defined(__FreeBSD__) ++ sem_ = sem_open(name_, O_CREAT, 0755, 1); ++ return sem_ ? true : false; ++#else pthread_mutexattr_t attr; if (pthread_mutexattr_init(&attr) != 0) { handler->Message(kError, "pthread_mutexattr_init failed with errno:%d", -@@ -113,19 +141,33 @@ +@@ -113,19 +156,32 @@ pthread_mutexattr_destroy(&attr); return true; -+#else -+//std::printf("sem: %s\n", name_); -+ sem_ = sem_open(name_, O_CREAT, 0755, 1); -+ return sem_ ? true : false; +#endif } virtual AbstractMutex* AttachToSharedMutex(size_t offset) { -+#if 0 - return new PthreadSharedMemMutex(MutexPtr(offset)); -+#else ++#if defined(__FreeBSD__) + sem_ = sem_open(name_, O_EXCL); + return new SemSharedMemMutex(sem_); ++#else + return new PthreadSharedMemMutex(MutexPtr(offset)); +#endif } private: -+#if 0 ++#if defined(__FreeBSD__) ++#else pthread_mutex_t* MutexPtr(size_t offset) { return reinterpret_cast(base_ + offset); } +#endif char* const base_; const size_t size_; ++#if defined(__FreeBSD__) + char name_[256]; + sem_t* sem_; ++#endif DISALLOW_COPY_AND_ASSIGN(PthreadSharedMemSegment); }; -@@ -143,7 +185,11 @@ +@@ -143,7 +199,11 @@ } size_t PthreadSharedMem::SharedMutexSize() const { -+#if 0 - return sizeof(pthread_mutex_t); -+#else ++#if defined(__FreeBSD__) + return 0; ++#else + return sizeof(pthread_mutex_t); +#endif } AbstractSharedMemSegment* PthreadSharedMem::CreateSegment( -@@ -167,7 +213,7 @@ +@@ -167,7 +227,11 @@ SegmentBaseMap* bases = AcquireSegmentBases(); (*bases)[name] = base; UnlockSegmentBases(); -- return new PthreadSharedMemSegment(base, size, handler); ++#if defined(__FreeBSD__) + return new PthreadSharedMemSegment(base, size, handler, name.c_str()); ++#else + return new PthreadSharedMemSegment(base, size, handler); ++#endif } AbstractSharedMemSegment* PthreadSharedMem::AttachToSegment( -@@ -182,7 +228,7 @@ +@@ -182,7 +246,11 @@ } char* base = i->second; UnlockSegmentBases(); -- return new PthreadSharedMemSegment(base, size, handler); ++#if defined(__FreeBSD__) + return new PthreadSharedMemSegment(base, size, handler, name.c_str()); ++#else + return new PthreadSharedMemSegment(base, size, handler); ++#endif } void PthreadSharedMem::DestroySegment(const GoogleString& name, Property changes on: head/www/mod_pagespeed/files/patch-pthread_shared_mem.cc ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/www/mod_pagespeed/files/patch-resource_manager_test.cc =================================================================== --- head/www/mod_pagespeed/files/patch-resource_manager_test.cc (revision 284984) +++ head/www/mod_pagespeed/files/patch-resource_manager_test.cc (revision 284985) @@ -1,11 +1,14 @@ ---- net/instaweb/rewriter/resource_manager_test.cc.orig 2011-09-29 13:52:19.000000000 +0000 -+++ net/instaweb/rewriter/resource_manager_test.cc 2011-09-29 13:52:27.000000000 +0000 -@@ -323,7 +323,7 @@ +--- net/instaweb/rewriter/resource_manager_test.cc.orig 2011-10-31 14:25:06.000000000 +0000 ++++ net/instaweb/rewriter/resource_manager_test.cc 2011-10-31 18:56:11.000000000 +0000 +@@ -339,7 +339,11 @@ void VerifyWithinSecond(int64 time_a_ms, int64 time_b_ms) { // Note: need to pass in 1 * since otherwise we get a link failure // due to conversion of compile-time constant to const reference -- EXPECT_GE(1 * Timer::kSecondMs, std::abs(time_a_ms - time_b_ms)); ++#if defined(__FreeBSD__) + EXPECT_GE(1 * Timer::kSecondMs, llabs(time_a_ms - time_b_ms)); ++#else + EXPECT_GE(1 * Timer::kSecondMs, std::abs(time_a_ms - time_b_ms)); ++#endif } void VerifyValidCachedResult(const char* subtest_name, bool test_meta_data, Property changes on: head/www/mod_pagespeed/files/patch-resource_manager_test.cc ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/www/mod_pagespeed/files/patch-utypes.h =================================================================== --- head/www/mod_pagespeed/files/patch-utypes.h (revision 284984) +++ head/www/mod_pagespeed/files/patch-utypes.h (revision 284985) @@ -1,11 +1,13 @@ ---- third_party/icu/public/common/unicode/utypes.h.orig 2011-09-28 02:40:04.000000000 +0000 -+++ third_party/icu/public/common/unicode/utypes.h 2011-09-28 02:41:11.000000000 +0000 -@@ -32,7 +32,7 @@ +--- third_party/icu/public/common/unicode/utypes.h.orig 2011-10-31 14:25:20.000000000 +0000 ++++ third_party/icu/public/common/unicode/utypes.h 2011-10-31 18:11:55.000000000 +0000 +@@ -32,7 +32,9 @@ #ifndef UTYPES_H #define UTYPES_H - ++#if defined(__FreeBSD__) +#include ++#endif #include "unicode/umachine.h" #include "unicode/utf.h" #include "unicode/uversion.h" Property changes on: head/www/mod_pagespeed/files/patch-utypes.h ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property