6 files changed, 88 insertions, 12 deletions

diff --git a/www/aolserver/Makefile b/www/aolserver/Makefile
index 5c55f2060554..8abd24f304b4 100644
--- a/www/aolserver/Makefile
+++ b/www/aolserver/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	aolserver
-PORTVERSION=	3.4
+PORTVERSION=	3.4.2
 CATEGORIES=	www
-MASTER_SITES=	ftp://ftp.aolserver.com/aolserver/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	aolserver
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	mab@red-bean.com
@@ -20,9 +21,6 @@ USE_GMAKE=	yes
 INSTALL_TARGET=	install INST=${PREFIX}/${PORTNAME}
 
 post-extract:
-	${MV} ${WRKSRC}/include/Makefile.global ${WRKSRC}/include/Makefile.global.orig
-	${SED} s/tcl83/tcl8.3/ ${WRKSRC}/include/Makefile.global.orig > ${WRKSRC}/include/Makefile.global
-	${RM} ${WRKSRC}/include/Makefile.global.orig
 	find ${WRKSRC} -name CVS | xargs ${RM} -rf
 
 post-install:
@@ -31,15 +29,16 @@ post-install:
 .for header in nsd/nsd.h
 	 ${INSTALL_DATA} ${WRKSRC}/${header} ${PREFIX}/${PORTNAME}/include
 .endfor
+	 ${RM} ${PREFIX}/${PORTNAME}/include/*.orig
 
 # Other documentation
-	 ${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 -
+	 ${MKDIR} ${PREFIX}/share/doc/${PORTNAME}
+	 ${TAR} -C ${WRKSRC} -c -f - ChangeLog README | ${TAR} -C ${PREFIX}/share/doc/${PORTNAME} -x -f -
+	 ${TAR} -C ${WRKSRC}/doc -c -f - . | ${TAR} -C ${PREFIX}/share/doc/${PORTNAME} -x -f -
 
 # Permissions
-	${CHOWN} nobody:nogroup ${PREFIX}/aolserver/servers/server1/modules/nslog
-	${CHOWN} nobody:nogroup ${PREFIX}/aolserver/log
+	${CHOWN} nobody:nogroup ${PREFIX}/${PORTNAME}/servers/server1/modules/nslog
+	${CHOWN} nobody:nogroup ${PREFIX}/${PORTNAME}/log
 
 # Startup file
 	@if [ ! -f ${PREFIX}/etc/rc.d/aolserver.sh ]; then \
diff --git a/www/aolserver/distinfo b/www/aolserver/distinfo
index 94bd9d2c77f9..18d35563fd29 100644
--- a/www/aolserver/distinfo
+++ b/www/aolserver/distinfo
@@ -1 +1 @@
-MD5 (aolserver-3.4-src.tar.gz) = 45ed3ed31ac373bc4951b4f1ecb09da3
+MD5 (aolserver-3.4.2-src.tar.gz) = 51d4336535c171782e8f5abeb5689cca
diff --git a/www/aolserver/files/patch-a b/www/aolserver/files/patch-a
new file mode 100644
index 000000000000..5576bbaaea27
--- /dev/null
+++ b/www/aolserver/files/patch-a
@@ -0,0 +1,11 @@
+--- include/Makefile.global	Fri Feb 15 11:39:00 2002
++++ include/Makefile.global.new	Fri Feb 15 11:39:00 2002
+@@ -259,7 +259,7 @@
+ TCL76_DIR=tcl7.6
+ ifeq (bsd, $(findstring bsd, $(PLATFORM)))
+   TCL76_LIB=libtcl76.a
+-  TCL8X_LIB=libtcl83g.a
++  TCL8X_LIB=libtcl8.3g.a
+ else
+   TCL76_LIB=libtcl7.6.a
+   TCL8X_LIB=libtcl8.3g.a
diff --git a/www/aolserver/files/patch-b b/www/aolserver/files/patch-b
new file mode 100644
index 000000000000..3f82e84c9170
--- /dev/null
+++ b/www/aolserver/files/patch-b
@@ -0,0 +1,40 @@
+--- nsd/nsmain.c	Tue Apr  3 18:13:15 2001
++++ nsd/nsmain.c.new	Fri Feb 15 12:22:04 2002
+@@ -311,16 +311,10 @@
+     /*
+      * Verify the uid/gid args.
+      */
+-
+-    if (garg != NULL) {
+-	gid = Ns_GetGid(garg);
+-	if (gid < 0) {
+-	    gid = atoi(garg);
+-	    if (gid == 0) {
+-		Ns_Fatal("nsmain: invalid group '%s'", garg);
+-	    }
+-	}
+-    }
++    /* Reversed the order so this will actually work
++     * Jon Griffin <jon@jongriffin.com> 01/27/2001
++     *
++    */
+     if (uarg != NULL) {
+ 	uid = Ns_GetUid(uarg);
+ 	gid = Ns_GetUserGid(uarg);
+@@ -329,6 +323,16 @@
+ 	}
+ 	if (uid == 0) {
+ 	    Ns_Fatal("nsmain: invalid user '%s'", uarg);
++	}
++    }
++
++    if (garg != NULL) {
++	gid = Ns_GetGid(garg);
++	if (gid < 0) {
++	    gid = atoi(garg);
++	    if (gid == 0) {
++		Ns_Fatal("nsmain: invalid group '%s'", garg);
++	    }
+ 	}
+     }
+ 
diff --git a/www/aolserver/files/patch-c b/www/aolserver/files/patch-c
new file mode 100644
index 000000000000..5716715a1947
--- /dev/null
+++ b/www/aolserver/files/patch-c
@@ -0,0 +1,24 @@
+--- tcl8.3.2/unix/tclUnixPipe.c	Thu Aug 17 17:46:15 2000
++++ tcl8.3.2/unix/tclUnixPipe.c.new	Fri Feb 15 12:30:19 2002
+@@ -950,12 +950,16 @@
+      * nonblocking, the read will never block.
+      */
+ 
+-    bytesRead = read(GetFd(psPtr->inFile), buf, (size_t) toRead);
+-    if (bytesRead > -1) {
+-        return bytesRead;
++    while (1) {
++        bytesRead = read(GetFd(psPtr->inFile), buf, (size_t) toRead);
++        if (bytesRead > -1) {
++           return bytesRead;
++        }
++        if ( errno != EINTR ) {
++           *errorCodePtr = errno;
++           return -1;
++        }
+     }
+-    *errorCodePtr = errno;
+-    return -1;
+ }
+ 
+ /*
diff --git a/www/aolserver/pkg-plist b/www/aolserver/pkg-plist
index c24724491086..5f106992dc0a 100644
--- a/www/aolserver/pkg-plist
+++ b/www/aolserver/pkg-plist
@@ -144,6 +144,8 @@ share/doc/aolserver/install.html
 share/doc/aolserver/license.txt
 share/doc/aolserver/tcl-changes.txt
 share/doc/aolserver/tuning.html
+@exec mkdir -p %D/aolserver/servers/server1/modules/nslog
+@exec mkdir -p %D/aolserver/log
 @dirrm aolserver/bin
 @dirrm aolserver/log
 @dirrm aolserver/modules/tcl/nsperm
@@ -159,8 +161,8 @@ share/doc/aolserver/tuning.html
 @dirrm aolserver/lib/tcl8.3/tcltest1.0
 @dirrm aolserver/lib/tcl8.3
 @dirrm aolserver/lib
-@dirrm aolserver/servers/server1/modules/nsperm
 @dirrm aolserver/servers/server1/modules/nslog
+@dirrm aolserver/servers/server1/modules/nsperm
 @dirrm aolserver/servers/server1/modules
 @dirrm aolserver/servers/server1/pages
 @dirrm aolserver/servers/server1