summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authorkristerw <kristerw>2004-06-14 11:47:36 +0000
committerkristerw <kristerw>2004-06-14 11:47:36 +0000
commit2e84b1b543b12bcea3626c1952eb73ff830f8a1e (patch)
tree17822e3146395bb2ad6c168a1372b08d40f8cb0e /lang
parent16cef7d770d559adb99bae79a811e9bfa7bbf01d (diff)
downloadpkgsrc-2e84b1b543b12bcea3626c1952eb73ff830f8a1e.tar.gz
ake sure the build finds all relevant include files.
Diffstat (limited to 'lang')
-rw-r--r--lang/RScheme/Makefile7
-rw-r--r--lang/RScheme/distinfo4
-rw-r--r--lang/RScheme/patches/patch-ae14
3 files changed, 16 insertions, 9 deletions
diff --git a/lang/RScheme/Makefile b/lang/RScheme/Makefile
index 3cfa21b3c08..97ba4e1dd8a 100644
--- a/lang/RScheme/Makefile
+++ b/lang/RScheme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2004/04/28 05:06:28 snj Exp $
+# $NetBSD: Makefile,v 1.17 2004/06/14 11:47:36 kristerw Exp $
DISTNAME= rs-0.7.3.2
PKGNAME= RScheme-0.7.3.2
@@ -13,6 +13,7 @@ COMMENT= Object-oriented Scheme implementation
USE_BUILDLINK3= YES
GNU_CONFIGURE= YES
ALL_TARGET= base
+AUTOMAKE_OVERRIDE= NO
NOT_FOR_PLATFORM= *-*-alpha
@@ -56,6 +57,7 @@ do-install:
cd ${WRKSRC}/src && \
(cd install; ${PAX} -rw include ${BUILDLINK_DIR}) && \
(cd install; ${PAX} -rw lib ${BUILDLINK_DIR}) && \
+ ${LN} -s ${PREFIX}/lib/rscheme ${BUILDLINK_DIR}/lib/rscheme && \
${SETENV} ${MAKE_ENV} ${MAKE} install-base && \
${SETENV} ${MAKE_ENV} ${MAKE} shell && \
${MAKE} install-shell && \
@@ -69,7 +71,8 @@ post-install:
${PREFIX}/share/doc/rscheme
${RM} -rf ${BUILDLINK_DIR}/include/rscheme \
${BUILDLINK_DIR}/include/rscheme.h \
- ${BUILDLINK_DIR}/lib/librs.a
+ ${BUILDLINK_DIR}/lib/librs.a \
+ ${BUILDLINK_DIR}/lib/rscheme
${CHMOD} -R g+w ${WRKSRC}
.include "../../devel/readline/buildlink3.mk"
diff --git a/lang/RScheme/distinfo b/lang/RScheme/distinfo
index 46f76571537..98234fcec4d 100644
--- a/lang/RScheme/distinfo
+++ b/lang/RScheme/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2003/08/29 07:09:59 jtb Exp $
+$NetBSD: distinfo,v 1.7 2004/06/14 11:47:36 kristerw Exp $
SHA1 (rs-0.7.3.2.tar.gz) = 77684f5be5609d8b5bf203f3944172fbc80f06cb
Size (rs-0.7.3.2.tar.gz) = 1907741 bytes
@@ -6,7 +6,7 @@ SHA1 (patch-aa) = 7dc2ff680b5772c38920141f2ffcd1828a4ce9ef
SHA1 (patch-ab) = 3d185953e0d69071587b9df5e571c33201d4af0f
SHA1 (patch-ac) = 6eeb983340975ac4de59ea8b14cd74df0df2f4d5
SHA1 (patch-ad) = e0efd451eb1694bb5caa3b5724573483b3095f0c
-SHA1 (patch-ae) = 9303297d84c8d361a6ac8c7e24138da935ceaac2
+SHA1 (patch-ae) = c12d0c3a2400a2e28af573650256d845e737b6e9
SHA1 (patch-af) = b7735535f0f24e683cc630e7d4039eee27dc9abe
SHA1 (patch-ag) = 11f32cedb3e2ab4879676d55b4ecf886ee89164b
SHA1 (patch-ah) = 4ed3ce7e0ab2f9cb292f7c6f6b312f737c9ffb16
diff --git a/lang/RScheme/patches/patch-ae b/lang/RScheme/patches/patch-ae
index 7ea9c1424bd..2a95545e3c2 100644
--- a/lang/RScheme/patches/patch-ae
+++ b/lang/RScheme/patches/patch-ae
@@ -1,14 +1,18 @@
-$NetBSD: patch-ae,v 1.2 2003/08/04 15:34:21 jtb Exp $
+$NetBSD: patch-ae,v 1.3 2004/06/14 11:47:36 kristerw Exp $
---- packages/pkg-bld.orig 1999-01-12 22:03:47.000000000 +0000
-+++ packages/pkg-bld 2003-08-04 13:55:10.000000000 +0100
-@@ -39,9 +39,14 @@
+--- packages/pkg-bld.orig Tue Jan 12 22:03:47 1999
++++ packages/pkg-bld Mon Jun 14 11:12:14 2004
+@@ -39,9 +39,18 @@
M="`echo $PKG | sed 's/\./_/g'`"
rsc -P src/pkg packages/$PKG/$P.mcf
+if test "$PKG" = "db"
+then
-+ echo "NOSTDINC=-I/usr/include" >> src/pkg/db/Makefile
++ # We need to add /usr/include first in the search path, but
++ # buildlink3 is helpful and removes it... Fool buildlink
++ # by reaching it through a link...
++ ln -s /usr/include src/pkg/db/usrinclude
++ echo "NOSTDINC=-Iusrinclude" >> src/pkg/db/Makefile
+fi
+
if test -d src/pkg/$PKG