CVS commit: pkgsrc/geography

["Brook Milligan" <brook%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   brook
Date:           Fri Aug  7 01:45:47 UTC 2020

Modified Files:
        pkgsrc/geography: Makefile
Added Files:
        pkgsrc/geography/R-mapdata: DESCR Makefile distinfo
        pkgsrc/geography/R-mapdata/patches: patch-src_Makefile.in

Log Message:
geography/R-mapdata: import R-mapdata-2.3.0

Supplement to maps package, providing the larger and/or
higher-resolution databases.


To generate a diff of this commit:
cvs rdiff -u -r1.83 -r1.84 pkgsrc/geography/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/geography/R-mapdata/DESCR \
    pkgsrc/geography/R-mapdata/Makefile pkgsrc/geography/R-mapdata/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/geography/R-mapdata/patches/patch-src_Makefile.in

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

Modified files:

Index: pkgsrc/geography/Makefile
diff -u pkgsrc/geography/Makefile:1.83 pkgsrc/geography/Makefile:1.84
--- pkgsrc/geography/Makefile:1.83      Fri Aug  7 01:33:30 2020
+++ pkgsrc/geography/Makefile   Fri Aug  7 01:45:47 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.83 2020/08/07 01:33:30 brook Exp $
+# $NetBSD: Makefile,v 1.84 2020/08/07 01:45:47 brook Exp $
 #
 
 COMMENT=       Software for geographical-related uses
@@ -6,6 +6,7 @@ COMMENT=        Software for geographical-relat
 SUBDIR+=       R-countrycode
 SUBDIR+=       R-deldir
 SUBDIR+=       R-geosphere
+SUBDIR+=       R-mapdata
 SUBDIR+=       R-maps
 SUBDIR+=       R-maptools
 SUBDIR+=       cm2gpx

Added files:

Index: pkgsrc/geography/R-mapdata/DESCR
diff -u /dev/null pkgsrc/geography/R-mapdata/DESCR:1.1
--- /dev/null   Fri Aug  7 01:45:47 2020
+++ pkgsrc/geography/R-mapdata/DESCR    Fri Aug  7 01:45:47 2020
@@ -0,0 +1,2 @@
+Supplement to maps package, providing the larger and/or
+higher-resolution databases.
Index: pkgsrc/geography/R-mapdata/Makefile
diff -u /dev/null pkgsrc/geography/R-mapdata/Makefile:1.1
--- /dev/null   Fri Aug  7 01:45:47 2020
+++ pkgsrc/geography/R-mapdata/Makefile Fri Aug  7 01:45:47 2020
@@ -0,0 +1,17 @@
+# $NetBSD: Makefile,v 1.1 2020/08/07 01:45:47 brook Exp $
+
+CATEGORIES=    geography
+MASTER_SITES=  ${MASTER_SITE_R_CRAN:=contrib/}
+
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=      ${R_HOMEPAGE_BASE}/mapdata/
+COMMENT=       Extra Map Databases
+LICENSE=       gnu-gpl-v2
+
+R_PKGNAME=     mapdata
+R_PKGVER=      2.3.0
+
+DEPENDS+=      R-maps>=2.0-7:../../geography/R-maps
+
+.include "../../math/R/Makefile.extension"
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/geography/R-mapdata/distinfo
diff -u /dev/null pkgsrc/geography/R-mapdata/distinfo:1.1
--- /dev/null   Fri Aug  7 01:45:47 2020
+++ pkgsrc/geography/R-mapdata/distinfo Fri Aug  7 01:45:47 2020
@@ -0,0 +1,7 @@
+$NetBSD: distinfo,v 1.1 2020/08/07 01:45:47 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

Index: pkgsrc/geography/R-mapdata/patches/patch-src_Makefile.in
diff -u /dev/null pkgsrc/geography/R-mapdata/patches/patch-src_Makefile.in:1.1
--- /dev/null   Fri Aug  7 01:45:47 2020
+++ pkgsrc/geography/R-mapdata/patches/patch-src_Makefile.in    Fri Aug  7 01:45:47 2020
@@ -0,0 +1,23 @@
+$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"