ports/66683: Upgrade to 1.3.31

Sun May 16 10:20:24 UTC 2004

>Number:         66683
>Category:       ports
>Synopsis:       Upgrade to 1.3.31
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun May 16 03:20:20 PDT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Jose Liang
>Release:        FreeBSD 5.2.1-RELEASE i386
>Organization:
>Environment:
System: FreeBSD matrix.jose.idv.tw 5.2.1-RELEASE 


	
>Description:
Upgrade Apache server from 1.3.29 to 1.3.31 	
Note: I don't know how to make a correct packing list, so I just use the way of Chapter 18 of Porter's Handbook. If there is something worng, please check that again.
>How-To-Repeat:
	
>Fix:
diff -dur apache13_old/Makefile apache13/Makefile

--- apache13_old/Makefile       Sun May 16 17:25:00 2004
+++ apache13/Makefile   Sun May 16 17:21:04 2004
@@ -6,14 +6,13 @@
 #

 PORTNAME=      apache
-PORTVERSION=    1.3.29
-PORTREVISION=   6
+PORTVERSION=    1.3.31
 CATEGORIES=    www
 MASTER_SITES=   ${MASTER_SITE_APACHE_HTTPD}
 DISTNAME=      apache_${PORTVERSION}

 #PATCH_SITES=   ${MASTER_SITE_APACHE_HTTPD}
-#PATCH_SITE_SUBDIR=     patches/apply_to_1.3.29/
+#PATCH_SITE_SUBDIR=     patches/apply_to_1.3.31/
 #PATCHFILES=
 #PATCH_DIST_ARGS= -d ${WRKSRC}/src --forward --quiet -E ${PATCH_DIST_STRIP}


diff -dur apache13_old/distinfo apache13/distinfo
--- apache13_old/distinfo       Sun May 16 17:25:00 2004
+++ apache13/distinfo   Sun May 16 17:22:20 2004
@@ -1 +1 @@
-MD5 (apache_1.3.29.tar.gz) = e97fe9bf51dc2c9c233d53f63b1347e3
+MD5 (apache_1.3.31.tar.gz) = bd548a06ac48dda496b4e613572bb020


diff -dur apache13_old/pkg-plist apache13/pkg-plist
--- apache13_old/pkg-plist	Sun May 16 17:25:00 2004
+++ apache13/pkg-plist	Sun May 16 18:01:05 2004
@@ -1,23 +1,17 @@
- at comment $FreeBSD: ports/www/apache13/pkg-plist,v 1.51 2004/04/30 21:44:50 nork Exp $
 bin/checkgid
 bin/dbmmanage
 bin/htdigest
 bin/htpasswd
- at unexec if cmp -s %D/etc/apache/access.conf %D/etc/apache/access.conf-dist; then rm -f %D/etc/apache/access.conf; fi
-etc/apache/access.conf-dist
- at exec [ -f %B/access.conf ] || cp %B/%f %B/access.conf
- at unexec if cmp -s %D/etc/apache/httpd.conf %D/etc/apache/httpd.conf-dist; then rm -f %D/etc/apache/httpd.conf; fi
-etc/apache/httpd.conf-dist
- at exec [ -f %B/httpd.conf ] || cp %B/%f %B/httpd.conf
- at unexec if cmp -s %D/etc/apache/magic %D/etc/apache/magic-dist; then rm -f %D/etc/apache/magic; fi
-etc/apache/magic-dist
- at exec [ -f %B/magic ] || cp %B/%f %B/magic
- at unexec if cmp -s %D/etc/apache/mime.types %D/etc/apache/mime.types-dist; then rm -f %D/etc/apache/mime.types; fi
-etc/apache/mime.types-dist
- at exec [ -f %B/mime.types ] || cp %B/%f %B/mime.types
- at unexec if cmp -s %D/etc/apache/srm.conf %D/etc/apache/srm.conf-dist; then rm -f %D/etc/apache/srm.conf; fi
-etc/apache/srm.conf-dist
- at exec [ -f %B/srm.conf ] || cp %B/%f %B/srm.conf
+etc/apache/access.conf
+etc/apache/access.conf.default
+etc/apache/httpd.conf
+etc/apache/httpd.conf.default
+etc/apache/magic
+etc/apache/magic.default
+etc/apache/mime.types
+etc/apache/mime.types.default
+etc/apache/srm.conf
+etc/apache/srm.conf.default
 etc/rc.d/apache.sh
 include/apache/ap.h
 include/apache/ap_alloc.h
@@ -85,6 +79,7 @@
 libexec/apache/mod_include.so
 libexec/apache/mod_info.so
 libexec/apache/mod_log_config.so
+libexec/apache/mod_log_forensic.so
 libexec/apache/mod_mime.so
 libexec/apache/mod_mime_magic.so
 libexec/apache/mod_mmap_static.so
@@ -97,46 +92,21 @@
 libexec/apache/mod_userdir.so
 libexec/apache/mod_usertrack.so
 libexec/apache/mod_vhost_alias.so
+man/man1/dbmmanage.1
+man/man1/htdigest.1
+man/man1/htpasswd.1
+man/man8/ab.8
+man/man8/apachectl.8
+man/man8/apxs.8
+man/man8/httpd.8
+man/man8/logresolve.8
+man/man8/rotatelogs.8
 sbin/ab
 sbin/apachectl
 sbin/apxs
 sbin/httpd
 sbin/logresolve
 sbin/rotatelogs
-%%SUB_SUEXEC%%sbin/suexec
-www/data-dist/EXAMPLE_DIRECTORY-DONT_ADD_OR_TOUCH_ANYTHING
- at exec [ -d %D/www/data/ ] || ln -fs %B %D/www/data
-www/data-dist/apache_pb.gif
-www/data-dist/index.html.ca
-www/data-dist/index.html.cz
-www/data-dist/index.html.de
-www/data-dist/index.html.dk
-www/data-dist/index.html.ee
-www/data-dist/index.html.el
-www/data-dist/index.html.en
-www/data-dist/index.html.es
-www/data-dist/index.html.fr
-www/data-dist/index.html.he.iso8859-8
-www/data-dist/index.html.it
-www/data-dist/index.html.ja.jis
-www/data-dist/index.html.kr.iso-kr
-www/data-dist/index.html.lb.utf8
-www/data-dist/index.html.nl
-www/data-dist/index.html.nn
-www/data-dist/index.html.no
-www/data-dist/index.html.po.iso-pl
-www/data-dist/index.html.pt
-www/data-dist/index.html.pt-br
-www/data-dist/index.html.ru.cp-1251
-www/data-dist/index.html.ru.cp866
-www/data-dist/index.html.ru.iso-ru
-www/data-dist/index.html.ru.koi8-r
-www/data-dist/index.html.ru.ucs2
-www/data-dist/index.html.ru.ucs4
-www/data-dist/index.html.ru.utf8
-www/data-dist/index.html.se
-www/data-dist/index.html.zh-tw.big5
-share/doc/apache/FAQ.html
 share/doc/apache/LICENSE
 share/doc/apache/bind.html.en
 share/doc/apache/bind.html.fr
@@ -207,7 +177,9 @@
 share/doc/apache/keepalive.html.en
 share/doc/apache/keepalive.html.html
 share/doc/apache/keepalive.html.ja.jis
-share/doc/apache/location.html
+share/doc/apache/location.html.en
+share/doc/apache/location.html.html
+share/doc/apache/location.html.ja.jis
 share/doc/apache/logs.html
 share/doc/apache/man-template.html
 share/doc/apache/misc/API.html
@@ -276,7 +248,9 @@
 share/doc/apache/mod/mod_auth_db.html
 share/doc/apache/mod/mod_auth_dbm.html
 share/doc/apache/mod/mod_auth_digest.html
-share/doc/apache/mod/mod_autoindex.html
+share/doc/apache/mod/mod_autoindex.html.en
+share/doc/apache/mod/mod_autoindex.html.html
+share/doc/apache/mod/mod_autoindex.html.ja.jis
 share/doc/apache/mod/mod_browser.html
 share/doc/apache/mod/mod_cern_meta.html
 share/doc/apache/mod/mod_cgi.html.en
@@ -305,6 +279,8 @@
 share/doc/apache/mod/mod_log_config.html.en
 share/doc/apache/mod/mod_log_config.html.html
 share/doc/apache/mod/mod_log_config.html.ja.jis
+share/doc/apache/mod/mod_log_forensic.html.en
+share/doc/apache/mod/mod_log_forensic.html.html
 share/doc/apache/mod/mod_log_referer.html
 share/doc/apache/mod/mod_mime.html.en
 share/doc/apache/mod/mod_mime.html.html
@@ -377,7 +353,6 @@
 share/doc/apache/programs/suexec.html.html
 share/doc/apache/programs/suexec.html.ja.jis
 share/doc/apache/readme-tpf.html
-share/doc/apache/search/manual-index.cgi
 share/doc/apache/sections.html.en
 share/doc/apache/sections.html.html
 share/doc/apache/sections.html.ja.jis
@@ -423,11 +398,43 @@
 share/doc/apache/win_service.html.html
 share/doc/apache/win_service.html.ja.jis
 share/doc/apache/windows.html.en
+share/doc/apache/windows.html.html
 share/doc/apache/windows.html.ja.jis
-www/cgi-bin-dist/EXAMPLE_DIRECTORY-DONT_ADD_OR_TOUCH_ANYTHING
- at exec [ -d %D/www/cgi-bin/ ] || ln -fs %B %D/www/cgi-bin
-www/cgi-bin-dist/printenv
-www/cgi-bin-dist/test-cgi
+share/nls/POSIX
+share/nls/en_US.US-ASCII
+www/cgi-bin/printenv
+www/cgi-bin/test-cgi
+www/data/apache_pb.gif
+www/data/index.html.ca
+www/data/index.html.cz
+www/data/index.html.de
+www/data/index.html.dk
+www/data/index.html.ee
+www/data/index.html.el
+www/data/index.html.en
+www/data/index.html.es
+www/data/index.html.fr
+www/data/index.html.he.iso8859-8
+www/data/index.html.hu
+www/data/index.html.it
+www/data/index.html.ja.jis
+www/data/index.html.kr.iso-kr
+www/data/index.html.lb.utf8
+www/data/index.html.nl
+www/data/index.html.nn
+www/data/index.html.no
+www/data/index.html.po.iso-pl
+www/data/index.html.pt
+www/data/index.html.pt-br
+www/data/index.html.ru.cp-1251
+www/data/index.html.ru.cp866
+www/data/index.html.ru.iso-ru
+www/data/index.html.ru.koi8-r
+www/data/index.html.ru.ucs2
+www/data/index.html.ru.ucs4
+www/data/index.html.ru.utf8
+www/data/index.html.se
+www/data/index.html.zh-tw.big5
 www/icons/README
 www/icons/a.gif
 www/icons/a.png
@@ -646,24 +653,20 @@
 www/icons/world1.png
 www/icons/world2.gif
 www/icons/world2.png
- at exec mkdir -p %D/www/proxy
- at unexec if [ -L %D/www/cgi-bin ]; then rm -f %D/www/cgi-bin; fi
- at unexec if [ -L %D/www/data ]; then rm -f %D/www/data; fi
- at dirrm etc/apache
- at dirrm include/apache/xml
- at dirrm include/apache
- at dirrm libexec/apache
- at dirrm share/doc/apache/howto
- at dirrm share/doc/apache/images
- at dirrm share/doc/apache/misc
- at dirrm share/doc/apache/mod
- at dirrm share/doc/apache/programs
- at dirrm share/doc/apache/search
- at dirrm share/doc/apache/vhosts
- at dirrm share/doc/apache
- at dirrm www/data-dist
- at dirrm www/cgi-bin-dist
+ at dirrm www/proxy
 @dirrm www/icons/small
 @dirrm www/icons
- at dirrm www/proxy
+ at dirrm www/data
+ at dirrm www/cgi-bin
 @dirrm www
+ at dirrm share/doc/apache/vhosts
+ at dirrm share/doc/apache/programs
+ at dirrm share/doc/apache/mod
+ at dirrm share/doc/apache/misc
+ at dirrm share/doc/apache/images
+ at dirrm share/doc/apache/howto
+ at dirrm share/doc/apache
+ at dirrm libexec/apache
+ at dirrm include/apache/xml
+ at dirrm include/apache
+ at dirrm etc/apache
	


>Release-Note:
>Audit-Trail:
>Unformatted:

