diff options
author | ache <ache@FreeBSD.org> | 2002-06-20 01:35:05 +0000 |
---|---|---|
committer | ache <ache@FreeBSD.org> | 2002-06-20 01:35:05 +0000 |
commit | f0042a8bed7a4bcfcfd8fc97aa40f66020ec383c (patch) | |
tree | 504d6407056288753fa771b19743b90194ca33df /www/apache13 | |
parent | d06d3ce6eebe73af64234f65c9a54037c3cdf6cd (diff) | |
download | FreeBSD-ports-f0042a8bed7a4bcfcfd8fc97aa40f66020ec383c.zip FreeBSD-ports-f0042a8bed7a4bcfcfd8fc97aa40f66020ec383c.tar.gz |
Don't remove data.default & cgi-bin.default on install
Diffstat (limited to 'www/apache13')
-rw-r--r-- | www/apache13/Makefile | 3 | ||||
-rw-r--r-- | www/apache13/files/patch-ab | 12 |
2 files changed, 7 insertions, 8 deletions
diff --git a/www/apache13/Makefile b/www/apache13/Makefile index e1a5bb5..09dc848 100644 --- a/www/apache13/Makefile +++ b/www/apache13/Makefile @@ -7,6 +7,7 @@ PORTNAME= apache PORTVERSION= 1.3.26 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://www.apache.org/dist/httpd/ \ ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/httpd/ \ @@ -25,7 +26,7 @@ MASTER_SITES= http://www.apache.org/dist/httpd/ \ ftp://apache.nextpath.com/pub/apache/dist/httpd/ DISTNAME= apache_${PORTVERSION} -PATCH_SITES= http://www.apache.org/dist/httpd/patches/apply_to_1.3.26/ +#PATCH_SITES= http://www.apache.org/dist/httpd/patches/apply_to_1.3.26/ #PATCHFILES= #PATCH_DIST_ARGS= -d ${WRKSRC}/src --forward --quiet -E ${PATCH_DIST_STRIP} diff --git a/www/apache13/files/patch-ab b/www/apache13/files/patch-ab index 7e823f4..a99bd73 100644 --- a/www/apache13/files/patch-ab +++ b/www/apache13/files/patch-ab @@ -1,21 +1,19 @@ ---- Makefile.tmpl.orig Wed Nov 28 18:02:12 2001 -+++ Makefile.tmpl Fri Jan 25 07:48:19 2002 -@@ -270,10 +270,12 @@ +--- Makefile.tmpl.orig Thu Mar 14 00:05:27 2002 ++++ Makefile.tmpl Thu Jun 20 05:30:58 2002 +@@ -270,10 +270,10 @@ $(MKDIR) $(root)$(mandir)/man1 $(MKDIR) $(root)$(mandir)/man8 $(MKDIR) $(root)$(sysconfdir) - $(MKDIR) $(root)$(htdocsdir) -+ $(RM) -rf $(root)$(htdocsdir).default + $(MKDIR) $(root)$(htdocsdir).default $(MKDIR) $(root)$(manualdir) $(MKDIR) $(root)$(iconsdir) - $(MKDIR) $(root)$(cgidir) -+ $(RM) -rf $(root)$(cgidir).default + $(MKDIR) $(root)$(cgidir).default $(MKDIR) $(root)$(includedir) $(MKDIR) $(root)$(includedir)/xml $(MKDIR) $(root)$(runtimedir) -@@ -459,33 +461,39 @@ +@@ -459,33 +459,39 @@ # icons and distributed CGI scripts. install-data: @echo "===> [data: Installing initial data files]" @@ -70,7 +68,7 @@ @echo "Copying tree $(TOP)/icons/ -> $(root)$(iconsdir)/"; \ (cd $(TOP)/icons/ && $(TAR) $(TAROPT) - *) |\ (cd $(root)$(iconsdir)/ && $(TAR) -xf -); \ -@@ -524,10 +532,10 @@ +@@ -524,10 +530,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;' \ |