- Makefile cleanup

- Silence build warnings
- Fix plist

PR:		ports/81007
Submitted by:	Jeremy Chadwick <freebsd@jdc.parodius.com>
Approved by:	Brad Davis <so14k@so14k.com> (maintainer)

4 files changed, 53 insertions, 6 deletions

diff --git a/net/rtg/Makefile b/net/rtg/Makefile
index f28b48a184fd..d07bf83f5e5d 100644
--- a/net/rtg/Makefile
+++ b/net/rtg/Makefile
@@ -14,9 +14,8 @@ MASTER_SITE_SUBDIR=	rtg
 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 @@ GNU_CONFIGURE=	yes
 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 --git a/net/rtg/files/patch-cgilib-cgi.c b/net/rtg/files/patch-cgilib-cgi.c
new file mode 100644
index 000000000000..b50c913a03b4
--- /dev/null
+++ b/net/rtg/files/patch-cgilib-cgi.c
@@ -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 --git a/net/rtg/files/patch-config-config.h.in b/net/rtg/files/patch-config-config.h.in
new file mode 100644
index 000000000000..c47cc9d8ef1a
--- /dev/null
+++ b/net/rtg/files/patch-config-config.h.in
@@ -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
diff --git a/net/rtg/pkg-plist b/net/rtg/pkg-plist
index b6c76a69c71c..3c6d871c58dd 100644
--- a/net/rtg/pkg-plist
+++ b/net/rtg/pkg-plist
@@ -4,11 +4,16 @@ bin/rtgplot
 bin/rtgpoll
 contrib/README
 contrib/rtgtargmkr-with-modules-0.2.tar.gz
+etc/rtg/rtg.conf
+etc/rtg/rtgtargmkr.pl
+etc/rtg/routers
+etc/rtg/createdb
+etc/rtg/BER.pm
+etc/rtg/SNMP_Session.pm
+etc/rtg/SNMP_util.pm
 include/common.h
 include/rtg.h
 include/rtgplot.h
-share/nls/POSIX
-share/nls/en_US.US-ASCII
 www/data/95.php
 www/data/common.php
 www/data/rtg.php
@@ -16,3 +21,4 @@ www/data/rtg.png
 www/data/rtgback.png
 www/data/view.php
 @dirrm contrib
+@dirrm etc/rtg