kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- remove duplicate entry of mod_charset_lite [1]

Browse source 
- add PCRE_FROM_PORTS to OPTIONS
- use @dirrmtry for include/apache22
- workaround plist issues when upgrading, but it's not as safe as I
  would expect, it requires more work.

Spotted by:     bland@ [1]
This commit is contained in:
Clement Laforet 2007-09-19 21:05:23 +00:00
parent ab8293d70e
commit db9219af7d
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=199782
5 changed files with 63 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
www/apache22/Makefile
View file

@ -58,7 +58,8 @@ OPTIONS= \
MYSQL "Enable MySQL support for apr-dbd" Off \
PGSQL "Enable PostgreSQL support for apr-dbd" Off \
SQLITE "Enable SQLite support for apr-dbd" Off \
IPV6 "Enable IPv6 support" On
IPV6 "Enable IPv6 support" On \
PCRE_FROM_PORTS "Use devel/pcre instead of bundled one" Off
.include "${.CURDIR}/Makefile.options"
.endif

2
www/apache22/Makefile.modules
View file

@ -146,7 +146,7 @@ AUTHZ_MODULES= authz_host authz_groupfile authz_user authz_dbm \
authz_owner authz_default
CACHE_MODULES= cache disk_cache file_cache mem_cache
DAV_MODULES= dav dav_fs
EXPERIMENTAL_MODULES= bucketeer case_filter case_filter_in ext_filter charset_lite \
EXPERIMENTAL_MODULES= bucketeer case_filter case_filter_in ext_filter \
log_forensic optional_hook_export optional_hook_import \
optional_fn_import optional_fn_export
LDAP_MODULES= ldap authnz_ldap

1
www/apache22/Makefile.options
View file

@ -23,7 +23,6 @@ OPTIONS+= \
CASE_FILTER "Enable mod_case_filter" OFF \
CASE_FILTER_IN "Enable mod_case_filter_in" OFF \
EXT_FILTER "Enable mod_ext_filter" OFF \
CHARSET_LITE "Enable mod_charset_lite" ON \
LOG_FORENSIC "Enable mod_log_forensic" OFF \
OPTIONAL_HOOK_EXPORT "Enable mod_optional_hook_export" OFF \
OPTIONAL_HOOK_IMPORT "Enable mod_optional_hook_import" OFF \

61
www/apache22/files/patch-Makefile.in
View file

@ -1,5 +1,5 @@
--- Makefile.in.orig Tue Apr 24 13:08:01 2007
+++ Makefile.in Sun Sep 9 11:57:06 2007
+++ Makefile.in Wed Sep 19 21:28:08 2007
@@ -31,9 +31,11 @@
install-conf:
@echo Installing configuration files
@ -31,7 +31,64 @@
fi; \
fi; \
done ; \
@@ -206,12 +208,14 @@
@@ -117,48 +119,32 @@
doxygen $(top_srcdir)/docs/doxygen.conf
install-htdocs:
- -@if [ -d $(DESTDIR)$(htdocsdir) ]; then \
- echo "[PRESERVING EXISTING HTDOCS SUBDIR: $(DESTDIR)$(htdocsdir)]"; \
- else \
- echo Installing HTML documents ; \
+ @echo Installing HTML documents ; \
$(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir) ; \
if test -d $(htdocs-srcdir) && test "x$(RSYNC)" != "x" && test -x $(RSYNC) ; then \
$(RSYNC) --exclude .svn -rlpt --numeric-ids $(htdocs-srcdir)/ $(DESTDIR)$(htdocsdir)/; \
else \
test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir)) ; \
cd $(DESTDIR)$(htdocsdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
- fi; \
- fi
+ fi;
install-error:
- -@if [ -d $(DESTDIR)$(errordir) ]; then \
- echo "[PRESERVING EXISTING ERROR SUBDIR: $(DESTDIR)$(errordir)]"; \
- else \
- echo Installing error documents ; \
+ @echo Installing error documents ; \
$(MKINSTALLDIRS) $(DESTDIR)$(errordir) ; \
cd $(top_srcdir)/docs/error && cp -rp * $(DESTDIR)$(errordir) ; \
- test "x$(errordir)" != "x" && cd $(DESTDIR)$(errordir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
- fi
+ test "x$(errordir)" != "x" && cd $(DESTDIR)$(errordir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true;
install-icons:
- -@if [ -d $(DESTDIR)$(iconsdir) ]; then \
- echo "[PRESERVING EXISTING ICONS SUBDIR: $(DESTDIR)$(iconsdir)]"; \
- else \
- echo Installing icons ; \
+ @echo Installing icons ; \
$(MKINSTALLDIRS) $(DESTDIR)$(iconsdir) ; \
cd $(top_srcdir)/docs/icons && cp -rp * $(DESTDIR)$(iconsdir) ; \
- test "x$(iconsdir)" != "x" && cd $(DESTDIR)$(iconsdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
- fi
+ test "x$(iconsdir)" != "x" && cd $(DESTDIR)$(iconsdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true;
install-cgi:
- -@if [ -d $(DESTDIR)$(cgidir) ];then \
- echo "[PRESERVING EXISTING CGI SUBDIR: $(DESTDIR)$(cgidir)]"; \
- else \
- echo Installing CGIs ; \
+ @echo Installing CGIs ; \
$(MKINSTALLDIRS) $(DESTDIR)$(cgidir) ; \
cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir) ; \
- test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
- fi
+ test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true;
install-other:
@test -d $(DESTDIR)$(logfiledir) || $(MKINSTALLDIRS) $(DESTDIR)$(logfiledir)
@@ -206,12 +192,14 @@
@test -d $(DESTDIR)$(manualdir) || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir)
@cp -p $(top_srcdir)/docs/man/*.1 $(DESTDIR)$(mandir)/man1
@cp -p $(top_srcdir)/docs/man/*.8 $(DESTDIR)$(mandir)/man8

2
www/apache22/pkg-plist
View file

@ -537,7 +537,7 @@ www/apache22/icons/world2.png
%%APR_PORTS%%@dirrm include/apr-1
%%APR_PORTS%%@dirrm build-1
@dirrmtry libexec/apache22
@dirrm include/apache22
@dirrmtry include/apache22
@dirrmtry www/apache22
@dirrmtry etc/apache22/Includes
@unexec rm -f %D/etc/apache22/httpd.conf.bak 2> /dev/null || true