From owner-freebsd-ports-bugs@FreeBSD.ORG Sat May 14 09:30:03 2005 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C36D416A4CE for ; Sat, 14 May 2005 09:30:03 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 969B043D64 for ; Sat, 14 May 2005 09:30:03 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j4E9U3R8094438 for ; Sat, 14 May 2005 09:30:03 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j4E9U3O0094434; Sat, 14 May 2005 09:30:03 GMT (envelope-from gnats) Resent-Date: Sat, 14 May 2005 09:30:03 GMT Resent-Message-Id: <200505140930.j4E9U3O0094434@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Jeremy Chadwick Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9371C16A4CE for ; Sat, 14 May 2005 09:26:07 +0000 (GMT) Received: from mx1.parodius.com (mx1.parodius.com [64.62.145.229]) by mx1.FreeBSD.org (Postfix) with ESMTP id 74ED843D55 for ; Sat, 14 May 2005 09:26:07 +0000 (GMT) (envelope-from jdc@pentarou.parodius.com) Received: from pentarou.parodius.com (localhost [127.0.0.1]) by mx1.parodius.com (8.13.3/8.13.3) with ESMTP id j4E9Q7w8058829 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Sat, 14 May 2005 02:26:07 -0700 (PDT) (envelope-from jdc@pentarou.parodius.com) Received: (from jdc@localhost) by pentarou.parodius.com (8.13.3/8.13.3/Submit) id j4E9Q7kY058828; Sat, 14 May 2005 02:26:07 -0700 (PDT) (envelope-from jdc) Message-Id: <200505140926.j4E9Q7kY058828@pentarou.parodius.com> Date: Sat, 14 May 2005 02:26:07 -0700 (PDT) From: Jeremy Chadwick To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/81007: net/rtg -- Makefile clean-up, removal of build warnings X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Jeremy Chadwick List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 May 2005 09:30:03 -0000 >Number: 81007 >Category: ports >Synopsis: net/rtg -- Makefile clean-up, removal of build warnings >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sat May 14 09:30:02 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Jeremy Chadwick >Release: FreeBSD 4.11-STABLE i386 >Organization: Parodius Networking >Environment: System: FreeBSD pentarou.parodius.com 4.11-STABLE FreeBSD 4.11-STABLE #0: Thu May 12 04:37:52 PDT 2005 root@pentarou.parodius.com:/usr/obj/usr/src/sys/PENTAROU i386 >Description: Minor changes to ports/net/rtg: * Minor clean-up of the Makefile (use LIB_DEPENDS instead of BUILD_*) * Addition of files/patch-cgilib-cgi.c -- removes malloc.h warning * Addition of files/patch-config-config.h.in -- removes PACKAGE_* re-definition warnings (conflicts with net-snmp's include files) Verified to work on FreeBSD 4.11-STABLE. >How-To-Repeat: n/a >Fix: Apply below patch. diff -ruN rtg.orig/Makefile rtg/Makefile --- rtg.orig/Makefile Sun Feb 22 20:41:47 2004 +++ rtg/Makefile Sat May 14 02:13:02 2005 @@ -14,9 +14,8 @@ MAINTAINER= so14k@so14k.com COMMENT= A flexible, high-performance SNMP statistics monitoring system -BUILD_DEPENDS= \ - ${LOCALBASE}/lib/mysql/libmysqlclient_r.a:${PORTSDIR}/databases/mysql41-client \ - ${LOCALBASE}/sbin/snmpd:${PORTSDIR}/net-mgmt/net-snmp +LIB_DEPENDS= mysqlclient:${PORTSDIR}/databases/mysql41-client \ + netsnmp.7:${PORTSDIR}/net-mgmt/net-snmp MAN1= rtgplot.1 rtgpoll.1 @@ -25,6 +24,6 @@ CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/etc/rtg pre-configure: - ${REINPLACE_CMD} -e "s,-pthread,${PTHREAD_LIBS},g" ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's,-pthread,${PTHREAD_LIBS},g' ${WRKSRC}/configure .include diff -ruN rtg.orig/files/patch-cgilib-cgi.c rtg/files/patch-cgilib-cgi.c --- rtg.orig/files/patch-cgilib-cgi.c Wed Dec 31 16:00:00 1969 +++ rtg/files/patch-cgilib-cgi.c Sat May 14 01:29:04 2005 @@ -0,0 +1,15 @@ +--- cgilib-0.4/cgi.c.orig Thu Sep 25 08:21:06 2003 ++++ cgilib-0.4/cgi.c Sat May 14 01:28:33 2005 +@@ -33,9 +33,12 @@ + #ifdef HAVE_CTYPE_H + # include + #endif ++/* Unnecessary on FreeBSD; malloc.h included in stdlib.h */ ++/* + #ifdef HAVE_MALLOC_H + # include + #endif ++*/ + + #include + diff -ruN rtg.orig/files/patch-config-config.h.in rtg/files/patch-config-config.h.in --- rtg.orig/files/patch-config-config.h.in Wed Dec 31 16:00:00 1969 +++ rtg/files/patch-config-config.h.in Sat May 14 01:32:49 2005 @@ -0,0 +1,27 @@ +--- config/config.h.in.orig Thu Sep 25 08:21:14 2003 ++++ config/config.h.in Sat May 14 01:31:47 2005 +@@ -91,19 +91,19 @@ + #undef PACKAGE + + /* Define to the address where bug reports for this package should be sent. */ +-#undef PACKAGE_BUGREPORT ++#undef RTG_PACKAGE_BUGREPORT + + /* Define to the full name of this package. */ +-#undef PACKAGE_NAME ++#undef RTG_PACKAGE_NAME + + /* Define to the full name and version of this package. */ +-#undef PACKAGE_STRING ++#undef RTG_PACKAGE_STRING + + /* Define to the one symbol short name of this package. */ +-#undef PACKAGE_TARNAME ++#undef RTG_PACKAGE_TARNAME + + /* Define to the version of this package. */ +-#undef PACKAGE_VERSION ++#undef RTG_PACKAGE_VERSION + + /* Define as the return type of signal handlers (`int' or `void'). */ + #undef RETSIGTYPE >Release-Note: >Audit-Trail: >Unformatted: