From ceb559b87fcd3e983c54d1950d492c053b813518 Mon Sep 17 00:00:00 2001
From: "Charlton, Scott R" <charlton@usgs.gov>
Date: Mon, 6 Sep 2021 15:18:39 -0600
Subject: [PATCH] [iphreeqc] fix for CRAN (forwarding urls and DOI format)

---
 R/phreeqc.R.in          | 4 ++--
 R/phreeqc/inst/CITATION | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/R/phreeqc.R.in b/R/phreeqc.R.in
index cc1bed19..c88ee593 100644
--- a/R/phreeqc.R.in
+++ b/R/phreeqc.R.in
@@ -12,7 +12,7 @@
 ##' @aliases phreeqc-package phreeqc
 ##' @docType package
 ##' @author S.R. Charlton, D.L. Parkhurst, and C.A.J. Appelo, with contributions from D. Gillespie for Chipmunk BASIC (p2c) and S.D. Cohen, A.C. Hindmarsh, R. Serban, D. Shumaker, and A.G. Taylor for CVODE (SUNDIALS) \cr Maintainer: S.R. Charlton \email{charlton@@usgs.gov}
-##' @references \url{https://water.usgs.gov/water-resources/software/PHREEQC/IPhreeqc.pdf}\cr \url{http://computation.llnl.gov/casc/sundials/main.html}
+##' @references \url{https://water.usgs.gov/water-resources/software/PHREEQC/IPhreeqc.pdf}\cr \url{https://computing.llnl.gov/projects/sundials}
 ##' @keywords package
 ##' @examples
 ##'
@@ -1448,7 +1448,7 @@ NULL
 ##' \code{\link{phrLoadDatabaseString}}.
 ##' @docType data
 ##' @family Databases
-##' @references \url{https://dx.doi.org/10.1016/j.gca.2017.06.023}
+##' @references \doi{10.1016/j.gca.2017.06.023}
 ##' @source \url{https://github.com/MarcNeveu/IcyDwarf/blob/master/IcyDwarf/PHREEQC-3.1.2/core10.dat}
 ##' @usage core10.dat  # phrLoadDatabaseString(core10.dat)
 ##' @keywords dataset
diff --git a/R/phreeqc/inst/CITATION b/R/phreeqc/inst/CITATION
index 3f826dae..a808f4fc 100644
--- a/R/phreeqc/inst/CITATION
+++ b/R/phreeqc/inst/CITATION
@@ -11,7 +11,7 @@ citEntry(entry="Manual",
          volume       = "book 6",
          chapter      = "A43",
          pages        = "497",
-         url          = "https://pubs.usgs.gov/tm/06/a43",
+         url          = "https://pubs.usgs.gov/tm/06/a43/",
 
 	 textVersion  =
          paste("Parkhurst, D.L., and Appelo, C.A.J., 2013, Description of",
@@ -20,7 +20,7 @@ citEntry(entry="Manual",
                "transport, and inverse geochemical calculations: U.S.",
                "Geological Survey Techniques and Methods, book 6, chap.",
                "A43, 497 p., available only at",
-               "https://pubs.usgs.gov/tm/06/a43.")
+               "https://pubs.usgs.gov/tm/06/a43/.")
 )