Revision: 138998 https://trac.macports.org/changeset/138998 Author: ryandesign@macports.org Date: 2015-07-26 23:51:24 -0700 (Sun, 26 Jul 2015) Log Message: ----------- fsvs: update to 1.2.6; add apr dependency; add patch for clang compatibility; use expand operator instead of eval Modified Paths: -------------- trunk/dports/devel/fsvs/Portfile trunk/dports/devel/fsvs/files/patch-configure.diff Added Paths: ----------- trunk/dports/devel/fsvs/files/patch-clang.diff Modified: trunk/dports/devel/fsvs/Portfile =================================================================== --- trunk/dports/devel/fsvs/Portfile 2015-07-27 06:15:58 UTC (rev 138997) +++ trunk/dports/devel/fsvs/Portfile 2015-07-27 06:51:24 UTC (rev 138998) @@ -4,7 +4,7 @@ PortSystem 1.0 name fsvs -version 1.2.5 +version 1.2.6 categories devel platforms darwin maintainers ryandesign openmaintainer @@ -23,14 +23,16 @@ http://download.fsvs-software.org/old/ use_bzip2 yes -checksums rmd160 7bc9e87c5e4949f715208c0c589c8ee6c3339f22 \ - sha256 3c957d29e0e568d46ce2fd659a88ed6ea93a05267bdc11dc93131a88b7cb44d2 +checksums rmd160 425fca5adbca8c9f51e1687861773f95e1721202 \ + sha256 819551340b0124542af7ef0c6af74275a9b7689b736643766eb1b332d77b1a81 depends_lib port:subversion \ + port:apr \ port:gdbm \ port:pcre patchfiles patch-configure.diff \ + patch-clang.diff \ patch-src-Makefile.in.diff configure.cflags-append -fnested-functions @@ -46,10 +48,10 @@ ${destroot}${prefix}/etc/fsvs/svn/auth/ssl.client-passphrase post-destroot { - eval xinstall -m 644 [glob ${worksrcpath}/doc/*.1] ${destroot}${prefix}/share/man/man1 - eval xinstall -m 644 [glob ${worksrcpath}/doc/*.5] ${destroot}${prefix}/share/man/man5 + xinstall -m 644 {*}[glob ${worksrcpath}/doc/*.1] ${destroot}${prefix}/share/man/man1 + xinstall -m 644 {*}[glob ${worksrcpath}/doc/*.5] ${destroot}${prefix}/share/man/man5 - set docdir ${destroot}${prefix}/share/doc/${name} + set docdir ${destroot}${prefix}/share/doc/${subport} xinstall -d ${docdir} xinstall -m 644 -W ${worksrcpath} \ CHANGES \ Added: trunk/dports/devel/fsvs/files/patch-clang.diff =================================================================== --- trunk/dports/devel/fsvs/files/patch-clang.diff (rev 0) +++ trunk/dports/devel/fsvs/files/patch-clang.diff 2015-07-27 06:51:24 UTC (rev 138998) @@ -0,0 +1,333 @@ +Index: fsvs/src/props.c +=================================================================== +--- src/props.c (revision 2473) ++++ src/props.c (revision 2474) +@@ -1,5 +1,5 @@ + /************************************************************************ +- * Copyright (C) 2007-2009 Philipp Marek. ++ * Copyright (C) 2007-2009,2015 Philipp Marek. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 3 as +@@ -442,7 +442,7 @@ + + /** -. + * Wrapper for prp__fetch(). */ +-int prp__get(hash_t db, const char *keycp, datum *value) ++int prp__get(hash_t db, char * const keycp, datum *value) + { + static datum key; + +@@ -567,6 +567,7 @@ + char **normalized; + + ++ db=NULL; + status=0; + output=stdout; + if (argc<2) ac__Usage_this(); +@@ -636,6 +637,7 @@ + + + status=0; ++ db=NULL; + if (argc<2) ac__Usage_this(); + + /* Check name for special values. */ +@@ -893,6 +895,7 @@ + int status, rv; + datum key; + ++ status=0; + rv = prp__open_byestat( sts, GDBM_READER, &db); + if (rv == ENOENT) + goto done; +Index: fsvs/src/props.h +=================================================================== +--- src/props.h (revision 2473) ++++ src/props.h (revision 2474) +@@ -63,7 +63,7 @@ + hash_t *db); + /** Get a value, addressed by a string; key length is calculated inclusive + * the \c \\0. */ +-int prp__get(hash_t db, const char *keycp, datum *value); ++int prp__get(hash_t db, char * const keycp, datum *value); + /** Store the value; basic function. */ + int prp__store(hash_t db, datum key, datum value); + /** Get first key. */ +Index: fsvs/src/waa.c +=================================================================== +--- src/waa.c (revision 2473) ++++ src/waa.c (revision 2474) +@@ -1,5 +1,5 @@ + /************************************************************************ +- * Copyright (C) 2005-2009 Philipp Marek. ++ * Copyright (C) 2005-2009,2015 Philipp Marek. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 3 as +@@ -378,7 +378,7 @@ + + + /** Returns the MD5 of the given path, taking the softroot into account. */ +-int waa___get_path_md5(const char const *path, ++int waa___get_path_md5(const char * path, + unsigned char digest[APR_MD5_DIGESTSIZE]) + { + int status; +@@ -769,12 +769,8 @@ + "\t"; + static const char readme_2[]="\n"; + +- inline int w(const char *buffer, int l) +- { +- return write(hdl, buffer, l) != l; +- } ++#define w(_buffer, _l) (write(hdl, _buffer, _l) != _l) + +- + STOPIF( waa__open(directory, name, O_CREAT | O_WRONLY, &hdl), NULL); + STOPIF_CODE_ERR( + w(readme_1, sizeof(readme_1)-1) || +@@ -784,6 +780,8 @@ + "Cannot create the readme file."); + STOPIF( waa__close(hdl, 0), NULL); + ++#undef w ++ + ex: + return status; + } +@@ -3005,7 +3003,7 @@ + /** -. + * The \a dir must be absolute; this function makes an own copy, so the + * value will be unchanged. */ +-int waa__set_working_copy(const char const *wc_dir) ++int waa__set_working_copy(const char * const wc_dir) + { + int status; + +@@ -3022,7 +3020,7 @@ + /** -. + * The \a dir must be absolute; this function makes an own copy, so the + * value will be unchanged. */ +-int waa__create_working_copy(const char const *wc_dir) ++int waa__create_working_copy(const char * const wc_dir) + { + int status; + char *dir; +Index: fsvs/src/waa.h +=================================================================== +--- src/waa.h (revision 2473) ++++ src/waa.h (revision 2474) +@@ -1,5 +1,5 @@ + /************************************************************************ +- * Copyright (C) 2005-2009 Philipp Marek. ++ * Copyright (C) 2005-2009,2015 Philipp Marek. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 3 as +@@ -283,10 +283,10 @@ + int waa__find_base(struct estat *root, int *argc, char ***args); + + /** Creates the WAA and CONF directories needed for \a wc_path. */ +-int waa__create_working_copy(const char const *wc_dir); ++int waa__create_working_copy(const char * const wc_dir); + /** Stores the path of the working copy. + * Not needed if waa__find_common_base or similar is called. */ +-int waa__set_working_copy(const char const *wc_dir); ++int waa__set_working_copy(const char * const wc_dir); + + + /** \name Building paths for FSVS's datafiles. +Index: fsvs/src/commit.c +=================================================================== +--- src/commit.c (revision 2473) ++++ src/commit.c (revision 2474) +@@ -1,5 +1,5 @@ + /************************************************************************ +- * Copyright (C) 2005-2009 Philipp Marek. ++ * Copyright (C) 2005-2009,2015 Philipp Marek. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 3 as +@@ -241,7 +241,8 @@ + + /* Convenience function; checks for \c FSVS_PROP_COMMIT_PIPE. + * By putting that here we can avoid sending most of the parameters. */ +-inline int send_a_prop(void *baton, int store_encoder, ++// inline ++int send_a_prop(void *baton, int store_encoder, + struct estat *sts, change_any_prop_t function, + char *key, svn_string_t *value, + apr_pool_t *pool) +Index: fsvs/src/racallback.c +=================================================================== +--- src/racallback.c (revision 2473) ++++ src/racallback.c (revision 2474) +@@ -1,5 +1,5 @@ + /************************************************************************ +- * Copyright (C) 2005-2009 Philipp Marek. ++ * Copyright (C) 2005-2009,2015 Philipp Marek. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 3 as +@@ -293,7 +293,8 @@ + } + + +-inline int cb___store_prop(struct estat *sts, ++// inline ++int cb___store_prop(struct estat *sts, + const char *utf8_name, const svn_string_t *value, + apr_pool_t *pool) + { +Index: fsvs/src/status.c +=================================================================== +--- src/status.c (revision 2473) ++++ src/status.c (revision 2474) +@@ -134,29 +134,29 @@ + + + /** Meta-data status string. */ +-inline char * st___meta_string(int status_bits, int flags) ++char * st___meta_string(int status_bits, int flags) + { +- static char buffer[4]; +- int prop; ++ static char buffer[4]; ++ int prop; + +- prop=(status_bits & FS_PROPERTIES) | (flags & RF_PUSHPROPS); ++ prop=(status_bits & FS_PROPERTIES) | (flags & RF_PUSHPROPS); + +- if (opt__is_verbose() > 0) +- { +- buffer[0] = status_bits & FS_META_MTIME ? 't' : '.'; +- buffer[1] = status_bits & +- (FS_META_OWNER | FS_META_GROUP | FS_META_UMODE) ? 'p' : '.'; +- buffer[2] = prop ? 'P' : '.'; +- buffer[3] = 0; +- } +- else +- { +- buffer[0] = status_bits & FS_META_CHANGED ? 'm' : +- prop ? 'P' : '.'; +- buffer[1]=0; +- } ++ if (opt__is_verbose() > 0) ++ { ++ buffer[0] = status_bits & FS_META_MTIME ? 't' : '.'; ++ buffer[1] = status_bits & ++ (FS_META_OWNER | FS_META_GROUP | FS_META_UMODE) ? 'p' : '.'; ++ buffer[2] = prop ? 'P' : '.'; ++ buffer[3] = 0; ++ } ++ else ++ { ++ buffer[0] = status_bits & FS_META_CHANGED ? 'm' : ++ prop ? 'P' : '.'; ++ buffer[1]=0; ++ } + +- return buffer; ++ return buffer; + } + + +Index: fsvs/src/helper.c +=================================================================== +--- src/helper.c (revision 2473) ++++ src/helper.c (revision 2474) +@@ -1,5 +1,5 @@ + /************************************************************************ +- * Copyright (C) 2005-2009 Philipp Marek. ++ * Copyright (C) 2005-2009,2015 Philipp Marek. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 3 as +@@ -1582,6 +1582,7 @@ + + + status=0; ++ path=NULL; + switch (opt__get_int(OPT__PATH)) + { + case PATH_WCRELATIVE: +@@ -1958,7 +1959,7 @@ + /** -. + * If \a source is not \c NULL \a len bytes are copied. + * The buffer is \b always \c \\0 terminated. */ +-int hlp__strnalloc(int len, char **dest, const char const *source) ++int hlp__strnalloc(int len, char **dest, const char * const source) + { + int status; + +@@ -1974,7 +1975,7 @@ + + /** -. */ + int hlp__strmnalloc(int len, char **dest, +- const char const *source, ...) ++ const char * source, ...) + { + int status; + va_list vl; +Index: fsvs/src/log.c +=================================================================== +--- src/log.c (revision 2473) ++++ src/log.c (revision 2474) +@@ -1,5 +1,5 @@ + /************************************************************************ +- * Copyright (C) 2007-2009 Philipp Marek. ++ * Copyright (C) 2007-2009,2015 Philipp Marek. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 3 as +@@ -404,7 +404,7 @@ + case 2: + opt__set_int(OPT__LOG_MAXREV, + PRIO_DEFAULT, +- abs(opt_target_revision-opt_target_revision2)+1); ++ labs(opt_target_revision-opt_target_revision2)+1); + break; + default: + BUG("how many"); +Index: fsvs/src/helper.h +=================================================================== +--- src/helper.h (revision 2473) ++++ src/helper.h (revision 2474) +@@ -1,5 +1,5 @@ + /************************************************************************ +- * Copyright (C) 2005-2009 Philipp Marek. ++ * Copyright (C) 2005-2009,2015 Philipp Marek. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 3 as +@@ -181,13 +181,13 @@ + * and so I'd have to use casts everywhere, which wouldn't help the + * type-safety anyway. */ + /** Allocates a buffer in \a *dest, and copies \a source. */ +-int hlp__strnalloc(int len, char **dest, const char const *source); ++int hlp__strnalloc(int len, char **dest, const char * const source); + /** Like \c hlp__strnalloc, but concatenates strings until a \c NULL is + * found. */ + int hlp__strmnalloc(int len, char **dest, +- const char const *source, ...) __attribute__((sentinel)); ++ const char * source, ...) __attribute__((sentinel)); + /** Own implementation of \c strdup(), possibly returning \c ENOMEM. */ +-inline static int hlp__strdup(char **dest, const char const *src) ++inline static int hlp__strdup(char **dest, const char * const src) + { return hlp__strnalloc(strlen(src), dest, src); } + /** Error returning \c calloc(); uses \c (void**) \a output. */ + int hlp__calloc(void *output, size_t nmemb, size_t count); +Index: fsvs/CHANGES +=================================================================== +--- CHANGES (revision 2473) ++++ CHANGES (revision 2474) +@@ -1,5 +1,6 @@ + Changes since 1.2.6 + - Updates for GCC 5 ++- Updates for Clang + + Changes since 1.2.5 + - Fix for segfault on deleted properties, eg. "svn:owner". Modified: trunk/dports/devel/fsvs/files/patch-configure.diff =================================================================== --- trunk/dports/devel/fsvs/files/patch-configure.diff 2015-07-27 06:15:58 UTC (rev 138997) +++ trunk/dports/devel/fsvs/files/patch-configure.diff 2015-07-27 06:51:24 UTC (rev 138998) @@ -1,6 +1,6 @@ ---- configure.orig 2012-07-10 02:51:43.000000000 -0500 -+++ configure 2012-07-12 21:29:10.000000000 -0500 -@@ -4252,7 +4252,7 @@ +--- configure.orig 2015-07-25 09:35:10.000000000 -0500 ++++ configure 2015-07-26 12:30:44.000000000 -0500 +@@ -4251,7 +4251,7 @@ ##################################### Header files @@ -9,7 +9,7 @@ # The subversion headers do a #include <apr_pools.h>, so the APR libraries # *have* to be directly specified. # Furthermore there's apr-1/ as directory name, depending on apr version. -@@ -4334,7 +4334,7 @@ +@@ -4333,7 +4333,7 @@ $as_echo "$as_me: \"CFLAGS=$CFLAGS\"" >&6;} ##################################### Linker @@ -18,12 +18,3 @@ # Check whether --with-aprlib was given. -@@ -4987,7 +4987,7 @@ - /* end confdefs.h. */ - - #include "src/preproc.h" -- int main(int argc, char *args) -+ int main(int argc, char *args[]) - { - if (_BITCOUNT( (S_IFMT >> MODE_T_SHIFT_BITS) + 1) == 1) - return 0;
participants (1)
-
ryandesign＠macports.org