ports/81007: net/rtg -- Makefile clean-up, removal of build warnings

[Jeremy Chadwick]

>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 at 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 at 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 <bsd.port.mk>
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 <ctype.h>
+ #endif
++/* Unnecessary on FreeBSD; malloc.h included in stdlib.h */
++/*
+ #ifdef HAVE_MALLOC_H
+ # include <malloc.h>
+ #endif
++*/
+ 
+ #include <cgi.h>
+ 
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: