summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarkd <markd>2004-11-21 05:31:03 +0000
committermarkd <markd>2004-11-21 05:31:03 +0000
commit7e6e670c57ddb0014918896d1a90f303aa913035 (patch)
tree26d1a96e215eff632cdd6622392bb60d20127ef3
parenteec5e5835b7bbe1806cec9e74193e6286e93047a (diff)
downloadpkgsrc-7e6e670c57ddb0014918896d1a90f303aa913035.tar.gz
Find new location of libR.so. Bump PKGREVISION.
Fixes PR pkg/28371
-rw-r--r--math/py-rpy/Makefile3
-rw-r--r--math/py-rpy/distinfo4
-rw-r--r--math/py-rpy/patches/patch-aa15
3 files changed, 16 insertions, 6 deletions
diff --git a/math/py-rpy/Makefile b/math/py-rpy/Makefile
index f822175ac34..f31c31a8516 100644
--- a/math/py-rpy/Makefile
+++ b/math/py-rpy/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2004/07/22 09:16:03 recht Exp $
+# $NetBSD: Makefile,v 1.8 2004/11/21 05:31:03 markd Exp $
#
DISTNAME= rpy-0.3.1
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
+PKGREVISION= 1
CATEGORIES= math python
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=rpy/}
diff --git a/math/py-rpy/distinfo b/math/py-rpy/distinfo
index b56a0c73079..49b1ede2ebf 100644
--- a/math/py-rpy/distinfo
+++ b/math/py-rpy/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2003/12/04 13:50:34 adam Exp $
+$NetBSD: distinfo,v 1.3 2004/11/21 05:31:03 markd Exp $
SHA1 (rpy-0.3.1.tar.gz) = ec56b00518fed416179afac949914fa2055cd8d7
Size (rpy-0.3.1.tar.gz) = 219278 bytes
-SHA1 (patch-aa) = 34ec97c595215c0ac037d8774b29289596bff43f
+SHA1 (patch-aa) = ae84b9424ee5422d1ad313837bcf72dd32f7fc7c
diff --git a/math/py-rpy/patches/patch-aa b/math/py-rpy/patches/patch-aa
index 0e7b14c3be5..82aa908ecfd 100644
--- a/math/py-rpy/patches/patch-aa
+++ b/math/py-rpy/patches/patch-aa
@@ -1,8 +1,17 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/12/10 12:30:58 markd Exp $
+$NetBSD: patch-aa,v 1.2 2004/11/21 05:31:03 markd Exp $
---- setup.py.orig Sat Dec 7 01:36:39 2002
+--- setup.py.orig 2003-02-15 08:23:33.000000000 +1300
+++ setup.py
-@@ -59,6 +59,7 @@
+@@ -27,7 +27,7 @@ else:
+ RHOME = get_R_HOME()
+ DEFINE.append(('R_HOME', '"%s"' %RHOME))
+ r_include = os.path.join(RHOME, 'include')
+-r_libs = os.path.join(RHOME, 'bin')
++r_libs = os.path.join(RHOME, 'lib')
+
+ # check whether Numeric is present
+ try:
+@@ -58,6 +58,7 @@ setup(name="rpy",
include_dirs=[r_include, "src"],
libraries=["R"],
library_dirs=[r_libs],