From owner-svn-ports-all@FreeBSD.ORG Fri May 30 08:05:13 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 10DEF184; Fri, 30 May 2014 08:05:13 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E67B82B97; Fri, 30 May 2014 08:05:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4U85CEr018430; Fri, 30 May 2014 08:05:12 GMT (envelope-from jadawin@svn.freebsd.org) Received: (from jadawin@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4U85CNk018426; Fri, 30 May 2014 08:05:12 GMT (envelope-from jadawin@svn.freebsd.org) Message-Id: <201405300805.s4U85CNk018426@svn.freebsd.org> From: Philippe Audeoud Date: Fri, 30 May 2014 08:05:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r355800 - in head/net/rtg: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 May 2014 08:05:13 -0000 Author: jadawin Date: Fri May 30 08:05:11 2014 New Revision: 355800 URL: http://svnweb.freebsd.org/changeset/ports/355800 QAT: https://qat.redports.org/buildarchive/r355800/ Log: - Convert to STAGE PR: ports/189620 Submitted by: maintainer Added: head/net/rtg/files/pkg-message.in (contents, props changed) Modified: head/net/rtg/Makefile head/net/rtg/files/patch-etc-Makefile.in head/net/rtg/pkg-plist Modified: head/net/rtg/Makefile ============================================================================== --- head/net/rtg/Makefile Fri May 30 08:05:02 2014 (r355799) +++ head/net/rtg/Makefile Fri May 30 08:05:11 2014 (r355800) @@ -3,25 +3,28 @@ PORTNAME= rtg PORTVERSION= 0.7.4 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= net MASTER_SITES= SF MAINTAINER= freebsd-ports@dan.me.uk COMMENT= A flexible, high-performance SNMP statistics monitoring system -LIB_DEPENDS= netsnmp:${PORTSDIR}/net-mgmt/net-snmp +LICENSE= GPLv2 -MAN1= rtgplot.1 rtgpoll.1 +LIB_DEPENDS= libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp USE_RC_SUBR= rtgpoll USE_MYSQL= yes +WANT_PERL= yes +USES= shebangfix +SHEBANG_FILES= etc/95.pl etc/report.pl +SUB_FILES= pkg-message GNU_CONFIGURE= yes CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/etc/${PORTNAME} \ --with-mysql=${LOCALBASE} \ --with-snmp=${LOCALBASE} -NO_STAGE= yes .include .if ( ${OSVERSION} >= 800040 ) @@ -36,7 +39,4 @@ post-patch: @${MV} ${WRKSRC}/etc/rtg.conf ${WRKSRC}/etc/rtg.conf.sample @${MV} ${WRKSRC}/etc/routers ${WRKSRC}/etc/routers.sample -post-install: - @${ECHO} "To enable the web interface, copy ${PREFIX}/bin/rtgplot to your site cgi-bin as rtgplot.cgi" - .include Modified: head/net/rtg/files/patch-etc-Makefile.in ============================================================================== --- head/net/rtg/files/patch-etc-Makefile.in Fri May 30 08:05:02 2014 (r355799) +++ head/net/rtg/files/patch-etc-Makefile.in Fri May 30 08:05:11 2014 (r355800) @@ -1,14 +1,15 @@ --- etc/Makefile.in.orig 2003-10-02 16:59:32.000000000 +0100 -+++ etc/Makefile.in 2010-07-04 03:34:26.379748720 +0100 ++++ etc/Makefile.in 2014-05-10 17:29:11.995407415 +0100 @@ -84,19 +84,19 @@ install_sh = @install_sh@ top_builddir = .. -etcdir = /etc -webdir = /web +-reportsdir = /bin +etcdir = @etcdir@ +webdir = @webdir@ - reportsdir = /bin ++reportsdir = @bindir@ -ETC = rtg.conf rtgtargmkr.pl routers createdb BER.pm \ +ETC = rtg.conf.sample rtgtargmkr.pl routers.sample createdb BER.pm \ @@ -25,21 +26,24 @@ subdir = etc mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs -@@ -220,13 +220,13 @@ +@@ -220,14 +220,14 @@ all: install: installdirs - @for i in $(ETC) ; do $(INSTALL) $(srcdir)/$$i $(prefix)$(etcdir) ; echo "install: installed $$i in $(prefix)$(etcdir)" ; done - @for i in $(WEB) ; do $(INSTALL) $(srcdir)/$$i $(prefix)$(webdir) ; echo "install: installed $$i in $(prefix)$(webdir)" ; done -+ @for i in $(ETC) ; do $(INSTALL) $(srcdir)/$$i $(etcdir) ; echo "install: installed $$i in $(etcdir)" ; done -+ @for i in $(WEB) ; do $(INSTALL) $(srcdir)/$$i $(webdir) ; echo "install: installed $$i in $(webdir)" ; done - @for i in $(REPORTS) ; do $(INSTALL) $(srcdir)/$$i $(prefix)$(reportsdir) ; echo "install: installed $$i in $(prefix)$(reportsdir)" ; done +- @for i in $(REPORTS) ; do $(INSTALL) $(srcdir)/$$i $(prefix)$(reportsdir) ; echo "install: installed $$i in $(prefix)$(reportsdir)" ; done ++ @for i in $(ETC) ; do $(INSTALL) $(srcdir)/$$i $(DESTDIR)$(etcdir) ; echo "install: installed $$i in $(DESTDIR)$(etcdir)" ; done ++ @for i in $(WEB) ; do $(INSTALL) $(srcdir)/$$i $(DESTDIR)$(webdir) ; echo "install: installed $$i in $(DESTDIR)$(webdir)" ; done ++ @for i in $(REPORTS) ; do $(INSTALL) $(srcdir)/$$i $(DESTDIR)$(reportsdir) ; echo "install: installed $$i in $(DESTDIR)$(reportsdir)" ; done installdirs: - $(mkinstalldirs) $(prefix)$(etcdir) - $(mkinstalldirs) $(prefix)$(webdir) -+ $(mkinstalldirs) $(etcdir) -+ $(mkinstalldirs) $(webdir) - $(mkinstalldirs) $(prefix)$(reportsdir) +- $(mkinstalldirs) $(prefix)$(reportsdir) ++ $(mkinstalldirs) $(DESTDIR)$(etcdir) ++ $(mkinstalldirs) $(DESTDIR)$(webdir) ++ $(mkinstalldirs) $(DESTDIR)$(reportsdir) # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: Added: head/net/rtg/files/pkg-message.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/rtg/files/pkg-message.in Fri May 30 08:05:11 2014 (r355800) @@ -0,0 +1,2 @@ +To enable the web interface, copy %%PREFIX%%/bin/rtgplot to your site cgi-bin as rtgplot.cgi +Without this step, your graphs will be broken. Modified: head/net/rtg/pkg-plist ============================================================================== --- head/net/rtg/pkg-plist Fri May 30 08:05:02 2014 (r355799) +++ head/net/rtg/pkg-plist Fri May 30 08:05:11 2014 (r355800) @@ -4,22 +4,24 @@ bin/rtgplot bin/rtgpoll contrib/README contrib/rtgtargmkr-with-modules-0.2.tar.gz -etc/rtg/rtg.conf.sample -etc/rtg/rtgtargmkr.pl -etc/rtg/routers.sample -etc/rtg/createdb -etc/rtg/BER.pm -etc/rtg/SNMP_Session.pm -etc/rtg/SNMP_util.pm +%%ETCDIR%%/rtg.conf.sample +%%ETCDIR%%/rtgtargmkr.pl +%%ETCDIR%%/routers.sample +%%ETCDIR%%/createdb +%%ETCDIR%%/BER.pm +%%ETCDIR%%/SNMP_Session.pm +%%ETCDIR%%/SNMP_util.pm include/common.h include/rtg.h include/rtgplot.h +man/man1/rtgplot.1.gz +man/man1/rtgpoll.1.gz www/data/95.php www/data/common.php www/data/rtg.php www/data/rtg.png www/data/rtgback.png www/data/view.php -@dirrm contrib -@dirrm etc/rtg +@dirrmtry contrib +@dirrmtry %%ETCDIR%% @dirrmtry www/data