Bug 203713 - devel/subversion: update to 1.9.2
Summary: devel/subversion: update to 1.9.2
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: Lev A. Serebryakov
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2015-10-12 05:44 UTC by Peter Wemm
Modified: 2015-10-15 10:43 UTC (History)
1 user (show)

See Also:
bugzilla: maintainer-feedback? (lev)


Attachments
subversion1.9.2.diff (18.91 KB, patch)
2015-10-12 05:46 UTC, Peter Wemm
no flags Details | Diff
build-outputs.mk.addons patch (51.20 KB, application/octet-stream)
2015-10-12 05:47 UTC, Peter Wemm
no flags Details
Additional plist patch (841 bytes, patch)
2015-10-12 06:13 UTC, Peter Wemm
no flags Details | Diff
Additional plist #2 patch (1.45 KB, patch)
2015-10-12 06:48 UTC, Peter Wemm
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Peter Wemm freebsd_committer freebsd_triage 2015-10-12 05:44:05 UTC
I needed svn-1.9.2 in the freebsd.org cluster so I did an initial pass of updating the port and am adding the patch here.

Of note:

P4_STYLE_MARKERS is baseline functionality now so the option is removed and extra-patch-3way-conflict-markers goes away

I regenerated files/build-outputs.mk.addons, which makes the patch huge.

files/extra-patch-Makefile.in goes away, the change it makes is in the base tarball.

The plist was updated as there's been churn in the DATADIR.

I have **not** regenerated the patches, but they probably should be as there's a lot of fuzz and offsets.

I have checked that p5-subversion and py-subversion build (hence finding the need to regenerate that file).

Obviously a svn cp subversion subversion18 and corresponding WITH_SUBVERSION_VERSION==18 set of changes for the downstream ports would be required but haven't been included here.
Comment 1 Peter Wemm freebsd_committer freebsd_triage 2015-10-12 05:46:13 UTC
Created attachment 161929 [details]
subversion1.9.2.diff

Patch without the build-outputs.mk.addons segment
Comment 2 Peter Wemm freebsd_committer freebsd_triage 2015-10-12 05:47:28 UTC
Created attachment 161930 [details]
build-outputs.mk.addons patch
Comment 3 Peter Wemm freebsd_committer freebsd_triage 2015-10-12 06:13:49 UTC
Created attachment 161931 [details]
Additional plist patch

I missed some of the TOOLS changes in the plist - we don't normally build with that.
Comment 4 Peter Wemm freebsd_committer freebsd_triage 2015-10-12 06:48:50 UTC
Created attachment 161932 [details]
Additional plist #2 patch

Add missing pkgconfig files, libsvn_fs_x and an include file.
Comment 5 Lev A. Serebryakov freebsd_committer 2015-10-12 11:30:50 UTC
Do we need to keep subversion18 — it is main question for me now :)
Comment 6 Peter Wemm freebsd_committer freebsd_triage 2015-10-12 11:36:32 UTC
I don't *think* so.  The main reason for keeping 1.6 and 1.7 was format changes and I'm not sure that applies here.

Please, cast a critical eye on the patches though.  I would be shocked if I didn't miss something.  And probably regenerate the .patch files with the correct line numbers.  There are some fuzzy matches in there.

The deprecated downstream devel/pysvn didn't compile for me - it hit lots of deprecated function warnings and eventually hit a type error that clang objected to.  It hasn't been maintained since svn-1.7 was current and needs a lot of work.
Comment 7 Lev A. Serebryakov freebsd_committer 2015-10-15 10:43:36 UTC
Updated!
Comment 8 commit-hook freebsd_committer 2015-10-15 10:43:55 UTC
A commit references this bug:

Author: lev
Date: Thu Oct 15 10:43:16 UTC 2015
New revision: 399335
URL: https://svnweb.freebsd.org/changeset/ports/399335

Log:
    Update devel/subversion to 1.9.2.

  PR:		203713
  Submitted by:	Peter Wemm <peter@FreeBSD.org>

Changes:
  head/UPDATING
  head/devel/p5-subversion/Makefile
  head/devel/py-subversion/Makefile
  head/devel/ruby-subversion/Makefile
  head/devel/subversion/Makefile
  head/devel/subversion/Makefile.common
  head/devel/subversion/distinfo
  head/devel/subversion/files/build-outputs.mk.addons
  head/devel/subversion/files/extra-patch-3way-conflict-markers
  head/devel/subversion/files/extra-patch-Makefile.in
  head/devel/subversion/files/extra-patch-build.conf
  head/devel/subversion/files/extra-patch-fbsd-template
  head/devel/subversion/files/extra-patch-svnserve-wrapper
  head/devel/subversion/files/patch-Makefile.in
  head/devel/subversion/files/patch-build-outputs.mk
  head/devel/subversion/files/patch-configure
  head/devel/subversion/files/patch-configure.ac
  head/devel/subversion/files/patch-subversion--bindings--swig--perl--native--Base.pm
  head/devel/subversion/files/patch-subversion--bindings--swig--perl--native--Makefile.PL.in
  head/devel/subversion/pkg-plist
  head/java/java-subversion/Makefile
  head/security/subversion-gnome-keyring/Makefile
  head/security/subversion-kwallet/Makefile
  head/www/mod_dav_svn/Makefile