Attachment 142581 Details for Bug 189620 – rtg-20140510.patch

[patch] rtg-20140510.patch

rtg-20140510.patch (text/plain), 4.95 KB, created by Daniel Austin on 2014-05-10 18:50:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Austin

Created: 2014-05-10 18:50:00 UTC

Size: 4.95 KB

patch

obsolete

>diff -ruN rtg.orig/Makefile rtg/Makefile
>--- rtg.orig/Makefile	2014-01-22 17:00:46.000000000 +0000
>+++ rtg/Makefile	2014-05-10 17:58:33.874348208 +0100
>@@ -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 <bsd.port.pre.mk>
> 
> .if ( ${OSVERSION} >= 800040 )
>@@ -36,7 +39,4 @@
> 	@${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 <bsd.port.post.mk>
>diff -ruN rtg.orig/files/patch-etc-Makefile.in rtg/files/patch-etc-Makefile.in
>--- rtg.orig/files/patch-etc-Makefile.in	2014-01-22 17:40:44.000000000 +0000
>+++ rtg/files/patch-etc-Makefile.in	2014-05-10 17:33:25.007390075 +0100
>@@ -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:
>diff -ruN rtg.orig/files/pkg-message.in rtg/files/pkg-message.in
>--- rtg.orig/files/pkg-message.in	1970-01-01 01:00:00.000000000 +0100
>+++ rtg/files/pkg-message.in	2014-05-10 17:56:42.941294041 +0100
>@@ -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.
>diff -ruN rtg.orig/pkg-plist rtg/pkg-plist
>--- rtg.orig/pkg-plist	2014-01-22 15:16:56.000000000 +0000
>+++ rtg/pkg-plist	2014-05-10 17:48:52.649325586 +0100
>@@ -4,22 +4,24 @@
> 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

Actions: View | Diff

Attachments on bug 189620: 142581