From 0e0b73913a57f639058d90a574405d6173d669b1 Mon Sep 17 00:00:00 2001 From: jlam Date: Wed, 12 Jan 2005 22:49:35 +0000 Subject: 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. --- math/R/Makefile | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) (limited to 'math') diff --git a/math/R/Makefile b/math/R/Makefile index 7e138423f49..236e0526c99 100644 --- a/math/R/Makefile +++ b/math/R/Makefile @@ -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 @@ PLIST_SRC= ${WRKDIR}/.PLIST_SRC 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 -- cgit v1.2.3