Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F148600962
D4066.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Flag For Later
Award Token
Size
2 KB
Referenced Files
None
Subscribers
None
D4066.diff
View Options
Index: head/devel/svn2git/Makefile
===================================================================
--- head/devel/svn2git/Makefile
+++ head/devel/svn2git/Makefile
@@ -2,9 +2,8 @@
# $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
@@ -17,21 +16,21 @@
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 <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MFREEBSD_REPO}
-EXTRA_PATCHES= ${PATCHDIR}/freebsd-export-patch
-.endif
+FREEBSD_REPO_EXTRA_PATCHES= ${PATCHDIR}/freebsd-export-patch
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/
Index: head/devel/svn2git/distinfo
===================================================================
--- head/devel/svn2git/distinfo
+++ head/devel/svn2git/distinfo
@@ -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
+++ head/devel/svn2git/files/patch-src__src.pro
@@ -1,8 +1,6 @@
-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
######################################################################
@@ -13,11 +11,7 @@
+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
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Fri, Mar 20, 1:56 AM (7 h, 33 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29991292
Default Alt Text
D4066.diff (2 KB)
Attached To
Mode
D4066: devel/svn2git: Backport svn 1.9 fix
Attached
Detach File
Event Timeline
Log In to Comment