Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 9 Jan 2000 00:25:26 +0300 (MSK)
From:      Dmitry Sivachenko <dima@Chg.RU>
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/15999: Please update net/rrdtool to 1.0.10
Message-ID:  <200001082125.AAA93005@netserv1.chg.ru>

next in thread | raw e-mail | index | archive | help

>Number:         15999
>Category:       ports
>Synopsis:       Please update net/rrdtool to 1.0.10
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jan  8 13:30:00 PST 2000
>Closed-Date:
>Last-Modified:
>Originator:     Dmitry Sivachenko
>Release:        FreeBSD 3.3-RELEASE i386
>Organization:
>Environment:

	

>Description:

This patch removes an ugly do-install target from the Makefile.
I am the maintainer.

>How-To-Repeat:

	

>Fix:
	

diff -Nur rrdtool.old/Makefile rrdtool/Makefile
--- rrdtool.old/Makefile	Fri Jan  7 20:08:28 2000
+++ rrdtool/Makefile	Sat Jan  8 23:18:54 2000
@@ -1,46 +1,33 @@
 # New ports collection makefile for:	rrdtool
-# Version required:			1.0.8
+# Version required:			1.0.10
 # Date created:				20 July 1999
 # Whom:					Dmitry Sivachenko <dima@Chg.RU>
 #
 # $FreeBSD: ports/net/rrdtool/Makefile,v 1.7 1999/12/23 17:08:22 steve Exp $
 #
 
-DISTNAME=	rrdtool-1.0.8
+DISTNAME=	rrdtool-1.0.10
 CATEGORIES=	net
 MASTER_SITES=	http://ee-staff.ethz.ch/~oetiker/webtools/rrdtool/pub/
 
 MAINTAINER=	dima@Chg.RU
 
-USE_PERL5=	YES
+USE_PERL5=	yes
 MAKE_ENV+=	PERL=${PERL}
 
-GNU_CONFIGURE=	YES
+USE_LIBTOOL=	yes
+
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--enable-shared=yes
 
 CONFIGURE_ENV=	PERL=${PERL}
 
 MAN1=		RRDp.1 RRDs.1 bin_dec_hex.1 rrdcgi.1 rrdcreate.1 rrddump.1 \
 		rrdfetch.1 rrdgraph.1 rrdlast.1 rrdresize.1 rrdrestore.1 \
-		rrdtool.1 rrdtune.1 rrdtutorial.1 rrdupdate.1
+		rrdtool.1 rrdtune.1 rrdtutorial.1 rrdupdate.1 cdeftutorial.1 \
+		rpntutorial.1
 MAN3=		RRDp.3 RRDs.3
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
-
-do-install:
-		${INSTALL_PROGRAM} ${WRKSRC}/src/rrdtool ${PREFIX}/bin
-		${INSTALL_PROGRAM} ${WRKSRC}/src/rrdcgi ${PREFIX}/bin
-		${INSTALL_SCRIPT} ${WRKSRC}/contrib/log2rrd/log2rrd.pl ${PREFIX}/bin
-		${MKDIR} -m 755 ${PREFIX}/share/examples/rrdtool
-		${INSTALL_SCRIPT} ${WRKSRC}/examples/*.pl ${PREFIX}/share/examples/rrdtool
-		${INSTALL_SCRIPT} ${WRKSRC}/examples/*.cgi ${PREFIX}/share/examples/rrdtool
-		${INSTALL_MAN} ${WRKSRC}/doc/*.1 ${PREFIX}/man/man1
-.if !defined(NOPORTDOCS)
-		${MKDIR} -m 755 ${PREFIX}/share/doc/rrdtool
-		${INSTALL_DATA} ${WRKSRC}/contrib/log2rrd/README ${PREFIX}/share/doc/rrdtool/README.log2rrd
-		${INSTALL_DATA} ${WRKSRC}/doc/*.html ${PREFIX}/share/doc/rrdtool
-.endif
-		for dir in piped shared; do \
-			cd ${WRKSRC}/perl-$$dir; ${MAKE} install; \
-		done
 
 post-install:
 .if !defined(BATCH)
diff -Nur rrdtool.old/files/md5 rrdtool/files/md5
--- rrdtool.old/files/md5	Fri Jan  7 20:08:27 2000
+++ rrdtool/files/md5	Fri Jan  7 20:12:33 2000
@@ -1 +1 @@
-MD5 (rrdtool-1.0.8.tar.gz) = 2cfa8fcf701d128e193d8c11a81b4588
+MD5 (rrdtool-1.0.10.tar.gz) = 8aebe66d23b15c13dd1e7e521abbebad
diff -Nur rrdtool.old/patches/patch-ac rrdtool/patches/patch-ac
--- rrdtool.old/patches/patch-ac	Thu Jan  1 03:00:00 1970
+++ rrdtool/patches/patch-ac	Fri Jan  7 22:59:45 2000
@@ -0,0 +1,21 @@
+--- Makefile.in.orig	Fri Jan  7 22:59:16 2000
++++ Makefile.in	Fri Jan  7 22:59:21 2000
+@@ -373,12 +373,12 @@
+ 
+ 
+ # lets schedule the perl stuff for installation
+-install-data-local:
+-	$(INSTALL) -d -m 755 $(prefix)/lib/perl/auto/RRDs
+-	$(INSTALL) -m 644 perl-piped/RRDp.pm $(prefix)/lib/perl
+-	$(INSTALL) -m 644 perl-shared/RRDs.pm $(prefix)/lib/perl
+-	$(INSTALL) -m 644 perl-shared/blib/arch/auto/RRDs/RRDs.bs $(prefix)/lib/perl/auto/RRDs
+-	$(INSTALL) -m 755 perl-shared/blib/arch/auto/RRDs/RRDs.so $(prefix)/lib/perl/auto/RRDs
++install-data-local: site-perl-inst
++#	$(INSTALL) -d -m 755 $(prefix)/lib/perl/auto/RRDs
++#	$(INSTALL) -m 644 perl-piped/RRDp.pm $(prefix)/lib/perl
++#	$(INSTALL) -m 644 perl-shared/RRDs.pm $(prefix)/lib/perl
++#	$(INSTALL) -m 644 perl-shared/blib/arch/auto/RRDs/RRDs.bs $(prefix)/lib/perl/auto/RRDs
++#	$(INSTALL) -m 755 perl-shared/blib/arch/auto/RRDs/RRDs.so $(prefix)/lib/perl/auto/RRDs
+ 
+ # rules for building the perl module
+ perl_piped: perl-piped/Makefile
diff -Nur rrdtool.old/patches/patch-ae rrdtool/patches/patch-ae
--- rrdtool.old/patches/patch-ae	Thu Jan  1 03:00:00 1970
+++ rrdtool/patches/patch-ae	Fri Jan  7 20:58:08 2000
@@ -0,0 +1,14 @@
+--- doc/Makefile.in.orig	Fri Jan  7 20:56:21 2000
++++ doc/Makefile.in	Fri Jan  7 20:57:05 2000
+@@ -96,9 +96,9 @@
+ EXTRA_DIST = $(POD) $(HTML) $(TXT)
+ 
+ # some install rules
+-idocdir = $(prefix)/doc
++idocdir = $(prefix)/share/doc/rrdtool
+ idoc_DATA = $(POD) $(TXT)
+-ihtmldir = $(prefix)/html
++ihtmldir = $(prefix)/share/doc/rrdtool/html
+ ihtml_DATA = $(HTML)
+ imandir = $(prefix)/man/man1
+ iman_DATA = $(MAN)
diff -Nur rrdtool.old/patches/patch-af rrdtool/patches/patch-af
--- rrdtool.old/patches/patch-af	Thu Jan  1 03:00:00 1970
+++ rrdtool/patches/patch-af	Fri Jan  7 21:21:59 2000
@@ -0,0 +1,11 @@
+--- examples/Makefile.in.orig	Fri Jan  7 20:58:16 2000
++++ examples/Makefile.in	Fri Jan  7 20:59:13 2000
+@@ -81,7 +81,7 @@
+ 
+ EXTRA_DIST = cgi-demo.cgi.in    piped-demo.pl.in   shared-demo.pl.in stripes.pl.in bigtops.pl.in minmax.pl.in
+ 
+-examplesdir = $(prefix)/examples
++examplesdir = $(prefix)/share/examples/rrdtool
+ examples_SCRIPTS = cgi-demo.cgi piped-demo.pl shared-demo.pl stripes.pl bigtops.pl minmax.pl
+ mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
+ CONFIG_HEADER = ../config/config.h
diff -Nur rrdtool.old/patches/patch-ag rrdtool/patches/patch-ag
--- rrdtool.old/patches/patch-ag	Thu Jan  1 03:00:00 1970
+++ rrdtool/patches/patch-ag	Fri Jan  7 21:23:32 2000
@@ -0,0 +1,11 @@
+--- contrib/Makefile.in.orig	Fri Jan  7 21:04:47 2000
++++ contrib/Makefile.in	Fri Jan  7 21:04:24 2000
+@@ -77,7 +77,7 @@
+ 
+ SUBDIRS = log2rrd rrd-file-icon trytime rrdproc
+ 
+-contribdir = $(prefix)/contrib
++contribdir = $(prefix)/share/examples/rrdtool
+ contrib_DATA = README
+ mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
+ CONFIG_HEADER = ../config/config.h
diff -Nur rrdtool.old/patches/patch-ah rrdtool/patches/patch-ah
--- rrdtool.old/patches/patch-ah	Thu Jan  1 03:00:00 1970
+++ rrdtool/patches/patch-ah	Fri Jan  7 21:10:23 2000
@@ -0,0 +1,11 @@
+--- contrib/log2rrd/Makefile.in.orig	Fri Jan  7 21:07:22 2000
++++ contrib/log2rrd/Makefile.in	Fri Jan  7 21:07:45 2000
+@@ -77,7 +77,7 @@
+ 
+ EXTRA_DIST = log2rrd.pl.in
+ 
+-contribdir = $(prefix)/contrib/log2rrd
++contribdir = $(prefix)/share/examples/rrdtool/log2rrd
+ contrib_DATA = README
+ contrib_SCRIPTS = log2rrd.pl
+ mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
diff -Nur rrdtool.old/patches/patch-ai rrdtool/patches/patch-ai
--- rrdtool.old/patches/patch-ai	Thu Jan  1 03:00:00 1970
+++ rrdtool/patches/patch-ai	Fri Jan  7 21:10:48 2000
@@ -0,0 +1,11 @@
+--- contrib/rrd-file-icon/Makefile.in.orig	Fri Jan  7 21:08:22 2000
++++ contrib/rrd-file-icon/Makefile.in	Fri Jan  7 21:08:46 2000
+@@ -76,7 +76,7 @@
+ ZLIB_LIB_DIR = @ZLIB_LIB_DIR@
+ 
+ EXTRA_DIST = rrd.png
+-contribdir = $(prefix)/contrib/rrd-file-icon
++contribdir = $(prefix)/share/examples/rrdtool/rrd-file-icon
+ contrib_DATA = README       rrd.png
+ mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
+ CONFIG_HEADER = ../../config/config.h
diff -Nur rrdtool.old/patches/patch-aj rrdtool/patches/patch-aj
--- rrdtool.old/patches/patch-aj	Thu Jan  1 03:00:00 1970
+++ rrdtool/patches/patch-aj	Fri Jan  7 21:11:09 2000
@@ -0,0 +1,11 @@
+--- contrib/rrdproc/Makefile.in.orig	Fri Jan  7 21:09:17 2000
++++ contrib/rrdproc/Makefile.in	Fri Jan  7 21:09:36 2000
+@@ -76,7 +76,7 @@
+ ZLIB_LIB_DIR = @ZLIB_LIB_DIR@
+ 
+ EXTRA_DIST = rrdproc.c
+-contribdir = $(prefix)/contrib/rrdproc
++contribdir = $(prefix)/share/examples/rrdtool/rrdproc
+ contrib_DATA = README rrdproc.c
+ mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
+ CONFIG_HEADER = ../../config/config.h
diff -Nur rrdtool.old/patches/patch-ak rrdtool/patches/patch-ak
--- rrdtool.old/patches/patch-ak	Thu Jan  1 03:00:00 1970
+++ rrdtool/patches/patch-ak	Fri Jan  7 21:12:06 2000
@@ -0,0 +1,11 @@
+--- contrib/trytime/Makefile.in.orig	Fri Jan  7 21:11:21 2000
++++ contrib/trytime/Makefile.in	Fri Jan  7 21:11:41 2000
+@@ -76,7 +76,7 @@
+ ZLIB_LIB_DIR = @ZLIB_LIB_DIR@
+ 
+ EXTRA_DIST = trytime.c
+-contribdir = $(prefix)/contrib/trytime
++contribdir = $(prefix)/share/examples/rrdtool/trytime
+ contrib_DATA = README trytime.c
+ mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
+ CONFIG_HEADER = ../../config/config.h
diff -Nur rrdtool.old/pkg/PLIST rrdtool/pkg/PLIST
--- rrdtool.old/pkg/PLIST	Fri Jan  7 20:08:28 2000
+++ rrdtool/pkg/PLIST	Sun Jan  9 00:20:06 2000
@@ -1,35 +1,87 @@
 bin/rrdtool
 bin/rrdcgi
-bin/log2rrd.pl
-share/examples/rrdtool/bigtops.pl
-share/examples/rrdtool/minmax.pl
+lib/librrd.a
+lib/librrd.so.0
+lib/librrd.so
+@exec /sbin/ldconfig -m %D/lib
+@unexec /sbin/ldconfig -R
+share/examples/rrdtool/cgi-demo.cgi
 share/examples/rrdtool/piped-demo.pl
 share/examples/rrdtool/shared-demo.pl
 share/examples/rrdtool/stripes.pl
-share/examples/rrdtool/cgi-demo.cgi
-share/doc/rrdtool/README.log2rrd
-share/doc/rrdtool/RRDp.html
-share/doc/rrdtool/RRDs.html
-share/doc/rrdtool/bin_dec_hex.html
-share/doc/rrdtool/cdeftutorial.html
-share/doc/rrdtool/rpntutorial.html
-share/doc/rrdtool/rrdcgi.html
-share/doc/rrdtool/rrdcreate.html
-share/doc/rrdtool/rrddump.html
-share/doc/rrdtool/rrdfetch.html
-share/doc/rrdtool/rrdgraph.html
-share/doc/rrdtool/rrdlast.html
-share/doc/rrdtool/rrdresize.html
-share/doc/rrdtool/rrdrestore.html
-share/doc/rrdtool/rrdtool.html
-share/doc/rrdtool/rrdtune.html
-share/doc/rrdtool/rrdtutorial.html
-share/doc/rrdtool/rrdupdate.html
+share/examples/rrdtool/bigtops.pl
+share/examples/rrdtool/minmax.pl
+share/examples/rrdtool/log2rrd/log2rrd.pl
+share/examples/rrdtool/log2rrd/README
+share/examples/rrdtool/rrd-file-icon/rrd.png
+share/examples/rrdtool/rrd-file-icon/README
+share/examples/rrdtool/trytime/trytime.c
+share/examples/rrdtool/trytime/README
+share/examples/rrdtool/rrdproc/rrdproc.c
+share/examples/rrdtool/rrdproc/README
+share/examples/rrdtool/README
+share/doc/rrdtool/rrdtool.pod
+share/doc/rrdtool/rrdlast.pod
+share/doc/rrdtool/rrdcreate.pod
+share/doc/rrdtool/rrdupdate.pod
+share/doc/rrdtool/cdeftutorial.pod
+share/doc/rrdtool/rpntutorial.pod
+share/doc/rrdtool/rrdgraph.pod
+share/doc/rrdtool/bin_dec_hex.pod
+share/doc/rrdtool/rrdfetch.pod
+share/doc/rrdtool/rrdrestore.pod
+share/doc/rrdtool/rrddump.pod
+share/doc/rrdtool/rrdtune.pod
+share/doc/rrdtool/rrdresize.pod
+share/doc/rrdtool/rrdcgi.pod
+share/doc/rrdtool/rrdtutorial.pod
+share/doc/rrdtool/rrdtool.txt
+share/doc/rrdtool/rrdlast.txt
+share/doc/rrdtool/rrdcreate.txt
+share/doc/rrdtool/rrdupdate.txt
+share/doc/rrdtool/cdeftutorial.txt
+share/doc/rrdtool/rpntutorial.txt
+share/doc/rrdtool/rrdgraph.txt
+share/doc/rrdtool/bin_dec_hex.txt
+share/doc/rrdtool/rrdfetch.txt
+share/doc/rrdtool/rrdrestore.txt
+share/doc/rrdtool/rrddump.txt
+share/doc/rrdtool/rrdtune.txt
+share/doc/rrdtool/rrdresize.txt
+share/doc/rrdtool/rrdcgi.txt
+share/doc/rrdtool/rrdtutorial.txt
+share/doc/rrdtool/RRDs.txt
+share/doc/rrdtool/RRDp.txt
+share/doc/rrdtool/html/rrdtool.html
+share/doc/rrdtool/html/rrdlast.html
+share/doc/rrdtool/html/rrdcreate.html
+share/doc/rrdtool/html/rrdupdate.html
+share/doc/rrdtool/html/cdeftutorial.html
+share/doc/rrdtool/html/rpntutorial.html
+share/doc/rrdtool/html/rrdgraph.html
+share/doc/rrdtool/html/bin_dec_hex.html
+share/doc/rrdtool/html/rrdfetch.html
+share/doc/rrdtool/html/rrdrestore.html
+share/doc/rrdtool/html/rrddump.html
+share/doc/rrdtool/html/rrdtune.html
+share/doc/rrdtool/html/rrdresize.html
+share/doc/rrdtool/html/rrdcgi.html
+share/doc/rrdtool/html/rrdtutorial.html
+share/doc/rrdtool/html/RRDs.html
+share/doc/rrdtool/html/RRDp.html
 lib/perl5/site_perl/%%PERL_VER%%/RRDp.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/RRDp/.packlist
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/RRDs.pm
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/ntmake.pl
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/RRDs/RRDs.so
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/RRDs/RRDs.bs
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/RRDs/.packlist
+@dirrm share/examples/rrdtool/log2rrd
+@dirrm share/examples/rrdtool/trytime
+@dirrm share/examples/rrdtool/rrdproc
+@dirrm share/examples/rrdtool/rrd-file-icon
 @dirrm share/examples/rrdtool
+@dirrm share/doc/rrdtool/html
 @dirrm share/doc/rrdtool
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/RRDp
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/RRDs

>Release-Note:
>Audit-Trail:
>Unformatted:


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200001082125.AAA93005>