4 files changed, 130 insertions, 43 deletions

diff --git a/www/aolserver/Makefile b/www/aolserver/Makefile
index c4f879a7828a..443174ccbfed 100644
--- a/www/aolserver/Makefile
+++ b/www/aolserver/Makefile
@@ -1,19 +1,19 @@
 # New ports collection makefile for:	aolserver
 # Date created:		13 January 2000
-# Whom:			Matt Braithwaite <mab@red-bean.com>
+# Whom:			Matthew Braithwaite <mab@red-bean.com>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	aolserver
-PORTVERSION=	3.1
+PORTVERSION=	3.2
 CATEGORIES=	www
-MASTER_SITES=	ftp://ftp.aolserver.com/server/aolserver3_1/
-DISTNAME=	aolserver3_1-source
+MASTER_SITES=	ftp://ftp.aolserver.com/server/aolserver3_2/
+DISTNAME=	aolserver3_2-source
 
 MAINTAINER=	mab@red-bean.com
 
-WRKSRC=		${WRKDIR}/aolserver3_1
+WRKSRC=		${WRKDIR}/aolserver3_2
 
 USE_GMAKE=	yes
 
@@ -25,17 +25,14 @@ post-extract:
 post-install:
 # Headers
 # nsd.h is needed for, e.g., building the Postgres driver
-	${MKDIR} ${PREFIX}/include/aolserver
-.for header in include/*.h nsd/nsd.h
-	${INSTALL_DATA} ${WRKSRC}/${header} ${PREFIX}/include/aolserver
+.for header in nsd/nsd.h
+	 ${INSTALL_DATA} ${WRKSRC}/${header} ${PREFIX}/aolserver/include
 .endfor
 
-# Libraries
-	${INSTALL_DATA} ${WRKSRC}/nspd/libnspd.a ${PREFIX}/lib
-
 # Other documentation
-	${MKDIR} ${PREFIX}/share/doc/aolserver
-	${TAR} -C ${WRKSRC} -c -f - ChangeLog LICENSE.txt README.txt doc | ${TAR} -C ${PREFIX}/share/doc/aolserver -x -f -
+	 ${MKDIR} ${PREFIX}/share/doc/aolserver
+	 ${TAR} -C ${WRKSRC} -c -f - ChangeLog README | ${TAR} -C ${PREFIX}/share/doc/aolserver -x -f -
+	 ${TAR} -C ${WRKSRC}/doc -c -f - . | ${TAR} -C ${PREFIX}/share/doc/aolserver -x -f -
 
 # Permissions
 	${CHOWN} nobody.nogroup ${PREFIX}/aolserver/servers/server1/modules/nslog
diff --git a/www/aolserver/distinfo b/www/aolserver/distinfo
index 946860d67112..1a3bb1fca258 100644
--- a/www/aolserver/distinfo
+++ b/www/aolserver/distinfo
@@ -1 +1 @@
-MD5 (aolserver3_1-source.tar.gz) = 1cf4c58bec0b9804387d37dc9341434d
+MD5 (aolserver3_2-source.tar.gz) = c2e5db0f719cb76af8b7cc28bcc53f0b
diff --git a/www/aolserver/pkg-message b/www/aolserver/pkg-message
index 7db1ff556361..e119861697f2 100644
--- a/www/aolserver/pkg-message
+++ b/www/aolserver/pkg-message
@@ -1,9 +1,9 @@
 
 Assuming you have changed to /usr/local, please copy
-aolserver/nsd.tcl.sample to aolserver/nsd.tcl and season to
-taste.  An example server is in at aolserver/servers/server1, and
-you should similarly copy the contents of this directory to, e.g.,
-aolserver/servers/www.mydomain.com before modifying them.  
+aolserver/sample-config.tcl to aolserver/nsd.tcl and season to taste.
+An example server is in at aolserver/servers/server1, and you should
+similarly copy the contents of this directory to, e.g.,
+aolserver/servers/www.mydomain.com before modifying them.
 
 These files are examples only and will be deleted if you remove this
 port.
diff --git a/www/aolserver/pkg-plist b/www/aolserver/pkg-plist
index afdd9a3e3ac9..6533c66ca44c 100644
--- a/www/aolserver/pkg-plist
+++ b/www/aolserver/pkg-plist
@@ -11,19 +11,111 @@ aolserver/bin/nsext.so
 aolserver/bin/nsunix.so
 aolserver/bin/nsvhr.so
 aolserver/modules/tcl/util.tcl
-aolserver/modules/tcl/fastpath.tcl
+aolserver/modules/tcl/debug.tcl
+aolserver/modules/tcl/namespace.tcl
 aolserver/modules/tcl/file.tcl
 aolserver/modules/tcl/form.tcl
 aolserver/modules/tcl/http.tcl
 aolserver/modules/tcl/init.tcl
 aolserver/modules/tcl/modlog.tcl
-aolserver/modules/tcl/namespace.tcl
-aolserver/modules/tcl/nsdb.tcl
 aolserver/modules/tcl/prodebug.tcl
+aolserver/modules/tcl/nsdb.tcl
 aolserver/modules/tcl/sendmail.tcl
-aolserver/modules/tcl/debug.tcl
+aolserver/modules/tcl/tcl.html
+aolserver/modules/tcl/fastpath.tcl
 aolserver/modules/tcl/nsperm/compat.tcl
 aolserver/modules/tcl/nsperm/init.tcl
+aolserver/lib/tcl8.3/msgcat1.0/pkgIndex.tcl
+aolserver/lib/tcl8.3/msgcat1.0/msgcat.tcl
+aolserver/lib/tcl8.3/encoding/symbol.enc
+aolserver/lib/tcl8.3/encoding/ascii.enc
+aolserver/lib/tcl8.3/encoding/big5.enc
+aolserver/lib/tcl8.3/encoding/cp1250.enc
+aolserver/lib/tcl8.3/encoding/cp1251.enc
+aolserver/lib/tcl8.3/encoding/cp1252.enc
+aolserver/lib/tcl8.3/encoding/cp1253.enc
+aolserver/lib/tcl8.3/encoding/cp1254.enc
+aolserver/lib/tcl8.3/encoding/cp1255.enc
+aolserver/lib/tcl8.3/encoding/cp1256.enc
+aolserver/lib/tcl8.3/encoding/cp1257.enc
+aolserver/lib/tcl8.3/encoding/cp1258.enc
+aolserver/lib/tcl8.3/encoding/cp437.enc
+aolserver/lib/tcl8.3/encoding/cp737.enc
+aolserver/lib/tcl8.3/encoding/cp775.enc
+aolserver/lib/tcl8.3/encoding/cp850.enc
+aolserver/lib/tcl8.3/encoding/cp852.enc
+aolserver/lib/tcl8.3/encoding/cp855.enc
+aolserver/lib/tcl8.3/encoding/cp857.enc
+aolserver/lib/tcl8.3/encoding/cp860.enc
+aolserver/lib/tcl8.3/encoding/cp861.enc
+aolserver/lib/tcl8.3/encoding/cp862.enc
+aolserver/lib/tcl8.3/encoding/cp863.enc
+aolserver/lib/tcl8.3/encoding/cp864.enc
+aolserver/lib/tcl8.3/encoding/cp865.enc
+aolserver/lib/tcl8.3/encoding/cp866.enc
+aolserver/lib/tcl8.3/encoding/cp869.enc
+aolserver/lib/tcl8.3/encoding/cp874.enc
+aolserver/lib/tcl8.3/encoding/cp932.enc
+aolserver/lib/tcl8.3/encoding/cp936.enc
+aolserver/lib/tcl8.3/encoding/cp949.enc
+aolserver/lib/tcl8.3/encoding/cp950.enc
+aolserver/lib/tcl8.3/encoding/gb12345.enc
+aolserver/lib/tcl8.3/encoding/euc-cn.enc
+aolserver/lib/tcl8.3/encoding/euc-jp.enc
+aolserver/lib/tcl8.3/encoding/euc-kr.enc
+aolserver/lib/tcl8.3/encoding/iso2022-jp.enc
+aolserver/lib/tcl8.3/encoding/gb1988.enc
+aolserver/lib/tcl8.3/encoding/gb2312.enc
+aolserver/lib/tcl8.3/encoding/macCentEuro.enc
+aolserver/lib/tcl8.3/encoding/iso2022-kr.enc
+aolserver/lib/tcl8.3/encoding/iso2022.enc
+aolserver/lib/tcl8.3/encoding/iso8859-1.enc
+aolserver/lib/tcl8.3/encoding/iso8859-2.enc
+aolserver/lib/tcl8.3/encoding/iso8859-3.enc
+aolserver/lib/tcl8.3/encoding/iso8859-4.enc
+aolserver/lib/tcl8.3/encoding/shiftjis.enc
+aolserver/lib/tcl8.3/encoding/jis0201.enc
+aolserver/lib/tcl8.3/encoding/iso8859-5.enc
+aolserver/lib/tcl8.3/encoding/iso8859-6.enc
+aolserver/lib/tcl8.3/encoding/iso8859-7.enc
+aolserver/lib/tcl8.3/encoding/iso8859-8.enc
+aolserver/lib/tcl8.3/encoding/iso8859-9.enc
+aolserver/lib/tcl8.3/encoding/jis0208.enc
+aolserver/lib/tcl8.3/encoding/jis0212.enc
+aolserver/lib/tcl8.3/encoding/koi8-r.enc
+aolserver/lib/tcl8.3/encoding/ksc5601.enc
+aolserver/lib/tcl8.3/encoding/macCroatian.enc
+aolserver/lib/tcl8.3/encoding/macCyrillic.enc
+aolserver/lib/tcl8.3/encoding/macDingbats.enc
+aolserver/lib/tcl8.3/encoding/macGreek.enc
+aolserver/lib/tcl8.3/encoding/macIceland.enc
+aolserver/lib/tcl8.3/encoding/macJapan.enc
+aolserver/lib/tcl8.3/encoding/macRoman.enc
+aolserver/lib/tcl8.3/encoding/macRomania.enc
+aolserver/lib/tcl8.3/encoding/macThai.enc
+aolserver/lib/tcl8.3/encoding/macTurkish.enc
+aolserver/lib/tcl8.3/encoding/macUkraine.enc
+aolserver/lib/tcl8.3/encoding/dingbats.enc
+aolserver/lib/tcl8.3/http1.0/pkgIndex.tcl
+aolserver/lib/tcl8.3/http1.0/http.tcl
+aolserver/lib/tcl8.3/http2.3/pkgIndex.tcl
+aolserver/lib/tcl8.3/http2.3/http.tcl
+aolserver/lib/tcl8.3/dde1.1/pkgIndex.tcl
+aolserver/lib/tcl8.3/opt0.4/optparse.tcl
+aolserver/lib/tcl8.3/opt0.4/pkgIndex.tcl
+aolserver/lib/tcl8.3/reg1.0/pkgIndex.tcl
+aolserver/lib/tcl8.3/tcltest1.0/pkgIndex.tcl
+aolserver/lib/tcl8.3/tcltest1.0/tcltest.tcl
+aolserver/lib/tcl8.3/history.tcl
+aolserver/lib/tcl8.3/word.tcl
+aolserver/lib/tcl8.3/tclIndex
+aolserver/lib/tcl8.3/auto.tcl
+aolserver/lib/tcl8.3/license.terms
+aolserver/lib/tcl8.3/init.tcl
+aolserver/lib/tcl8.3/ldAout.tcl
+aolserver/lib/tcl8.3/package.tcl
+aolserver/lib/tcl8.3/parray.tcl
+aolserver/lib/tcl8.3/safe.tcl
 aolserver/lib/libnspd.a
 aolserver/lib/libnsthread.a
 aolserver/servers/server1/modules/nsperm/perms
@@ -42,31 +134,32 @@ aolserver/include/tcl.h
 aolserver/include/tcl76.h
 aolserver/include/tcl83.h
 aolserver/include/Makefile.global
-aolserver/nsd.tcl.sample
+aolserver/include/nsd.h
+aolserver/sample-config.tcl
 etc/rc.d/aolserver.sh
-include/aolserver/ns.h
-include/aolserver/nsextmsg.h
-include/aolserver/nspd.h
-include/aolserver/nsthread.h
-include/aolserver/tcl.h
-include/aolserver/tcl76.h
-include/aolserver/tcl83.h
-include/aolserver/tclDecls.h
-include/aolserver/nsd.h
-lib/libnspd.a
 share/doc/aolserver/ChangeLog
-share/doc/aolserver/LICENSE.txt
-share/doc/aolserver/README.txt
-share/doc/aolserver/doc/config.txt
-share/doc/aolserver/doc/install.txt
-share/doc/aolserver/doc/internals.txt
-share/doc/aolserver/doc/nsv.txt
-share/doc/aolserver/doc/threads.txt
+share/doc/aolserver/README
+share/doc/aolserver/install.html
+share/doc/aolserver/config.txt
+share/doc/aolserver/faq.html
+share/doc/aolserver/default-home.html
+share/doc/aolserver/tcl-changes.txt
+share/doc/aolserver/license.txt
+share/doc/aolserver/tuning.html
 @dirrm aolserver/bin
 @dirrm aolserver/log
 @dirrm aolserver/modules/tcl/nsperm
 @dirrm aolserver/modules/tcl
 @dirrm aolserver/modules
+@dirrm aolserver/lib/tcl8.3/msgcat1.0
+@dirrm aolserver/lib/tcl8.3/encoding
+@dirrm aolserver/lib/tcl8.3/http1.0
+@dirrm aolserver/lib/tcl8.3/http2.3
+@dirrm aolserver/lib/tcl8.3/dde1.1
+@dirrm aolserver/lib/tcl8.3/opt0.4
+@dirrm aolserver/lib/tcl8.3/reg1.0
+@dirrm aolserver/lib/tcl8.3/tcltest1.0
+@dirrm aolserver/lib/tcl8.3
 @dirrm aolserver/lib
 @dirrm aolserver/servers/server1/modules/nslog
 @dirrm aolserver/servers/server1/modules/nsperm
@@ -76,8 +169,5 @@ share/doc/aolserver/doc/threads.txt
 @dirrm aolserver/servers
 @dirrm aolserver/include
 @dirrm aolserver
-@dirrm include/aolserver
-@dirrm include
-@dirrm share/doc/aolserver/doc
 @dirrm share/doc/aolserver
 @dirrm share/doc