Fix to confirm to hier(7), PKGLIBTOOL->LIBTOOL

7 files changed, 163 insertions, 91 deletions

diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile
index e9830940f5e..cd73452994e 100644
--- a/databases/rrdtool/Makefile
+++ b/databases/rrdtool/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/06/01 11:23:19 rh Exp $
+# $NetBSD: Makefile,v 1.5 2000/06/27 01:32:11 hubertf Exp $
 #
 
 DISTNAME=	rrdtool-1.0.21
@@ -13,7 +13,7 @@ DEPENDS+=	gd>=1.7.3:../../graphics/gd
 DEPENDS+=	jpeg-6*:../../graphics/jpeg
 
 USE_PERL5=	yes
-USE_PKGLIBTOOL=	yes
+USE_LIBTOOL=	yes
 USE_GMAKE=	yes
 USE_X11=	yes
 GNU_CONFIGURE=	yes
diff --git a/databases/rrdtool/files/patch-sum b/databases/rrdtool/files/patch-sum
index a7e235f6e7d..65688568af9 100644
--- a/databases/rrdtool/files/patch-sum
+++ b/databases/rrdtool/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.4 2000/05/07 13:56:50 wulf Exp $
+$NetBSD: patch-sum,v 1.5 2000/06/27 01:32:12 hubertf Exp $
 
 MD5 (patch-aa) = b551857e3989780dca848a79e7729644
 MD5 (patch-ab) = 6ad36347d300005cc45690ce79bb2177
@@ -17,3 +17,7 @@ MD5 (patch-an) = f5f2ef97bd1cc75759cdb578236389e8
 MD5 (patch-ao) = dd701ac3b43157f9e3b89fcc2a9ccaf0
 MD5 (patch-ap) = 60100a12dd5cb5be8992b0aadb57a754
 MD5 (patch-aq) = 14a14d053602d46d11b842e1f8bb87ef
+MD5 (patch-ar) = 9428ec77d9166aff02ea370c81ff9365
+MD5 (patch-as) = 810acca601241f5beebdb7c31deac571
+MD5 (patch-at) = e1b4bc946f59db48b6317aca7b15a6c5
+MD5 (patch-au) = 299e143ef30832bfdda00d78d1da2802
diff --git a/databases/rrdtool/patches/patch-ar b/databases/rrdtool/patches/patch-ar
new file mode 100644
index 00000000000..2ce00437387
--- /dev/null
+++ b/databases/rrdtool/patches/patch-ar
@@ -0,0 +1,13 @@
+$NetBSD: patch-ar,v 1.1 2000/06/27 01:32:13 hubertf Exp $
+
+--- contrib/add_ds/Makefile.in.orig	Tue Jun 27 01:52:30 2000
++++ contrib/add_ds/Makefile.in	Tue Jun 27 01:54:08 2000
+@@ -85,7 +85,7 @@
+ 
+ EXTRA_DIST = add_ds.pl.in batch.pl.in
+ 
+-contribdir = $(prefix)/contrib/add_ds
++contribdir = $(prefix)/share/rrdtool/contrib/add_ds
+ contrib_DATA = README
+ contrib_SCRIPTS = add_ds.pl  batch.pl
+ mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
diff --git a/databases/rrdtool/patches/patch-as b/databases/rrdtool/patches/patch-as
new file mode 100644
index 00000000000..af0a10ec616
--- /dev/null
+++ b/databases/rrdtool/patches/patch-as
@@ -0,0 +1,13 @@
+$NetBSD: patch-as,v 1.1 2000/06/27 01:32:13 hubertf Exp $
+
+--- contrib/killspike/Makefile.in.orig	Tue Jun 27 01:55:42 2000
++++ contrib/killspike/Makefile.in	Tue Jun 27 01:56:05 2000
+@@ -85,7 +85,7 @@
+ 
+ EXTRA_DIST = killspike.pl.in
+ 
+-contribdir = $(prefix)/contrib/killspike
++contribdir = $(prefix)/share/rrdtool/contrib/killspike
+ contrib_DATA = README
+ contrib_SCRIPTS = killspike.pl
+ mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
diff --git a/databases/rrdtool/patches/patch-at b/databases/rrdtool/patches/patch-at
new file mode 100644
index 00000000000..ab47e20563a
--- /dev/null
+++ b/databases/rrdtool/patches/patch-at
@@ -0,0 +1,13 @@
+$NetBSD: patch-at,v 1.1 2000/06/27 01:32:13 hubertf Exp $
+
+--- contrib/rrdfetchnames/Makefile.in.orig	Tue Jun 27 01:57:15 2000
++++ contrib/rrdfetchnames/Makefile.in	Tue Jun 27 01:57:24 2000
+@@ -85,7 +85,7 @@
+ 
+ EXTRA_DIST = rrdfetchnames.pl.in
+ 
+-contribdir = $(prefix)/contrib/rrdfetchnames
++contribdir = $(prefix)/share/rrdtool/contrib/rrdfetchnames
+ contrib_DATA = README
+ contrib_SCRIPTS = rrdfetchnames.pl
+ mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
diff --git a/databases/rrdtool/patches/patch-au b/databases/rrdtool/patches/patch-au
new file mode 100644
index 00000000000..7b1d01ea685
--- /dev/null
+++ b/databases/rrdtool/patches/patch-au
@@ -0,0 +1,13 @@
+$NetBSD: patch-au,v 1.1 2000/06/27 01:32:14 hubertf Exp $
+
+--- contrib/rrdlastds/Makefile.in.orig	Tue Jun 27 01:58:01 2000
++++ contrib/rrdlastds/Makefile.in	Tue Jun 27 01:58:08 2000
+@@ -85,7 +85,7 @@
+ 
+ EXTRA_DIST = rrdlastds.pl.in
+ 
+-contribdir = $(prefix)/contrib/rrdlastds
++contribdir = $(prefix)/share/rrdtool/contrib/rrdlastds
+ contrib_DATA = README
+ contrib_SCRIPTS = rrdlastds.pl
+ mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
diff --git a/databases/rrdtool/pkg/PLIST b/databases/rrdtool/pkg/PLIST
index bfe6971295b..4871c749823 100644
--- a/databases/rrdtool/pkg/PLIST
+++ b/databases/rrdtool/pkg/PLIST
@@ -1,116 +1,132 @@
-@comment $NetBSD: PLIST,v 1.4 2000/05/07 12:50:52 wulf Exp $
+@comment $NetBSD: PLIST,v 1.5 2000/06/27 01:32:14 hubertf Exp $
 bin/rrdcgi
 bin/rrdtool
+bin/trytime
 lib/librrd.a
+lib/librrd.la
 lib/librrd.so.0.0
-man/man1/rrdtool.1
-man/man1/rrdlast.1
-man/man1/rrdcreate.1
-man/man1/rrdupdate.1
-man/man1/rrdgraph.1
+lib/perl5/man/man3/RRDp.3
+lib/perl5/man/man3/RRDs.3
+lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/RRDp/.packlist
+lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/RRDs/.packlist
+lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/RRDs/RRDs.bs
+lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/RRDs/RRDs.so
+man/man1/RRDp.1
+man/man1/RRDs.1
 man/man1/bin_dec_hex.1
+man/man1/cdeftutorial.1
+man/man1/rpntutorial.1
+man/man1/rrdcgi.1
+man/man1/rrdcreate.1
+man/man1/rrddump.1
 man/man1/rrdfetch.1
+man/man1/rrdgraph.1
+man/man1/rrdinfo.1
+man/man1/rrdlast.1
+man/man1/rrdresize.1
 man/man1/rrdrestore.1
-man/man1/rrddump.1
+man/man1/rrdtool.1
 man/man1/rrdtune.1
-man/man1/rrdresize.1
-man/man1/rrdcgi.1
 man/man1/rrdtutorial.1
-man/man1/RRDs.1
-man/man1/RRDp.1
-man/man1/cdeftutorial.1
-man/man1/rpntutorial.1
-share/rrdtool/contrib/README
-share/rrdtool/contrib/log2rrd/README
-share/rrdtool/contrib/log2rrd/log2rrd.pl
-share/rrdtool/contrib/rrd-file-icon/README
-share/rrdtool/contrib/rrd-file-icon/rrd.png
-share/rrdtool/contrib/trytime/README
-share/rrdtool/contrib/trytime/trytime.c
-share/rrdtool/contrib/rrdproc/README
-share/rrdtool/contrib/rrdproc/rrdproc.c
-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/bigtops.pl
-share/examples/rrdtool/minmax.pl
+man/man1/rrdupdate.1
+share/doc/rrdtool/RRDp.html
+share/doc/rrdtool/RRDp.txt
+share/doc/rrdtool/RRDs.html
+share/doc/rrdtool/RRDs.txt
+share/doc/rrdtool/bin_dec_hex.html
+share/doc/rrdtool/bin_dec_hex.pod
+share/doc/rrdtool/bin_dec_hex.txt
+share/doc/rrdtool/cdeftutorial.html
+share/doc/rrdtool/cdeftutorial.pod
+share/doc/rrdtool/cdeftutorial.txt
+share/doc/rrdtool/rpntutorial.html
+share/doc/rrdtool/rpntutorial.pod
+share/doc/rrdtool/rpntutorial.txt
+share/doc/rrdtool/rrdcgi.html
+share/doc/rrdtool/rrdcgi.pod
+share/doc/rrdtool/rrdcgi.txt
+share/doc/rrdtool/rrdcreate.html
+share/doc/rrdtool/rrdcreate.pod
+share/doc/rrdtool/rrdcreate.txt
+share/doc/rrdtool/rrddump.html
+share/doc/rrdtool/rrddump.pod
+share/doc/rrdtool/rrddump.txt
+share/doc/rrdtool/rrdfetch.html
+share/doc/rrdtool/rrdfetch.pod
+share/doc/rrdtool/rrdfetch.txt
+share/doc/rrdtool/rrdgraph.html
+share/doc/rrdtool/rrdgraph.pod
+share/doc/rrdtool/rrdgraph.txt
 share/doc/rrdtool/rrdinfo.html
 share/doc/rrdtool/rrdinfo.pod
 share/doc/rrdtool/rrdinfo.txt
-share/doc/rrdtool/rrdtool.html
 share/doc/rrdtool/rrdlast.html
-share/doc/rrdtool/rrdcreate.html
-share/doc/rrdtool/rrdupdate.html
-share/doc/rrdtool/rrdgraph.html
-share/doc/rrdtool/bin_dec_hex.html
-share/doc/rrdtool/rrdfetch.html
-share/doc/rrdtool/rrdrestore.html
-share/doc/rrdtool/rrddump.html
-share/doc/rrdtool/rrdtune.html
-share/doc/rrdtool/rrdresize.html
-share/doc/rrdtool/rrdcgi.html
-share/doc/rrdtool/rrdtutorial.html
-share/doc/rrdtool/RRDs.html
-share/doc/rrdtool/RRDp.html
-share/doc/rrdtool/rrdtool.pod
 share/doc/rrdtool/rrdlast.pod
-share/doc/rrdtool/rrdcreate.pod
-share/doc/rrdtool/rrdupdate.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/rrdgraph.txt
-share/doc/rrdtool/bin_dec_hex.txt
-share/doc/rrdtool/rrdfetch.txt
+share/doc/rrdtool/rrdresize.html
+share/doc/rrdtool/rrdresize.pod
+share/doc/rrdtool/rrdresize.txt
+share/doc/rrdtool/rrdrestore.html
+share/doc/rrdtool/rrdrestore.pod
 share/doc/rrdtool/rrdrestore.txt
-share/doc/rrdtool/rrddump.txt
+share/doc/rrdtool/rrdtool.html
+share/doc/rrdtool/rrdtool.pod
+share/doc/rrdtool/rrdtool.txt
+share/doc/rrdtool/rrdtune.html
+share/doc/rrdtool/rrdtune.pod
 share/doc/rrdtool/rrdtune.txt
-share/doc/rrdtool/rrdresize.txt
-share/doc/rrdtool/rrdcgi.txt
+share/doc/rrdtool/rrdtutorial.html
+share/doc/rrdtool/rrdtutorial.pod
 share/doc/rrdtool/rrdtutorial.txt
-share/doc/rrdtool/RRDs.txt
-share/doc/rrdtool/RRDp.txt
-share/doc/rrdtool/cdeftutorial.pod
-share/doc/rrdtool/cdeftutorial.txt
-share/doc/rrdtool/cdeftutorial.html
-share/doc/rrdtool/rpntutorial.pod
-share/doc/rrdtool/rpntutorial.txt
-share/doc/rrdtool/rpntutorial.html
+share/doc/rrdtool/rrdupdate.html
+share/doc/rrdtool/rrdupdate.pod
+share/doc/rrdtool/rrdupdate.txt
+share/examples/rrdtool/bigtops.pl
+share/examples/rrdtool/cgi-demo.cgi
+share/examples/rrdtool/minmax.pl
+share/examples/rrdtool/piped-demo.pl
+share/examples/rrdtool/shared-demo.pl
+share/examples/rrdtool/stripes.pl
+share/rrdtool/contrib/README
+share/rrdtool/contrib/add_ds/README
+share/rrdtool/contrib/add_ds/add_ds.pl
+share/rrdtool/contrib/add_ds/batch.pl
+share/rrdtool/contrib/killspike/README
+share/rrdtool/contrib/killspike/killspike.pl
+share/rrdtool/contrib/log2rrd/README
+share/rrdtool/contrib/log2rrd/log2rrd.pl
+share/rrdtool/contrib/rrd-file-icon/README
+share/rrdtool/contrib/rrd-file-icon/rrd.png
+share/rrdtool/contrib/rrdfetchnames/README
+share/rrdtool/contrib/rrdfetchnames/rrdfetchnames.pl
+share/rrdtool/contrib/rrdlastds/README
+share/rrdtool/contrib/rrdlastds/rrdlastds.pl
+share/rrdtool/contrib/rrdproc/README
+share/rrdtool/contrib/rrdproc/rrdproc.c
+share/rrdtool/contrib/trytime/README
+share/rrdtool/contrib/trytime/trytime.c
 share/rrdtool/lib/perl/RRDp.pm
 share/rrdtool/lib/perl/RRDs.pm
 share/rrdtool/lib/perl/auto/RRDs/RRDs.bs
 share/rrdtool/lib/perl/auto/RRDs/RRDs.so
-lib/perl5/site_perl/RRDp.pm
-lib/perl5/site_perl/RRDs.pm
-lib/perl5/site_perl/ntmake.pl
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/RRDs/RRDs.bs
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/RRDs/RRDs.so
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/RRDp/.packlist
-lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/RRDs/.packlist
-lib/perl5/man/man3/RRDp.3
-lib/perl5/man/man3/RRDs.3
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/RRDp
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/RRDs
+@dirrm share/rrdtool/lib/perl/auto/RRDs
+@dirrm share/rrdtool/lib/perl/auto
+@dirrm share/rrdtool/lib/perl
+@dirrm share/rrdtool/lib
+@dirrm share/rrdtool/contrib/trytime
 @dirrm share/rrdtool/contrib/rrdproc
+@dirrm share/rrdtool/contrib/rrdlastds
+@dirrm share/rrdtool/contrib/rrdfetchnames
 @dirrm share/rrdtool/contrib/rrd-file-icon
-@dirrm share/rrdtool/contrib/trytime
 @dirrm share/rrdtool/contrib/log2rrd
+@dirrm share/rrdtool/contrib/killspike
+@dirrm share/rrdtool/contrib/add_ds
 @dirrm share/rrdtool/contrib
+@dirrm share/rrdtool
 @dirrm share/examples/rrdtool
 @dirrm share/doc/rrdtool
-@dirrm share/rrdtool/lib/perl/auto/RRDs
-@dirrm share/rrdtool/lib/perl/auto
-@dirrm share/rrdtool/lib/perl
-@dirrm share/rrdtool/lib
-@dirrm share/rrdtool
+@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/RRDs
+@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/RRDp
+@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-${LOWER_OPSYS}/auto
+@dirrm lib/perl5/site_perl
+@dirrm lib/perl5/man/man3