diff options
| author | swills <swills@FreeBSD.org> | 2012-02-11 05:34:15 +0800 |
|---|---|---|
| committer | swills <swills@FreeBSD.org> | 2012-02-11 05:34:15 +0800 |
| commit | deff2c26ea6b0f9e623054326151f702b212047a (patch) | |
| tree | 53acd453152a02befeb2d5e5e09ee9f9898045e7 /www | |
| parent | 82c8001617f9c10315782475b35ce344dcb5bfdb (diff) | |
| download | freebsd-ports-gnome-deff2c26ea6b0f9e623054326151f702b212047a.tar.gz freebsd-ports-gnome-deff2c26ea6b0f9e623054326151f702b212047a.tar.zst freebsd-ports-gnome-deff2c26ea6b0f9e623054326151f702b212047a.zip | |
- Try to fix build on older systems
- Use variables in plist so we don't break with apache 2.4
Diffstat (limited to 'www')
| -rw-r--r-- | www/mod_pagespeed/Makefile | 2 | ||||
| -rw-r--r-- | www/mod_pagespeed/files/patch-python_arch.sh | 21 | ||||
| -rw-r--r-- | www/mod_pagespeed/files/patch-python_arch2.sh | 21 | ||||
| -rw-r--r-- | www/mod_pagespeed/pkg-plist | 6 |
4 files changed, 46 insertions, 4 deletions
diff --git a/www/mod_pagespeed/Makefile b/www/mod_pagespeed/Makefile index 68b416941df7..5a4607aeb231 100644 --- a/www/mod_pagespeed/Makefile +++ b/www/mod_pagespeed/Makefile @@ -7,7 +7,7 @@ PORTNAME= mod_pagespeed PORTVERSION= 0.10.21.2 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_LOCAL} diff --git a/www/mod_pagespeed/files/patch-python_arch.sh b/www/mod_pagespeed/files/patch-python_arch.sh new file mode 100644 index 000000000000..ee59a745ff01 --- /dev/null +++ b/www/mod_pagespeed/files/patch-python_arch.sh @@ -0,0 +1,21 @@ +Index: build/linux/python_arch.sh +=================================================================== +--- build/linux/python_arch.sh (revision 90205) ++++ build/linux/python_arch.sh (working copy) +@@ -10,7 +10,15 @@ + # python_arch.sh /path/to/sysroot/usr/lib/libpython2.4.so.1.0 + # + +-python=$(readlink -f "$1") ++UNAME=`uname` ++ ++# FreeBSD readlink lacks -f support before 9.0 ++if [ ${UNAME} = "FreeBSD" ]; then ++ python=$(greadlink -f "$1") ++else ++ python=$(readlink -f "$1") ++fi ++ + if [ ! -r "$python" ]; then + echo unknown + exit 0 diff --git a/www/mod_pagespeed/files/patch-python_arch2.sh b/www/mod_pagespeed/files/patch-python_arch2.sh new file mode 100644 index 000000000000..9cf967b9efdc --- /dev/null +++ b/www/mod_pagespeed/files/patch-python_arch2.sh @@ -0,0 +1,21 @@ +Index: third_party/chromium/src/build/linux/python_arch.sh +=================================================================== +--- third_party/chromium/src/build/linux/python_arch.sh (revision 90205) ++++ third_party/chromium/src/build/linux/python_arch.sh (working copy) +@@ -10,7 +10,15 @@ + # python_arch.sh /path/to/sysroot/usr/lib/libpython2.4.so.1.0 + # + +-python=$(readlink -f "$1") ++UNAME=`uname` ++ ++# FreeBSD readlink lacks -f support before 9.0 ++if [ "${UNAME}" = "FreeBSD" ]; then ++ python=$(greadlink -f "$1") ++else ++ python=$(readlink -f "$1") ++fi ++ + if [ ! -r "$python" ]; then + echo unknown + exit 0 diff --git a/www/mod_pagespeed/pkg-plist b/www/mod_pagespeed/pkg-plist index 9d0e18e4355f..18065b619368 100644 --- a/www/mod_pagespeed/pkg-plist +++ b/www/mod_pagespeed/pkg-plist @@ -1,6 +1,6 @@ -libexec/apache22/mod_pagespeed.so -@unexec if cmp -s %D/etc/apache22/pagespeed.conf %D/etc/apache22/pagespeed.conf-dist; then rm -f %D/etc/apache22/pagespeed.conf; fi -etc/apache22/pagespeed.conf-dist +%%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 |