pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/math/R Fix up the comment to note that we still need t...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/ea96d6104d59
branches:  trunk
changeset: 487342:ea96d6104d59
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Jan 12 22:49:35 2005 +0000

description:
Fix up the comment to note that we still need to unwrap some files at
post-configure time, even after the switch from buildlink2 to buildlink3.
Also, use SUBST_CLASSES instead of the custom post-configure target,
and take advantage of the fact that the "unwrap" SUBST_CLASS already
does mostly the right thing.

diffstat:

 math/R/Makefile |  25 ++++++++++++-------------
 1 files changed, 12 insertions(+), 13 deletions(-)

diffs (40 lines):

diff -r a7dde01de097 -r ea96d6104d59 math/R/Makefile
--- a/math/R/Makefile   Wed Jan 12 22:33:19 2005 +0000
+++ b/math/R/Makefile   Wed Jan 12 22:49:35 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2005/01/12 15:32:00 jlam Exp $
+# $NetBSD: Makefile,v 1.61 2005/01/12 22:49:35 jlam Exp $
 
 DISTNAME=              R-2.0.1
 CATEGORIES=            math
@@ -80,19 +80,18 @@
 R_LIBDIR=              ${PREFIX}/lib/R
 R_INSTALL_DIRS=                ${R_LIBDIR}
 
-# XXX: following comment still true for buildlink3?
-# R does ugly things in the configure to get the default list of arguments
-# for linking Fortran, which exposes the buildlink2 tricks so clean up
-# afterwards
+# R does ugly things in the configure to get the default list of
+# arguments for linking Fortran and exposes the buildlink directory
+# in various files and scripts that will later be installed, so clean
+# up after configure is complete.
 #
-post-configure:
-       ( cd ${WRKSRC};                                                 \
-         for file in src/scripts/R.sh src/scripts/f77 etc/Makeconf; do \
-           ${SED} -e "s|${BUILDLINK_X11_DIR}/|${X11BASE}/|g"           \
-                  -e "s|${BUILDLINK_DIR}/|${LOCALBASE}/|g" $${file} > $${file}.fix; \
-           ${MV} $${file}.fix $${file};                                \
-         done;                                                         \
-       )
+SUBST_CLASSES+=                fix-R
+SUBST_STAGE.fix-R=     post-configure
+SUBST_MESSAGE.fix-R=   ${SUBST_MESSAGE.unwrap}
+SUBST_FILES.fix-R=     etc/Makeconf src/scripts/R.sh src/scripts/f77
+SUBST_SED.fix-R=       ${SUBST_SED.unwrap}                             \
+                       -e "s|${BUILDLINK_DIR}/|${LOCALBASE}/|g"        \
+                       -e "s|${BUILDLINK_X11_DIR}/|${X11BASE}/|g"
 
 # Generate the PLIST dynamically as it changes in each version only in a
 # specific subtree.  This will make maintaining this package a little easier



Home | Main Index | Thread Index | Old Index