CVS commit: pkgsrc/geography

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

Module Name:    pkgsrc
Committed By:   brook
Date:           Fri Aug  7 01:33:30 UTC 2020

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

Log Message:
geography/R-maps: import R-maps-3.3.0

Display of maps.  Projection code and larger maps are in separate
packages ('mapproj' and 'mapdata').


To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 pkgsrc/geography/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/geography/R-maps/DESCR \
    pkgsrc/geography/R-maps/Makefile pkgsrc/geography/R-maps/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/geography/R-maps/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.82 pkgsrc/geography/Makefile:1.83
--- pkgsrc/geography/Makefile:1.82      Fri Aug  7 00:25:49 2020
+++ pkgsrc/geography/Makefile   Fri Aug  7 01:33:30 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.82 2020/08/07 00:25:49 brook Exp $
+# $NetBSD: Makefile,v 1.83 2020/08/07 01:33:30 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-maps
 SUBDIR+=       R-maptools
 SUBDIR+=       cm2gpx
 SUBDIR+=       cmconvert

Added files:

Index: pkgsrc/geography/R-maps/DESCR
diff -u /dev/null pkgsrc/geography/R-maps/DESCR:1.1
--- /dev/null   Fri Aug  7 01:33:30 2020
+++ pkgsrc/geography/R-maps/DESCR       Fri Aug  7 01:33:30 2020
@@ -0,0 +1,2 @@
+Display of maps.  Projection code and larger maps are in separate
+packages ('mapproj' and 'mapdata').
Index: pkgsrc/geography/R-maps/Makefile
diff -u /dev/null pkgsrc/geography/R-maps/Makefile:1.1
--- /dev/null   Fri Aug  7 01:33:30 2020
+++ pkgsrc/geography/R-maps/Makefile    Fri Aug  7 01:33:30 2020
@@ -0,0 +1,15 @@
+# $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@localhost
+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"
Index: pkgsrc/geography/R-maps/distinfo
diff -u /dev/null pkgsrc/geography/R-maps/distinfo:1.1
--- /dev/null   Fri Aug  7 01:33:30 2020
+++ pkgsrc/geography/R-maps/distinfo    Fri Aug  7 01:33:30 2020
@@ -0,0 +1,7 @@
+$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

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