From 3fa0100d0880e024c287716ed0dbbecc27cf7747 Mon Sep 17 00:00:00 2001
From: swills <swills@FreeBSD.org>
Date: Mon, 3 Dec 2012 03:00:20 +0000
Subject: - Update to 1.1.23.2

Feature safe:	yes
---
 www/mod_pagespeed/Makefile                     | 12 +++++++-----
 www/mod_pagespeed/distinfo                     |  4 ++--
 www/mod_pagespeed/files/patch-hostname_util.cc | 12 ++++++++++++
 www/mod_pagespeed/pkg-plist                    |  5 +----
 4 files changed, 22 insertions(+), 11 deletions(-)
 create mode 100644 www/mod_pagespeed/files/patch-hostname_util.cc

(limited to 'www')

diff --git a/www/mod_pagespeed/Makefile b/www/mod_pagespeed/Makefile
index 76365c6ccf04..13d389058419 100644
--- a/www/mod_pagespeed/Makefile
+++ b/www/mod_pagespeed/Makefile
@@ -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
diff --git a/www/mod_pagespeed/distinfo b/www/mod_pagespeed/distinfo
index 7f51faa0ff90..5ae7d1f925d6 100644
--- a/www/mod_pagespeed/distinfo
+++ b/www/mod_pagespeed/distinfo
@@ -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
diff --git a/www/mod_pagespeed/files/patch-hostname_util.cc b/www/mod_pagespeed/files/patch-hostname_util.cc
new file mode 100644
index 000000000000..54c5292a6440
--- /dev/null
+++ b/www/mod_pagespeed/files/patch-hostname_util.cc
@@ -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,
diff --git a/www/mod_pagespeed/pkg-plist b/www/mod_pagespeed/pkg-plist
index 18065b619368..47b50665cd22 100644
--- a/www/mod_pagespeed/pkg-plist
+++ b/www/mod_pagespeed/pkg-plist
@@ -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
-- 
cgit