Fri Aug 7 01:33:30 2020 UTC ()
geography/R-maps: import R-maps-3.3.0
Display of maps. Projection code and larger maps are in separate
packages ('mapproj' and 'mapdata').
(brook)
diff -r1.82 -r1.83 pkgsrc/geography/Makefile
diff -r0 -r1.1 pkgsrc/geography/R-maps/DESCR
diff -r0 -r1.1 pkgsrc/geography/R-maps/Makefile
diff -r0 -r1.1 pkgsrc/geography/R-maps/distinfo
diff -r0 -r1.1 pkgsrc/geography/R-maps/patches/patch-src_Makefile.in
--- pkgsrc/geography/Makefile 2020/08/07 00:25:49 1.82
+++ pkgsrc/geography/Makefile 2020/08/07 01:33:30 1.83
| @@ -1,21 +1,22 @@ | | | @@ -1,21 +1,22 @@ |
| 1 | # $NetBSD: Makefile,v 1.82 2020/08/07 00:25:49 brook Exp $ | | 1 | # $NetBSD: Makefile,v 1.83 2020/08/07 01:33:30 brook Exp $ |
| 2 | # | | 2 | # |
| 3 | | | 3 | |
| 4 | COMMENT= Software for geographical-related uses | | 4 | COMMENT= Software for geographical-related uses |
| 5 | | | 5 | |
| 6 | SUBDIR+= R-countrycode | | 6 | SUBDIR+= R-countrycode |
| 7 | SUBDIR+= R-deldir | | 7 | SUBDIR+= R-deldir |
| 8 | SUBDIR+= R-geosphere | | 8 | SUBDIR+= R-geosphere |
| | | 9 | SUBDIR+= R-maps |
| 9 | SUBDIR+= R-maptools | | 10 | SUBDIR+= R-maptools |
| 10 | SUBDIR+= cm2gpx | | 11 | SUBDIR+= cm2gpx |
| 11 | SUBDIR+= cmconvert | | 12 | SUBDIR+= cmconvert |
| 12 | SUBDIR+= epsg | | 13 | SUBDIR+= epsg |
| 13 | SUBDIR+= epsg-docs | | 14 | SUBDIR+= epsg-docs |
| 14 | SUBDIR+= gama | | 15 | SUBDIR+= gama |
| 15 | SUBDIR+= garmin-utils | | 16 | SUBDIR+= garmin-utils |
| 16 | SUBDIR+= garmintools | | 17 | SUBDIR+= garmintools |
| 17 | SUBDIR+= gdal-lib | | 18 | SUBDIR+= gdal-lib |
| 18 | SUBDIR+= geoclue | | 19 | SUBDIR+= geoclue |
| 19 | SUBDIR+= geos | | 20 | SUBDIR+= geos |
| 20 | SUBDIR+= gipfel | | 21 | SUBDIR+= gipfel |
| 21 | SUBDIR+= gpsbabel | | 22 | SUBDIR+= gpsbabel |
Display of maps. Projection code and larger maps are in separate
packages ('mapproj' and 'mapdata').
# $NetBSD: Makefile,v 1.1 2020/08/07 01:33:30 brook Exp $
CATEGORIES= geography
MASTER_SITES= ${MASTER_SITE_R_CRAN:=contrib/}
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= ${R_HOMEPAGE_BASE}/maps/
COMMENT= Draw Geographical Maps
LICENSE= gnu-gpl-v2
R_PKGNAME= maps
R_PKGVER= 3.3.0
.include "../../math/R/Makefile.extension"
.include "../../mk/bsd.pkg.mk"
$NetBSD: distinfo,v 1.1 2020/08/07 01:33:30 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
$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