From leeym@utopia.leeym.com  Fri Sep 17 17:04:01 2004
Return-Path: <leeym@utopia.leeym.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 1DDDC16A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 17 Sep 2004 17:04:01 +0000 (GMT)
Received: from utopia.leeym.com (utopia.leeym.com [211.21.137.52])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 645AA43D3F
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 17 Sep 2004 17:04:00 +0000 (GMT)
	(envelope-from leeym@utopia.leeym.com)
Received: from localhost (localhost [127.0.0.1])
	by utopia.leeym.com (Postfix) with ESMTP id 2E57F3EACE2;
	Sat, 18 Sep 2004 01:03:59 +0800 (CST)
Received: from utopia.leeym.com ([127.0.0.1])
 by localhost (utopia.leeym.com [127.0.0.1]) (amavisd-new, port 10024)
 with ESMTP id 47418-04; Sat, 18 Sep 2004 01:03:55 +0800 (CST)
Received: by utopia.leeym.com (Postfix, from userid 1000)
	id 5A1673E9CED; Sat, 18 Sep 2004 01:03:55 +0800 (CST)
Message-Id: <20040917170355.5A1673E9CED@utopia.leeym.com>
Date: Sat, 18 Sep 2004 01:03:55 +0800 (CST)
From: Yen-Ming Lee <leeym@FreeBSD.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: gnn@neville-neil.com
Subject: [PATCH] net/click: unbreak and minor fixes
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         71820
>Category:       ports
>Synopsis:       [PATCH] net/click: unbreak and minor fixes
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    leeym
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Sep 17 17:10:11 GMT 2004
>Closed-Date:    Tue Oct 12 17:53:36 GMT 2004
>Last-Modified:  Tue Oct 12 17:53:36 GMT 2004
>Originator:     Yen-Ming Lee
>Release:        FreeBSD 5.3-BETA4 i386
>Organization:
FreeBSD Taiwan
>Environment:
System: FreeBSD utopia.leeym.com 5.3-BETA4 FreeBSD 5.3-BETA4 #7: Mon Sep 13 05:12:30 CST 2004
>Description:

- add USE_GCC=2.95 and unbreak this port
- utilize INFO
- cosmetic fixes which makes portlint happier

Port maintainer (gnn@neville-neil.com) is cc'd.

Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:

--- click-1.2.3_1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/net/click/Makefile,v
retrieving revision 1.9
diff -u -u -r1.9 Makefile
--- Makefile	14 Mar 2004 03:39:09 -0000	1.9
+++ Makefile	17 Sep 2004 17:02:34 -0000
@@ -1,4 +1,4 @@
-# Updated ports collection makefile for:   click
+# Ports collection makefile for:	click
 # Date created:        3 Nov 2001
 # Whom:                gnn
 #
@@ -16,8 +16,10 @@
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
+USE_GCC=	2.95
 
 MANCOMPRESSED=	no
+INFO=	click
 MAN1=	click.1 click-align.1 click-combine.1 click-devirtualize.1 \
 	click-fastclassifier.1 click-flatten.1 click-install.1 \
 	click-mkmindriver.1 click-uncombine.1 click-undead.1 \
@@ -68,10 +70,6 @@
 BROKEN=		"Does not compile on alpha 4.x"
 .endif
 
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.endif
-
 post-install:
 	@${STRIP_CMD} ${PREFIX}/bin/click
 	@${STRIP_CMD} ${PREFIX}/bin/click-align
@@ -97,13 +95,13 @@
 	${INSTALL_DATA} ${WRKSRC}/conf/test2.click ${CONFDIR}
 	${INSTALL_DATA} ${WRKSRC}/conf/test3.click ${CONFDIR}
 	${INSTALL_DATA} ${WRKSRC}/conf/udpgen.click ${CONFDIR}
-	@echo
-	@echo "----------------------------------------------------"
-	@echo "Install complete, to try it out do the following:"
-	@echo "cd ${PREFIX}/etc/click/conf"
-	@echo "click test.click"
-	@echo "You should see some output.  Now go read the papers and manual."
-	@echo "----------------------------------------------------"
-	@echo
+	@${ECHO_CMD}
+	@${ECHO_CMD} "----------------------------------------------------"
+	@${ECHO_CMD} "Install complete, to try it out do the following:"
+	@${ECHO_CMD} "cd ${PREFIX}/etc/click/conf"
+	@${ECHO_CMD} "click test.click"
+	@${ECHO_CMD} "You should see some output.  Now go read the papers and manual."
+	@${ECHO_CMD} "----------------------------------------------------"
+	@${ECHO_CMD}
 
 .include <bsd.port.post.mk>
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/net/click/pkg-plist,v
retrieving revision 1.3
diff -u -u -r1.3 pkg-plist
--- pkg-plist	10 Apr 2004 16:07:06 -0000	1.3
+++ pkg-plist	17 Sep 2004 17:02:34 -0000
@@ -94,15 +94,7 @@
 include/clicktool/processingt.hh
 include/clicktool/routert.hh
 include/clicktool/toolutils.hh
-@unexec install-info --delete %D/info/click.info %D/info/dir
-info/click.info
-info/click.info-1
-info/click.info-2
-info/click.info-3
-info/click.info-4
-info/click.info-5
-@exec install-info --section="Click Modular Router" --entry="* click: (click).        Click Modular Router" %D/info/click.info %D/info/dir
-@unexec rm -rf %D/etc/click
+@unexec rm -rf %D/etc/click 2>&1 >/dev/null || true
 lib/libclick.a
 lib/libclicktool.a
 share/click/elementmap
--- click-1.2.3_1.patch ends here ---

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: leeym 
State-Changed-When: Fri Sep 17 18:09:56 GMT 2004 
State-Changed-Why:  
The maintainer is Cc-ed. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=71820 
Responsible-Changed-From-To: freebsd-ports-bugs->leeym 
Responsible-Changed-By: leeym 
Responsible-Changed-When: Fri Sep 17 18:09:59 GMT 2004 
Responsible-Changed-Why:  
I will take care of this PR. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=71820 
State-Changed-From-To: feedback->closed 
State-Changed-By: leeym 
State-Changed-When: Tue Oct 12 17:53:29 GMT 2004 
State-Changed-Why:  
Committed, thanks. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=71820 
>Unformatted:
