mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-23 00:43:28 +00:00
Code Issues Releases Activity

Fix build by clang and gcc 4.7.

Browse Source 
Feature safe: yes
This commit is contained in:
Lev A. Serebryakov 2012-04-02 15:16:52 +00:00
parent 64c20c9eb7
commit 195098580d
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=294127
4 changed files with 123 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devel/subversion/Makefile
View File

@ -76,7 +76,7 @@ SUB_LIST+= SVNSERVE_BIN_EXT=""
.if !defined(NOPORTDOCS) && defined(WITH_BOOK)
BOOK_HTML= svn-book-html-r${BOOK_VERSION}.tar.bz2
BOOK_PDF= svn-book-r${BOOK_VERSION}.pdf.bz2
BOOK_PDF= svn-book-r${BOOK_VERSION}.pdf
DISTFILES+= ${BOOK_HTML}:book ${BOOK_PDF}:book
PLIST_SUB+= BOOK=""
.else

2
devel/subversion/Makefile.common
View File

@ -6,7 +6,7 @@
PORTNAME= subversion
PORTVERSION= 1.7.4
PORTREVISION?= 0
PORTREVISION?= 1
CATEGORIES+= devel
MASTER_SITES= ${MASTER_SITE_APACHE:S/$/:main/} \
${MASTER_SITE_LOCAL:S/$/:book/}

4
devel/subversion/distinfo
View File

@ -2,5 +2,5 @@ SHA256 (subversion17/subversion-1.7.4.tar.bz2) = c4c736f5d94a93b5862d1d245235314
SIZE (subversion17/subversion-1.7.4.tar.bz2) = 5978020
SHA256 (subversion17/svn-book-html-r4259.tar.bz2) = f02b64ad255b507325a960586225d721e086ec6f2a1843214202814e7fee3ac3
SIZE (subversion17/svn-book-html-r4259.tar.bz2) = 467637
SHA256 (subversion17/svn-book-r4259.pdf.bz2) = 784ea29e47202a78edf038545fee3319da701a61c467b8efa59be39362662ff5
SIZE (subversion17/svn-book-r4259.pdf.bz2) = 1202957
SHA256 (subversion17/svn-book-r4259.pdf) = c091c598b2964f9692f3b3ffb7585c14f7d4e70793dd7e0fb862e30d9a98d289
SIZE (subversion17/svn-book-r4259.pdf) = 1921400

161
devel/subversion/files/extra-patch-enhanced-keyword
View File

@ -1,10 +1,44 @@
diff -ruN subversion/include/private/svn_string_private.h subversion/include/private/svn_string_private.h
--- subversion/include/private/svn_string_private.h 2012-02-24 11:21:04.000000000 +0400
+++ subversion/include/private/svn_string_private.h 2012-04-01 22:27:28.000000000 +0400
@@ -35,6 +35,31 @@
#endif /* __cplusplus */
/**
diff -ruN subversion/include/private/svn_subst_private.h subversion/include/private/svn_subst_private.h
--- subversion/include/private/svn_subst_private.h 1970-01-01 03:00:00.000000000 +0300
+++ subversion/include/private/svn_subst_private.h 2012-04-02 18:49:12.000000000 +0400
@@ -0,0 +1,68 @@
+/**
+ * @copyright
+ * ====================================================================
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ * ====================================================================
+ * @endcopyright
+ *
+ * @file svn_subst_private.h
+ * @brief Non-public subst utility functions.
+ */
+
+
+#ifndef SVN_SUBST_PRIVATE_H
+#define SVN_SUBST_PRIVATE_H
+
+#include "svn_subst.h" /* for svn_boolean_t, svn_error_t */
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+/**
+ * Set @a *kw to a new keywords hash filled with the appropriate contents
+ * given a @a keywords_string (the contents of the svn:keywords
+ * property for the file in question), the revision @a rev, the @a url,
@ -29,14 +63,25 @@ diff -ruN subversion/include/private/svn_string_private.h subversion/include/pri
+ const char *author,
+ apr_pool_t *pool);
+
+/**
* @defgroup svn_string String handling
* @{
*/
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* SVN_SUBST_PRIVATE_H */
diff -ruN subversion/libsvn_client/cat.c subversion/libsvn_client/cat.c
--- subversion/libsvn_client/cat.c 2011-08-18 18:05:35.000000000 +0400
+++ subversion/libsvn_client/cat.c 2012-04-01 22:24:38.000000000 +0400
@@ -137,12 +137,15 @@
+++ subversion/libsvn_client/cat.c 2012-04-02 18:46:56.000000000 +0400
@@ -40,6 +40,7 @@
#include "svn_private_config.h"
#include "private/svn_wc_private.h"
+#include "private/svn_subst_private.h"
/*** Code. ***/
@@ -137,12 +138,15 @@
const char *rev_str;
const char *author;
const char *url;
@ -52,7 +97,7 @@ diff -ruN subversion/libsvn_client/cat.c subversion/libsvn_client/cat.c
if (local_mod)
{
@@ -158,8 +161,8 @@
@@ -158,8 +162,8 @@
rev_str = apr_psprintf(scratch_pool, "%ld", changed_rev);
}
@ -63,7 +108,7 @@ diff -ruN subversion/libsvn_client/cat.c subversion/libsvn_client/cat.c
}
/* Wrap the output stream if translation is needed. */
@@ -188,6 +191,7 @@
@@ -188,6 +192,7 @@
svn_string_t *keywords;
apr_hash_t *props;
const char *url;
@ -71,7 +116,7 @@ diff -ruN subversion/libsvn_client/cat.c subversion/libsvn_client/cat.c
svn_stream_t *output = out;
svn_error_t *err;
@@ -231,6 +235,8 @@
@@ -231,6 +236,8 @@
&url, path_or_url, NULL,
peg_revision,
revision, ctx, pool));
@ -80,7 +125,7 @@ diff -ruN subversion/libsvn_client/cat.c subversion/libsvn_client/cat.c
/* Grab some properties we need to know in order to figure out if anything
special needs to be done with this file. */
@@ -281,10 +287,11 @@
@@ -281,10 +288,11 @@
if (cmt_date)
SVN_ERR(svn_time_from_cstring(&when, cmt_date->data, pool));
@ -95,8 +140,16 @@ diff -ruN subversion/libsvn_client/cat.c subversion/libsvn_client/cat.c
pool));
diff -ruN subversion/libsvn_client/commit.c subversion/libsvn_client/commit.c
--- subversion/libsvn_client/commit.c 2011-11-28 21:04:12.000000000 +0400
+++ subversion/libsvn_client/commit.c 2012-04-01 22:24:38.000000000 +0400
@@ -126,9 +126,9 @@
+++ subversion/libsvn_client/commit.c 2012-04-02 18:46:52.000000000 +0400
@@ -50,6 +50,7 @@
#include "client.h"
#include "private/svn_wc_private.h"
#include "private/svn_magic.h"
+#include "private/svn_subst_private.h"
#include "svn_private_config.h"
@@ -126,9 +127,9 @@
}
if (keywords_val)
@ -110,8 +163,16 @@ diff -ruN subversion/libsvn_client/commit.c subversion/libsvn_client/commit.c
diff -ruN subversion/libsvn_client/export.c subversion/libsvn_client/export.c
--- subversion/libsvn_client/export.c 2012-02-10 08:00:30.000000000 +0400
+++ subversion/libsvn_client/export.c 2012-04-01 22:24:38.000000000 +0400
@@ -274,6 +274,7 @@
+++ subversion/libsvn_client/export.c 2012-04-02 18:46:47.000000000 +0400
@@ -43,6 +43,7 @@
#include "svn_private_config.h"
#include "private/svn_wc_private.h"
+#include "private/svn_subst_private.h"
/*** Code. ***/
@@ -274,6 +275,7 @@
svn_revnum_t changed_rev;
const char *suffix;
const char *url;
@ -119,7 +180,7 @@ diff -ruN subversion/libsvn_client/export.c subversion/libsvn_client/export.c
const char *author;
SVN_ERR(svn_wc__node_get_changed_info(&changed_rev, NULL, &author,
@@ -296,11 +297,13 @@
@@ -296,11 +298,13 @@
SVN_ERR(svn_wc__node_get_url(&url, wc_ctx, from_abspath,
scratch_pool, scratch_pool));
@ -135,7 +196,7 @@ diff -ruN subversion/libsvn_client/export.c subversion/libsvn_client/export.c
}
/* For atomicity, we translate to a tmp file and then rename the tmp file
@@ -702,6 +705,7 @@
@@ -702,6 +706,7 @@
/* Any keyword vals to be substituted */
const char *revision;
const char *url;
@ -143,7 +204,7 @@ diff -ruN subversion/libsvn_client/export.c subversion/libsvn_client/export.c
const char *author;
apr_time_t date;
@@ -823,6 +827,7 @@
@@ -823,6 +828,7 @@
fb->edit_baton = eb;
fb->path = full_path;
fb->url = full_url;
@ -151,7 +212,7 @@ diff -ruN subversion/libsvn_client/export.c subversion/libsvn_client/export.c
fb->pool = pool;
*baton = fb;
@@ -987,8 +992,8 @@
@@ -987,8 +993,8 @@
}
if (fb->keywords_val)
@ -164,8 +225,16 @@ diff -ruN subversion/libsvn_client/export.c subversion/libsvn_client/export.c
SVN_ERR(svn_subst_copy_and_translate4(fb->tmppath, fb->path,
diff -ruN subversion/libsvn_subr/subst.c subversion/libsvn_subr/subst.c
--- subversion/libsvn_subr/subst.c 2011-07-29 21:28:11.000000000 +0400
+++ subversion/libsvn_subr/subst.c 2012-04-01 22:24:38.000000000 +0400
@@ -135,8 +135,11 @@
+++ subversion/libsvn_subr/subst.c 2012-04-02 18:47:06.000000000 +0400
@@ -49,6 +49,7 @@
#include "svn_private_config.h"
#include "private/svn_string_private.h"
+#include "private/svn_subst_private.h"
/**
* The textual elements of a detranslated special file. One of these
@@ -135,8 +136,11 @@
* %b basename of the URL of this file
* %d short format of date of this revision
* %D long format of date of this revision
@ -177,7 +246,7 @@ diff -ruN subversion/libsvn_subr/subst.c subversion/libsvn_subr/subst.c
* %% a literal %
*
* All memory is allocated out of @a pool.
@@ -145,12 +148,14 @@
@@ -145,12 +149,14 @@
keyword_printf(const char *fmt,
const char *rev,
const char *url,
@ -192,7 +261,7 @@ diff -ruN subversion/libsvn_subr/subst.c subversion/libsvn_subr/subst.c
size_t n;
for (;;)
@@ -203,6 +208,23 @@
@@ -203,6 +209,23 @@
svn_stringbuf_appendcstr(value,
svn_time_to_human_cstring(date, pool));
break;
@ -216,7 +285,7 @@ diff -ruN subversion/libsvn_subr/subst.c subversion/libsvn_subr/subst.c
case 'r': /* number of this revision */
if (rev)
svn_stringbuf_appendcstr(value, rev);
@@ -211,6 +233,9 @@
@@ -211,6 +234,9 @@
if (url)
svn_stringbuf_appendcstr(value, url);
break;
@ -226,7 +295,7 @@ diff -ruN subversion/libsvn_subr/subst.c subversion/libsvn_subr/subst.c
case '%': /* '%%' => a literal % */
svn_stringbuf_appendbyte(value, *cur);
break;
@@ -246,8 +271,8 @@
@@ -246,8 +272,8 @@
apr_hash_t *kwhash;
const svn_string_t *val;
@ -237,7 +306,7 @@ diff -ruN subversion/libsvn_subr/subst.c subversion/libsvn_subr/subst.c
/* The behaviour of pre-1.3 svn_subst_build_keywords, which we are
* replicating here, is to write to a slot in the svn_subst_keywords_t
@@ -286,6 +311,21 @@
@@ -286,6 +312,21 @@
const char *author,
apr_pool_t *pool)
{
@ -259,7 +328,7 @@ diff -ruN subversion/libsvn_subr/subst.c subversion/libsvn_subr/subst.c
apr_array_header_t *keyword_tokens;
int i;
*kw = apr_hash_make(pool);
@@ -296,6 +336,24 @@
@@ -296,6 +337,24 @@
for (i = 0; i < keyword_tokens->nelts; ++i)
{
const char *keyword = APR_ARRAY_IDX(keyword_tokens, i, const char *);
@ -284,7 +353,7 @@ diff -ruN subversion/libsvn_subr/subst.c subversion/libsvn_subr/subst.c
if ((! strcmp(keyword, SVN_KEYWORD_REVISION_LONG))
|| (! strcmp(keyword, SVN_KEYWORD_REVISION_MEDIUM))
@@ -303,7 +361,7 @@
@@ -303,7 +362,7 @@
{
svn_string_t *revision_val;
@ -293,7 +362,7 @@ diff -ruN subversion/libsvn_subr/subst.c subversion/libsvn_subr/subst.c
apr_hash_set(*kw, SVN_KEYWORD_REVISION_LONG,
APR_HASH_KEY_STRING, revision_val);
apr_hash_set(*kw, SVN_KEYWORD_REVISION_MEDIUM,
@@ -316,7 +374,7 @@
@@ -316,7 +375,7 @@
{
svn_string_t *date_val;
@ -302,7 +371,7 @@ diff -ruN subversion/libsvn_subr/subst.c subversion/libsvn_subr/subst.c
apr_hash_set(*kw, SVN_KEYWORD_DATE_LONG,
APR_HASH_KEY_STRING, date_val);
apr_hash_set(*kw, SVN_KEYWORD_DATE_SHORT,
@@ -327,7 +385,7 @@
@@ -327,7 +386,7 @@
{
svn_string_t *author_val;
@ -311,7 +380,7 @@ diff -ruN subversion/libsvn_subr/subst.c subversion/libsvn_subr/subst.c
apr_hash_set(*kw, SVN_KEYWORD_AUTHOR_LONG,
APR_HASH_KEY_STRING, author_val);
apr_hash_set(*kw, SVN_KEYWORD_AUTHOR_SHORT,
@@ -338,7 +396,7 @@
@@ -338,7 +397,7 @@
{
svn_string_t *url_val;
@ -320,7 +389,7 @@ diff -ruN subversion/libsvn_subr/subst.c subversion/libsvn_subr/subst.c
apr_hash_set(*kw, SVN_KEYWORD_URL_LONG,
APR_HASH_KEY_STRING, url_val);
apr_hash_set(*kw, SVN_KEYWORD_URL_SHORT,
@@ -348,7 +406,7 @@
@@ -348,7 +407,7 @@
{
svn_string_t *id_val;
@ -329,7 +398,7 @@ diff -ruN subversion/libsvn_subr/subst.c subversion/libsvn_subr/subst.c
pool);
apr_hash_set(*kw, SVN_KEYWORD_ID,
APR_HASH_KEY_STRING, id_val);
@@ -357,7 +415,7 @@
@@ -357,7 +416,7 @@
{
svn_string_t *header_val;
@ -340,8 +409,16 @@ diff -ruN subversion/libsvn_subr/subst.c subversion/libsvn_subr/subst.c
APR_HASH_KEY_STRING, header_val);
diff -ruN subversion/libsvn_wc/translate.c subversion/libsvn_wc/translate.c
--- subversion/libsvn_wc/translate.c 2011-07-07 15:29:08.000000000 +0400
+++ subversion/libsvn_wc/translate.c 2012-04-01 22:24:38.000000000 +0400
@@ -313,10 +313,10 @@
+++ subversion/libsvn_wc/translate.c 2012-04-02 18:47:00.000000000 +0400
@@ -46,6 +46,7 @@
#include "svn_private_config.h"
#include "private/svn_wc_private.h"
+#include "private/svn_subst_private.h"
@@ -313,10 +314,10 @@
apr_time_t changed_date;
const char *changed_author;
const char *url;
@ -353,7 +430,7 @@ diff -ruN subversion/libsvn_wc/translate.c subversion/libsvn_wc/translate.c
const char *repos_relpath;
SVN_ERR(svn_wc__db_read_info(NULL, NULL, NULL, &repos_relpath,
@@ -341,13 +341,23 @@
@@ -341,13 +342,23 @@
changed_rev = SVN_INVALID_REVNUM;
changed_date = 0;
changed_author = "";