Index: head/www/mod_pagespeed/Makefile =================================================================== --- head/www/mod_pagespeed/Makefile (revision 308119) +++ head/www/mod_pagespeed/Makefile (revision 308120) @@ -1,115 +1,117 @@ # Created by: Steve Wills # $FreeBSD$ PORTNAME= mod_pagespeed -PORTVERSION= 0.10.22.7 +PORTVERSION= 1.1.23.2 PORTEPOCH= 1 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= png15:${PORTSDIR}/graphics/png \ jpeg:${PORTSDIR}/graphics/jpeg \ icutu:${PORTSDIR}/devel/icu \ opencv_legacy:${PORTSDIR}/graphics/opencv \ execinfo:${PORTSDIR}/devel/libexecinfo USE_XZ= yes USE_BINUTILS= yes USE_APACHE= 22 USE_PYTHON= 2.6+ USE_GMAKE= yes MAKE_JOBS_SAFE= yes # debugging #MAKE_ENV+= V=1 -#MAKE_JOBS_UNSAFE= yes +# seems new version isn't JOBS safe +MAKE_JOBS_UNSAFE= yes + ONLY_FOR_ARCHS= amd64 i386 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 \ use_system_icu=1 \ use_system_opencv=1 \ target_arch=${ARCH} \ system_include_path_apr=${LOCALBASE}/include/apr-1 \ system_include_path_aprutil=${LOCALBASE}/include/apr-1 \ system_include_path_httpd=${LOCALBASE}/include/apache22 \ system_include_path_execinfo=${LOCALBASE}/include \ system_include_path_icu=${LOCALBASE}/include \ include_dirs=${LOCALBASE}/include .include # testing #USE_GCC= 4.6+ #.if ${OSVERSION} > 1000000 #CC= clang #CXX= clang++ #GYP_DEFINES+= clang=1 #.endif .if ${OSVERSION} < 802517 || (${OSVERSION} >= 900000 && ${OSVERSION} < 900502) EXTRA_PATCHES= ${FILESDIR}/extra-gperf.gypi BUILD_DEPENDS+= ${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf .endif post-patch: ( cd ${BUILD_WRKSRC}/third_party/gflags/gen/arch && ${CP} -R linux freebsd && \ cd ${BUILD_WRKSRC}/third_party/gflags/gen/arch/freebsd && ${MV} ia32 i386 && ${MV} x64 amd64 ) ( cd ${BUILD_WRKSRC}/third_party/google-sparsehash/gen/arch && ${CP} -R linux freebsd && \ cd ${BUILD_WRKSRC}/third_party/google-sparsehash/gen/arch/freebsd && ${MV} ia32 i386 && ${MV} x64 amd64 ) ( cd ${BUILD_WRKSRC}/third_party/opencv/gen/arch && ${CP} -R linux freebsd && \ cd ${BUILD_WRKSRC}/third_party/opencv/gen/arch/freebsd && ${MV} ia32 i386 && ${MV} x64 amd64 ) ${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE},g" \ ${WRKSRC}/base/base.gypi ${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE},g" \ -e "s,%%CC%%,${CC},g" \ -e "s,%%CXX%%,${CXX},g" \ ${WRKSRC}/tools/gyp/pylib/gyp/generator/make.py .if ${OSVERSION} < 802517 || ${OSVERSION} < 900502 ${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE},g" \ ${WRKSRC}/net/instaweb/gperf.gypi .endif 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" \ + -e "s,@@MOD_PAGESPEED_STATS_LOG@@,/var/log/mod_pagespeed_stats.log," \ + -e "s,@@MOD_PAGESPEED_CACHE@@,/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 + ${INSTALL} -d -o ${WWWOWN} -g ${WWWGRP} -m 755 /var/mod_pagespeed @if [ ! -f ${PREFIX}/etc/pagespeed.conf ]; then \ ${CP} -p ${PREFIX}/${APACHEETCDIR}/pagespeed.conf-dist ${PREFIX}/${APACHEETCDIR}/pagespeed.conf ; \ fi @${CAT} ${PKGMESSAGE} .include Index: head/www/mod_pagespeed/distinfo =================================================================== --- head/www/mod_pagespeed/distinfo (revision 308119) +++ head/www/mod_pagespeed/distinfo (revision 308120) @@ -1,2 +1,2 @@ -SHA256 (mod_pagespeed_source_0.10.22.7.tar.xz) = b0983ad6fd283ee3ad7023ab9792761c0d3801ffe74f3bdb33fbbc925889b200 -SIZE (mod_pagespeed_source_0.10.22.7.tar.xz) = 11806420 +SHA256 (mod_pagespeed_source_1.1.23.2.tar.xz) = 0515e178bbb1c6b8f4221ac2ae850ad1fe3a0c5052d4556b51a61988deb31789 +SIZE (mod_pagespeed_source_1.1.23.2.tar.xz) = 11868748 Index: head/www/mod_pagespeed/files/patch-hostname_util.cc =================================================================== --- head/www/mod_pagespeed/files/patch-hostname_util.cc (nonexistent) +++ head/www/mod_pagespeed/files/patch-hostname_util.cc (revision 308120) @@ -0,0 +1,12 @@ +--- net/instaweb/util/hostname_util.cc.orig 2012-12-02 20:27:11.000000000 +0000 ++++ net/instaweb/util/hostname_util.cc 2012-12-02 20:43:33.000000000 +0000 +@@ -29,7 +29,8 @@ + namespace net_instaweb { + + GoogleString GetHostname() { +- char hostname[HOST_NAME_MAX + 1]; ++ int hnm = sysconf(_SC_HOST_NAME_MAX); ++ char hostname[hnm + 1]; + hostname[sizeof(hostname) - 1] = '\0'; + + // This call really shouldn't fail, so crash if it does under Debug, Property changes on: head/www/mod_pagespeed/files/patch-hostname_util.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/mod_pagespeed/pkg-plist =================================================================== --- head/www/mod_pagespeed/pkg-plist (revision 308119) +++ head/www/mod_pagespeed/pkg-plist (revision 308120) @@ -1,9 +1,6 @@ %%APACHEMODDIR%%/mod_pagespeed.so @unexec if cmp -s %D/%%APACHEETCDIR%%/pagespeed.conf %D/%%APACHEETCDIR%%/pagespeed.conf-dist; then rm -f %D/%%APACHEETCDIR%%/pagespeed.conf; fi %%APACHEETCDIR%%/pagespeed.conf-dist @exec [ ! -f %B/pagespeed.conf ] && cp %B/pagespeed.conf-dist %B/pagespeed.conf -@exec install -d -o %%WWWOWN%% -g %%WWWGRP%% -m 755 /var/mod_pagespeed/cache -@exec install -d -o %%WWWOWN%% -g %%WWWGRP%% -m 755 /var/mod_pagespeed/files -@unexec rmdir /var/mod_pagespeed/cache -@unexec rmdir /var/mod_pagespeed/files +@exec install -d -o %%WWWOWN%% -g %%WWWGRP%% -m 755 /var/mod_pagespeed @unexec rmdir /var/mod_pagespeed