summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2002-07-31 17:04:07 +0000
committerwiz <wiz@pkgsrc.org>2002-07-31 17:04:07 +0000
commit90bba6c1d197caba5491f62fcc5ff855513ef6cc (patch)
treed516d19ca947be3afa7a6e18a6a5eb8cb6712fe5
parent49b8fc95af4f5d3c0273d795c2af52abc0a57c7f (diff)
downloadpkgsrc-90bba6c1d197caba5491f62fcc5ff855513ef6cc.tar.gz
Use LTCONFIG_OVERRIDE.
-rw-r--r--databases/rrdtool/Makefile4
-rw-r--r--databases/rrdtool/distinfo4
-rw-r--r--databases/rrdtool/patches/patch-ap22
3 files changed, 16 insertions, 14 deletions
diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile
index 6777f949910..18aa233ab43 100644
--- a/databases/rrdtool/Makefile
+++ b/databases/rrdtool/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2002/06/15 18:35:13 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.15 2002/07/31 17:04:07 wiz Exp $
#
DISTNAME= rrdtool-1.0.33
@@ -19,6 +19,8 @@ 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
+LTCONFIG_OVERRIDE= ${WRKSRC}/config/ltconfig
+LTCONFIG_OVERRIDE+= ${WRKSRC}/contrib/php4/ltconfig
USE_GMAKE= # defined
USE_X11= # defined
GNU_CONFIGURE= # defined
diff --git a/databases/rrdtool/distinfo b/databases/rrdtool/distinfo
index bcbe510d325..69d3c7ce468 100644
--- a/databases/rrdtool/distinfo
+++ b/databases/rrdtool/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2001/09/25 12:18:02 wulf Exp $
+$NetBSD: distinfo,v 1.6 2002/07/31 17:04:08 wiz Exp $
SHA1 (rrdtool-1.0.33.tar.gz) = d0394368ef30dcd390d466843ef4d052365f2470
Size (rrdtool-1.0.33.tar.gz) = 1118040 bytes
@@ -14,5 +14,5 @@ SHA1 (patch-ak) = 21fc4da20d97ecdb71c6009c9a1fff5fc580afcb
SHA1 (patch-al) = 7ac3e507d3d8950ed431c7a9cc3afd23d4462c07
SHA1 (patch-am) = 048de065a9d3bdb7625df69c4c6807ea58522ba4
SHA1 (patch-an) = 4dc1cf17f7d143a347de2bc141607e404064a03d
-SHA1 (patch-ap) = c313f11dfd4a7666702bfb943d5b699def360660
+SHA1 (patch-ap) = f9ffb2faac2f4c5a3fa63d830a6f3184f54c1a35
SHA1 (patch-aq) = 28f845f4384fd04558e627d9f33eaf5529f5a780
diff --git a/databases/rrdtool/patches/patch-ap b/databases/rrdtool/patches/patch-ap
index 97310c6a6d1..3a0f10af7a9 100644
--- a/databases/rrdtool/patches/patch-ap
+++ b/databases/rrdtool/patches/patch-ap
@@ -1,13 +1,13 @@
-$NetBSD: patch-ap,v 1.2 2000/12/05 11:15:42 wulf Exp $
+$NetBSD: patch-ap,v 1.3 2002/07/31 17:04:08 wiz Exp $
---- configure.orig Thu Sep 14 15:27:47 2000
-+++ configure Tue Dec 5 20:58:00 2000
-@@ -1708,7 +1708,7 @@
- LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
+--- configure.orig Thu Feb 22 12:02:16 2001
++++ configure
+@@ -2217,8 +2217,6 @@ echo "$ac_t""$rd_cv_gcc_opt" 1>&6
+ CFLAGS=$oCFLAGS
+ fi
+ fi
+-
+-CFLAGS="$CFLAGS "`grep pic_flag= libtool | sed -e 's/.*pic_flag=//' -e 's/"//g'`
- # Always use our own libtool.
--LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+# LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-
- # Redirect the config.log output again, so that the ltconfig log is not
- # clobbered by the next message.
+ case $target_os in
+ *hpux*)