Bug 218158 - astro/geographiclib: update to 1.49
Summary: astro/geographiclib: update to 1.49
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Kyle Evans
URL:
Keywords:
Depends on:
Blocks: 218639
  Show dependency treegraph
 
Reported: 2017-03-27 07:02 UTC by Tatsuki Makino
Modified: 2018-02-03 15:47 UTC (History)
3 users (show)

See Also:


Attachments
patch for astro/geographiclib (6.04 KB, patch)
2017-03-27 07:02 UTC, Tatsuki Makino
tatsuki_makino: maintainer-approval+
Details | Diff
test log (166.25 KB, text/plain)
2017-03-27 07:04 UTC, Tatsuki Makino
tatsuki_makino: maintainer-approval+
Details
test log (399.60 KB, text/plain)
2017-03-27 07:05 UTC, Tatsuki Makino
tatsuki_makino: maintainer-approval+
Details
patch for astro/geographiclib (6.03 KB, patch)
2017-04-06 01:47 UTC, Tatsuki Makino
tatsuki_makino: maintainer-approval+
Details | Diff
patch for astro/geographiclib (9.88 KB, patch)
2017-04-21 07:27 UTC, Tatsuki Makino
tatsuki_makino: maintainer-approval+
Details | Diff
test log (165.90 KB, text/plain)
2017-04-21 07:29 UTC, Tatsuki Makino
tatsuki_makino: maintainer-approval+
Details
test log (408.62 KB, text/plain)
2017-04-21 07:30 UTC, Tatsuki Makino
tatsuki_makino: maintainer-approval+
Details
svn(1) diff of astro/geographiclib (7.94 KB, patch)
2018-02-01 22:25 UTC, Kyle Evans
no flags Details | Diff
patch for astro/geographiclib (10.33 KB, patch)
2018-02-03 07:42 UTC, Tatsuki Makino
tatsuki_makino: maintainer-approval+
Details | Diff
test log (872.42 KB, text/plain)
2018-02-03 07:46 UTC, Tatsuki Makino
tatsuki_makino: maintainer-approval+
Details

Note You need to log in before you can comment on or make changes to this bug.
Description Tatsuki Makino 2017-03-27 07:02:14 UTC
Created attachment 181224 [details]
patch for astro/geographiclib

Update to GeographicLib-1.47-patch1.

Option CMAKE is added.
Comment 1 Tatsuki Makino 2017-03-27 07:04:29 UTC
Created attachment 181225 [details]
test log

CMAKE=off
Comment 2 Tatsuki Makino 2017-03-27 07:05:35 UTC
Created attachment 181226 [details]
test log

CMAKE=on
Comment 3 Tatsuki Makino 2017-04-06 01:47:03 UTC
Created attachment 181526 [details]
patch for astro/geographiclib

Small change
Comment 4 Tatsuki Makino 2017-04-21 07:27:19 UTC
Created attachment 181967 [details]
patch for astro/geographiclib

Update to GeographicLib-1.48
Comment 5 Tatsuki Makino 2017-04-21 07:29:28 UTC
Created attachment 181968 [details]
test log

CMAKE=off
Comment 6 Tatsuki Makino 2017-04-21 07:30:45 UTC
Created attachment 181969 [details]
test log

CMAKE=on
Comment 7 Martin Wilke freebsd_committer freebsd_triage 2017-05-03 13:26:24 UTC
Hi,

Can you please explain why you want to support CMAKE and GNU autotools?
I think you should choose one and use it as default. No need make it complicated to maintain :)
Comment 8 Kyle Evans freebsd_committer freebsd_triage 2017-05-15 21:27:25 UTC
(In reply to Martin Wilke from comment #7)

I think it would be desirable to just switch it over to building with only CMake and no autotools option. Any objections to me whipping up said patch? I'd like to be able to resolve PR 218639 soon-ish, and the CMake bits are a game-changer from what I had done previously.
Comment 9 Tatsuki Makino 2017-05-16 01:58:10 UTC
(In reply to Martin Wilke from comment #7)
(In reply to Kyle Evans from comment #8)

Different results are returned in cmake and autotools.
Cmake can use all the prepared features, but it is difficult to stop some features.
Autotools is easy to control the features we use.
Cmake generates more documents than autotools, but probably jsdoc (package of node.js?) has not existed in the portstree yet.
Autotools generates an ar archive that can be used to create static binaries.
Building with autotools requires a patch to avoid egrep \b (bug 218639).
Building with cmake requires a patch to avoid head --lines -4 and tail --lines.
Comment 10 Timur I. Bakeyev freebsd_committer freebsd_triage 2018-01-30 23:02:10 UTC
Reset to the default owner due timeout and a volunteer ready to step in.
Comment 11 Tatsuki Makino 2018-01-30 23:34:44 UTC
1.49 already exists. I have not prepared it yet.
Comment 12 Kyle Evans freebsd_committer freebsd_triage 2018-01-31 00:53:18 UTC
Hi Tatsuki,

I'm taking this, since I have a vested interest in seeing it completed. =)

I'd like to urge you to move to a CMake-only build, rather than having options for another build system. I am willing to work with you (and, begrudgingly, CMake) to get the needed functionality to make it the default and only option.

I guess the first question is- what is the state as of 1.49? Are they still not building a static lib there?
Comment 13 Kyle Evans freebsd_committer freebsd_triage 2018-02-01 15:27:54 UTC
I had some time to go back and check- there is a switch to generate both static and shared libs.

I'll go ahead and prepare a patch for the update to 1.49 for your approval after taking a look at this PERL situation.
Comment 14 Kyle Evans freebsd_committer freebsd_triage 2018-02-01 22:25:53 UTC
Created attachment 190255 [details]
svn(1) diff of astro/geographiclib

Attached is my proposed patch for the 1.4.9 update, based on your 1.4.8 update patch.

The build system here is switched entirely to CMake, with a patch to ${WRKSRC}/CMakeLists.txt to add a GEOGRAPHICLIB_NO_PERL option so that we can force the perl usage off even if pod2man/pod2html are present on the system.

Tested with: Poudriere (amd64, -CURRENT, default options)
Tested with: Poudriere (amd64, -CURRENT, -PERL)
Tested with: Poudriere (amd64, 10.3-RELEASE, default options)
Comment 15 Tatsuki Makino 2018-02-03 07:42:23 UTC
Created attachment 190287 [details]
patch for astro/geographiclib

I'm sorry to have kept you waiting.
Would you use this one?

The change point is...
I referred to the attachment 190255 [details].
emm2017 detaset is added.
GEOGRAPHICLIB_NO_PERL is suppressing to run find_program.
Patches were rebuilt using make makepatch.
Comment 16 Tatsuki Makino 2018-02-03 07:46:30 UTC
Created attachment 190288 [details]
test log

Log created by attachment 190287 [details]
3 logs are connected :)
Comment 17 Kyle Evans freebsd_committer freebsd_triage 2018-02-03 13:52:37 UTC
(In reply to Tatsuki Makino from comment #15)

"I'm sorry to keep you waiting" says the guy person whose PR has been open for a year as of next month. =)

Looks good to me, I'll poke someone, try a d get it committed today.
Comment 18 commit-hook freebsd_committer freebsd_triage 2018-02-03 15:42:32 UTC
A commit references this bug:

Author: kevans
Date: Sat Feb  3 15:42:09 UTC 2018
New revision: 460821
URL: https://svnweb.freebsd.org/changeset/ports/460821

Log:
  Update astro/geographiclib to 1.4.9

  Highlights:
  - Update from 1.4.6 to 1.4.9
  - MAGNETIC_EMM2017 model addd
  - Switched to CMake for build

  head/tail usage must be patched to avoid use of --lines; work is in progress
  to eventually grow this long-option alternative to -n so that such patching
  isn't necessary at some point in the future.

  PR:		218158
  Approved by:	ak (ports), Tatsuki Makino (maintainer)

Changes:
  head/astro/geographiclib/Makefile
  head/astro/geographiclib/distinfo
  head/astro/geographiclib/files/
  head/astro/geographiclib/files/patch-CMakeLists.txt
  head/astro/geographiclib/files/patch-cmake_CMakeLists.txt
  head/astro/geographiclib/files/patch-doc_CMakeLists.txt
  head/astro/geographiclib/files/patch-man_CMakeLists.txt
  head/astro/geographiclib/files/patch-python_geographiclib_CMakeLists.txt
  head/astro/geographiclib/pkg-plist
Comment 19 Kyle Evans freebsd_committer freebsd_triage 2018-02-03 15:47:56 UTC
Committed, thanks!

I've closed my dependent PR as "Overcome by events" since it is no longer an issue with a full-CMake build.