From 3f811ff3087e01031787baf535840a74190f798d Mon Sep 17 00:00:00 2001 From: "Philip M. Gollucci" Date: Fri, 7 May 2010 21:46:21 +0000 Subject: - Continuation of ports/133704 apxs -A comments out the LoadModule line This adds custom FreeBSD mod to 'DELETE' the line so that it works with our pkg-plists in packages. - Remove -s form the cmp httpd.conf in pkg-plist to be blatant about why it didn't get removed - Tested with lang/php5 - Bump PORTREVISION PR: ports/133704 With Hat: apache@ --- www/apache22/pkg-plist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'www/apache22/pkg-plist') diff --git a/www/apache22/pkg-plist b/www/apache22/pkg-plist index d041aa734060..b62392302f37 100644 --- a/www/apache22/pkg-plist +++ b/www/apache22/pkg-plist @@ -3,7 +3,7 @@ @exec mkdir -p %D/etc/apache22/extra 2> /dev/null @exec mkdir -p %D/etc/apache22/Includes 2> /dev/null || true @exec mkdir -p %D/etc/apache22/envvars.d 2> /dev/null || true -@unexec if cmp -s %D/etc/apache22/httpd.conf %D/%%EXAMPLESDIR%%/httpd.conf; then rm -f %D/etc/apache22/httpd.conf; fi +@unexec if cmp %D/etc/apache22/httpd.conf %D/%%EXAMPLESDIR%%/httpd.conf; then rm -f %D/etc/apache22/httpd.conf; fi %%EXAMPLESDIR%%/httpd.conf @exec [ -f %D/etc/apache22/httpd.conf ] || cp %D/%%EXAMPLESDIR%%/httpd.conf %D/etc/apache22/httpd.conf @unexec if cmp -s %D/etc/apache22/magic %D/%%EXAMPLESDIR%%/magic; then rm -f %D/etc/apache22/magic; fi -- cgit v1.2.3