mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-23 00:43:28 +00:00
Code Issues Releases Activity

Update to version 1.0.47.

Browse Source
This commit is contained in:
Dmitry Sivachenko 2004-04-06 07:30:51 +00:00
parent fdc587a4b0
commit 216dba9b3e
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=106296
32 changed files with 148 additions and 232 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
databases/rrdtool/Makefile
View File

@ -6,20 +6,25 @@
#
PORTNAME= rrdtool
PORTVERSION= 1.0.45
PORTVERSION= 1.0.47
CATEGORIES= net
MASTER_SITES= http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/
MAINTAINER= demon@FreeBSD.org
COMMENT= Round Robin Database Tools
LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png
USE_PERL5= yes
MAKE_ENV+= PERL=${PERL}
USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-shared=yes
CONFIGURE_ARGS= --enable-shared --enable-local-zlib --enable-local-libpng \
--program-transform-name=''
CONFIGURE_ENV= PERL=${PERL}
CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib
LDFLAGS+= -L${LOCALBASE}/lib
CFLAGS:= ${CFLAGS:N-ffast-math}
MAN1= RRDp.1 RRDs.1 bin_dec_hex.1 rrdcgi.1 rrdcreate.1 rrddump.1 \

4
databases/rrdtool/distinfo
View File

@ -1,2 +1,2 @@
MD5 (rrdtool-1.0.45.tar.gz) = 64086fc7f1ca28c069ee5104f85d7a8c
SIZE (rrdtool-1.0.45.tar.gz) = 1176656
MD5 (rrdtool-1.0.47.tar.gz) = 19fec533ad125b2538f5e27b3be6dfd6
SIZE (rrdtool-1.0.47.tar.gz) = 1462489

13
databases/rrdtool/files/patch-aa
View File

@ -1,12 +1,11 @@
--- perl-shared/Makefile.PL.in.orig Wed May 1 17:55:28 2002
+++ perl-shared/Makefile.PL.in Wed May 1 18:00:05 2002
@@ -10,7 +10,8 @@
--- perl-shared/Makefile.PL.in.orig Sat Apr 3 18:33:13 2004
+++ perl-shared/Makefile.PL.in Tue Apr 6 10:49:27 2004
@@ -10,7 +10,7 @@
'NAME' => 'RRDs',
'VERSION_FROM' => '@top_srcdir@/perl-shared/RRDs.pm', # finds $VERSION
'DEFINE' => "-DPERLPATCHLEVEL=$Config{PATCHLEVEL}",
- 'INC' => '-I@top_srcdir@/src -I@top_srcdir@/gd1.3',
+ 'CCFLAGS' => '-DHAVE_CONFIG_H',
+ 'INC' => '-I../config -I@top_srcdir@/src -I@top_srcdir@/gd1.3',
- 'INC' => '-I@top_srcdir@ -I@top_srcdir@/src -I@top_srcdir@/gd1.3',
+ 'INC' => '-I../ -I@top_srcdir@ -I@top_srcdir@/src -I@top_srcdir@/gd1.3',
'CCFLAGS' => '-DHAVE_CONFIG_H',
# where to look for the necessary libraries
# Perl will figure out which one is valid
'depend' => {'RRDs.c' => "../src/.libs/librrd_private.a"},

12
databases/rrdtool/files/patch-ab
View File

@ -1,11 +1,11 @@
--- src/rrd_tool.c.orig Sun Apr 14 11:48:04 2002
+++ src/rrd_tool.c Wed May 1 15:59:04 2002
@@ -322,12 +322,12 @@
--- src/rrd_tool.c.orig Mon Apr 5 02:13:52 2004
+++ src/rrd_tool.c Tue Apr 6 10:51:41 2004
@@ -340,12 +340,12 @@
datai=data;
printf(" ");
printf(" ");
for (i = 0; i<ds_cnt;i++)
- printf("%14s",ds_namv[i]);
+ printf("%14s ",ds_namv[i]);
- printf(" %20s",ds_namv[i]);
+ printf(" %20s ",ds_namv[i]);
printf ("\n\n");
for (i = start; i <= end; i += step){
- printf("%10lu:", i);

26
databases/rrdtool/files/patch-ac
View File

@ -1,23 +1,17 @@
--- Makefile.in.orig Mon Oct 20 22:43:34 2003
+++ Makefile.in Mon Oct 20 22:43:25 2003
@@ -393,13 +393,13 @@
--- Makefile.in.orig Mon Apr 5 02:03:53 2004
+++ Makefile.in Tue Apr 6 10:53:31 2004
@@ -633,13 +633,7 @@
# lets schedule the perl stuff for installation
# the special call to install-sh is because the -d switch is not portable
# mac os X has its perl module in bundles so it seems
-install-data-local:
- $(top_srcdir)/config/mkinstalldirs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs
- $(INSTALL) -m 644 perl-piped/RRDp.pm $(DESTDIR)$(prefix)/lib/perl
- $(INSTALL) -m 644 perl-shared/RRDs.pm $(DESTDIR)$(prefix)/lib/perl
- $(INSTALL) -m 644 perl-shared/blib/arch/auto/RRDs/RRDs.bs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs
- test -f perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@ && $(INSTALL) -m 755 perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@ $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true
- test -f perl-shared/blib/arch/auto/RRDs/RRDs.bundle && $(INSTALL) -m 755 perl-shared/blib/arch/auto/RRDs/RRDs.bundle $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true
- $(INSTALL) -m 644 $(top_srcdir)/perl-piped/RRDp.pm $(DESTDIR)$(prefix)/lib/perl
- $(INSTALL) -m 644 $(top_srcdir)/perl-shared/RRDs.pm $(DESTDIR)$(prefix)/lib/perl
- $(INSTALL) -m 644 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs
- test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@ && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@ $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true
- test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true
+install-data-local: site-perl-inst
+# $(top_srcdir)/config/mkinstalldirs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs
+# $(INSTALL) -m 644 perl-piped/RRDp.pm $(DESTDIR)$(prefix)/lib/perl
+# $(INSTALL) -m 644 perl-shared/RRDs.pm $(DESTDIR)$(prefix)/lib/perl
+# $(INSTALL) -m 644 perl-shared/blib/arch/auto/RRDs/RRDs.bs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs
+# test -f perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@ && $(INSTALL) -m 755 perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@ $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true
+# test -f perl-shared/blib/arch/auto/RRDs/RRDs.bundle && $(INSTALL) -m 755 perl-shared/blib/arch/auto/RRDs/RRDs.bundle $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true
perl_piped:: $(top_builddir)/perl-piped
test -d perl-piped \
# rules for building the perl module

10
databases/rrdtool/files/patch-ak
View File

@ -1,8 +1,8 @@
--- contrib/trytime/Makefile.in.orig Sun Apr 14 11:51:10 2002
+++ contrib/trytime/Makefile.in Wed May 1 16:09:23 2002
@@ -89,7 +89,7 @@
INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/gd1.3
--- contrib/trytime/Makefile.in.orig Mon Apr 5 02:03:53 2004
+++ contrib/trytime/Makefile.in Tue Apr 6 11:17:12 2004
@@ -162,7 +162,7 @@
target_vendor = @target_vendor@
AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/gd1.3
EXTRA_DIST = trytime.c
-contribdir = $(prefix)/contrib/trytime
+contribdir = $(prefix)/share/examples/rrdtool/trytime

20
databases/rrdtool/files/patch-al
View File

@ -1,20 +0,0 @@
--- src/parsetime.c.orig Fri Oct 11 14:39:46 2002
+++ src/parsetime.c Mon Feb 10 20:47:18 2003
@@ -660,6 +660,7 @@
{
long mday=0, wday, mon, year = ptv->tm.tm_year;
int tlen;
+ time_t montime;
switch (sc_tokid) {
case YESTERDAY:
@@ -713,7 +714,8 @@
tlen = strlen(sc_token);
mon = atol(sc_token);
if (mon > 10*356*24*60*60) {
- ptv->tm=*localtime(&mon);
+ montime = mon;
+ ptv->tm=*localtime(&montime);
token();
break;
}

1
databases/rrdtool/pkg-plist
View File

@ -3,6 +3,7 @@ bin/rrdcgi
bin/trytime
bin/rrdupdate
lib/librrd.a
lib/librrd.la
lib/librrd.so.0
lib/librrd.so
include/rrd.h

9
databases/rrdtool10/Makefile
View File

@ -6,20 +6,25 @@
#
PORTNAME= rrdtool
PORTVERSION= 1.0.45
PORTVERSION= 1.0.47
CATEGORIES= net
MASTER_SITES= http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/
MAINTAINER= demon@FreeBSD.org
COMMENT= Round Robin Database Tools
LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png
USE_PERL5= yes
MAKE_ENV+= PERL=${PERL}
USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-shared=yes
CONFIGURE_ARGS= --enable-shared --enable-local-zlib --enable-local-libpng \
--program-transform-name=''
CONFIGURE_ENV= PERL=${PERL}
CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib
LDFLAGS+= -L${LOCALBASE}/lib
CFLAGS:= ${CFLAGS:N-ffast-math}
MAN1= RRDp.1 RRDs.1 bin_dec_hex.1 rrdcgi.1 rrdcreate.1 rrddump.1 \

4
databases/rrdtool10/distinfo
View File

@ -1,2 +1,2 @@
MD5 (rrdtool-1.0.45.tar.gz) = 64086fc7f1ca28c069ee5104f85d7a8c
SIZE (rrdtool-1.0.45.tar.gz) = 1176656
MD5 (rrdtool-1.0.47.tar.gz) = 19fec533ad125b2538f5e27b3be6dfd6
SIZE (rrdtool-1.0.47.tar.gz) = 1462489

13
databases/rrdtool10/files/patch-aa
View File

@ -1,12 +1,11 @@
--- perl-shared/Makefile.PL.in.orig Wed May 1 17:55:28 2002
+++ perl-shared/Makefile.PL.in Wed May 1 18:00:05 2002
@@ -10,7 +10,8 @@
--- perl-shared/Makefile.PL.in.orig Sat Apr 3 18:33:13 2004
+++ perl-shared/Makefile.PL.in Tue Apr 6 10:49:27 2004
@@ -10,7 +10,7 @@
'NAME' => 'RRDs',
'VERSION_FROM' => '@top_srcdir@/perl-shared/RRDs.pm', # finds $VERSION
'DEFINE' => "-DPERLPATCHLEVEL=$Config{PATCHLEVEL}",
- 'INC' => '-I@top_srcdir@/src -I@top_srcdir@/gd1.3',
+ 'CCFLAGS' => '-DHAVE_CONFIG_H',
+ 'INC' => '-I../config -I@top_srcdir@/src -I@top_srcdir@/gd1.3',
- 'INC' => '-I@top_srcdir@ -I@top_srcdir@/src -I@top_srcdir@/gd1.3',
+ 'INC' => '-I../ -I@top_srcdir@ -I@top_srcdir@/src -I@top_srcdir@/gd1.3',
'CCFLAGS' => '-DHAVE_CONFIG_H',
# where to look for the necessary libraries
# Perl will figure out which one is valid
'depend' => {'RRDs.c' => "../src/.libs/librrd_private.a"},

12
databases/rrdtool10/files/patch-ab
View File

@ -1,11 +1,11 @@
--- src/rrd_tool.c.orig Sun Apr 14 11:48:04 2002
+++ src/rrd_tool.c Wed May 1 15:59:04 2002
@@ -322,12 +322,12 @@
--- src/rrd_tool.c.orig Mon Apr 5 02:13:52 2004
+++ src/rrd_tool.c Tue Apr 6 10:51:41 2004
@@ -340,12 +340,12 @@
datai=data;
printf(" ");
printf(" ");
for (i = 0; i<ds_cnt;i++)
- printf("%14s",ds_namv[i]);
+ printf("%14s ",ds_namv[i]);
- printf(" %20s",ds_namv[i]);
+ printf(" %20s ",ds_namv[i]);
printf ("\n\n");
for (i = start; i <= end; i += step){
- printf("%10lu:", i);

26
databases/rrdtool10/files/patch-ac
View File

@ -1,23 +1,17 @@
--- Makefile.in.orig Mon Oct 20 22:43:34 2003
+++ Makefile.in Mon Oct 20 22:43:25 2003
@@ -393,13 +393,13 @@
--- Makefile.in.orig Mon Apr 5 02:03:53 2004
+++ Makefile.in Tue Apr 6 10:53:31 2004
@@ -633,13 +633,7 @@
# lets schedule the perl stuff for installation
# the special call to install-sh is because the -d switch is not portable
# mac os X has its perl module in bundles so it seems
-install-data-local:
- $(top_srcdir)/config/mkinstalldirs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs
- $(INSTALL) -m 644 perl-piped/RRDp.pm $(DESTDIR)$(prefix)/lib/perl
- $(INSTALL) -m 644 perl-shared/RRDs.pm $(DESTDIR)$(prefix)/lib/perl
- $(INSTALL) -m 644 perl-shared/blib/arch/auto/RRDs/RRDs.bs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs
- test -f perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@ && $(INSTALL) -m 755 perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@ $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true
- test -f perl-shared/blib/arch/auto/RRDs/RRDs.bundle && $(INSTALL) -m 755 perl-shared/blib/arch/auto/RRDs/RRDs.bundle $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true
- $(INSTALL) -m 644 $(top_srcdir)/perl-piped/RRDp.pm $(DESTDIR)$(prefix)/lib/perl
- $(INSTALL) -m 644 $(top_srcdir)/perl-shared/RRDs.pm $(DESTDIR)$(prefix)/lib/perl
- $(INSTALL) -m 644 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs
- test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@ && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@ $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true
- test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true
+install-data-local: site-perl-inst
+# $(top_srcdir)/config/mkinstalldirs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs
+# $(INSTALL) -m 644 perl-piped/RRDp.pm $(DESTDIR)$(prefix)/lib/perl
+# $(INSTALL) -m 644 perl-shared/RRDs.pm $(DESTDIR)$(prefix)/lib/perl
+# $(INSTALL) -m 644 perl-shared/blib/arch/auto/RRDs/RRDs.bs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs
+# test -f perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@ && $(INSTALL) -m 755 perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@ $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true
+# test -f perl-shared/blib/arch/auto/RRDs/RRDs.bundle && $(INSTALL) -m 755 perl-shared/blib/arch/auto/RRDs/RRDs.bundle $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true
perl_piped:: $(top_builddir)/perl-piped
test -d perl-piped \
# rules for building the perl module

10
databases/rrdtool10/files/patch-ak
View File

@ -1,8 +1,8 @@
--- contrib/trytime/Makefile.in.orig Sun Apr 14 11:51:10 2002
+++ contrib/trytime/Makefile.in Wed May 1 16:09:23 2002
@@ -89,7 +89,7 @@
INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/gd1.3
--- contrib/trytime/Makefile.in.orig Mon Apr 5 02:03:53 2004
+++ contrib/trytime/Makefile.in Tue Apr 6 11:17:12 2004
@@ -162,7 +162,7 @@
target_vendor = @target_vendor@
AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/gd1.3
EXTRA_DIST = trytime.c
-contribdir = $(prefix)/contrib/trytime
+contribdir = $(prefix)/share/examples/rrdtool/trytime

20
databases/rrdtool10/files/patch-al
View File

@ -1,20 +0,0 @@
--- src/parsetime.c.orig Fri Oct 11 14:39:46 2002
+++ src/parsetime.c Mon Feb 10 20:47:18 2003
@@ -660,6 +660,7 @@
{
long mday=0, wday, mon, year = ptv->tm.tm_year;
int tlen;
+ time_t montime;
switch (sc_tokid) {
case YESTERDAY:
@@ -713,7 +714,8 @@
tlen = strlen(sc_token);
mon = atol(sc_token);
if (mon > 10*356*24*60*60) {
- ptv->tm=*localtime(&mon);
+ montime = mon;
+ ptv->tm=*localtime(&montime);
token();
break;
}

1
databases/rrdtool10/pkg-plist
View File

@ -3,6 +3,7 @@ bin/rrdcgi
bin/trytime
bin/rrdupdate
lib/librrd.a
lib/librrd.la
lib/librrd.so.0
lib/librrd.so
include/rrd.h

9
net/rrdtool/Makefile
View File

@ -6,20 +6,25 @@
#
PORTNAME= rrdtool
PORTVERSION= 1.0.45
PORTVERSION= 1.0.47
CATEGORIES= net
MASTER_SITES= http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/
MAINTAINER= demon@FreeBSD.org
COMMENT= Round Robin Database Tools
LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png
USE_PERL5= yes
MAKE_ENV+= PERL=${PERL}
USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-shared=yes
CONFIGURE_ARGS= --enable-shared --enable-local-zlib --enable-local-libpng \
--program-transform-name=''
CONFIGURE_ENV= PERL=${PERL}
CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib
LDFLAGS+= -L${LOCALBASE}/lib
CFLAGS:= ${CFLAGS:N-ffast-math}
MAN1= RRDp.1 RRDs.1 bin_dec_hex.1 rrdcgi.1 rrdcreate.1 rrddump.1 \

4
net/rrdtool/distinfo
View File

@ -1,2 +1,2 @@
MD5 (rrdtool-1.0.45.tar.gz) = 64086fc7f1ca28c069ee5104f85d7a8c
SIZE (rrdtool-1.0.45.tar.gz) = 1176656
MD5 (rrdtool-1.0.47.tar.gz) = 19fec533ad125b2538f5e27b3be6dfd6
SIZE (rrdtool-1.0.47.tar.gz) = 1462489

13
net/rrdtool/files/patch-aa
View File

@ -1,12 +1,11 @@
--- perl-shared/Makefile.PL.in.orig Wed May 1 17:55:28 2002
+++ perl-shared/Makefile.PL.in Wed May 1 18:00:05 2002
@@ -10,7 +10,8 @@
--- perl-shared/Makefile.PL.in.orig Sat Apr 3 18:33:13 2004
+++ perl-shared/Makefile.PL.in Tue Apr 6 10:49:27 2004
@@ -10,7 +10,7 @@
'NAME' => 'RRDs',
'VERSION_FROM' => '@top_srcdir@/perl-shared/RRDs.pm', # finds $VERSION
'DEFINE' => "-DPERLPATCHLEVEL=$Config{PATCHLEVEL}",
- 'INC' => '-I@top_srcdir@/src -I@top_srcdir@/gd1.3',
+ 'CCFLAGS' => '-DHAVE_CONFIG_H',
+ 'INC' => '-I../config -I@top_srcdir@/src -I@top_srcdir@/gd1.3',
- 'INC' => '-I@top_srcdir@ -I@top_srcdir@/src -I@top_srcdir@/gd1.3',
+ 'INC' => '-I../ -I@top_srcdir@ -I@top_srcdir@/src -I@top_srcdir@/gd1.3',
'CCFLAGS' => '-DHAVE_CONFIG_H',
# where to look for the necessary libraries
# Perl will figure out which one is valid
'depend' => {'RRDs.c' => "../src/.libs/librrd_private.a"},

12
net/rrdtool/files/patch-ab
View File

@ -1,11 +1,11 @@
--- src/rrd_tool.c.orig Sun Apr 14 11:48:04 2002
+++ src/rrd_tool.c Wed May 1 15:59:04 2002
@@ -322,12 +322,12 @@
--- src/rrd_tool.c.orig Mon Apr 5 02:13:52 2004
+++ src/rrd_tool.c Tue Apr 6 10:51:41 2004
@@ -340,12 +340,12 @@
datai=data;
printf(" ");
printf(" ");
for (i = 0; i<ds_cnt;i++)
- printf("%14s",ds_namv[i]);
+ printf("%14s ",ds_namv[i]);
- printf(" %20s",ds_namv[i]);
+ printf(" %20s ",ds_namv[i]);
printf ("\n\n");
for (i = start; i <= end; i += step){
- printf("%10lu:", i);

26
net/rrdtool/files/patch-ac
View File

@ -1,23 +1,17 @@
--- Makefile.in.orig Mon Oct 20 22:43:34 2003
+++ Makefile.in Mon Oct 20 22:43:25 2003
@@ -393,13 +393,13 @@
--- Makefile.in.orig Mon Apr 5 02:03:53 2004
+++ Makefile.in Tue Apr 6 10:53:31 2004
@@ -633,13 +633,7 @@
# lets schedule the perl stuff for installation
# the special call to install-sh is because the -d switch is not portable
# mac os X has its perl module in bundles so it seems
-install-data-local:
- $(top_srcdir)/config/mkinstalldirs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs
- $(INSTALL) -m 644 perl-piped/RRDp.pm $(DESTDIR)$(prefix)/lib/perl
- $(INSTALL) -m 644 perl-shared/RRDs.pm $(DESTDIR)$(prefix)/lib/perl
- $(INSTALL) -m 644 perl-shared/blib/arch/auto/RRDs/RRDs.bs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs
- test -f perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@ && $(INSTALL) -m 755 perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@ $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true
- test -f perl-shared/blib/arch/auto/RRDs/RRDs.bundle && $(INSTALL) -m 755 perl-shared/blib/arch/auto/RRDs/RRDs.bundle $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true
- $(INSTALL) -m 644 $(top_srcdir)/perl-piped/RRDp.pm $(DESTDIR)$(prefix)/lib/perl
- $(INSTALL) -m 644 $(top_srcdir)/perl-shared/RRDs.pm $(DESTDIR)$(prefix)/lib/perl
- $(INSTALL) -m 644 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs
- test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@ && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@ $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true
- test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true
+install-data-local: site-perl-inst
+# $(top_srcdir)/config/mkinstalldirs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs
+# $(INSTALL) -m 644 perl-piped/RRDp.pm $(DESTDIR)$(prefix)/lib/perl
+# $(INSTALL) -m 644 perl-shared/RRDs.pm $(DESTDIR)$(prefix)/lib/perl
+# $(INSTALL) -m 644 perl-shared/blib/arch/auto/RRDs/RRDs.bs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs
+# test -f perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@ && $(INSTALL) -m 755 perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@ $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true
+# test -f perl-shared/blib/arch/auto/RRDs/RRDs.bundle && $(INSTALL) -m 755 perl-shared/blib/arch/auto/RRDs/RRDs.bundle $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true
perl_piped:: $(top_builddir)/perl-piped
test -d perl-piped \
# rules for building the perl module

10
net/rrdtool/files/patch-ak
View File

@ -1,8 +1,8 @@
--- contrib/trytime/Makefile.in.orig Sun Apr 14 11:51:10 2002
+++ contrib/trytime/Makefile.in Wed May 1 16:09:23 2002
@@ -89,7 +89,7 @@
INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/gd1.3
--- contrib/trytime/Makefile.in.orig Mon Apr 5 02:03:53 2004
+++ contrib/trytime/Makefile.in Tue Apr 6 11:17:12 2004
@@ -162,7 +162,7 @@
target_vendor = @target_vendor@
AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/gd1.3
EXTRA_DIST = trytime.c
-contribdir = $(prefix)/contrib/trytime
+contribdir = $(prefix)/share/examples/rrdtool/trytime

20
net/rrdtool/files/patch-al
View File

@ -1,20 +0,0 @@
--- src/parsetime.c.orig Fri Oct 11 14:39:46 2002
+++ src/parsetime.c Mon Feb 10 20:47:18 2003
@@ -660,6 +660,7 @@
{
long mday=0, wday, mon, year = ptv->tm.tm_year;
int tlen;
+ time_t montime;
switch (sc_tokid) {
case YESTERDAY:
@@ -713,7 +714,8 @@
tlen = strlen(sc_token);
mon = atol(sc_token);
if (mon > 10*356*24*60*60) {
- ptv->tm=*localtime(&mon);
+ montime = mon;
+ ptv->tm=*localtime(&montime);
token();
break;
}

1
net/rrdtool/pkg-plist
View File

@ -3,6 +3,7 @@ bin/rrdcgi
bin/trytime
bin/rrdupdate
lib/librrd.a
lib/librrd.la
lib/librrd.so.0
lib/librrd.so
include/rrd.h

9
net/rrdtool10/Makefile
View File

@ -6,20 +6,25 @@
#
PORTNAME= rrdtool
PORTVERSION= 1.0.45
PORTVERSION= 1.0.47
CATEGORIES= net
MASTER_SITES= http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/
MAINTAINER= demon@FreeBSD.org
COMMENT= Round Robin Database Tools
LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png
USE_PERL5= yes
MAKE_ENV+= PERL=${PERL}
USE_LIBTOOL_VER=13
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-shared=yes
CONFIGURE_ARGS= --enable-shared --enable-local-zlib --enable-local-libpng \
--program-transform-name=''
CONFIGURE_ENV= PERL=${PERL}
CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib
LDFLAGS+= -L${LOCALBASE}/lib
CFLAGS:= ${CFLAGS:N-ffast-math}
MAN1= RRDp.1 RRDs.1 bin_dec_hex.1 rrdcgi.1 rrdcreate.1 rrddump.1 \

4
net/rrdtool10/distinfo
View File

@ -1,2 +1,2 @@
MD5 (rrdtool-1.0.45.tar.gz) = 64086fc7f1ca28c069ee5104f85d7a8c
SIZE (rrdtool-1.0.45.tar.gz) = 1176656
MD5 (rrdtool-1.0.47.tar.gz) = 19fec533ad125b2538f5e27b3be6dfd6
SIZE (rrdtool-1.0.47.tar.gz) = 1462489

13
net/rrdtool10/files/patch-aa
View File

@ -1,12 +1,11 @@
--- perl-shared/Makefile.PL.in.orig Wed May 1 17:55:28 2002
+++ perl-shared/Makefile.PL.in Wed May 1 18:00:05 2002
@@ -10,7 +10,8 @@
--- perl-shared/Makefile.PL.in.orig Sat Apr 3 18:33:13 2004
+++ perl-shared/Makefile.PL.in Tue Apr 6 10:49:27 2004
@@ -10,7 +10,7 @@
'NAME' => 'RRDs',
'VERSION_FROM' => '@top_srcdir@/perl-shared/RRDs.pm', # finds $VERSION
'DEFINE' => "-DPERLPATCHLEVEL=$Config{PATCHLEVEL}",
- 'INC' => '-I@top_srcdir@/src -I@top_srcdir@/gd1.3',
+ 'CCFLAGS' => '-DHAVE_CONFIG_H',
+ 'INC' => '-I../config -I@top_srcdir@/src -I@top_srcdir@/gd1.3',
- 'INC' => '-I@top_srcdir@ -I@top_srcdir@/src -I@top_srcdir@/gd1.3',
+ 'INC' => '-I../ -I@top_srcdir@ -I@top_srcdir@/src -I@top_srcdir@/gd1.3',
'CCFLAGS' => '-DHAVE_CONFIG_H',
# where to look for the necessary libraries
# Perl will figure out which one is valid
'depend' => {'RRDs.c' => "../src/.libs/librrd_private.a"},

12
net/rrdtool10/files/patch-ab
View File

@ -1,11 +1,11 @@
--- src/rrd_tool.c.orig Sun Apr 14 11:48:04 2002
+++ src/rrd_tool.c Wed May 1 15:59:04 2002
@@ -322,12 +322,12 @@
--- src/rrd_tool.c.orig Mon Apr 5 02:13:52 2004
+++ src/rrd_tool.c Tue Apr 6 10:51:41 2004
@@ -340,12 +340,12 @@
datai=data;
printf(" ");
printf(" ");
for (i = 0; i<ds_cnt;i++)
- printf("%14s",ds_namv[i]);
+ printf("%14s ",ds_namv[i]);
- printf(" %20s",ds_namv[i]);
+ printf(" %20s ",ds_namv[i]);
printf ("\n\n");
for (i = start; i <= end; i += step){
- printf("%10lu:", i);

26
net/rrdtool10/files/patch-ac
View File

@ -1,23 +1,17 @@
--- Makefile.in.orig Mon Oct 20 22:43:34 2003
+++ Makefile.in Mon Oct 20 22:43:25 2003
@@ -393,13 +393,13 @@
--- Makefile.in.orig Mon Apr 5 02:03:53 2004
+++ Makefile.in Tue Apr 6 10:53:31 2004
@@ -633,13 +633,7 @@
# lets schedule the perl stuff for installation
# the special call to install-sh is because the -d switch is not portable
# mac os X has its perl module in bundles so it seems
-install-data-local:
- $(top_srcdir)/config/mkinstalldirs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs
- $(INSTALL) -m 644 perl-piped/RRDp.pm $(DESTDIR)$(prefix)/lib/perl
- $(INSTALL) -m 644 perl-shared/RRDs.pm $(DESTDIR)$(prefix)/lib/perl
- $(INSTALL) -m 644 perl-shared/blib/arch/auto/RRDs/RRDs.bs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs
- test -f perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@ && $(INSTALL) -m 755 perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@ $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true
- test -f perl-shared/blib/arch/auto/RRDs/RRDs.bundle && $(INSTALL) -m 755 perl-shared/blib/arch/auto/RRDs/RRDs.bundle $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true
- $(INSTALL) -m 644 $(top_srcdir)/perl-piped/RRDp.pm $(DESTDIR)$(prefix)/lib/perl
- $(INSTALL) -m 644 $(top_srcdir)/perl-shared/RRDs.pm $(DESTDIR)$(prefix)/lib/perl
- $(INSTALL) -m 644 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs
- test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@ && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@ $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true
- test -f $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle && $(INSTALL) -m 755 $(top_builddir)/perl-shared/blib/arch/auto/RRDs/RRDs.bundle $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true
+install-data-local: site-perl-inst
+# $(top_srcdir)/config/mkinstalldirs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs
+# $(INSTALL) -m 644 perl-piped/RRDp.pm $(DESTDIR)$(prefix)/lib/perl
+# $(INSTALL) -m 644 perl-shared/RRDs.pm $(DESTDIR)$(prefix)/lib/perl
+# $(INSTALL) -m 644 perl-shared/blib/arch/auto/RRDs/RRDs.bs $(DESTDIR)$(prefix)/lib/perl/auto/RRDs
+# test -f perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@ && $(INSTALL) -m 755 perl-shared/blib/arch/auto/RRDs/RRDs.@SO_EXT@ $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true
+# test -f perl-shared/blib/arch/auto/RRDs/RRDs.bundle && $(INSTALL) -m 755 perl-shared/blib/arch/auto/RRDs/RRDs.bundle $(DESTDIR)$(prefix)/lib/perl/auto/RRDs || true
perl_piped:: $(top_builddir)/perl-piped
test -d perl-piped \
# rules for building the perl module

10
net/rrdtool10/files/patch-ak
View File

@ -1,8 +1,8 @@
--- contrib/trytime/Makefile.in.orig Sun Apr 14 11:51:10 2002
+++ contrib/trytime/Makefile.in Wed May 1 16:09:23 2002
@@ -89,7 +89,7 @@
INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/gd1.3
--- contrib/trytime/Makefile.in.orig Mon Apr 5 02:03:53 2004
+++ contrib/trytime/Makefile.in Tue Apr 6 11:17:12 2004
@@ -162,7 +162,7 @@
target_vendor = @target_vendor@
AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/gd1.3
EXTRA_DIST = trytime.c
-contribdir = $(prefix)/contrib/trytime
+contribdir = $(prefix)/share/examples/rrdtool/trytime

20
net/rrdtool10/files/patch-al
View File

@ -1,20 +0,0 @@
--- src/parsetime.c.orig Fri Oct 11 14:39:46 2002
+++ src/parsetime.c Mon Feb 10 20:47:18 2003
@@ -660,6 +660,7 @@
{
long mday=0, wday, mon, year = ptv->tm.tm_year;
int tlen;
+ time_t montime;
switch (sc_tokid) {
case YESTERDAY:
@@ -713,7 +714,8 @@
tlen = strlen(sc_token);
mon = atol(sc_token);
if (mon > 10*356*24*60*60) {
- ptv->tm=*localtime(&mon);
+ montime = mon;
+ ptv->tm=*localtime(&montime);
token();
break;
}

1
net/rrdtool10/pkg-plist
View File

@ -3,6 +3,7 @@ bin/rrdcgi
bin/trytime
bin/rrdupdate
lib/librrd.a
lib/librrd.la
lib/librrd.so.0
lib/librrd.so
include/rrd.h