CVS commit: pkgsrc

["Makoto Fujiwara" <mef%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   mef
Date:           Mon Sep 20 13:09:37 UTC 2021

Modified Files:
        pkgsrc/doc: CHANGES-2021
        pkgsrc/math: Makefile
        pkgsrc/math/R-mapproj: Makefile
Removed Files:
        pkgsrc/math/R-maps: DESCR Makefile distinfo

Log Message:
(math/R-maps) Removed duplicating with geography/R-maps


To generate a diff of this commit:
cvs rdiff -u -r1.4895 -r1.4896 pkgsrc/doc/CHANGES-2021
cvs rdiff -u -r1.519 -r1.520 pkgsrc/math/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/math/R-mapproj/Makefile
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/math/R-maps/DESCR
cvs rdiff -u -r1.13 -r0 pkgsrc/math/R-maps/Makefile
cvs rdiff -u -r1.8 -r0 pkgsrc/math/R-maps/distinfo

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

Modified files:

Index: pkgsrc/doc/CHANGES-2021
diff -u pkgsrc/doc/CHANGES-2021:1.4895 pkgsrc/doc/CHANGES-2021:1.4896
--- pkgsrc/doc/CHANGES-2021:1.4895      Mon Sep 20 13:01:45 2021
+++ pkgsrc/doc/CHANGES-2021     Mon Sep 20 13:09:37 2021
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2021,v 1.4895 2021/09/20 13:01:45 mef Exp $
+$NetBSD: CHANGES-2021,v 1.4896 2021/09/20 13:09:37 mef Exp $
 
 Changes to the packages collection and infrastructure in 2021:
 
@@ -7543,3 +7543,4 @@ Changes to the packages collection and i
        mk/bsd.pkg.mk: started freeze for pkgsrc-2021Q3 branch [wiz 2021-09-20]
        Updated geography/R-raster to 3.4.13 [mef 2021-09-20]
        Updated geography/R-stars to 0.5.3 [mef 2021-09-20]
+       Removed math/R-maps successor geography/R-maps [mef 2021-09-20]

Index: pkgsrc/math/Makefile
diff -u pkgsrc/math/Makefile:1.519 pkgsrc/math/Makefile:1.520
--- pkgsrc/math/Makefile:1.519  Mon Sep 20 02:51:23 2021
+++ pkgsrc/math/Makefile        Mon Sep 20 13:09:37 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.519 2021/09/20 02:51:23 mef Exp $
+# $NetBSD: Makefile,v 1.520 2021/09/20 13:09:37 mef Exp $
 
 COMMENT=       Mathematics
 
@@ -75,7 +75,6 @@ SUBDIR+=      R-lme4
 SUBDIR+=       R-lmm
 SUBDIR+=       R-lmtest
 SUBDIR+=       R-mapproj
-SUBDIR+=       R-maps
 SUBDIR+=       R-minqa
 SUBDIR+=       R-mitools
 SUBDIR+=       R-mnormt

Index: pkgsrc/math/R-mapproj/Makefile
diff -u pkgsrc/math/R-mapproj/Makefile:1.13 pkgsrc/math/R-mapproj/Makefile:1.14
--- pkgsrc/math/R-mapproj/Makefile:1.13 Sun Jun  6 07:22:40 2021
+++ pkgsrc/math/R-mapproj/Makefile      Mon Sep 20 13:09:37 2021
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.13 2021/06/06 07:22:40 mef Exp $
+# $NetBSD: Makefile,v 1.14 2021/09/20 13:09:37 mef Exp $
 
 R_PKGNAME=     mapproj
 R_PKGVER=      1.2.7
-CATEGORIES=    math
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Map projections
 LICENSE=       lucent
 
-DEPENDS+=      R-maps>=2.3.0:../../math/R-maps
+DEPENDS+=      R-maps>=2.3.0:../../geography/R-maps
 
 USE_LANGUAGES= c