mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-22 08:58:47 +00:00
Code Issues Releases Activity

- Fix PCRE_FROM_PORTS. it wasn't processed by OPTIONS stff [1]

Browse Source 
- Preserve index.html
- We no longer install images in default DocumentRoot (there're still in icons/)
- Various plist cleanup
- bump PORTREVISION since we are now safe with index.html

Reminded by:	bland@
This commit is contained in:
Clement Laforet 2007-09-20 07:57:36 +00:00
parent 51a3373392
commit d4538af23f
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=199816
3 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
www/apache22/Makefile
View File

@ -9,6 +9,7 @@
PORTNAME= apache
PORTVERSION= 2.2.6
PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD} \
${MASTER_SITE_LOCAL:S/%SUBDIR%\//clement\/:aprmysql/}

21
www/apache22/files/patch-Makefile.in
View File

@ -1,5 +1,5 @@
--- Makefile.in.orig Tue Apr 24 13:08:01 2007
+++ Makefile.in Wed Sep 19 21:28:08 2007
--- Makefile.in.orig 2007-04-24 13:08:01.000000000 +0200
+++ Makefile.in 2007-09-20 08:47:23.000000000 +0200
@@ -31,9 +31,11 @@
install-conf:
@echo Installing configuration files
@ -31,7 +31,7 @@
fi; \
fi; \
done ; \
@@ -117,48 +119,32 @@
@@ -117,48 +119,28 @@
doxygen $(top_srcdir)/docs/doxygen.conf
install-htdocs:
@ -41,14 +41,15 @@
- 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; \
- 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;
+ test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp index.html $(DESTDIR)$(EXAMPLESDIR)) && \
+ ( [ ! -f $(DESTDIR)$(htdocsdir)/index.html ] && cp -p $(DESTDIR)$(EXAMPLESDIR)/index.html $(DESTDIR)$(htdocsdir)/index.html)
install-error:
- -@if [ -d $(DESTDIR)$(errordir) ]; then \
@ -88,7 +89,7 @@
install-other:
@test -d $(DESTDIR)$(logfiledir) || $(MKINSTALLDIRS) $(DESTDIR)$(logfiledir)
@@ -206,12 +192,14 @@
@@ -206,12 +188,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

11
www/apache22/pkg-plist
View File

@ -275,12 +275,9 @@ share/apache22/build/rules.mk
share/apache22/build/special.mk
www/apache22/cgi-bin/printenv
www/apache22/cgi-bin/test-cgi
www/apache22/data/apache_pb.gif
www/apache22/data/apache_pb.png
www/apache22/data/apache_pb22.gif
www/apache22/data/apache_pb22.png
www/apache22/data/apache_pb22_ani.gif
www/apache22/data/index.html
@unexec if cmp -s %D/www/apache22/data/index.html %D/%%EXAMPLESDIR%%/index.html; then rm -f %D/www/apache22/data/index.html; fi
%%EXAMPLESDIR%%/index.html
@exec [ -f %D/www/apache22/data/index.html ] || cp %D/%%EXAMPLESDIR%%/www/apache22/data/index.html %D/www/apache22/data/index.html
www/apache22/error/HTTP_BAD_GATEWAY.html.var
www/apache22/error/HTTP_BAD_REQUEST.html.var
www/apache22/error/HTTP_FORBIDDEN.html.var
@ -528,7 +525,7 @@ www/apache22/icons/world2.png
@dirrm www/apache22/icons
@dirrm www/apache22/error/include
@dirrm www/apache22/error
@dirrm www/apache22/data
@dirrmtry www/apache22/data
@dirrm www/apache22/cgi-bin
@dirrm %%EXAMPLESDIR%%/extra
@dirrm %%EXAMPLESDIR%%