[Midnightbsd-cvs] mports: www/apache22: Update to 2.2.6.

ctriv at midnightbsd.org ctriv at midnightbsd.org
Wed Sep 26 14:49:20 EDT 2007 

Log Message:
-----------
Update to 2.2.6.  
This port has only been lightly tested.  make sure to test it in a safe
envirement before deploying for production use.

Modified Files:
--------------
    mports/www/apache22:
        Makefile (r1.4 -> r1.5)
        distinfo (r1.2 -> r1.3)
        pkg-plist (r1.2 -> r1.3)
    mports/www/apache22/files:
        patch-Makefile.in (r1.1 -> r1.2)
        patch-docs_conf_extra_httpd-ssl.conf.in (r1.1 -> r1.2)

-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/www/apache22/pkg-plist,v
retrieving revision 1.2
retrieving revision 1.3
diff -Lwww/apache22/pkg-plist -Lwww/apache22/pkg-plist -u -r1.2 -r1.3
--- www/apache22/pkg-plist
+++ www/apache22/pkg-plist
@@ -275,11 +275,6 @@
 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
 www/apache22/error/HTTP_BAD_GATEWAY.html.var
 www/apache22/error/HTTP_BAD_REQUEST.html.var
@@ -431,7 +426,6 @@
 www/apache22/icons/screw2.png
 www/apache22/icons/script.gif
 www/apache22/icons/script.png
-www/apache22/icons/small/README.txt
 www/apache22/icons/small/back.gif
 www/apache22/icons/small/back.png
 www/apache22/icons/small/binary.gif
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/www/apache22/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -Lwww/apache22/Makefile -Lwww/apache22/Makefile -u -r1.4 -r1.5
--- www/apache22/Makefile
+++ www/apache22/Makefile
@@ -9,19 +9,17 @@
 #
 
 PORTNAME=	apache
-PORTVERSION=	2.2.4
-PORTREVISION=	1
+PORTVERSION=	2.2.6
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_APACHE_HTTPD} \
 		${MASTER_SITE_LOCAL:S/%SUBDIR%\//clement\/:aprmysql/}
 DISTNAME=	httpd-${PORTVERSION}
-DISTFILES=	${DISTNAME}.tar.bz2 \
-		apr_dbd_mysql.rev-57.c:aprmysql
+DISTFILES=	${DISTNAME}.tar.bz2 
 DIST_SUBDIR=	apache22
-EXTRACT_ONLY=	${DISTNAME}.tar.bz2
 
 MAINTAINER?=	ports at MidnightBSD.org
 COMMENT?=	Version 2.2 of Apache web server with ${WITH_MPM:L} MPM.
+LICENSE=	apache2
 
 LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
 
@@ -161,10 +159,6 @@
 show-options:
 	@${SED} -ne 's/^##//p' ${APACHEDIR}/Makefile.doc
 
-post-extract:
-	@${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/apr_dbd_mysql.rev-57.c \
-		${WRKSRC}/srclib/apr-util/dbd/apr_dbd_mysql.c
-
 post-patch:
 	@${RM} -f ${WRKSRC}/docs/docroot/*.bak
 	@${REINPLACE_CMD} -e 's," PLATFORM ",MidnightBSD,' \
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/www/apache22/distinfo,v
retrieving revision 1.2
retrieving revision 1.3
diff -Lwww/apache22/distinfo -Lwww/apache22/distinfo -u -r1.2 -r1.3
--- www/apache22/distinfo
+++ www/apache22/distinfo
@@ -1,6 +1,6 @@
-MD5 (apache22/httpd-2.2.4.tar.bz2) = 536c86c7041515a25dd8bad3611da9a3
-SHA256 (apache22/httpd-2.2.4.tar.bz2) = 08ab82eae6418e265d361730e7eadc7d6966dffdb66ee07bd4d9af3f2b28dfc8
-SIZE (apache22/httpd-2.2.4.tar.bz2) = 4930375
+MD5 (apache22/httpd-2.2.6.tar.bz2) = 203bea91715064f0c787f6499d33a377
+SHA256 (apache22/httpd-2.2.6.tar.bz2) = f27cd9df50a2acd9df8f37520f62f6ce51758689d425ead5883e75ff5ed6548c
+SIZE (apache22/httpd-2.2.6.tar.bz2) = 4717066
 MD5 (apache22/apr_dbd_mysql.rev-57.c) = 506293fef131712113c145260809a894
 SHA256 (apache22/apr_dbd_mysql.rev-57.c) = f72719995221cd3cb9515ef55d2c4e6d8c0aad08fbf22626eb45be0655833f19
 SIZE (apache22/apr_dbd_mysql.rev-57.c) = 24130
Index: patch-docs_conf_extra_httpd-ssl.conf.in
===================================================================
RCS file: /home/cvs/mports/www/apache22/files/patch-docs_conf_extra_httpd-ssl.conf.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lwww/apache22/files/patch-docs_conf_extra_httpd-ssl.conf.in -Lwww/apache22/files/patch-docs_conf_extra_httpd-ssl.conf.in -u -r1.1 -r1.2
--- www/apache22/files/patch-docs_conf_extra_httpd-ssl.conf.in
+++ www/apache22/files/patch-docs_conf_extra_httpd-ssl.conf.in
@@ -1,13 +1,13 @@
---- docs/conf/extra/httpd-ssl.conf.in.orig	Sun Oct 30 19:40:45 2005
-+++ docs/conf/extra/httpd-ssl.conf.in	Sun Oct 30 19:41:50 2005
+--- docs/conf/extra/httpd-ssl.conf.in.orig	Wed Mar  7 08:33:58 2007
++++ docs/conf/extra/httpd-ssl.conf.in	Sun Sep  9 11:59:51 2007
 @@ -77,8 +77,8 @@
  DocumentRoot "@exp_htdocsdir@"
  ServerName www.example.com:443
  ServerAdmin you at example.com
--ErrorLog @exp_logfiledir@/error_log
--TransferLog @exp_logfiledir@/access_log
-+ErrorLog @exp_logfiledir@/httpd-error.log
-+TransferLog @exp_logfiledir@/httpd-access.log
+-ErrorLog "@exp_logfiledir@/error_log"
+-TransferLog "@exp_logfiledir@/access_log"
++ErrorLog "@exp_logfiledir@/httpd-error.log"
++TransferLog "@exp_logfiledir@/httpd-access.log"
  
  #   SSL Engine Switch:
  #   Enable/Disable SSL for this virtual host.
@@ -15,8 +15,8 @@
  #   Per-Server Logging:
  #   The home of a custom SSL log file. Use this when you want a
  #   compact non-error SSL logfile on a virtual host basis.
--CustomLog @exp_logfiledir@/ssl_request_log \
-+CustomLog @exp_logfiledir@/httpd-ssl_request.log \
+-CustomLog "@exp_logfiledir@/ssl_request_log" \
++CustomLog "@exp_logfiledir@/httpd-ssl_request.log" \
            "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"
  
  </VirtualHost>                                  
Index: patch-Makefile.in
===================================================================
RCS file: /home/cvs/mports/www/apache22/files/patch-Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lwww/apache22/files/patch-Makefile.in -Lwww/apache22/files/patch-Makefile.in -u -r1.1 -r1.2
--- www/apache22/files/patch-Makefile.in
+++ www/apache22/files/patch-Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Sun Nov 13 06:33:15 2005
-+++ Makefile.in	Sat Dec  3 22:10:42 2005
+--- 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,65 @@
  	    	fi; \
  	    	fi; \
  	    done ; \
-@@ -206,12 +208,14 @@
+@@ -117,48 +119,28 @@
+ 	doxygen $(top_srcdir)/docs/doxygen.conf
+ 
+ install-htdocs:
+-	- at 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
++		test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp index.html $(DESTDIR)$(htdocsdir)) || true
++		( [ ! -f $(DESTDIR)$(htdocsdir)/index.html ] && cp -p $(DESTDIR)$(EXAMPLESDIR)/index.html $(DESTDIR)$(htdocsdir)/index.html) || true
+ 
+ install-error:
+-	- at 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:
+-	- at 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:
+-	- at 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 +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
@@ -40,7 +98,7 @@
  	  $(RSYNC) --exclude .svn -rlpt --numeric-ids $(top_srcdir)/docs/manual/ $(DESTDIR)$(manualdir)/; \
  	else \
  	  cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir); \
- 	  cd $(DESTDIR)$(manualdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null; \
+ 	  cd $(DESTDIR)$(manualdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
  	fi
 +.endif

More information about the Midnightbsd-cvs mailing list