summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikhail Teterin <mi@FreeBSD.org>2012-05-11 21:54:56 +0000
committerMikhail Teterin <mi@FreeBSD.org>2012-05-11 21:54:56 +0000
commit4e7a56843152d1a164bf2c74b08d220f6e3a76d4 (patch)
treea96e9f69c36eea83b8f3f813c561732155488466
parent- Add DISTNAME to download correct tarball (diff)
Add a patch to accomodate "const-poisoning" added into svn-1.7.
Notified by: pav@, erwin@
Notes
Notes: svn path=/head/; revision=296463
-rw-r--r--devel/subcommander2/Makefile3
-rw-r--r--devel/subcommander2/files/patch-WcEntry18
2 files changed, 20 insertions, 1 deletions
diff --git a/devel/subcommander2/Makefile b/devel/subcommander2/Makefile
index 2128176abbc3..f3c0b6ea8017 100644
--- a/devel/subcommander2/Makefile
+++ b/devel/subcommander2/Makefile
@@ -24,7 +24,7 @@ LATEST_LINK= subcommander2
CONFLICTS= subcommander-1.*
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.b/b/g}
-USE_DOS2UNIX= *.cpp
+USE_DOS2UNIX= *.cpp *.h
GNU_CONFIGURE= yes
USE_GMAKE= yes
@@ -38,6 +38,7 @@ CONFIGURE_ARGS+= --with-boost=${LOCALBASE}/include --with-neon=${LOCALBASE} \
--with-openssl=${OPENSSLBASE}
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib -L${LOCALBASE}/lib/qt4 ${PTHREAD_LIBS}
+MAKE_JOBS_SAFE= yes
post-extract:
@${CHMOD} +x ${WRKSRC}/configure
diff --git a/devel/subcommander2/files/patch-WcEntry b/devel/subcommander2/files/patch-WcEntry
new file mode 100644
index 000000000000..9156522cdbfd
--- /dev/null
+++ b/devel/subcommander2/files/patch-WcEntry
@@ -0,0 +1,18 @@
+--- svn/WcEntry.h 2008-11-08 11:23:48.000000000 -0500
++++ svn/WcEntry.h 2012-05-11 17:46:20.000000000 -0400
+@@ -39,5 +39,5 @@
+
+ public:
+- WcEntry( svn_wc_entry_t* );
++ WcEntry(const svn_wc_entry_t*);
+ WcEntry( const WcEntry& src );
+
+--- svn/WcEntry.cpp 2008-11-08 11:23:48.000000000 -0500
++++ svn/WcEntry.cpp 2012-05-11 17:46:01.000000000 -0400
+@@ -21,5 +21,5 @@
+ }
+
+-WcEntry::WcEntry( svn_wc_entry_t* entry )
++WcEntry::WcEntry(const svn_wc_entry_t* entry)
+ {
+ _name = sc::String(entry->name);