From d1eee39eb348c050a3dc654666045d4de68ba5d8 Mon Sep 17 00:00:00 2001
From: fredb <fredb>
Date: Sun, 6 May 2001 01:09:34 +0000
Subject: Provide the missing libraries required to dynamically link in "-lgd".
 Closes PR pkg/12686.

---
 databases/rrdtool/Makefile         | 4 +++-
 databases/rrdtool/distinfo         | 4 ++--
 databases/rrdtool/patches/patch-ak | 8 ++++----
 3 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'databases/rrdtool')

diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile
index 405caad3219..9ff9ae98d9e 100644
--- a/databases/rrdtool/Makefile
+++ b/databases/rrdtool/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/02/23 12:32:47 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2001/05/06 01:09:34 fredb Exp $
 #
 
 DISTNAME=	rrdtool-1.0.28
@@ -27,6 +27,8 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}"
 CONFIGURE_ARGS= --enable-shared
 
+MAKE_ENV+=	X11BASE=${X11BASE} X11PREFIX=${X11PREFIX}
+
 USE_PERL5=		# defined
 PERL5_PACKLIST+= 	${PERL5_SITEARCH}/auto/RRDp/.packlist
 PERL5_PACKLIST+=	${PERL5_SITEARCH}/auto/RRDs/.packlist
diff --git a/databases/rrdtool/distinfo b/databases/rrdtool/distinfo
index 03b9f8bcea3..211e6046195 100644
--- a/databases/rrdtool/distinfo
+++ b/databases/rrdtool/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2001/04/18 16:11:04 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/05/06 01:09:34 fredb Exp $
 
 SHA1 (rrdtool-1.0.28.tar.gz) = f43bd1abbc6895754de3891885cdd26dc15e7495
 Size (rrdtool-1.0.28.tar.gz) = 1005682 bytes
@@ -12,7 +12,7 @@ SHA1 (patch-ag) = a234239914f6b6accdca2609657f0f95593130bd
 SHA1 (patch-ah) = 807ea1577dcadbef3c3c8c1ab221ed893824e91a
 SHA1 (patch-ai) = dbf48f7cdd1e6f5d257c239b54567527fe66a818
 SHA1 (patch-aj) = e89ef2af0c357e92523d8476d97cf68463de5427
-SHA1 (patch-ak) = e6b44aad4d80c742174cfe80e8ca4c4078d9445a
+SHA1 (patch-ak) = a89cad65549f108a70402cecffa7e849607150ac
 SHA1 (patch-al) = 7ac3e507d3d8950ed431c7a9cc3afd23d4462c07
 SHA1 (patch-am) = 048de065a9d3bdb7625df69c4c6807ea58522ba4
 SHA1 (patch-an) = 4dc1cf17f7d143a347de2bc141607e404064a03d
diff --git a/databases/rrdtool/patches/patch-ak b/databases/rrdtool/patches/patch-ak
index 508d97fd438..f83ff81514e 100644
--- a/databases/rrdtool/patches/patch-ak
+++ b/databases/rrdtool/patches/patch-ak
@@ -1,7 +1,7 @@
-$NetBSD: patch-ak,v 1.3 2000/12/05 11:15:42 wulf Exp $
+$NetBSD: patch-ak,v 1.4 2001/05/06 01:09:34 fredb Exp $
 
---- perl-shared/Makefile.PL.orig	Fri Jul 14 06:52:17 2000
-+++ perl-shared/Makefile.PL	Tue Dec  5 20:57:43 2000
+--- perl-shared/Makefile.PL.orig	Thu Jul 13 16:22:17 2000
++++ perl-shared/Makefile.PL
 @@ -10,10 +10,10 @@
      'NAME'         => 'RRDs',
      'VERSION_FROM' => 'RRDs.pm', # finds $VERSION
@@ -12,6 +12,6 @@ $NetBSD: patch-ak,v 1.3 2000/12/05 11:15:42 wulf Exp $
      # Perl will figure out which one is valid
      'depend'	   => {'RRDs.c' => "../src/.libs/librrd_private.a"},
 -    'dynamic_lib'  => {'OTHERLDFLAGS' => "$librrd -lm"},
-+    'dynamic_lib'  => {'OTHERLDFLAGS' => "$librrd -lm -lgd -lpng -ljpeg -lcgi -lz"},
++    'dynamic_lib'  => {'OTHERLDFLAGS' => '-L${X11BASE}/lib -L${X11PREFIX}/lib '."$librrd -lcgi -lm -lgd -lpng -lz -ljpeg -lttf -lXpm -lX11 -lintl"},
      'realclean'    => {FILES => 't/demo?.rrd t/demo?.gif' }
  );
-- 
cgit v1.2.3