1.16.8 --> 1.18.3

4 files changed, 37 insertions, 47 deletions

diff --git a/www/wn/Makefile b/www/wn/Makefile
index 063bd44fad77..a05705916fa7 100644
--- a/www/wn/Makefile
+++ b/www/wn/Makefile
@@ -3,10 +3,10 @@
 # Date created:         4 May 1995
 # Whom:                 adam
 #
-# $Id: Makefile,v 1.21 1997/08/10 23:50:33 adam Exp $
+# $Id: Makefile,v 1.22 1997/09/07 17:24:44 adam Exp $
 #
 
-DISTNAME=       wn-1.18.1
+DISTNAME=       wn-1.18.3
 CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.acns.nwu.edu/pub/wn/
 
@@ -25,7 +25,7 @@ post-install:
 	@install -c -o bin -g bin  ${WRKSRC}/bin/wn ${PREFIX}/libexec
 	@install -c -o bin -g bin  ${WRKSRC}/bin/swn ${PREFIX}/sbin
 	@install -c -o bin -g bin  ${WRKSRC}/bin/wndex ${PREFIX}/bin
-	@install -c -o bin -g bin  ${WRKSRC}/bin/mkpasswd ${PREFIX}/wn/bin
+	@install -c -o bin -g bin  ${WRKSRC}/bin/mkwnpasswd ${PREFIX}/wn/bin
 	@install -c -o bin -g bin  ${WRKSRC}/bin/authwn ${PREFIX}/wn/bin
 	@if [ -s ${PREFIX}/etc/wn_mime.types ]; then \
 	    cmp -s ${PREFIX}/etc/wn_mime.types ${WRKSRC}/lib/mime.types || \
diff --git a/www/wn/distinfo b/www/wn/distinfo
index 64545d74dd37..8e77ecb67870 100644
--- a/www/wn/distinfo
+++ b/www/wn/distinfo
@@ -1 +1 @@
-MD5 (wn-1.18.1.tar.gz) = 63f5e294cb3c297bcda621585cb0be94
+MD5 (wn-1.18.3.tar.gz) = 0f61cf0c7de4bd1d518fe18723dcf2b2
diff --git a/www/wn/files/patch-aa b/www/wn/files/patch-aa
index db0b207a34a5..78cbf8c4d9a7 100644
--- a/www/wn/files/patch-aa
+++ b/www/wn/files/patch-aa
@@ -34,8 +34,8 @@
   
   #For Solaris 5.X or SVR4.2 use
   #LIBS = -lsocket -lnsl
-*** config.h.dist	Tue Jul 11 15:55:43 1995
---- config.h	Sun Jul 23 02:28:27 1995
+*** config.h.dist	Wed Sep  3 17:22:17 1997
+--- config.h	Mon Sep 15 21:39:32 1997
 ***************
 *** 7,13 ****
    ********************************************************/
@@ -73,7 +73,24 @@
   /*
    * Full path of the file you want to use for a log file and the
 ***************
-*** 52,58 ****
+*** 41,47 ****
+   * To do no logging set all the logfiles above to "", the empty string.
+   */
+  
+! #define SWN_PID_FILE	"/usr/local/wnlogs/wn.pid"
+  /*
+   * Full path of the file in which you wish the standalone server swn
+   * to deposit its process id on startup.  Comment this out or set
+--- 41,47 ----
+   * To do no logging set all the logfiles above to "", the empty string.
+   */
+  
+! #define SWN_PID_FILE	"/var/run/swn.pid"
+  /*
+   * Full path of the file in which you wish the standalone server swn
+   * to deposit its process id on startup.  Comment this out or set
+***************
+*** 59,65 ****
    */
   
   
@@ -81,7 +98,7 @@
   /*
    * This file contains information permitting wndex to translate 
    * ascertain the MIME "Content-type" from the suffix of a file name
---- 52,58 ----
+--- 59,65 ----
    */
   
   
@@ -90,7 +107,7 @@
    * This file contains information permitting wndex to translate 
    * ascertain the MIME "Content-type" from the suffix of a file name
 ***************
-*** 77,83 ****
+*** 84,90 ****
    */
   
   
@@ -98,7 +115,7 @@
   /* By default WN uses the Common Log Format used by NCSA and CERN httpd.
    * Uncommenting this will cause additional information to be added to
    * the end of each log line.  In particular the User-Agent and Referrer
---- 77,83 ----
+--- 84,90 ----
    */
   
   
@@ -107,56 +124,29 @@
    * Uncommenting this will cause additional information to be added to
    * the end of each log line.  In particular the User-Agent and Referrer
 ***************
-*** 111,121 ****
-  
-  
-  #ifndef SOLARIS2
-! #define USERID          (65534)
-! #define GROUPID         (65534)
-  #else
-! #define USERID		(60001)		/* uid of nobody under Solaris */
-! #define GROUPID		(60001)		/* gid of nobody under Solaris */
-  #endif
-  /*
-   * These are the group and user id you want the server to switch to when
---- 111,121 ----
+*** 259,265 ****
   
-  
-  #ifndef SOLARIS2
-! #define USERID	(65534)
-! #define GROUPID	(65534)
-  #else
-! #define USERID	(65534)
-! #define GROUPID	(65534)
-  #endif
-  /*
-   * These are the group and user id you want the server to switch to when
-***************
-*** 198,204 ****
-  #define TILDE_TABLE	"/path/to/rootdir_table"
-  */
+  /* #define TILDE_TABLE	"/path/to/rootdir_table" */
   
 ! /* #define TILDE_USER_PWFILE */
   
   #define TILDE_USER_STRING	"/~"
   /*
---- 198,204 ----
-  #define TILDE_TABLE	"/path/to/rootdir_table"
-  */
+--- 259,265 ----
+  
+  /* #define TILDE_TABLE	"/path/to/rootdir_table" */
   
 ! #define TILDE_USER_PWFILE
   
   #define TILDE_USER_STRING	"/~"
   /*
-*** config.h.old	Thu Oct 19 21:29:04 1995
---- config.h	Thu Oct 19 21:01:36 1995
 ***************
-*** 380,385 ****
---- 380,386 ----
-  
+*** 430,435 ****
+--- 430,436 ----
+  /************************/
   #if defined(FREE_BSD_2)
   #define BSD_LIKE
 + #define SIGCLD SIGCHLD
   #endif
   
-  #if defined(AIX) || defined(IRIX)
+  
diff --git a/www/wn/pkg-plist b/www/wn/pkg-plist
index a1f956d76c38..5af56d9fa742 100644
--- a/www/wn/pkg-plist
+++ b/www/wn/pkg-plist
@@ -3,7 +3,7 @@ etc/wn_mime.types
 libexec/wn
 sbin/swn
 bin/wndex
-wn/bin/mkpasswd
+wn/bin/mkwnpasswd
 wn/bin/authwn
 wn/docs
 wn/index