diff options
| author | brook <brook@pkgsrc.org> | 2020-08-07 13:48:56 +0000 |
|---|---|---|
| committer | brook <brook@pkgsrc.org> | 2020-08-07 13:48:56 +0000 |
| commit | 9748791ed494f3d7e271c47c71a9cc3dd9aa0be9 (patch) | |
| tree | d19b1fbebf83f48b87357d4fce33071aab2b97c2 /geography | |
| parent | 18431259cb34d503c6a8bf4142df0dc354afa031 (diff) | |
| download | pkgsrc-9748791ed494f3d7e271c47c71a9cc3dd9aa0be9.tar.gz | |
geographcy/R-mapdata: use gmake and remove the patch.
The patch made it possible to comple R-mapdata 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 (limited to 'geography')
| -rw-r--r-- | geography/R-mapdata/Makefile | 4 | ||||
| -rw-r--r-- | geography/R-mapdata/distinfo | 3 | ||||
| -rw-r--r-- | geography/R-mapdata/patches/patch-src_Makefile.in | 23 |
3 files changed, 4 insertions, 26 deletions
diff --git a/geography/R-mapdata/Makefile b/geography/R-mapdata/Makefile index 8c429049e59..22c606a1bc1 100644 --- a/geography/R-mapdata/Makefile +++ b/geography/R-mapdata/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2020/08/07 01:45:47 brook Exp $ +# $NetBSD: Makefile,v 1.2 2020/08/07 13:48:56 brook Exp $ CATEGORIES= geography MASTER_SITES= ${MASTER_SITE_R_CRAN:=contrib/} @@ -11,6 +11,8 @@ LICENSE= gnu-gpl-v2 R_PKGNAME= mapdata R_PKGVER= 2.3.0 +USE_TOOLS+= gmake + DEPENDS+= R-maps>=2.0-7:../../geography/R-maps .include "../../math/R/Makefile.extension" diff --git a/geography/R-mapdata/distinfo b/geography/R-mapdata/distinfo index 9649cfba7f9..ac1e88a2923 100644 --- a/geography/R-mapdata/distinfo +++ b/geography/R-mapdata/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.1 2020/08/07 01:45:47 brook Exp $ +$NetBSD: distinfo,v 1.2 2020/08/07 13:48:56 brook Exp $ SHA1 (R/mapdata_2.3.0.tar.gz) = b28e5568334726132d3b30ba6c7f83dde24bae07 RMD160 (R/mapdata_2.3.0.tar.gz) = 0cd01cd0354d63bcfef5bfb609ff455af5ba98b1 SHA512 (R/mapdata_2.3.0.tar.gz) = 08df84941a281d4c93f295fa40cef205c6eb67d7ea2736085285287b1a6077f2fbdde81acd0442552464b44bb71dd9858c6fa6c481c303e9c7b7ad3905c6f6b3 Size (R/mapdata_2.3.0.tar.gz) = 13619287 bytes -SHA1 (patch-src_Makefile.in) = 6c10c7152de1911b3ba9803c9e5e5c870361fc53 diff --git a/geography/R-mapdata/patches/patch-src_Makefile.in b/geography/R-mapdata/patches/patch-src_Makefile.in deleted file mode 100644 index 00b1350335e..00000000000 --- a/geography/R-mapdata/patches/patch-src_Makefile.in +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-src_Makefile.in,v 1.1 2020/08/07 01:45:47 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-03-30 10:58:56.000000000 +0000 -+++ src/Makefile.in -@@ -44,10 +44,12 @@ world2: - $(MAKE) -f "$(R_HOME)/etc$(R_ARCH)/Makeconf" -f Makefile $(WORLD2) - - 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 - - world2Hires.line: worldHires.line - @$(ECHO) "Converting worldHires to world2Hires" |