Update to version 1.0.40. See changes below.

Packages changes: use buildlink2 and perl5/module.mk, documentation
splitted in $PREFIX/share/doc/{rrdtool,html/rrdtool}/*.

Okay'ed by wulf@.

Changes since version 1.0.33:

- bugfix, + enhancement, * contrib, = RELEASE
---------------------------------------------
= 1.0.40 2002/10/11 -- Tobi

- 2002/10/11 Jeffrey Wheat <jeff@nt.cetlink.net>
  updated php4 bindings to work with php 4.2.3

- 2002/10/07 Tomoyuki Murakami <tomoyuki@pobox.com>
  -z does not take an option

- 2002/10/03 Gonzalo Augusto Arana Tagle <garana@uolsinectis.com.ar>
  fix for PREV() operator

- 2002/08/01 Paul Clifford <paul.clifford@bbc.co.uk>
  fix for segfault in print_calc function

+ 2002/07/31  "Nenad Antic (EAB)" <Nenad.Antic@era.ericsson.se>
  rrdfetch manpage update

- 2002/07/12 Gonzalo Augusto Arana Tagle <garana@uolsinectis.com.ar>
  PREV(xxx) match with DEF_NAM_FMT

- 2002/07/12 Joerg Mertin <mertinj@europe.psi.com>
  fixed bindings for php4

- 2002/07/02 Philippe.Simonet@swisscom.com
  fixed DINF for win32 compile

= 1.0.39 2002/06/20 -- Tobi

+ 2002/06/20 -- Gonzalo Augusto Arana Tagle <garana@uolsinectis.com.ar>
  * new CDEF feature PREV(x) which allows for funky new filters
    to be created easily

+ 2002/06/14 -- "Shipway, Steve" <steve.shipway@eds.com>
  * Improved docs for rrd_resize

- Tobi
  * increassed commandline buffer in rrd_tool.c to 100 kilo Byte
  * in rrd_graph replace rint by ceil ...its more portable
  * remove // comments and replace with /* .... */
  * due to popular demand change strftime format to %V for weeks

+ 2002/05/24 -- Joe Griffin <joe.griffin@mscsoftware.com>
  * config.guess and config.sub updates for IA64

= 1.0.38 2002/05/22 -- Tobi

- 2002/05/12 -- Tobi
  * fix for crash in restore when used with existing file

- 2002/04/29 -- Alex
  * fix for PRINT template parser in rrd_graph ...

- 2002/04/16 -- Milan Obuch <milan.obuch@in.nextra.sk>
  * fix for --alt-mrtg

+ 2002/05/01 Wolfgang Schrimm <Wolfgang.Schrimm@urz.uni-heidelberg.de>
  * new subcommand xport

= 1.0.37 2002/04/13 -- Tobi

- 2002/04/14 -- Thierry Nkaoua <tnka@linux-sottises.net>
  * do not change LC_ALL but just LC_TIME ...

= 1.0.36 2002/04/13 -- Tobi

+ 2002/04/13 -- Milan Obuch <milan.obuch@in.nextra.sk>
  * added new options to rrdgraph. Check the manpage for
    --overlay, --background, --unit, GD (graph output format)

+ 2002/04/09 -- Tobi
  * added setlocale and tzset calls to rrd_graph

- 2002/04/09 -- Tobi
  * removed description of --goodfor and --refresh from rrdcgi

- 2002/04/02 -- Paul Vixie <paul@vix.com>
  * rrd restore should not burn down existing files

- 2002/03/23 -- Oliver Cook  <ollie@uk.clara.net>
  * kill segfault in diff code for non digit input

- 2002/03/23 -- Ashok Mandala <chakri063@yahoo.com>
  * make sure CDEFs work properly even when none of the contributing
    data sources start at start of the cdef.

+ 2002/03/20 -- David Lee <t.d.lee@durham.ac.uk>
  * Allow link builds through the ../configure syntax

= 1.0.35 2002/03/20 -- Tobi

- 2002/03/20 -- Tobi
  * fixed longstanding off by 1 bug in CDEF for cases where RRDs with
    different step sizes were mixed in one CDEF

- 2002/03/13 -- Tobi
  * Deal with cases where Config{cc} contains an absolute path to perls
    C compiler.
- 2002/03/14 -- Matt Galvin <mgalvin@dandd.com>
  * new OS detector config files which can deal with macos X

= 1.0.34 2002/03/12 -- Tobi

- 2002/02/12 -- Tobi
  * replaced zlib 1.1.3 with 1.1.4

- 2002/02/06 -- Alexander Schwartz <alexander.schwartz@gmx.net>
  * allow rrdcgi to deal with umlauts

- 2001/12/27 -- Tom.Bertelson@gecapital.com
  * fix overflow error in rrd_fetch

- 2001/11/28 -- Richard A. Steenbergen <ras@e-gerbil.net>
  * allow + - and ' ' in printfsring

- 2001/03/31 -- Tobi
  * added 'all' dependancy to site-perl-install rule as many seem to skip
    this step when instaling cricket ... probably an incomplete cricket doku.

- 2001/03/02 --  Mike Franusich <mike@franusich.com>
  * filedescriptor leak fixed in rrd_open for faild open attempts.

- 2001/03/01 -- Tobi
  * test if compiler perl wants to use for building its modules is available on the system
  * zlib wants to be linked with -fpic on HPUX or it breaks ...

1 files changed, 29 insertions, 38 deletions

diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile
index 09bd120d51e..82c8fc2e5c0 100644
--- a/databases/rrdtool/Makefile
+++ b/databases/rrdtool/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2002/12/08 23:23:42 cjep Exp $
+# $NetBSD: Makefile,v 1.18 2003/02/16 23:08:55 seb Exp $
 #
 
-DISTNAME=	rrdtool-1.0.33
-PKGREVISION=	1
+DISTNAME=	rrdtool-1.0.40
 CATEGORIES=	databases graphics net
 MASTER_SITES=	http://ee-staff.ethz.ch/~oetiker/webtools/rrdtool/pub/
 
@@ -10,54 +9,46 @@ MAINTAINER=	wulf@ping.net.au
 HOMEPAGE=	http://ee-staff.ethz.ch/~oetiker/webtools/rrdtool
 COMMENT=	Data analysis tool generating graphical representations
 
-DEPENDS+=	cgilib>=0.5nb1:../../www/cgilib
-DEPENDS+=	gd>=1.8.4nb1:../../graphics/gd
-DEPENDS+=	jpeg-6*:../../graphics/jpeg
-
 #needs FPC code not found in older versions of NetBSD
 NOT_FOR_PLATFORM=	NetBSD-1.[0-4]*-alpha NetBSD-1.5-alpha \
 			NetBSD-1.5.*-alpha NetBSD-1.5[A-U]-alpha
 
 USE_LIBTOOL=	# defined
+USE_BUILDLINK2=	# defined
 LTCONFIG_OVERRIDE=	${WRKSRC}/config/ltconfig
 LTCONFIG_OVERRIDE+=	${WRKSRC}/contrib/php4/ltconfig
 USE_GMAKE=	# defined
-USE_X11=	# defined
 GNU_CONFIGURE=	# defined
 
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-
 CONFIGURE_ARGS= --enable-shared
 
-MAKE_ENV+=	X11BASE=${X11BASE} X11PREFIX=${X11PREFIX}
-
-USE_PERL5=		# defined
+PERL5_CONFIGURE=	NO
 PERL5_PACKLIST+= 	${PERL5_SITEARCH}/auto/RRDp/.packlist
 PERL5_PACKLIST+=	${PERL5_SITEARCH}/auto/RRDs/.packlist
 
-post-patch:
-	cd ${WRKSRC};							\
-	files="perl-shared/Makefile.PL";				\
-	for file in $${files}; do					\
-		${SED}	-e "s|@X11BASE@|${X11BASE}|"			\
-			-e "s|@LOCALBASE@|${LOCALBASE}|"		\
-			$${file} > $${file}.new;			\
-		${MV} -f $${file}.new $${file};				\
-	done
-
-# tcl build not enabled at this time.  If this is turned on, the
-# following files & directory would have to be added to PLIST:
-#
-# lib/tclrrd1.0.21.so
-# lib/tclrrd1.0.21/
-# lib/tclrrd1.0.21/pkgIndex.tcl
-#
-#DEPENDS+=	tcl-8.0.5:../../x11/tk
-#
-#CFLAGS+=		-I${LOCALBASE}/include/tcl8.0
-#CONFIGURE_ENV+= 	CFLAGS="${CFLAGS}"
-#CONFIGURE_ARGS+=	--with-tcllib=${LOCALBASE}/lib/tcl8.0
-#INSTALL_TARGET= 	install site-tcl-install
-
+INSTALL_DIRS=	${WRKSRC} ${WRKSRC}/perl-piped ${WRKSRC}/perl-shared
+
+MAKE_ENV+=	CGILIB_INC=${BUILDLINK_PREFIX.cgilib}/include
+MAKE_ENV+=	CGILIB_LIB=${BUILDLINK_PREFIX.cgilib}/lib
+MAKE_ENV+=	GD_INC=${BUILDLINK_PREFIX.gd}/include
+MAKE_ENV+=	GD_LIB=${BUILDLINK_PREFIX.gd}/lib
+MAKE_ENV+=	JPEG_INC=${BUILDLINK_PREFIX.jpeg}/include
+MAKE_ENV+=	JPEG_LIB=${BUILDLINK_PREFIX.jpeg}/lib
+MAKE_ENV+=	ZLIB_INC=${BUILDLINK_PREFIX.zlib}/include
+MAKE_ENV+=	ZLIB_LIB=${BUILDLINK_PREFIX.zlib}/lib
+MAKE_ENV+=	PNG_INC=${BUILDLINK_PREFIX.png}/include
+MAKE_ENV+=	PNG_LIB=${BUILDLINK_PREFIX.png}/lib
+MAKE_ENV+=	TTF_INC=${BUILDLINK_PREFIX.freetype}/include
+MAKE_ENV+=	TTF_LIB=${BUILDLINK_PREFIX.freetype}/lib
+
+MAKE_ENV+=	_RPATH=${_OPSYS_RPATH_NAME}
+
+# remove this or else it is installed
+post-extract:
+	${RM} ${WRKSRC}/perl-shared/ntmake.pl
+
+.include "../../graphics/jpeg/buildlink2.mk"
+.include "../../graphics/gd/buildlink2.mk"
+.include "../../www/cgilib/buildlink2.mk"
+.include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"