Date: Fri, 21 Dec 2012 22:22:59 +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: r309377 - head/www/mod_pagespeed Message-ID: <201212212222.qBLMMxW6050134@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: swills Date: Fri Dec 21 22:22:58 2012 New Revision: 309377 URL: http://svnweb.freebsd.org/changeset/ports/309377 Log: - Update to 1.2.24.1 - Include the stand alone binaries for minifying html, css and js - Install the pagespeed_libraries.conf config file - Build tests Modified: head/www/mod_pagespeed/Makefile head/www/mod_pagespeed/distinfo head/www/mod_pagespeed/pkg-message head/www/mod_pagespeed/pkg-plist Modified: head/www/mod_pagespeed/Makefile ============================================================================== --- head/www/mod_pagespeed/Makefile Fri Dec 21 21:57:10 2012 (r309376) +++ head/www/mod_pagespeed/Makefile Fri Dec 21 22:22:58 2012 (r309377) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= mod_pagespeed -PORTVERSION= 1.1.23.2 -PORTREVISION= 1 +PORTVERSION= 1.2.24.1 +PORTREVISION= 0 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_LOCAL} @@ -41,6 +41,7 @@ ONLY_FOR_ARCHS= amd64 i386 LDFLAGS+= -L${LOCALBASE}/lib PLIST_SUB= WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} MAKE_ENV+= BUILDTYPE=Release +ALL_TARGET= mod_pagespeed_test pagespeed_automatic_test all html_minifier_main css_minify_main WRKSRC= ${WRKDIR}/${PORTNAME}_source_${PORTVERSION}/mod_pagespeed/src GYP_DEFINES+= \ use_system_apache_dev=1 \ @@ -97,6 +98,9 @@ do-configure: do-install: cd ${WRKSRC} && \ + ${INSTALL_PROGRAM} out/Release/css_minify_main ${PREFIX}/bin ; \ + ${INSTALL_PROGRAM} out/Release/html_minifier_main ${PREFIX}/bin ; \ + ${INSTALL_PROGRAM} out/Release/js_minify ${PREFIX}/bin ; \ ${INSTALL} out/Release/libmod_pagespeed.so ${PREFIX}/${APACHEMODDIR}/mod_pagespeed.so if [ ! -f ${PREFIX}/${APACHEETCDIR}/pagespeed.conf-dist ] ; then \ cd ${WRKSRC}/install && \ @@ -107,12 +111,18 @@ do-install: -e "s,@@MOD_PAGESPEED_CACHE@@,/var/mod_pagespeed/,g" \ > ${PREFIX}/${APACHEETCDIR}/pagespeed.conf-dist ; \ fi + if [ ! -f ${PREFIX}/${APACHEETCDIR}/pagespeed_libraries.conf-dist ] ; then \ + ${INSTALL_DATA} ${WRKSRC}/net/instaweb/genfiles/conf/pagespeed_libraries.conf ${PREFIX}/${APACHEETCDIR}/pagespeed_libraries.conf-dist ; \ + fi post-install: ${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 + @if [ ! -f ${PREFIX}/etc/pagespeed_libraries.conf ]; then \ + ${CP} -p ${PREFIX}/${APACHEETCDIR}/pagespeed_libraries.conf-dist ${PREFIX}/${APACHEETCDIR}/pagespeed_libraries.conf ; \ + fi @${CAT} ${PKGMESSAGE} .include <bsd.port.post.mk> Modified: head/www/mod_pagespeed/distinfo ============================================================================== --- head/www/mod_pagespeed/distinfo Fri Dec 21 21:57:10 2012 (r309376) +++ head/www/mod_pagespeed/distinfo Fri Dec 21 22:22:58 2012 (r309377) @@ -1,2 +1,2 @@ -SHA256 (mod_pagespeed_source_1.1.23.2.tar.xz) = 0515e178bbb1c6b8f4221ac2ae850ad1fe3a0c5052d4556b51a61988deb31789 -SIZE (mod_pagespeed_source_1.1.23.2.tar.xz) = 11868748 +SHA256 (mod_pagespeed_source_1.2.24.1.tar.xz) = b9f13957de30004b03397df5ded9a234d31542e7f0e8df219aa19c215cf0caaf +SIZE (mod_pagespeed_source_1.2.24.1.tar.xz) = 12151988 Modified: head/www/mod_pagespeed/pkg-message ============================================================================== --- head/www/mod_pagespeed/pkg-message Fri Dec 21 21:57:10 2012 (r309376) +++ head/www/mod_pagespeed/pkg-message Fri Dec 21 22:22:58 2012 (r309377) @@ -1,7 +1,8 @@ ---------------------------------------------------------------------- -To enable mod_pagespeed add this line: +To enable mod_pagespeed add these lines: Include etc/apache22/pagespeed.conf +Include etc/apache22/pagespeed_libraries.conf to etc/apache22/httpd.conf ---------------------------------------------------------------------- Modified: head/www/mod_pagespeed/pkg-plist ============================================================================== --- head/www/mod_pagespeed/pkg-plist Fri Dec 21 21:57:10 2012 (r309376) +++ head/www/mod_pagespeed/pkg-plist Fri Dec 21 22:22:58 2012 (r309377) @@ -1,6 +1,12 @@ +bin/css_minify_main +bin/html_minifier_main +bin/js_minify %%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 +@unexec if cmp -s %D/%%APACHEETCDIR%%/pagespeed_libraries.conf %D/%%APACHEETCDIR%%/pagespeed_libraries.conf-dist; then rm -f %D/%%APACHEETCDIR%%/pagespeed_libraries.conf; fi %%APACHEETCDIR%%/pagespeed.conf-dist +%%APACHEETCDIR%%/pagespeed_libraries.conf-dist @exec [ ! -f %B/pagespeed.conf ] && cp %B/pagespeed.conf-dist %B/pagespeed.conf +@exec [ ! -f %B/pagespeed_libraries.conf ] && cp %B/pagespeed_libraries.conf-dist %B/pagespeed_libraries.conf @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?201212212222.qBLMMxW6050134>