Index: head/devel/svn2git/Makefile =================================================================== --- head/devel/svn2git/Makefile (revision 403813) +++ head/devel/svn2git/Makefile (revision 403814) @@ -1,39 +1,38 @@ # Created by: David Naylor # $FreeBSD$ PORTNAME= svn2git -DISTVERSION= 1.0.10 +PORTVERSION= 1.0.10.a.20151201 CATEGORIES= devel kde -MASTER_SITES= LOCAL/dbn/${PORTNAME} MAINTAINER= dbn@FreeBSD.org COMMENT= Imports svn repositories into git LICENSE= GPLv3 LIB_DEPENDS= libsvn_client-1.so:${PORTSDIR}/devel/subversion RUN_DEPENDS+= git:${PORTSDIR}/devel/git \ p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey \ p5-subversion>=0:${PORTSDIR}/devel/p5-subversion USES= qmake tar:xz +USE_GITHUB= yes USE_QT4= corelib +GH_ACCOUNT= svn-all-fast-export +GH_TAGNAME= d4ff0b2 OPTIONS_DEFINE= FREEBSD_REPO FREEBSD_REPO_DESC= FreeBSD-repo only mode PLIST_FILES= bin/svn2git -.include +FREEBSD_REPO_EXTRA_PATCHES= ${PATCHDIR}/freebsd-export-patch -.if ${PORT_OPTIONS:MFREEBSD_REPO} -EXTRA_PATCHES= ${PATCHDIR}/freebsd-export-patch -.endif - post-patch: - ${REINPLACE_CMD} "s|/usr/local|${LOCALBASE}|" ${WRKSRC}/src/src.pro + ${REINPLACE_CMD} -e "s|/usr/local|${LOCALBASE}|" \ + -e "s/VERSION = .*/VERSION = ${PORTVERSION}/" ${WRKSRC}/src/src.pro do-install: ${INSTALL_PROGRAM} ${WRKSRC}/svn2git ${STAGEDIR}${PREFIX}/bin/ .include Index: head/devel/svn2git/distinfo =================================================================== --- head/devel/svn2git/distinfo (revision 403813) +++ head/devel/svn2git/distinfo (revision 403814) @@ -1,2 +1,2 @@ -SHA256 (svn2git-1.0.10.tar.xz) = e4448865b2f5a60ece2e379e123ac7d17e38668a98349291763b06a6b9690399 -SIZE (svn2git-1.0.10.tar.xz) = 23560 +SHA256 (svn-all-fast-export-svn2git-1.0.10.a.20151201-d4ff0b2_GH0.tar.xz) = 669c76f2a1cdb791831a7db41642c8e80bb495cfe9b12acaa3a125d28897f309 +SIZE (svn-all-fast-export-svn2git-1.0.10.a.20151201-d4ff0b2_GH0.tar.xz) = 27924 Index: head/devel/svn2git/files/patch-src__src.pro =================================================================== --- head/devel/svn2git/files/patch-src__src.pro (revision 403813) +++ head/devel/svn2git/files/patch-src__src.pro (revision 403814) @@ -1,29 +1,23 @@ -diff --git a/src/src.pro b/src/src.pro -index da6d40d..5749202 100644 ---- src/src.pro +--- src/src.pro.orig 2015-12-01 09:05:19 UTC +++ src/src.pro -@@ -2,11 +2,12 @@ +@@ -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) -+VERSION = 1.0.8 - !isEmpty(VERSION){ - VERSION = $${VERSION} - } + 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 DEFINES += VER=\"$${VERSTR}\" # create a VER macro containing the version string TEMPLATE = app -TARGET = ../svn-all-fast-export +TARGET = ../svn2git DEPENDPATH += . QT = core