summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2001-10-02 06:39:59 +0000
committerjlam <jlam@pkgsrc.org>2001-10-02 06:39:59 +0000
commitdaacc22e64da823a903d7db21f9a44239549aaee (patch)
treece81fcd862fefd020513d8d70ecc199ec0c50ab9 /x11
parentf49b05e650e8cd4011e4bab40fe9c9e5411789c6 (diff)
downloadpkgsrc-daacc22e64da823a903d7db21f9a44239549aaee.tar.gz
Add -Wl,-R${X11BASE}/lib to the link command when making Tk.so. This
allows us to find libX11.so at run-time in the correct place.
Diffstat (limited to 'x11')
-rw-r--r--x11/p5-Tk/Makefile6
-rw-r--r--x11/p5-Tk/distinfo3
-rw-r--r--x11/p5-Tk/patches/patch-ab13
3 files changed, 18 insertions, 4 deletions
diff --git a/x11/p5-Tk/Makefile b/x11/p5-Tk/Makefile
index d9ca29c1a5f..c630657b09e 100644
--- a/x11/p5-Tk/Makefile
+++ b/x11/p5-Tk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2001/06/08 20:34:16 tron Exp $
+# $NetBSD: Makefile,v 1.22 2001/10/02 06:39:59 jlam Exp $
# FreeBSD Id: Makefile,v 1.14 1997/09/14 04:00:00 jfitz Exp
#
@@ -9,10 +9,9 @@ MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Tk/}
MAINTAINER= packages@netbsd.org
HOMEPAGE= http://theory.uwinnipeg.ca/CPAN/data/Tk/pod/overview.html
-COMMENT= perl5 interface to Tk-8.0.5
+COMMENT= perl5 interface to Tk
BUILD_DEPENDS= p5-HTML-Parser>=3.19:../../www/p5-HTML-Parser
-DEPENDS+= tk>=8.3.2:../../x11/tk
USE_X11= # defined
USE_PERL5= # defined
@@ -23,4 +22,5 @@ MAKE_PARAMS= X11=${X11BASE}
do-configure:
@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL ${MAKE_PARAMS}
+.include "../../x11/tk/buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/p5-Tk/distinfo b/x11/p5-Tk/distinfo
index 886646e8766..3750558d943 100644
--- a/x11/p5-Tk/distinfo
+++ b/x11/p5-Tk/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 11:07:41 skrll Exp $
+$NetBSD: distinfo,v 1.3 2001/10/02 06:39:59 jlam Exp $
SHA1 (Tk800.022.tar.gz) = 0f80ed26d181cbe46ac274f0f8a5c1a313e9d9dd
Size (Tk800.022.tar.gz) = 3464312 bytes
SHA1 (patch-aa) = ad5b7a96006aa2c09a68c202a2e132b2c796dd8e
+SHA1 (patch-ab) = 9b01440c4035b71620e5a1e835e290f01b210f53
diff --git a/x11/p5-Tk/patches/patch-ab b/x11/p5-Tk/patches/patch-ab
new file mode 100644
index 00000000000..10beefbe002
--- /dev/null
+++ b/x11/p5-Tk/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2001/10/02 06:40:00 jlam Exp $
+
+--- myConfig.orig Fri Mar 31 05:06:53 2000
++++ myConfig
+@@ -153,7 +153,7 @@
+ if (-r $lib)
+ {
+ print "Using -L$_ to find $lib\n";
+- return "-L$_"
++ return "-L$_ -Wl,-R$_"
+ }
+ }
+ }