kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
freebsd-ports/www/apache20/files/patch-Makefile.in
Philip M. Gollucci f3c62ab6c6 - Fix 5 seen in 3rd party module failures due to converting from bundled apr to ports apr. 
Reported by:    pav via pointyhat
With Hat:       apache@
2010-05-23 23:59:35 +00:00

166 lines
7.3 KiB
Text
Raw Blame History

--- ./Makefile.in.orig 2010-05-23 19:54:31.000000000 -0400
+++ ./Makefile.in 2010-05-23 19:54:22.083759943 -0400
@@ -31,15 +31,21 @@
if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \
$(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir) ; \
fi ; \
+ if [ ! -d $(DESTDIR)$(EXAMPLESDIR) ]; then \
+ $(MKINSTALLDIRS) $(DESTDIR)$(EXAMPLESDIR) ; \
+ fi ; \
cd $(top_srcdir)/docs/conf; \
for i in mime.types magic; do \
if test ! -f $(DESTDIR)$(sysconfdir)/$$i; then \
$(INSTALL_DATA) $$i $(DESTDIR)$(sysconfdir); \
fi; \
+ cp -f $$i $$i-dist; \
+ $(INSTALL_DATA) $$i-dist $(DESTDIR)$(EXAMPLESDIR); \
done; \
for j in $(top_srcdir)/docs/conf $(top_builddir)/docs/conf ; do \
cd $$j ; \
for i in *-std*.conf; do \
+ [ -f `echo "$$i"|sed 's,\.in$$,_nonex,g'` ] || continue; \
( \
n_lm=`awk 'BEGIN {n=0} /@@LoadModule@@/ {n+=1} END {print n}' < $$i`; \
if test $$n_lm -eq 0 -o "x$(DSO_MODULES)" = "x"; then \
@@ -57,6 +63,9 @@
if test "x$$j" = "xssl"; then \
echo "<IfDefine SSL>"; \
fi; \
+ if [ `echo "$$j" | egrep 'cgid|cache|dav|digest|proxy'` ]; then \
+ echo -n "#"; \
+ fi; \
if test $$j != "^EOL^"; then \
echo "LoadModule $${j}_module $(rel_libexecdir)/mod_$${j}.so"; \
fi; \
@@ -70,31 +79,23 @@
-e 's#@@Port@@#$(PORT)#g' \
< $$i; \
fi \
- ) > $(DESTDIR)$(sysconfdir)/$$i; \
- chmod 0644 $(DESTDIR)$(sysconfdir)/$$i; \
+ ) > $(DESTDIR)$(EXAMPLESDIR)/$$i; \
+ chmod 0644 $(DESTDIR)$(EXAMPLESDIR)/$$i; \
file=`echo $$i|sed s/-std//`; \
if [ "$$file" = "httpd.conf" ]; then \
file=`echo $$file|sed s/.*.conf/$(PROGRAM_NAME).conf/`; \
fi; \
if test "$$file" != "$$i" && test ! -f $(DESTDIR)$(sysconfdir)/$$file; then \
- $(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/$$i $(DESTDIR)$(sysconfdir)/$$file; \
+ $(INSTALL_DATA) $(DESTDIR)$(EXAMPLESDIR)/$$i $(DESTDIR)$(sysconfdir)/$$file; \
fi; \
done ; \
- done ; \
- if test -f "$(builddir)/envvars-std"; then \
- cp -p envvars-std $(DESTDIR)$(sbindir); \
- if test ! -f $(DESTDIR)$(sbindir)/envvars; then \
- cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \
- fi ; \
- fi
+ done ;
install-build:
@echo Installing build system files
@test -d $(DESTDIR)$(installbuilddir) || $(MKINSTALLDIRS) $(DESTDIR)$(installbuilddir)
@cp $(top_srcdir)/build/*.mk $(DESTDIR)$(installbuilddir); \
cp build/*.mk $(DESTDIR)$(installbuilddir); \
- sed 's#LIBTOOL = \(.*\)#LIBTOOL = $(SHELL) $(installbuilddir)/libtool $(LTFLAGS)#' \
- build/config_vars.mk > $(DESTDIR)$(installbuilddir)/config_vars.mk; \
cp $(top_srcdir)/build/instdso.sh $(DESTDIR)$(installbuilddir); \
cp $(top_builddir)/config.nice $(DESTDIR)$(installbuilddir);
@@ -108,44 +109,40 @@
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 ; \
- $(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir) ; \
- 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
-
+.if !defined(NO_WWWDATA)
+ @echo Installing HTML documents
+ @test -d $(DESTDIR)$(htdocsdir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir)-dist
+ @test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir)-dist)
+ @test -e $(DESTDIR)$(htdocsdir) || ln -sf $(DESTDIR)$(htdocsdir)-dist $(DESTDIR)$(htdocsdir)
+ -@test "x$(htdocsdir)" != "x" && cd $(DESTDIR)$(htdocsdir)-dist && find . -name ".svn" -print | xargs rm -rf
+.endif
+
install-error:
- -@if [ -d $(DESTDIR)$(errordir) ]; then \
- echo "[PRESERVING EXISTING ERROR SUBDIR: $(DESTDIR)$(errordir)]"; \
- else \
- 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
-
+.if !defined(NO_ERROR)
+ @echo Installing error documents
+ @test -d $(DESTDIR)$(errordir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(errordir)-dist
+ cd $(top_srcdir)/docs/error && cp -rp * $(DESTDIR)$(errordir)-dist
+ -@test "x$(errordir)" != "x" && cd $(DESTDIR)$(errordir)-dist && find . -name ".svn" -print | xargs rm -rf
+ @test -e $(DESTDIR)$(errordir) || ln -sf $(DESTDIR)$(errordir)-dist $(DESTDIR)$(errordir)
+.endif
+
install-icons:
- -@if [ -d $(DESTDIR)$(iconsdir) ]; then \
- echo "[PRESERVING EXISTING ICONS SUBDIR: $(DESTDIR)$(iconsdir)]"; \
- else \
- 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
-
+.if !defined(NO_ICONS)
+ @echo Installing icons
+ @test -d $(DESTDIR)$(iconsdir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(iconsdir)-dist
+ cd $(top_srcdir)/docs/icons && cp -rp * $(DESTDIR)$(iconsdir)-dist
+ -@test "x$(iconsdir)" != "x" && cd $(DESTDIR)$(iconsdir)-dist && find . -name ".svn" -print | xargs rm -rf
+ @test -e $(DESTDIR)$(iconsdir) || ln -sf $(DESTDIR)$(iconsdir)-dist $(DESTDIR)$(iconsdir)
+.endif
+
install-cgi:
- -@if [ -d $(DESTDIR)$(cgidir) ];then \
- echo "[PRESERVING EXISTING CGI SUBDIR: $(DESTDIR)$(cgidir)]"; \
- else \
- 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
+.if !defined(NO_CGI)
+ @echo Installing CGIs
+ @test -d $(DESTDIR)$(cgidir)-dist || $(MKINSTALLDIRS) $(DESTDIR)$(cgidir)-dist
+ cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir)-dist
+ -@test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir)-dist && find . -name ".svn" -print | xargs rm -rf
+ @test -e $(DESTDIR)$(cgidir) || ln -sf $(DESTDIR)$(cgidir)-dist $(DESTDIR)$(cgidir)
+.endif
install-other:
@test -d $(DESTDIR)$(logfiledir) || $(MKINSTALLDIRS) $(DESTDIR)$(logfiledir)
@@ -179,7 +176,6 @@
@cp -p $(srcdir)/modules/http/mod_core.h $(DESTDIR)$(includedir)
@cp -p $(srcdir)/modules/proxy/mod_proxy.h $(DESTDIR)$(includedir)
@cp -p $(srcdir)/modules/ssl/*.h $(DESTDIR)$(includedir)
- @cp -p $(srcdir)/srclib/pcre/pcre*.h $(DESTDIR)$(includedir)
@cp -p $(srcdir)/os/$(OS_DIR)/*.h $(DESTDIR)$(includedir)
@chmod 644 $(DESTDIR)$(includedir)/*.h
@@ -191,8 +187,11 @@
@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
+.if !defined(NOPORTDOCS)
+ @test -d $(DESTDIR)$(manualdir) || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir)
@(cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir))
@(cd $(DESTDIR)$(manualdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null ) || true
+.endif
install-suexec:
@if test -f $(builddir)/support/suexec; then \
Reference in a new issue View git blame Copy permalink