pkgsrc-Changes archive

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

CVS commit: pkgsrc/math/R



Module Name:    pkgsrc
Committed By:   minskim
Date:           Thu Apr 12 15:40:18 UTC 2018

Modified Files:
        pkgsrc/math/R: Makefile.extension

Log Message:
math/R: Derive R_PKGNAME and R_PKGVER from DISTNAME

This reduces # of variables to define in an R extension package.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/math/R/Makefile.extension

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/math/R/Makefile.extension
diff -u pkgsrc/math/R/Makefile.extension:1.21 pkgsrc/math/R/Makefile.extension:1.22
--- pkgsrc/math/R/Makefile.extension:1.21       Mon Apr  9 21:57:46 2018
+++ pkgsrc/math/R/Makefile.extension    Thu Apr 12 15:40:18 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.extension,v 1.21 2018/04/09 21:57:46 minskim Exp $
+# $NetBSD: Makefile.extension,v 1.22 2018/04/12 15:40:18 minskim Exp $
 #
 # This Makefile fragment is included by packages for R library packages.
 #
@@ -8,7 +8,12 @@
 #     for the package desired.
 # (2) Include this Makefile fragment in the package Makefile,
 
+.if defined(DISTNAME)
+R_PKGNAME?=    ${DISTNAME:C/_.*//}
+R_PKGVER?=     ${DISTNAME:C/.*_//}
+.else
 DISTNAME?=             ${R_PKGNAME}_${R_PKGVER}
+.endif
 PKGNAME?=              R-${R_PKGNAME}-${R_PKGVER:S/-/./}
 MASTER_SITES?=         ${MASTER_SITE_R_CRAN:=contrib/}
 DIST_SUBDIR?=          R



Home | Main Index | Thread Index | Old Index