summaryrefslogtreecommitdiff
path: root/lang/guile
diff options
context:
space:
mode:
authortron <tron@pkgsrc.org>2002-08-26 20:28:14 +0000
committertron <tron@pkgsrc.org>2002-08-26 20:28:14 +0000
commitfa6930a4caeac854b78dd79dd1ea9b88c74d16a8 (patch)
tree3863513c3ef2939de7ae3e62a957f1fd3971c6aa /lang/guile
parente60366d5818777cc7d7efd1e815a038e7ff63f7e (diff)
downloadpkgsrc-fa6930a4caeac854b78dd79dd1ea9b88c74d16a8.tar.gz
Use brute force to stop this package from clobbering our "libtool"
instead of using it.
Diffstat (limited to 'lang/guile')
-rw-r--r--lang/guile/Makefile12
-rw-r--r--lang/guile/distinfo3
-rw-r--r--lang/guile/patches/patch-ab13
3 files changed, 25 insertions, 3 deletions
diff --git a/lang/guile/Makefile b/lang/guile/Makefile
index 41a74b1e425..ec52374551a 100644
--- a/lang/guile/Makefile
+++ b/lang/guile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2002/08/26 19:58:30 tron Exp $
+# $NetBSD: Makefile,v 1.31 2002/08/26 20:28:14 tron Exp $
DISTNAME= guile-1.4.1
CATEGORIES= lang
@@ -13,7 +13,7 @@ GNU_CONFIGURE= YES
USE_GMAKE= YES
USE_LIBTOOL= YES
-LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
+LIBTOOL_OVERRIDE= ${WRKSRC}/libtool ${WRKSRC}/guile-readline/libtool
USE_GNU_READLINE= YES
@@ -26,6 +26,14 @@ USE_NCURSES= # termlib not in libtermcap on Solaris, use the ncurses one
.include "../../devel/ncurses/buildlink.mk"
.endif
+post-configure:
+ ${RM} -rf ${WRKSRC}/libltdl
+ ${MKDIR} ${WRKSRC}/libltdl
+ for FILE in ${LOCALBASE}/lib/libltdl.* \
+ ${LOCALBASE}/share/libtool/libltdl/*; do \
+ ${LN} -s $$FILE ${WRKSRC}/libltdl; \
+ done
+
.include "../../devel/readline/buildlink.mk"
.include "../../mk/texinfo.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/lang/guile/distinfo b/lang/guile/distinfo
index ff1fd660658..bd4b180252f 100644
--- a/lang/guile/distinfo
+++ b/lang/guile/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.6 2002/08/26 19:58:30 tron Exp $
+$NetBSD: distinfo,v 1.7 2002/08/26 20:28:14 tron Exp $
SHA1 (guile-1.4.1.tar.gz) = 81a91ea7480ca06d1aeda94b90a89b27e9bdea7a
Size (guile-1.4.1.tar.gz) = 1502840 bytes
SHA1 (patch-aa) = 22a9181066193cadc3663ae43d42e9f81d55c8e1
+SHA1 (patch-ab) = 0be2d32b3ced16268b46001ef8586413282590e8
SHA1 (patch-ad) = 7f029e488fc6b1a7294a43606388114438768862
diff --git a/lang/guile/patches/patch-ab b/lang/guile/patches/patch-ab
new file mode 100644
index 00000000000..6887af63acf
--- /dev/null
+++ b/lang/guile/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.7 2002/08/26 20:28:14 tron Exp $
+
+--- Makefile.in.orig Mon May 13 23:30:48 2002
++++ Makefile.in Mon Aug 26 22:11:28 2002
+@@ -112,7 +112,7 @@
+
+ AUTOMAKE_OPTIONS = 1.5
+
+-SUBDIRS = ice-9 qt libltdl libguile guile-config guile-readline \
++SUBDIRS = ice-9 qt libguile guile-config guile-readline \
+ doc am test-suite
+
+