Fix more .default -> -dist leftovers
This commit is contained in:
Andrey A. Chernov
parent
05dfd792d5
commit
62f5f0377c
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=61724
@ -7,7 +7,7 @@
|
||||
|
||||
PORTNAME= apache
|
||||
PORTVERSION= 1.3.26
|
||||
PORTREVISION= 2
|
||||
PORTREVISION= 3
|
||||
CATEGORIES= www
|
||||
MASTER_SITES= http://www.apache.org/dist/httpd/ \
|
||||
ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/httpd/ \
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
--- Makefile.tmpl.orig Thu Mar 14 00:05:27 2002
|
||||
+++ Makefile.tmpl Thu Jun 20 05:30:58 2002
|
||||
+++ Makefile.tmpl Sat Jun 22 09:33:52 2002
|
||||
@@ -270,10 +270,10 @@
|
||||
$(MKDIR) $(root)$(mandir)/man1
|
||||
$(MKDIR) $(root)$(mandir)/man8
|
||||
@ -13,7 +13,7 @@
|
||||
$(MKDIR) $(root)$(includedir)
|
||||
$(MKDIR) $(root)$(includedir)/xml
|
||||
$(MKDIR) $(root)$(runtimedir)
|
||||
@@ -459,33 +459,39 @@
|
||||
@@ -459,33 +459,29 @@
|
||||
# icons and distributed CGI scripts.
|
||||
install-data:
|
||||
@echo "===> [data: Installing initial data files]"
|
||||
@ -21,9 +21,6 @@
|
||||
- echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \
|
||||
- else \
|
||||
- echo "Copying tree $(TOP)/htdocs/ -> $(root)$(htdocsdir)/"; \
|
||||
+# -@if [ -f $(root)$(htdocsdir)/index.html ] || [ -f $(root)$(htdocsdir)/index.html.en ]; then \
|
||||
+# echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \
|
||||
+# else \
|
||||
+ echo "Copying tree $(TOP)/htdocs/ -> $(root)$(htdocsdir)-dist/"; \
|
||||
(cd $(TOP)/htdocs/ && $(TAR) $(TAROPT) - index* apache_pb.* ) |\
|
||||
- (cd $(root)$(htdocsdir)/ && $(TAR) -xf -); \
|
||||
@ -33,42 +30,37 @@
|
||||
- -@if [ -d $(TOP)/htdocs/manual ]; then \
|
||||
+ (cd $(root)$(htdocsdir)-dist/ && $(TAR) -xf -); \
|
||||
+ find $(root)$(htdocsdir)-dist/ -type d -exec chmod a+rx {} \; ; \
|
||||
+ find $(root)$(htdocsdir)-dist/ -type f -print | xargs chmod a+r ; \
|
||||
+# fi
|
||||
+# -@if [ -d $(TOP)/htdocs/manual ]; then \
|
||||
+ find $(root)$(htdocsdir)-dist/ -type f -print | xargs chmod a+r ;
|
||||
echo "Copying tree $(TOP)/htdocs/manual -> $(root)/$(manualdir)/"; \
|
||||
(cd $(TOP)/htdocs/manual/ && $(TAR) $(TAROPT) - *) |\
|
||||
(cd $(root)$(manualdir)/ && $(TAR) -xf -); \
|
||||
find $(root)$(manualdir)/ -type d -exec chmod a+rx {} \; ; \
|
||||
find $(root)$(manualdir)/ -type f -print | xargs chmod a+r ; \
|
||||
+# fi
|
||||
- find $(root)$(manualdir)/ -type f -print | xargs chmod a+r ; \
|
||||
+ find $(root)$(manualdir)/ -type f -print | xargs chmod a+r ;
|
||||
+ if [ ! -d $(root)$(htdocsdir)/ ]; then \
|
||||
+ $(LN) -sf $(root)$(htdocsdir)-dist $(root)$(htdocsdir); \
|
||||
fi
|
||||
- -@if [ -f $(root)$(cgidir)/printenv ]; then \
|
||||
- echo "[PRESERVING EXISTING CGI SUBDIR: $(root)$(cgidir)/]"; \
|
||||
- else \
|
||||
+# -@if [ -f $(root)$(cgidir)/printenv ]; then \
|
||||
+# echo "[PRESERVING EXISTING CGI SUBDIR: $(root)$(cgidir)/]"; \
|
||||
+# else \
|
||||
for script in printenv test-cgi; do \
|
||||
cat $(TOP)/cgi-bin/$${script} |\
|
||||
sed -e 's;^#!/.*perl;#!$(PERL);' \
|
||||
> $(TOP)/$(SRC)/.apaci.install.tmp; \
|
||||
- echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir)/$${script}"; \
|
||||
- $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir)/$${script}; \
|
||||
- done; \
|
||||
- fi
|
||||
+ echo "$(INSTALL_DATA) $(TOP)/conf/$${script}[*] $(root)$(cgidir)-dist/$${script}"; \
|
||||
+ $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(cgidir)-dist/$${script}; \
|
||||
done; \
|
||||
- fi
|
||||
+# fi
|
||||
+ done;
|
||||
+ if [ ! -d $(root)$(cgidir)/ ]; then \
|
||||
+ $(LN) -sf $(root)$(cgidir)-dist $(root)$(cgidir); \
|
||||
+ fi
|
||||
@echo "Copying tree $(TOP)/icons/ -> $(root)$(iconsdir)/"; \
|
||||
(cd $(TOP)/icons/ && $(TAR) $(TAROPT) - *) |\
|
||||
(cd $(root)$(iconsdir)/ && $(TAR) -xf -); \
|
||||
@@ -524,10 +530,10 @@
|
||||
@@ -524,10 +520,10 @@
|
||||
-e 's;logs/accept\.lock;$(runtimedir)/$(TARGET).lock;' \
|
||||
-e 's;logs/apache_runtime_status;$(runtimedir)/$(TARGET).scoreboard;' \
|
||||
-e 's;logs/httpd\.pid;$(runtimedir)/$(TARGET).pid;' \
|
||||
@ -83,3 +75,25 @@
|
||||
-e 's;conf/magic;$(sysconfdir)/magic;' \
|
||||
-e 's;conf/mime\.types;$(sysconfdir)/mime.types;' \
|
||||
-e 's;User nobody;User $(conf_user);' \
|
||||
@@ -537,8 +533,8 @@
|
||||
-e 's;ServerAdmin you@your.address;ServerAdmin $(conf_serveradmin);' \
|
||||
-e 's;ServerName new.host.name;ServerName $(conf_servername);' \
|
||||
> $(TOP)/$(SRC)/.apaci.install.tmp && \
|
||||
- echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${target_conf}.default"; \
|
||||
- $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sysconfdir)/$${target_conf}.default; \
|
||||
+ echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${target_conf}-dist"; \
|
||||
+ $(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sysconfdir)/$${target_conf}-dist; \
|
||||
if [ ! -f "$(root)$(sysconfdir)/$${target_conf}" ]; then \
|
||||
echo "$(INSTALL_DATA) $(TOP)/conf/$${conf}-dist[*] $(root)$(sysconfdir)/$${target_conf}"; \
|
||||
$(INSTALL_DATA) $(TOP)/$(SRC)/.apaci.install.tmp $(root)$(sysconfdir)/$${target_conf}; \
|
||||
@@ -547,8 +543,8 @@
|
||||
fi; \
|
||||
done
|
||||
-@for conf in mime.types magic; do \
|
||||
- echo "$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}.default"; \
|
||||
- $(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}.default; \
|
||||
+ echo "$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}-dist"; \
|
||||
+ $(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}-dist; \
|
||||
if [ ! -f "$(root)$(sysconfdir)/$${conf}" ]; then \
|
||||
echo "$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}"; \
|
||||
$(INSTALL_DATA) $(TOP)/conf/$${conf} $(root)$(sysconfdir)/$${conf}; \
|
||||
|
||||
Loading…
Reference in New Issue
Block a user