2 files changed, 14 insertions, 13 deletions

diff --git a/www/cgihtml/Makefile b/www/cgihtml/Makefile
index 4a8604ef7e13..004ff935d016 100644
--- a/www/cgihtml/Makefile
+++ b/www/cgihtml/Makefile
@@ -17,11 +17,13 @@ USE_LDCONFIG=	yes
 OPTIONS_DEFINE=	DOCS
 
 post-extract:
-	${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.dist
-	${CP} ${FILESDIR}/Makefile ${WRKSRC}
+	@${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.dist
+	@${CP} ${FILESDIR}/Makefile ${WRKSRC}
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libcgihtml.so
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libcgihtml.so
+
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/html
 .for file in CHANGES CREDITS
 	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}
diff --git a/www/cgihtml/files/patch-cgi-lib.c b/www/cgihtml/files/patch-cgi-lib.c
index f208f6cfb91b..a15c8dc133ef 100644
--- a/www/cgihtml/files/patch-cgi-lib.c
+++ b/www/cgihtml/files/patch-cgi-lib.c
@@ -3,9 +3,8 @@ Index: cgi-lib.c
 RCS file: /home/cvs/ringlet/c/contrib/www/cgihtml/cgi-lib.c,v
 retrieving revision 1.1.1.1
 retrieving revision 1.6
-diff -u -r1.1.1.1 -r1.6
---- cgi-lib.c	27 Oct 2003 09:39:04 -0000	1.1.1.1
-+++ cgi-lib.c	27 Oct 2003 12:07:00 -0000	1.6
+--- cgi-lib.c.orig	1998-05-04 02:12:52 UTC
++++ cgi-lib.c
 @@ -17,6 +17,10 @@
  
  #ifdef WINDOWS
@@ -17,7 +16,7 @@ diff -u -r1.1.1.1 -r1.6
  #endif
  
  #include "cgi-lib.h"
-@@ -87,11 +91,11 @@
+@@ -87,11 +91,11 @@ char *get_DEBUG()
  
  char *get_POST()
  {
@@ -31,7 +30,7 @@ diff -u -r1.1.1.1 -r1.6
      buffer = (char *)malloc(sizeof(char) * content_length + 1);
      if (fread(buffer,sizeof(char),content_length,stdin) != content_length) {
        /* consistency error. */
-@@ -202,7 +206,7 @@
+@@ -202,7 +206,7 @@ int getline(char s[], int lim)
  
  int parse_form_encoded(llist* entries)
  {
@@ -40,7 +39,7 @@ diff -u -r1.1.1.1 -r1.6
    entrytype entry;
    node* window;
    FILE *uploadfile;
-@@ -220,7 +224,7 @@
+@@ -220,7 +224,7 @@ int parse_form_encoded(llist* entries)
    _fmode = BINARY;                    /* default all file I/O as binary */
  #endif
    if (CONTENT_LENGTH != NULL)
@@ -49,7 +48,7 @@ diff -u -r1.1.1.1 -r1.6
    else
      return 0;
    /* get boundary */
-@@ -241,14 +245,20 @@
+@@ -241,14 +245,20 @@ int parse_form_encoded(llist* entries)
         robustness sake. */
      buffer[bytesread] = '\0';
      tempstr = newstr(buffer);
@@ -75,7 +74,7 @@ diff -u -r1.1.1.1 -r1.6
      if (strstr(buffer,"filename=\"") != NULL) {
        isfile = 1;
        tempstr = newstr(buffer);
-@@ -258,9 +268,9 @@
+@@ -258,9 +268,9 @@ int parse_form_encoded(llist* entries)
  	entry.value = (char *) realloc(entry.value, sizeof(char) *
  				       strlen(tempstr)+1);
        entry.value = tempstr;
@@ -88,7 +87,7 @@ diff -u -r1.1.1.1 -r1.6
        /* Netscape's Windows browsers handle paths differently from its
  	 UNIX and Mac browsers.  It delivers a full path for the uploaded
  	 file (which it shouldn't do), and it uses backslashes rather than
-@@ -275,13 +285,12 @@
+@@ -275,13 +285,12 @@ int parse_form_encoded(llist* entries)
        }
        window = list_insafter(entries,window,entry);
        numentries++;
@@ -108,7 +107,7 @@ diff -u -r1.1.1.1 -r1.6
  	/* null filename; for now, just don't save info.  later, save
  	   to default file */
  	isfile = 0;
-@@ -529,9 +538,9 @@
+@@ -529,9 +538,9 @@ int parse_cookies(llist *entries)
    int numcookies = 0;
    short NM = 1;