4 files changed, 22 insertions, 5 deletions

diff --git a/www/mod_pagespeed/Makefile b/www/mod_pagespeed/Makefile
index 6dd580b3d556..1a00ae0df29c 100644
--- a/www/mod_pagespeed/Makefile
+++ b/www/mod_pagespeed/Makefile
@@ -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>
diff --git a/www/mod_pagespeed/distinfo b/www/mod_pagespeed/distinfo
index 5ae7d1f925d6..e08ae0ae37a4 100644
--- a/www/mod_pagespeed/distinfo
+++ b/www/mod_pagespeed/distinfo
@@ -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
diff --git a/www/mod_pagespeed/pkg-message b/www/mod_pagespeed/pkg-message
index 5b1ceae735b1..346577d2fb39 100644
--- a/www/mod_pagespeed/pkg-message
+++ b/www/mod_pagespeed/pkg-message
@@ -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
 ----------------------------------------------------------------------
diff --git a/www/mod_pagespeed/pkg-plist b/www/mod_pagespeed/pkg-plist
index 47b50665cd22..5699780b47c5 100644
--- a/www/mod_pagespeed/pkg-plist
+++ b/www/mod_pagespeed/pkg-plist
@@ -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