pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/math/R R assumes it can append to the DESCRIPTION file...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/cfe6700c2159
branches:  trunk
changeset: 474944:cfe6700c2159
user:      markd <markd%pkgsrc.org@localhost>
date:      Fri May 07 22:47:26 2004 +0000

description:
R assumes it can append to the DESCRIPTION files of each R package while
building even though it uses INSTALL_DATA on them so set SHAREMODE=644
rather than have to patch an ever increasing number of files.
Idea from Julio M. Merino Vidal.

diffstat:

 math/R/Makefile         |   6 +++++-
 math/R/distinfo         |  17 +----------------
 math/R/patches/patch-ae |  21 ---------------------
 math/R/patches/patch-af |  21 ---------------------
 math/R/patches/patch-ag |  21 ---------------------
 math/R/patches/patch-ah |  21 ---------------------
 math/R/patches/patch-ai |  21 ---------------------
 math/R/patches/patch-aj |  21 ---------------------
 math/R/patches/patch-ak |  21 ---------------------
 math/R/patches/patch-al |  21 ---------------------
 math/R/patches/patch-am |  21 ---------------------
 math/R/patches/patch-an |  21 ---------------------
 math/R/patches/patch-ao |  21 ---------------------
 math/R/patches/patch-ap |  21 ---------------------
 math/R/patches/patch-aq |  21 ---------------------
 math/R/patches/patch-ar |  21 ---------------------
 math/R/patches/patch-as |  21 ---------------------
 17 files changed, 6 insertions(+), 332 deletions(-)

diffs (truncated from 423 to 300 lines):

diff -r bc43361f56c3 -r cfe6700c2159 math/R/Makefile
--- a/math/R/Makefile   Fri May 07 22:08:56 2004 +0000
+++ b/math/R/Makefile   Fri May 07 22:47:26 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2004/04/27 11:24:31 markd Exp $
+# $NetBSD: Makefile,v 1.53 2004/05/07 22:47:26 markd Exp $
 
 DISTNAME=              R-1.9.0
 CATEGORIES=            math
@@ -53,6 +53,10 @@
 USE_FORTRAN=           # defined
 USE_LANGUAGES=         c fortran
 
+# Package assumes it can append to files (specifically DESCRIPTION) that have
+# been installed SHAREMODE
+SHAREMODE=             644
+
 .include "../../mk/bsd.prefs.mk"
 
 # R_PAPERSIZE can be: A4, Letter, Legal, Executive
diff -r bc43361f56c3 -r cfe6700c2159 math/R/distinfo
--- a/math/R/distinfo   Fri May 07 22:08:56 2004 +0000
+++ b/math/R/distinfo   Fri May 07 22:47:26 2004 +0000
@@ -1,23 +1,8 @@
-$NetBSD: distinfo,v 1.17 2004/04/27 11:24:31 markd Exp $
+$NetBSD: distinfo,v 1.18 2004/05/07 22:47:26 markd Exp $
 
 SHA1 (R-1.9.0.tgz) = 7b74c59838fb4a4129a21bbcbe1c83eeed7ac4b9
 Size (R-1.9.0.tgz) = 9505598 bytes
 SHA1 (patch-aa) = f435eae9f0a348f5f2e105045015039abf8ac102
 SHA1 (patch-ab) = 192044af2d9cd73f19e8324384cab91635e27067
 SHA1 (patch-ac) = 42329fa99c63c3823151f7a18e0ec5b6f2f5d6dd
-SHA1 (patch-ae) = 917fe5d509bcef59e18215c4a4ad3662694fca37
-SHA1 (patch-af) = 6c004f9bac11324f3cc43dcf5964411070700a46
-SHA1 (patch-ag) = ce1e2a053132a7dd63d01b7fa0af5c238e415713
-SHA1 (patch-ah) = 647f6b1c53bab8d39582d93ad31fdbc96a9658c7
-SHA1 (patch-ai) = 2f7fc15dcc08659dfb6c2fef097af7f86bb17e67
-SHA1 (patch-aj) = 238efe9407740b229b46e31800c0c6f6caa625c8
-SHA1 (patch-ak) = d81c7ac6f2ee718afce8303668bee8d12dc8f7c4
-SHA1 (patch-al) = 25692fe45674b8be9468f9e89864b1a23becce55
-SHA1 (patch-am) = 47c47fdc12e7c771eb29c066575c666eaec96870
-SHA1 (patch-an) = 121ccb559d6fdfd70bcfcfcf1bfaa7628f334b61
-SHA1 (patch-ao) = c99629da4329e67d1adbb48cd89a50531743d63f
-SHA1 (patch-ap) = b75680bae0d75f417c74d2137ba4b43ec1428131
-SHA1 (patch-aq) = 4bc27494b0e8d99d4edf4710d0c5647861aacea2
-SHA1 (patch-ar) = 5cc4a77c253a77a564433187babb0135ccb84eaf
-SHA1 (patch-as) = bb00673f7ea02d72b5d8bac6de43b68bd2e1c1ea
 SHA1 (patch-at) = d972e1072a7f6a30b5fbc2e5fa076bc5bdec5952
diff -r bc43361f56c3 -r cfe6700c2159 math/R/patches/patch-ae
--- a/math/R/patches/patch-ae   Fri May 07 22:08:56 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-$NetBSD: patch-ae,v 1.7 2003/12/03 12:05:19 markd Exp $
-
---- src/library/base/Makefile.in.orig  2003-09-21 20:13:04.000000000 +1200
-+++ src/library/base/Makefile.in
-@@ -33,14 +33,14 @@ all: Makefile DESCRIPTION
-         fi; \
-       done
-       @if test -f DESCRIPTION; then \
--        $(INSTALL_DATA) DESCRIPTION $(top_builddir)/library/$(pkg); \
-         (tmp="Built: R $(VERSION); "; \
-           if test -d $(srcdir)/src; then \
-             tmp="$${tmp}$(R_PLATFORM)"; \
-           fi; \
-           tmp="$${tmp}; `date`; $(R_OSTYPE)"; \
-           echo "$${tmp}") \
--          >> $(top_builddir)/library/$(pkg)/DESCRIPTION; \
-+          >> DESCRIPTION; \
-+          $(INSTALL_DATA) DESCRIPTION $(top_builddir)/library/$(pkg); \
-       fi
-       @$(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)/data
-       @for f in `ls -d $(srcdir)/data/* | sed '/CVS/d'`; do \
diff -r bc43361f56c3 -r cfe6700c2159 math/R/patches/patch-af
--- a/math/R/patches/patch-af   Fri May 07 22:08:56 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-$NetBSD: patch-af,v 1.7 2004/04/27 11:24:31 markd Exp $
-
---- src/library/ctest/Makefile.in.orig 2004-02-19 08:06:09.000000000 +1300
-+++ src/library/ctest/Makefile.in
-@@ -23,14 +23,14 @@ all: Makefile DESCRIPTION
-         $(SHELL) $(top_srcdir)/tools/move-if-change $${f} \
-           $(top_builddir)/library/$(pkg)/R/$(pkg))
-       @if test -f DESCRIPTION; then \
--        $(INSTALL_DATA) DESCRIPTION $(top_builddir)/library/$(pkg); \
-         (tmp="Built: R $(VERSION); "; \
-           if test -d $(srcdir)/src; then \
-             tmp="$${tmp}$(R_PLATFORM)"; \
-           fi; \
-           tmp="$${tmp}; `date`; $(R_OSTYPE)"; \
-           echo "$${tmp}") \
--          >> $(top_builddir)/library/$(pkg)/DESCRIPTION; \
-+          >> DESCRIPTION; \
-+        $(INSTALL_DATA) DESCRIPTION $(top_builddir)/library/$(pkg); \
-       fi
- 
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
diff -r bc43361f56c3 -r cfe6700c2159 math/R/patches/patch-ag
--- a/math/R/patches/patch-ag   Fri May 07 22:08:56 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-$NetBSD: patch-ag,v 1.7 2004/04/27 11:24:31 markd Exp $
-
---- src/library/eda/Makefile.in.orig   2004-02-19 08:06:10.000000000 +1300
-+++ src/library/eda/Makefile.in
-@@ -23,14 +23,14 @@ all: Makefile DESCRIPTION
-         $(SHELL) $(top_srcdir)/tools/move-if-change $${f} \
-           $(top_builddir)/library/$(pkg)/R/$(pkg))
-       @if test -f DESCRIPTION; then \
--        $(INSTALL_DATA) DESCRIPTION $(top_builddir)/library/$(pkg); \
-         (tmp="Built: R $(VERSION); "; \
-           if test -d $(srcdir)/src; then \
-             tmp="$${tmp}$(R_PLATFORM)"; \
-           fi; \
-           tmp="$${tmp}; `date`; $(R_OSTYPE)"; \
-           echo "$${tmp}") \
--          >> $(top_builddir)/library/$(pkg)/DESCRIPTION; \
-+          >> DESCRIPTION; \
-+          $(INSTALL_DATA) DESCRIPTION $(top_builddir)/library/$(pkg); \
-       fi
- 
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
diff -r bc43361f56c3 -r cfe6700c2159 math/R/patches/patch-ah
--- a/math/R/patches/patch-ah   Fri May 07 22:08:56 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-$NetBSD: patch-ah,v 1.5 2004/04/27 11:24:31 markd Exp $
-
---- src/library/lqs/Makefile.in.orig   2004-02-19 08:06:11.000000000 +1300
-+++ src/library/lqs/Makefile.in
-@@ -23,14 +23,14 @@ all: Makefile DESCRIPTION
-         $(SHELL) $(top_srcdir)/tools/move-if-change $${f} \
-           $(top_builddir)/library/$(pkg)/R/$(pkg))
-       @if test -f DESCRIPTION; then \
--        $(INSTALL_DATA) DESCRIPTION $(top_builddir)/library/$(pkg); \
-         (tmp="Built: R $(VERSION); "; \
-           if test -d $(srcdir)/src; then \
-             tmp="$${tmp}$(R_PLATFORM)"; \
-           fi; \
-           tmp="$${tmp}; `date`; $(R_OSTYPE)"; \
-           echo "$${tmp}") \
--          >> $(top_builddir)/library/$(pkg)/DESCRIPTION; \
-+          >> DESCRIPTION; \
-+          $(INSTALL_DATA) DESCRIPTION $(top_builddir)/library/$(pkg); \
-       fi
- 
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
diff -r bc43361f56c3 -r cfe6700c2159 math/R/patches/patch-ai
--- a/math/R/patches/patch-ai   Fri May 07 22:08:56 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-$NetBSD: patch-ai,v 1.2 2003/12/03 12:05:19 markd Exp $
-
---- src/library/methods/Makefile.in.orig       2003-09-24 08:56:51.000000000 +1200
-+++ src/library/methods/Makefile.in
-@@ -28,14 +28,14 @@ all: Makefile DESCRIPTION
-         fi; \
-       done
-       @if test -f DESCRIPTION; then \
--        $(INSTALL_DATA) DESCRIPTION $(top_builddir)/library/$(pkg); \
-         (tmp="Built: R $(VERSION); "; \
-           if test -d $(srcdir)/src; then \
-             tmp="$${tmp}$(R_PLATFORM)"; \
-           fi; \
-           tmp="$${tmp}; `date`; $(R_OSTYPE)"; \
-           echo "$${tmp}") \
--          >> $(top_builddir)/library/$(pkg)/DESCRIPTION; \
-+          >> DESCRIPTION; \
-+          $(INSTALL_DATA) DESCRIPTION $(top_builddir)/library/$(pkg); \
-       fi
-       @if test -d $(srcdir)/data; then \
-         $(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)/data; \
diff -r bc43361f56c3 -r cfe6700c2159 math/R/patches/patch-aj
--- a/math/R/patches/patch-aj   Fri May 07 22:08:56 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-$NetBSD: patch-aj,v 1.3 2004/04/27 11:24:31 markd Exp $
-
---- src/library/modreg/Makefile.in.orig        2004-02-19 08:06:12.000000000 +1300
-+++ src/library/modreg/Makefile.in
-@@ -23,14 +23,14 @@ all: Makefile DESCRIPTION
-         $(SHELL) $(top_srcdir)/tools/move-if-change $${f} \
-           $(top_builddir)/library/$(pkg)/R/$(pkg))
-       @if test -f DESCRIPTION; then \
--        $(INSTALL_DATA) DESCRIPTION $(top_builddir)/library/$(pkg); \
-         (tmp="Built: R $(VERSION); "; \
-           if test -d $(srcdir)/src; then \
-             tmp="$${tmp}$(R_PLATFORM)"; \
-           fi; \
-           tmp="$${tmp}; `date`; $(R_OSTYPE)"; \
-           echo "$${tmp}") \
--          >> $(top_builddir)/library/$(pkg)/DESCRIPTION; \
-+          >> DESCRIPTION; \
-+          $(INSTALL_DATA) DESCRIPTION $(top_builddir)/library/$(pkg); \
-       fi
- 
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
diff -r bc43361f56c3 -r cfe6700c2159 math/R/patches/patch-ak
--- a/math/R/patches/patch-ak   Fri May 07 22:08:56 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-$NetBSD: patch-ak,v 1.3 2004/04/27 11:24:31 markd Exp $
-
---- src/library/mva/Makefile.in.orig   2004-02-19 08:06:13.000000000 +1300
-+++ src/library/mva/Makefile.in
-@@ -23,14 +23,14 @@ all: Makefile DESCRIPTION
-         $(SHELL) $(top_srcdir)/tools/move-if-change $${f} \
-           $(top_builddir)/library/$(pkg)/R/$(pkg))
-       @if test -f DESCRIPTION; then \
--        $(INSTALL_DATA) DESCRIPTION $(top_builddir)/library/$(pkg); \
-         (tmp="Built: R $(VERSION); "; \
-           if test -d $(srcdir)/src; then \
-             tmp="$${tmp}$(R_PLATFORM)"; \
-           fi; \
-           tmp="$${tmp}; `date`; $(R_OSTYPE)"; \
-           echo "$${tmp}") \
--          >> $(top_builddir)/library/$(pkg)/DESCRIPTION; \
-+          >> DESCRIPTION; \
-+          $(INSTALL_DATA) DESCRIPTION $(top_builddir)/library/$(pkg); \
-       fi
- 
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
diff -r bc43361f56c3 -r cfe6700c2159 math/R/patches/patch-al
--- a/math/R/patches/patch-al   Fri May 07 22:08:56 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-$NetBSD: patch-al,v 1.3 2004/04/27 11:24:31 markd Exp $
-
---- src/library/nls/Makefile.in.orig   2004-02-19 08:06:13.000000000 +1300
-+++ src/library/nls/Makefile.in
-@@ -23,14 +23,14 @@ all: Makefile DESCRIPTION
-         $(SHELL) $(top_srcdir)/tools/move-if-change $${f} \
-           $(top_builddir)/library/$(pkg)/R/$(pkg))
-       @if test -f DESCRIPTION; then \
--        $(INSTALL_DATA) DESCRIPTION $(top_builddir)/library/$(pkg); \
-         (tmp="Built: R $(VERSION); "; \
-           if test -d $(srcdir)/src; then \
-             tmp="$${tmp}$(R_PLATFORM)"; \
-           fi; \
-           tmp="$${tmp}; `date`; $(R_OSTYPE)"; \
-           echo "$${tmp}") \
--          >> $(top_builddir)/library/$(pkg)/DESCRIPTION; \
-+          >> DESCRIPTION; \
-+          $(INSTALL_DATA) DESCRIPTION $(top_builddir)/library/$(pkg); \
-       fi
- 
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
diff -r bc43361f56c3 -r cfe6700c2159 math/R/patches/patch-am
--- a/math/R/patches/patch-am   Fri May 07 22:08:56 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-$NetBSD: patch-am,v 1.2 2003/12/03 12:05:19 markd Exp $
-
---- src/library/splines/Makefile.in.orig       2003-09-21 20:13:07.000000000 +1200
-+++ src/library/splines/Makefile.in
-@@ -29,14 +29,14 @@ all: Makefile DESCRIPTION
-         fi; \
-       done
-       @if test -f DESCRIPTION; then \
--        $(INSTALL_DATA) DESCRIPTION $(top_builddir)/library/$(pkg); \
-         (tmp="Built: R $(VERSION); "; \
-           if test -d $(srcdir)/src; then \
-             tmp="$${tmp}$(R_PLATFORM)"; \
-           fi; \
-           tmp="$${tmp}; `date`; $(R_OSTYPE)"; \
-           echo "$${tmp}") \
--          >> $(top_builddir)/library/$(pkg)/DESCRIPTION; \
-+          >> DESCRIPTION; \
-+          $(INSTALL_DATA) DESCRIPTION $(top_builddir)/library/$(pkg); \
-       fi
-       @if test -d $(srcdir)/data; then \
-         $(MKINSTALLDIRS) $(top_builddir)/library/$(pkg)/data; \
diff -r bc43361f56c3 -r cfe6700c2159 math/R/patches/patch-an
--- a/math/R/patches/patch-an   Fri May 07 22:08:56 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-$NetBSD: patch-an,v 1.3 2004/04/27 11:24:31 markd Exp $
-
---- src/library/stepfun/Makefile.in.orig       2004-02-19 08:15:09.000000000 +1300
-+++ src/library/stepfun/Makefile.in
-@@ -23,14 +23,14 @@ all: Makefile DESCRIPTION
-         $(SHELL) $(top_srcdir)/tools/move-if-change $${f} \
-           $(top_builddir)/library/$(pkg)/R/$(pkg))
-       @if test -f DESCRIPTION; then \
--        $(INSTALL_DATA) DESCRIPTION $(top_builddir)/library/$(pkg); \
-         (tmp="Built: R $(VERSION); "; \
-           if test -d $(srcdir)/src; then \
-             tmp="$${tmp}$(R_PLATFORM)"; \
-           fi; \
-           tmp="$${tmp}; `date`; $(R_OSTYPE)"; \
-           echo "$${tmp}") \
--          >> $(top_builddir)/library/$(pkg)/DESCRIPTION; \
-+          >> DESCRIPTION; \
-+          $(INSTALL_DATA) DESCRIPTION $(top_builddir)/library/$(pkg); \
-       fi
- 
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
diff -r bc43361f56c3 -r cfe6700c2159 math/R/patches/patch-ao
--- a/math/R/patches/patch-ao   Fri May 07 22:08:56 2004 +0000



Home | Main Index | Thread Index | Old Index