Date: Sat, 2 Jun 2018 11:46:34 +0000 (UTC) From: David Naylor <dbn@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r471366 - in head/devel/svn2git: . files Message-ID: <201806021146.w52BkYr3006286@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dbn Date: Sat Jun 2 11:46:33 2018 New Revision: 471366 URL: https://svnweb.freebsd.org/changeset/ports/471366 Log: devel/svn2git: update to 1.0.12 - add LICENSE_FILE as it is now included in the tarball - LICENSE does not indicate "or later" for version - add libapr as dependency, it is linked in - switch to Qt5 [1] - override LOCALBASE for SVN and APR includes using qmake arguments - update patches (and patch name) [1] Although the code base still compiles with Qt4, the src.pro file implicitly uses Qt5. On Qt4 the overriding of the SVN_INCLUDE and APR_INCLUDE variables do not work (due to the src.pro implicitly using Qt5). Added: head/devel/svn2git/files/patch-src_src.pro - copied, changed from r471365, head/devel/svn2git/files/patch-src__src.pro Deleted: head/devel/svn2git/files/patch-src__src.pro Modified: head/devel/svn2git/Makefile head/devel/svn2git/distinfo head/devel/svn2git/files/freebsd-export-patch Modified: head/devel/svn2git/Makefile ============================================================================== --- head/devel/svn2git/Makefile Sat Jun 2 11:39:24 2018 (r471365) +++ head/devel/svn2git/Makefile Sat Jun 2 11:46:33 2018 (r471366) @@ -2,28 +2,31 @@ # $FreeBSD$ PORTNAME= svn2git -PORTVERSION= 1.0.11.a.20151201 +PORTVERSION= 1.0.12 CATEGORIES= devel kde MAINTAINER= dbn@FreeBSD.org COMMENT= Imports svn repositories into git -LICENSE= GPLv3+ +LICENSE= GPLv3 +LICENSE_FILE= ${WRKSRC}/LICENSE -LIB_DEPENDS= libsvn_client-1.so:devel/subversion +LIB_DEPENDS= libapr-1.so:devel/apr1 \ + libsvn_client-1.so:devel/subversion RUN_DEPENDS= git:devel/git \ p5-Term-ReadKey>=0:devel/p5-Term-ReadKey \ p5-subversion>=0:devel/p5-subversion USES= qmake USE_GITHUB= yes -USE_QT4= corelib +USE_QT5= core GH_ACCOUNT= svn-all-fast-export -GH_TAGNAME= d4ff0b2 OPTIONS_DEFINE= FREEBSD_REPO FREEBSD_REPO_DESC= FreeBSD-repo only mode +QMAKE_ARGS= SVN_INCLUDE=${LOCALBASE}/include/subversion-1 \ + APR_INCLUDE=${LOCALBASE}/include/apr-1 PLIST_FILES= bin/svn2git FREEBSD_REPO_EXTRA_PATCHES= ${PATCHDIR}/freebsd-export-patch Modified: head/devel/svn2git/distinfo ============================================================================== --- head/devel/svn2git/distinfo Sat Jun 2 11:39:24 2018 (r471365) +++ head/devel/svn2git/distinfo Sat Jun 2 11:46:33 2018 (r471366) @@ -1,2 +1,3 @@ -SHA256 (svn-all-fast-export-svn2git-1.0.11.a.20151201-d4ff0b2_GH0.tar.gz) = 669c76f2a1cdb791831a7db41642c8e80bb495cfe9b12acaa3a125d28897f309 -SIZE (svn-all-fast-export-svn2git-1.0.11.a.20151201-d4ff0b2_GH0.tar.gz) = 27924 +TIMESTAMP = 1527936756 +SHA256 (svn-all-fast-export-svn2git-1.0.12_GH0.tar.gz) = 6d78d6a1967ff82cbe0124c6cb7c473b5b9d7a3ab1b7727a3504697c2eca0819 +SIZE (svn-all-fast-export-svn2git-1.0.12_GH0.tar.gz) = 43591 Modified: head/devel/svn2git/files/freebsd-export-patch ============================================================================== --- head/devel/svn2git/files/freebsd-export-patch Sat Jun 2 11:39:24 2018 (r471365) +++ head/devel/svn2git/files/freebsd-export-patch Sat Jun 2 11:46:33 2018 (r471366) @@ -1,18 +1,15 @@ -diff --git a/src/svn.cpp b/src/svn.cpp -index 1aadce9..3d359bb 100644 ---- src/svn.cpp +--- src/svn.cpp.orig 2018-05-27 18:34:59 UTC +++ src/svn.cpp -@@ -800,8 +800,13 @@ int SvnRevision::exportInternal(const char *key, const svn_fs_path_change_t *cha - // merge points. This heuristic is fairly useful for tracking +@@ -873,7 +873,13 @@ int SvnRevision::exportInternal(const ch // changes across directory re-organizations and wholesale branch // imports. -- // -- if (path_from != NULL && prevrepository == repository && prevbranch != branch) { + // +- if (path_from != NULL && preveffectiverepository == effectiveRepository && prevbranch != branch) { + // NOTE(uqs): HACK ALERT! Only merge between head, projects, and user + // branches for the FreeBSD repositories. Never merge into stable or + // releng, as we only ever cherry-pick changes to those branches. + // FIXME: Needs to move into the ruleset ... -+ if (path_from != NULL && prevrepository == repository && prevbranch != branch && ++ if (path_from != NULL && preveffectiverepository == effectiveRepository && prevbranch != branch && + (branch.startsWith("master") || branch.startsWith("head") || + branch.startsWith("projects") || branch.startsWith("user"))) { if(ruledebug) Copied and modified: head/devel/svn2git/files/patch-src_src.pro (from r471365, head/devel/svn2git/files/patch-src__src.pro) ============================================================================== --- head/devel/svn2git/files/patch-src__src.pro Sat Jun 2 11:39:24 2018 (r471365, copy source) +++ head/devel/svn2git/files/patch-src_src.pro Sat Jun 2 11:46:33 2018 (r471366) @@ -1,23 +1,11 @@ ---- src/src.pro.orig 2015-12-01 09:05:19 UTC +--- src/src.pro.orig 2018-06-02 10:56:17 UTC +++ src/src.pro -@@ -2,8 +2,9 @@ - # Automatically generated by qmake (2.01a) dim. dc. 23 13:49:28 2007 - ###################################################################### - --SVN_INCLUDE = /usr/include/subversion-1 /usr/local/include/subversion-1 --APR_INCLUDE = /usr/include/apr-1.0 /usr/include/apr-1 /usr/local/include/apr-1 -+LOCALBASE = /usr/local -+SVN_INCLUDE = $${LOCALBASE}/include/subversion-1 -+APR_INCLUDE = $${LOCALBASE}/include/apr-1 - exists(local-config.pri):include(local-config.pri) - - VERSION = $$system(git --no-pager show --pretty=oneline --no-notes | head -1 | cut -b-40) -@@ -15,7 +16,7 @@ VERSTR = '\\"$${VERSION}\\"' # place quotes around the version string +@@ -14,7 +14,7 @@ VERSTR = '\\"$${VERSION}\\"' # place qu DEFINES += VER=\"$${VERSTR}\" # create a VER macro containing the version string TEMPLATE = app -TARGET = ../svn-all-fast-export +TARGET = ../svn2git - DEPENDPATH += . - QT = core + isEmpty(PREFIX) { + PREFIX = /usr/local
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201806021146.w52BkYr3006286>