From jadawin@huppa.tuxaco.net  Thu Nov  8 14:20:05 2007
Return-Path: <jadawin@huppa.tuxaco.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8618916A41B
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  8 Nov 2007 14:20:05 +0000 (UTC)
	(envelope-from jadawin@huppa.tuxaco.net)
Received: from huppa.tuxaco.net (huppa.tuxaco.net [91.121.19.193])
	by mx1.freebsd.org (Postfix) with ESMTP id 15F3F13C4CC
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  8 Nov 2007 14:20:04 +0000 (UTC)
	(envelope-from jadawin@huppa.tuxaco.net)
Received: from localhost (unknown [127.0.0.1])
	by huppa.tuxaco.net (Postfix) with ESMTP id CB532FA09
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  8 Nov 2007 15:22:06 +0100 (CET)
Received: from huppa.tuxaco.net ([127.0.0.1])
	by localhost (huppa.tuxaco.net [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id D2O1hQtfKMxA for <FreeBSD-gnats-submit@freebsd.org>;
	Thu,  8 Nov 2007 15:22:03 +0100 (CET)
Received: by huppa.tuxaco.net (Postfix, from userid 1001)
	id D74C0F1E8; Thu,  8 Nov 2007 15:22:03 +0100 (CET)
Message-Id: <20071108142203.D74C0F1E8@huppa.tuxaco.net>
Date: Thu,  8 Nov 2007 15:22:03 +0100 (CET)
From: Philippe Audeoud <jadawin@tuxaco.net>
Reply-To: Philippe Audeoud <jadawin@tuxaco.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [patch] www/cgichk - unbreak gcc42
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         117925
>Category:       ports
>Synopsis:       [patch] www/cgichk - unbreak gcc42
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    tabthorpe
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Nov 08 14:30:01 UTC 2007
>Closed-Date:    Thu Nov 08 16:26:42 UTC 2007
>Last-Modified:  Thu Nov  8 16:30:02 UTC 2007
>Originator:     Philippe Audeoud
>Release:        FreeBSD 6.2-RELEASE i386
>Organization:
>Environment:
System: FreeBSD huppa.tuxaco.net 6.2-RELEASE FreeBSD 6.2-RELEASE #0: Tue Mar 20 16:05:42 CET 2007 root@:/usr/obj/usr/src/sys/GENERIC i386


	
>Description:
	- unbreak gcc42
	- update MASTER_SITES with SF macro
	- Bump PORTREVISION	
>How-To-Repeat:
	
>Fix:

	

--- patch-cgichk.1 begins here ---
diff -ruN www/cgichk.orig/Makefile www/cgichk/Makefile
--- www/cgichk.orig/Makefile	2007-11-08 12:51:21.000000000 +0000
+++ www/cgichk/Makefile	2007-11-08 13:59:02.000000000 +0000
@@ -7,9 +7,9 @@
 
 PORTNAME=	cgichk
 PORTVERSION=	2.60
+PORTREVISION=	1
 CATEGORIES=	www
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
@@ -18,12 +18,6 @@
 WRKSRC=		${WRKDIR}/${PORTNAME}
 ALL_TARGET=	cgichk
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 700042
-BROKEN=		Broken with gcc 4.2
-.endif
-
 post-patch:
 	${REINPLACE_CMD} -e "s/^(CC|CFLAGS).+//g" ${WRKSRC}/Makefile
 	${REINPLACE_CMD} -e \
@@ -37,4 +31,4 @@
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -ruN www/cgichk.orig/files/patch-cgichk.h www/cgichk/files/patch-cgichk.h
--- www/cgichk.orig/files/patch-cgichk.h	2007-11-08 12:51:21.000000000 +0000
+++ www/cgichk/files/patch-cgichk.h	2007-11-08 12:58:51.000000000 +0000
@@ -1,9 +1,10 @@
---- cgichk.h.orig	Wed Feb  5 00:36:57 2003
-+++ cgichk.h	Wed Feb  5 00:37:05 2003
-@@ -19,6 +19,7 @@
+--- cgichk.h.orig	2007-11-08 12:58:24.000000000 +0000
++++ cgichk.h	2007-11-08 12:58:46.000000000 +0000
+@@ -19,6 +19,8 @@
  
  #include <stdio.h>
  #include <stdlib.h>
++#include <string.h>
 +#include <sys/types.h>
  #include <sys/socket.h>
  #include <netinet/in.h>
diff -ruN www/cgichk.orig/files/patch-misc.c www/cgichk/files/patch-misc.c
--- www/cgichk.orig/files/patch-misc.c	1970-01-01 00:00:00.000000000 +0000
+++ www/cgichk/files/patch-misc.c	2007-11-08 13:43:26.000000000 +0000
@@ -0,0 +1,20 @@
+--- misc.c.orig	2007-11-08 13:41:34.000000000 +0000
++++ misc.c	2007-11-08 13:43:22.000000000 +0000
+@@ -92,7 +92,7 @@
+ 		hasport = 1;
+ 	
+ 	if (t = (char *)index(u, '/'))						// does host have path?
+-		(char *)haspath = 1;
++		haspath = 1;
+ 
+ 	if (hasport)
+ 		t = (char *)index(u, ':');
+@@ -209,7 +209,7 @@
+ 	return str;
+ }
+ /*----------------------------------------------------------------*/
+-char *strnstr(const char *HAYSTACK, const char *NEEDLE)
++char *cgichk_strnstr(const char *HAYSTACK, const char *NEEDLE)
+ {
+   char	*h, *n, *res;
+ 
diff -ruN www/cgichk.orig/files/patch-net.c www/cgichk/files/patch-net.c
--- www/cgichk.orig/files/patch-net.c	1970-01-01 00:00:00.000000000 +0000
+++ www/cgichk/files/patch-net.c	2007-11-08 13:29:58.000000000 +0000
@@ -0,0 +1,26 @@
+--- net.c.orig	2007-11-08 13:24:24.000000000 +0000
++++ net.c	2007-11-08 13:27:30.000000000 +0000
+@@ -150,10 +150,10 @@
+     {
+ 		if (parms.no_false_200_search == FALSE)
+ 		{
+-			if (strnstr(httpbuff, "file not found") ||
+-				strnstr(httpbuff, "error 404") ||
+-				strnstr(httpbuff, "document has moved") ||
+-				strnstr(httpbuff, "page you have requested") ) // Wise?
++			if (cgichk_strnstr(httpbuff, "file not found") ||
++				cgichk_strnstr(httpbuff, "error 404") ||
++				cgichk_strnstr(httpbuff, "document has moved") ||
++				cgichk_strnstr(httpbuff, "page you have requested") ) // Wise?
+ 			{
+ 				err = HTTP_NOEXIST;
+ 			}
+@@ -161,7 +161,7 @@
+ 			// If user spcified an additional string to search for, check for that too.
+ 			if (parms.alt_fake_404_string)
+ 			{
+-				if (strnstr(httpbuff, parms.alt_fake_404_string))
++				if (cgichk_strnstr(httpbuff, parms.alt_fake_404_string))
+ 				{
+ 					err = HTTP_NOEXIST;
+ 				}
--- patch-cgichk.1 ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->tabthorpe 
Responsible-Changed-By: tabthorpe 
Responsible-Changed-When: Thu Nov 8 14:58:06 UTC 2007 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=117925 
State-Changed-From-To: open->closed 
State-Changed-By: tabthorpe 
State-Changed-When: Thu Nov 8 16:26:41 UTC 2007 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=117925 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/117925: commit references a PR
Date: Thu,  8 Nov 2007 16:25:44 +0000 (UTC)

 tabthorpe    2007-11-08 16:25:40 UTC
 
   FreeBSD ports repository
 
   Modified files:
     www/cgichk           Makefile 
     www/cgichk/files     patch-cgichk.h 
   Added files:
     www/cgichk/files     patch-misc.c patch-net.c 
   Log:
   - Unbreak gcc42
   - Update MASTER_SITES with SF macro
   - Bump PORTREVISION
   
   PR:             ports/117925
   Submitted by:   Philippe Audeoud <jadawin tuxaco.net>
   Approved by:    portmgr (erwin)
   
   Revision  Changes    Path
   1.7       +3 -9      ports/www/cgichk/Makefile
   1.2       +4 -3      ports/www/cgichk/files/patch-cgichk.h
   1.1       +20 -0     ports/www/cgichk/files/patch-misc.c (new)
   1.1       +26 -0     ports/www/cgichk/files/patch-net.c (new)
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
