[pkgsrc/trunk]: pkgsrc/geography/R-maps geographcy/R-maps: use gmake and remo...

[brook <brook%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d560ac54575b
branches:  trunk
changeset: 436692:d560ac54575b
user:      brook <brook%pkgsrc.org@localhost>
date:      Fri Aug 07 13:50:41 2020 +0000

description:
geographcy/R-maps: use gmake and remove the patch.

The patch made it possible to comple R-maps with bmake.  However, the
intent of upstream is to use gmake, which requires no patches.  Therefore,
add USE_TOOLS=gmake and remove the patch.

diffstat:

 geography/R-maps/Makefile                      |   4 +++-
 geography/R-maps/distinfo                      |   3 +--
 geography/R-maps/patches/patch-src_Makefile.in |  23 -----------------------
 3 files changed, 4 insertions(+), 26 deletions(-)

diffs (56 lines):

diff -r 8026709e0872 -r d560ac54575b geography/R-maps/Makefile
--- a/geography/R-maps/Makefile Fri Aug 07 13:50:07 2020 +0000
+++ b/geography/R-maps/Makefile Fri Aug 07 13:50:41 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2020/08/07 01:33:30 brook Exp $
+# $NetBSD: Makefile,v 1.2 2020/08/07 13:50:41 brook Exp $
 
 CATEGORIES=    geography
 MASTER_SITES=  ${MASTER_SITE_R_CRAN:=contrib/}
@@ -11,5 +11,7 @@
 R_PKGNAME=     maps
 R_PKGVER=      3.3.0
 
+USE_TOOLS+=    gmake
+
 .include "../../math/R/Makefile.extension"
 .include "../../mk/bsd.pkg.mk"
diff -r 8026709e0872 -r d560ac54575b geography/R-maps/distinfo
--- a/geography/R-maps/distinfo Fri Aug 07 13:50:07 2020 +0000
+++ b/geography/R-maps/distinfo Fri Aug 07 13:50:41 2020 +0000
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.1 2020/08/07 01:33:30 brook Exp $
+$NetBSD: distinfo,v 1.2 2020/08/07 13:50:41 brook Exp $
 
 SHA1 (R/maps_3.3.0.tar.gz) = a691cc1a4b3e57b52d202c587c7ef80ad0978ed6
 RMD160 (R/maps_3.3.0.tar.gz) = c4249d4f907742c8174a3e34034bc9b41b2e37ab
 SHA512 (R/maps_3.3.0.tar.gz) = 4310748976ab262f818de589d63d5a5b49bc356c5df0651b123124152701e4c2003387a5cb9b5e8b7fbd0ecc8bbe010c707fc86461f152d544451f1fa65ac647
 Size (R/maps_3.3.0.tar.gz) = 2493744 bytes
-SHA1 (patch-src_Makefile.in) = 84a1fb6a431878a567b53a7f7e5b8c4cdc40b00b
diff -r 8026709e0872 -r d560ac54575b geography/R-maps/patches/patch-src_Makefile.in
--- a/geography/R-maps/patches/patch-src_Makefile.in    Fri Aug 07 13:50:07 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-$NetBSD: patch-src_Makefile.in,v 1.1 2020/08/07 01:33:30 brook Exp $
-
-Makeconf does not have implicit rules for making programs directly.  Instead,
-use implicit make rules to compile object files and an explicit rule to build
-programs.
-
---- src/Makefile.in.orig       2018-04-03 07:33:40.000000000 +0000
-+++ src/Makefile.in
-@@ -52,10 +52,12 @@ ndata: world2
-       $(MAKE) -f "$(R_HOME)/etc$(R_ARCH)/Makeconf" -f Makefile $(NDATA)
- 
- lmake:
--      $(MAKE) -f "$(R_HOME)/etc$(R_ARCH)/Makeconf" -f Makefile Lmake
-+      $(MAKE) -f "$(R_HOME)/etc$(R_ARCH)/Makeconf" -f Makefile Lmake.o
-+      $(CC) $(CFLAGS) -o Lmake Lmake.o
- 
- gmake:
--      $(MAKE) -f "$(R_HOME)/etc$(R_ARCH)/Makeconf" -f Makefile Gmake
-+      $(MAKE) -f "$(R_HOME)/etc$(R_ARCH)/Makeconf" -f Makefile Gmake.o
-+      $(CC) $(CFLAGS) -o Gmake Gmake.o
- 
- world2:
-       $(MAKE) -f "$(R_HOME)/etc$(R_ARCH)/Makeconf" -f Makefile world2.line