diff options
| author | jlam <jlam> | 2002-08-27 06:08:47 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2002-08-27 06:08:47 +0000 |
| commit | c799318a4ea3214778dfff4886fa3782681121b4 (patch) | |
| tree | 1f2f88658c7ecd50aa074ee46cbe2007452ba669 | |
| parent | 90d8808aa25ccb8d318752e3b0c487aa5e8a1434 (diff) | |
| download | pkgsrc-c799318a4ea3214778dfff4886fa3782681121b4.tar.gz | |
buildlink1 -> buildlink2, and remove the "brute force" hack as requested
by tron; we now use libtool/buildlink2.mk to ensure that guile uses the
right libtool and libltdl.*.
| -rw-r--r-- | lang/guile/Makefile | 21 | ||||
| -rw-r--r-- | lang/guile/distinfo | 3 | ||||
| -rw-r--r-- | lang/guile/patches/patch-ab | 13 |
3 files changed, 9 insertions, 28 deletions
diff --git a/lang/guile/Makefile b/lang/guile/Makefile index ec52374551a..3a58ad85a04 100644 --- a/lang/guile/Makefile +++ b/lang/guile/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2002/08/26 20:28:14 tron Exp $ +# $NetBSD: Makefile,v 1.32 2002/08/27 06:08:47 jlam Exp $ DISTNAME= guile-1.4.1 CATEGORIES= lang @@ -8,12 +8,14 @@ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.gnu.org/software/guile/guile.html COMMENT= GNU's Ubiquitous Intelligent Language for Extension -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES GNU_CONFIGURE= YES USE_GMAKE= YES USE_LIBTOOL= YES -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool ${WRKSRC}/guile-readline/libtool +LIBTOOL_OVERRIDE= ${WRKSRC}/libtool +LIBTOOL_OVERRIDE+= ${WRKSRC}/guile-readline/libtool +LIBTOOL_OVERRIDE+= ${WRKSRC}/libltdl/libtool USE_GNU_READLINE= YES @@ -23,17 +25,10 @@ INFO_FILES= guile.info .if ${OPSYS} == "SunOS" USE_NCURSES= # termlib not in libtermcap on Solaris, use the ncurses one -.include "../../devel/ncurses/buildlink.mk" +. include "../../devel/ncurses/buildlink2.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 "../../devel/libtool/buildlink2.mk" +.include "../../devel/readline/buildlink2.mk" .include "../../mk/texinfo.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/guile/distinfo b/lang/guile/distinfo index bd4b180252f..30b7440f34d 100644 --- a/lang/guile/distinfo +++ b/lang/guile/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.7 2002/08/26 20:28:14 tron Exp $ +$NetBSD: distinfo,v 1.8 2002/08/27 06:08:48 jlam 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 deleted file mode 100644 index 6887af63acf..00000000000 --- a/lang/guile/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$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 - - |