summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
Diffstat (limited to 'lang')
-rw-r--r--lang/guile14/Makefile14
-rw-r--r--lang/guile14/distinfo3
-rw-r--r--lang/guile14/patches/patch-ab13
3 files changed, 23 insertions, 7 deletions
diff --git a/lang/guile14/Makefile b/lang/guile14/Makefile
index dbaac892e2a..ba997f773c1 100644
--- a/lang/guile14/Makefile
+++ b/lang/guile14/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2004/02/14 17:21:43 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2004/05/02 03:19:50 snj Exp $
DISTNAME= guile-1.4.1
PKGNAME= guile14-1.4.1
@@ -10,7 +10,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.gnu.org/software/guile/guile.html
COMMENT= GNU's Ubiquitous Intelligent Language for Extension
-USE_BUILDLINK2= YES
+USE_BUILDLINK3= YES
GNU_CONFIGURE= YES
USE_GNU_TOOLS+= make
NO_MTREE= YES
@@ -19,14 +19,16 @@ USE_GNU_READLINE= YES
INFO_FILES= guile.info
+BUILDLINK_PASSTHRU_DIRS=${PREFIX}/guile/1.4/lib
+
# Link the native thread so that Guile processes won't die when libpthread.so
# is dl_open(3)'ed.
CFLAGS+= ${PTHREAD_CFLAGS}
-.include "../../devel/libtool/buildlink2.mk"
-.include "../../devel/ncurses/buildlink2.mk"
-.include "../../devel/readline/buildlink2.mk"
-.include "../../mk/pthread.buildlink2.mk"
+.include "../../devel/libtool/buildlink3.mk"
+.include "../../devel/ncurses/buildlink3.mk"
+.include "../../devel/readline/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
PREFIX= ${LOCALBASE}/guile/1.4
diff --git a/lang/guile14/distinfo b/lang/guile14/distinfo
index b1f2b3bc385..f5ead04a43f 100644
--- a/lang/guile14/distinfo
+++ b/lang/guile14/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.2 2003/01/17 04:43:06 uebayasi Exp $
+$NetBSD: distinfo,v 1.3 2004/05/02 03:19:50 snj 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) = 5ecfcacba60cc509682ff5482906b115a6e90ddc
SHA1 (patch-ad) = c692027caed122ef840a9ef3bf78eb125b26441e
SHA1 (patch-ae) = 98174a540753d1eb5ac9071fb3ebd073158d8e93
diff --git a/lang/guile14/patches/patch-ab b/lang/guile14/patches/patch-ab
new file mode 100644
index 00000000000..93a75cbc244
--- /dev/null
+++ b/lang/guile14/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2004/05/02 03:19:50 snj Exp $
+
+--- libguile/Makefile.in.orig 2004-04-28 20:56:11.000000000 -0700
++++ libguile/Makefile.in 2004-04-28 20:59:32.000000000 -0700
+@@ -122,7 +122,7 @@ lib_LTLIBRARIES = libguile.la
+ bin_PROGRAMS = guile
+
+ guile_SOURCES = guile.c
+-guile_LDADD = libguile.la ${THREAD_LIBS_LOCAL}
++guile_LDADD = libguile.la ${THREAD_LIBS_LOCAL} -Wl,${RPATH_FLAG}${PREFIX}/lib
+ guile_LDFLAGS = @DLPREOPEN@
+
+ libguile_la_SOURCES = \