Date: Mon, 3 Dec 2012 03:00:20 +0000 (UTC) From: Steve Wills <swills@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r308120 - in head/www/mod_pagespeed: . files Message-ID: <201212030300.qB330KNj020599@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: swills Date: Mon Dec 3 03:00:20 2012 New Revision: 308120 URL: http://svnweb.freebsd.org/changeset/ports/308120 Log: - Update to 1.1.23.2 Feature safe: yes Added: head/www/mod_pagespeed/files/patch-hostname_util.cc (contents, props changed) Modified: head/www/mod_pagespeed/Makefile head/www/mod_pagespeed/distinfo head/www/mod_pagespeed/pkg-plist Modified: head/www/mod_pagespeed/Makefile ============================================================================== --- head/www/mod_pagespeed/Makefile Sun Dec 2 22:55:57 2012 (r308119) +++ head/www/mod_pagespeed/Makefile Mon Dec 3 03:00:20 2012 (r308120) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= mod_pagespeed -PORTVERSION= 0.10.22.7 +PORTVERSION= 1.1.23.2 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_LOCAL} @@ -32,7 +32,9 @@ 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 @@ -100,13 +102,13 @@ do-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 Modified: head/www/mod_pagespeed/distinfo ============================================================================== --- head/www/mod_pagespeed/distinfo Sun Dec 2 22:55:57 2012 (r308119) +++ head/www/mod_pagespeed/distinfo Mon Dec 3 03:00:20 2012 (r308120) @@ -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 Added: head/www/mod_pagespeed/files/patch-hostname_util.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/mod_pagespeed/files/patch-hostname_util.cc Mon Dec 3 03:00:20 2012 (r308120) @@ -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, Modified: head/www/mod_pagespeed/pkg-plist ============================================================================== --- head/www/mod_pagespeed/pkg-plist Sun Dec 2 22:55:57 2012 (r308119) +++ head/www/mod_pagespeed/pkg-plist Mon Dec 3 03:00:20 2012 (r308120) @@ -2,8 +2,5 @@ @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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212030300.qB330KNj020599>