[122404] trunk/dports/archivers/dar
ryandesign at macports.org
ryandesign at macports.org
Tue Jul 22 01:41:59 PDT 2014
Revision: 122404
https://trac.macports.org/changeset/122404
Author: ryandesign at macports.org
Date: 2014-07-22 01:41:59 -0700 (Tue, 22 Jul 2014)
Log Message:
-----------
dar: update to 2.4.14 (#44037)
Modified Paths:
--------------
trunk/dports/archivers/dar/Portfile
Added Paths:
-----------
trunk/dports/archivers/dar/files/patch-src-libdar-Makefile.in.diff
Removed Paths:
-------------
trunk/dports/archivers/dar/files/patch-clang-compatibility.diff
trunk/dports/archivers/dar/files/patch-configure.diff
trunk/dports/archivers/dar/files/patch-doc-Makefile.in.diff
Modified: trunk/dports/archivers/dar/Portfile
===================================================================
--- trunk/dports/archivers/dar/Portfile 2014-07-22 06:08:55 UTC (rev 122403)
+++ trunk/dports/archivers/dar/Portfile 2014-07-22 08:41:59 UTC (rev 122404)
@@ -4,7 +4,7 @@
PortSystem 1.0
name dar
-version 2.4.11
+version 2.4.14
categories archivers
platforms darwin
maintainers nomaintainer
@@ -18,8 +18,8 @@
homepage http://dar.sourceforge.net/
master_sites sourceforge:project/dar/dar/${version}
-checksums rmd160 659ea594a33cd9f0e3744b6d3b19ba58c74995e2 \
- sha256 c15fd11cc339363c25cbf24594eaa571235e00de60b6034a7a58d299ed864a5f
+checksums rmd160 b3b4f3bf64f540b15f1389e4dffabf6bf94c6e51 \
+ sha256 b4d020b86ffba9d38a1b3489e685a23ea108049f4c3dd4cb8924d3ff04f2f532
depends_build port:doxygen
@@ -31,11 +31,8 @@
port:openssl \
port:zlib
-patchfiles patch-configure.diff \
- patch-doc-Makefile.in.diff
+universal_variant no
-if {[string match *clang* ${configure.compiler}]} {
- patchfiles-append patch-clang-compatibility.diff
+platform darwin {
+ patchfiles-append patch-src-libdar-Makefile.in.diff
}
-
-universal_variant no
Deleted: trunk/dports/archivers/dar/files/patch-clang-compatibility.diff
===================================================================
--- trunk/dports/archivers/dar/files/patch-clang-compatibility.diff 2014-07-22 06:08:55 UTC (rev 122403)
+++ trunk/dports/archivers/dar/files/patch-clang-compatibility.diff 2014-07-22 08:41:59 UTC (rev 122404)
@@ -1,205 +0,0 @@
-http://sourceforge.net/p/dar/patches/32/
---- src/dar_suite/command_line.cpp 2013-08-26 00:02:14.000000000 +0200
-+++ src/dar_suite/command_line.cpp 2013-11-16 17:01:55.000000000 +0100
-@@ -778,7 +778,7 @@ static bool get_args_recursive(recursive
- try
- {
- // trying to read a simple integer
-- deci tmp = string(optarg);
-+ libdar::deci tmp = string(optarg);
- p.fixed_date = tmp.computer();
- }
- catch(Edeci & e)
-@@ -865,7 +865,7 @@ static bool get_args_recursive(recursive
- case 'p':
- if(optarg != NULL)
- {
-- deci conv = string(optarg);
-+ libdar::deci conv = string(optarg);
- p.pause = conv.computer();
- }
- else
-@@ -1244,7 +1244,7 @@ static bool get_args_recursive(recursive
- {
- try
- {
-- p.hourshift = deci(string(optarg)).computer();
-+ p.hourshift = libdar::deci(string(optarg)).computer();
- }
- catch(Edeci & e)
- {
---- src/dar_suite/crit_action_cmd_line.cpp 2013-08-25 19:09:49.000000000 +0200
-+++ src/dar_suite/crit_action_cmd_line.cpp 2013-11-16 17:03:59.000000000 +0100
-@@ -412,7 +412,7 @@ static const criterium * criterium_creat
- case 'r':
- try
- {
-- deci tmp = sub_arg;
-+ libdar::deci tmp = sub_arg;
- date = tmp.computer();
- }
- catch(Edeci & e)
---- src/dar_suite/dar_manager.cpp 2013-08-26 00:02:14.000000000 +0200
-+++ src/dar_suite/dar_manager.cpp 2013-11-16 17:13:39.000000000 +0100
-@@ -78,7 +78,7 @@ using namespace libdar;
- #define INVALID_ARG "Invalid argument given to -%c (requires integer)"
- #define OPT_STRING "C:B:A:lD:b:p:od:ru:f:shVm:vQjw:ie:c@:N;:ka:"
-
--enum operation { none_op, create, add, listing, del, chbase, where, options, dar, restore, used, files, stats, move, interactive, check, batch };
-+namespace libdar { enum operation { none_op, create, add, listing, del, chbase, where, options, dar, restore, used, files, stats, move, interactive, check, batch }; };
-
- static S_I little_main(user_interaction & dialog, S_I argc, char *const argv[], const char **env);
- static bool command_line(user_interaction & dialog,
-@@ -197,7 +197,7 @@ S_I little_main(user_interaction & dialo
- case used:
- case files:
- case stats:
-- case move:
-+ case libdar::move:
- case interactive:
- case check:
- case batch:
-@@ -404,7 +404,7 @@ static bool command_line(user_interactio
- case 'm':
- if(op != none_op)
- throw Erange("command_line", tools_printf(gettext(ONLY_ONCE), char(lu)));
-- op = move;
-+ op = libdar::move;
- if(optarg == NULL)
- throw Erange("command_line", tools_printf(gettext(MISSING_ARG), char(lu)));
- num = tools_str2int(optarg);
-@@ -466,7 +466,7 @@ static bool command_line(user_interactio
- {
- try
- {
-- deci tmp = string(optarg);
-+ libdar::deci tmp = string(optarg);
- date = tmp.computer();
- }
- catch(Edeci & e)
-@@ -555,7 +555,7 @@ static bool command_line(user_interactio
- break;
- case options:
- break;
-- case move:
-+ case libdar::move:
- if(rest.size() != 1)
- {
- dialog.warning(gettext("Missing argument to command line, aborting"));
-@@ -1321,7 +1321,7 @@ static void finalize(user_interaction &
- case where:
- case options:
- case dar:
-- case move:
-+ case libdar::move:
- case batch:
- if(info_details)
- dialog.warning(gettext("Compressing and writing back database to file..."));
-@@ -1385,7 +1385,7 @@ static void action(user_interaction & di
- case stats:
- op_stats(dialog, dat, info_details);
- break;
-- case move:
-+ case libdar::move:
- op_move(dialog, dat, num, num2, info_details);
- break;
- case interactive:
---- src/dar_suite/dar_xform.cpp 2013-08-26 00:02:14.000000000 +0200
-+++ src/dar_suite/dar_xform.cpp 2013-11-16 17:04:25.000000000 +0100
-@@ -342,7 +342,7 @@ static bool command_line(user_interactio
- case 'p':
- if(optarg != NULL)
- {
-- deci conv = string(optarg);
-+ libdar::deci conv = string(optarg);
- pause = conv.computer();
- }
- else
---- src/dar_suite/line_tools.cpp 2013-08-26 00:02:14.000000000 +0200
-+++ src/dar_suite/line_tools.cpp 2013-11-16 17:03:30.000000000 +0100
-@@ -221,8 +221,8 @@ void line_tools_repeat_param(const strin
-
- try
- {
-- deci x1 = tmp1;
-- deci x2 = tmp2;
-+ libdar::deci x1 = tmp1;
-+ libdar::deci x2 = tmp2;
-
- repeat_count = x1.computer();
- repeat_byte = x2.computer();
-@@ -520,14 +520,14 @@ void line_tools_get_min_digits(string th
- it1 = tools_find_first_char_of(the_arg, ',');
- if(it1 == the_arg.end()) // a single number is provided
- {
-- deci tmp = the_arg;
-+ libdar::deci tmp = the_arg;
- num = tmp.computer();
- }
- else // at least two numbers are provided
- {
- if(the_arg.begin() != it1)
- {
-- deci convert = string(the_arg.begin(), it1);
-+ libdar::deci convert = string(the_arg.begin(), it1);
- num = convert.computer();
- }
- // else we ignore the leading ','
-@@ -539,20 +539,20 @@ void line_tools_get_min_digits(string th
- it2 = tools_find_first_char_of(tmp2, ',');
- if(it2 == tmp2.end()) // just two number have been provided
- {
-- deci convert = tmp2;
-+ libdar::deci convert = tmp2;
- ref_num = convert.computer();
- }
- else
- {
- if(tmp2.begin() != it2)
- {
-- deci convert = string(tmp2.begin(), it2);
-+ libdar::deci convert = string(tmp2.begin(), it2);
- ref_num = convert.computer();
- }
- ++it2;
- if(it2 != tmp2.end())
- {
-- deci convert = string(it2, tmp2.end());
-+ libdar::deci convert = string(it2, tmp2.end());
- aux_num = convert.computer();
- }
- }
---- src/libdar/generic_file.cpp 2013-08-25 19:09:49.000000000 +0200
-+++ src/libdar/generic_file.cpp 2013-11-03 09:15:46.000000000 +0100
-@@ -470,7 +470,7 @@ namespace libdar
-
- const char * generic_file_get_name(gf_mode mode)
- {
-- char *ret = NULL;
-+ const char *ret = NULL;
-
- switch(mode)
- {
---- src/libdar/mask_list.hpp 2013-08-25 19:09:49.000000000 +0200
-+++ src/libdar/mask_list.hpp 2013-11-16 16:56:09.000000000 +0100
-@@ -77,8 +77,8 @@ namespace libdar
- class my_char
- {
- public:
-- my_char() { val = 0; };
-+ my_char() = default;
- my_char(const char x) : val(x) {};
- bool operator < (const my_char & x) const
- {
- if(val == '/')
---- src/libdar/tools.cpp 2013-08-26 00:02:14.000000000 +0200
-+++ src/libdar/tools.cpp 2013-11-03 18:57:49.000000000 +0100
-@@ -1048,7 +1048,7 @@ namespace libdar
-
- void tools_display_features(user_interaction & dialog)
- {
-- char *endy = NULL;
-+ const char *endy = NULL;
-
- tools_display_features(dialog,
- compile_time::ea(),
Deleted: trunk/dports/archivers/dar/files/patch-configure.diff
===================================================================
--- trunk/dports/archivers/dar/files/patch-configure.diff 2014-07-22 06:08:55 UTC (rev 122403)
+++ trunk/dports/archivers/dar/files/patch-configure.diff 2014-07-22 08:41:59 UTC (rev 122404)
@@ -1,142 +0,0 @@
-https://sourceforge.net/p/dar/patches/34/
---- configure.orig 2013-08-25 17:05:49.000000000 -0500
-+++ configure 2013-12-25 02:29:48.000000000 -0600
-@@ -24605,84 +24605,84 @@
- echo ""
- echo " LIBDAR parameters:"
-
--echo -n " Zlib compression (gzip) : "
-+printf " Zlib compression (gzip) : "
- if [ "$local_libz" = "yes" ] ; then
- echo "YES"
- else
- echo "NO"
- fi
-
--echo -n " Libbz2 compression (bzip2) : "
-+printf " Libbz2 compression (bzip2) : "
- if [ "$local_libbz2" = "yes" ] ; then
- echo "YES"
- else
- echo "NO"
- fi
-
--echo -n " Liblzo2 compression (lzo) : "
-+printf " Liblzo2 compression (lzo) : "
- if [ "$local_liblzo2" = "yes" ] ; then
- echo "YES"
- else
- echo "NO"
- fi
-
--echo -n " Strong encryption support : "
-+printf " Strong encryption support : "
- if [ "$local_crypto" = "yes" ] ; then
- echo "YES"
- else
- echo "NO"
- fi
-
--echo -n " Extended Attributes support: "
-+printf " Extended Attributes support: "
- if [ "$local_ea_support" = "yes" ] ; then
- echo "YES"
- else
- echo "NO"
- fi
-
--echo -n " Large files support (> 2GB): "
-+printf " Large files support (> 2GB): "
- if [ ! -z "$ac_cv_sys_file_offset_bits" -o ! -z "$ac_cv_sys_large_files" ] ; then
- echo "YES"
- else
- echo "NO"
- fi
-
--echo -n " ext2fs NODUMP flag support : "
-+printf " ext2fs NODUMP flag support : "
- if [ "$local_nodump_feature" = "yes" ] ; then
- echo "YES"
- else
- echo "NO"
- fi
-
--echo -n " Special allocation scheme : "
-+printf " Special allocation scheme : "
- if [ "$local_special_alloc" = "yes" ] ; then
- echo "YES"
- else
- echo "NO"
- fi
-
--echo -n " Integer size used : "
-+printf " Integer size used : "
- if [ -z "$build_mode" -o \( ! "$build_mode" = "32" -a ! "$build_mode" = "64" \) ] ; then
- echo "infinint"
- else
- echo "$build_mode"
- fi
-
--echo -n " Thread safe support : "
-+printf " Thread safe support : "
- if [ \( "$local_mutex_works" = "yes" -o ! "$local_special_alloc" = "yes" \) -a -z "$local_test_memory" ] ; then
- echo "YES"
- else
- echo "NO"
- fi
-
--echo -n " Furtive read mode : "
-+printf " Furtive read mode : "
- if [ "$local_furtive_read_mode" = "yes" ]; then
- echo "YES"
- else
- echo "NO"
- fi
-
--echo -n " Large directory optim. : "
-+printf " Large directory optim. : "
- if [ "$local_fast_dir" = "yes" ] ; then
- echo "YES"
- else
-@@ -24691,21 +24691,21 @@
-
- echo ""
- echo " DAR SUITE command line programs:"
--echo -n " Long options available : "
-+printf " Long options available : "
- if [ "$local_have_getopt_long" = "yes" ] ; then
- echo "YES"
- else
- echo "NO"
- fi
-
--echo -n " Building examples : "
-+printf " Building examples : "
- if [ "$examples" = "yes" ] ; then
- echo "YES"
- else
- echo "NO"
- fi
-
--echo -n " Building dar_static : "
-+printf " Building dar_static : "
- if [ "$build_static" = "yes" ]; then
- if [ "$static_pb" = "yes" ]; then
- echo "NO (system does not support static linking, see note below)"
-@@ -24716,14 +24716,14 @@
- echo "NO"
- fi
-
--echo -n " using upx at install : "
-+printf " using upx at install : "
- if [ "$upx" = "yes" ] ; then
- echo "YES"
- else
- echo "NO"
- fi
-
--echo -n " building documentation : "
-+printf " building documentation : "
- if [ "$doxygen" = "yes" ] ; then
- echo "YES"
- else
Deleted: trunk/dports/archivers/dar/files/patch-doc-Makefile.in.diff
===================================================================
--- trunk/dports/archivers/dar/files/patch-doc-Makefile.in.diff 2014-07-22 06:08:55 UTC (rev 122403)
+++ trunk/dports/archivers/dar/files/patch-doc-Makefile.in.diff 2014-07-22 08:41:59 UTC (rev 122404)
@@ -1,12 +0,0 @@
-http://sourceforge.net/p/dar/patches/33/
---- doc/Makefile.in.orig 2013-12-23 12:29:05.000000000 +0100
-+++ doc/Makefile.in 2013-12-23 12:33:30.000000000 +0100
-@@ -646,7 +646,7 @@
- @USE_DOXYGEN_TRUE@ rm -rf html Doxyfile.tmp
-
- @USE_DOXYGEN_TRUE at install-data-hook:
-- at USE_DOXYGEN_TRUE@ cp -dR --preserve=mode html $(DESTDIR)$(pkgdatadir)
-+ at USE_DOXYGEN_TRUE@ cp -pR html $(DESTDIR)$(pkgdatadir)
- @USE_DOXYGEN_TRUE@ $(INSTALL_HTML_MAN)
-
- @USE_DOXYGEN_TRUE at uninstall-hook:
Added: trunk/dports/archivers/dar/files/patch-src-libdar-Makefile.in.diff
===================================================================
--- trunk/dports/archivers/dar/files/patch-src-libdar-Makefile.in.diff (rev 0)
+++ trunk/dports/archivers/dar/files/patch-src-libdar-Makefile.in.diff 2014-07-22 08:41:59 UTC (rev 122404)
@@ -0,0 +1,12 @@
+https://sourceforge.net/p/dar/bugs/171/
+--- src/libdar/Makefile.in.orig 2014-06-15 11:44:07.000000000 -0500
++++ src/libdar/Makefile.in 2014-07-22 03:27:30.000000000 -0500
+@@ -337,7 +337,7 @@
+ lib_LTLIBRARIES = $(MYLIB)
+ LIBDAR_MAJOR = `grep LIBDAR_COMPILE_TIME_MAJOR libdar.hpp | cut -f 2 -d "=" | cut -f 1 -d ';' | sed -e 's% %%g'`
+ LIBDAR_MEDIUM = `grep LIBDAR_COMPILE_TIME_MEDIUM libdar.hpp | cut -f 2 -d "=" | cut -f 1 -d ';' | sed -e 's% %%g'`
+-LIBDAR_MEDIUM_000 = `grep LIBDAR_COMPILE_TIME_MEDIUM libdar.hpp | cut -f 2 -d "=" | cut -f 1 -d ';' | sed -r -e 's% %%g' -e 's%([^0-9]|^)([0-9]{1})([^0-9]|$$)%0\2%' -e 's%([^0-9]|^)([0-9]{2})([^0-9]|$$)%0\2%'`
++LIBDAR_MEDIUM_000 = `grep LIBDAR_COMPILE_TIME_MEDIUM libdar.hpp | cut -f 2 -d "=" | cut -f 1 -d ';' | sed -E -e 's% %%g' -e 's%([^0-9]|^)([0-9]{1})([^0-9]|$$)%0\2%' -e 's%([^0-9]|^)([0-9]{2})([^0-9]|$$)%0\2%'`
+ LIBDAR_MINOR = `grep LIBDAR_COMPILE_TIME_MINOR libdar.hpp | cut -f 2 -d "=" | cut -f 1 -d ';' | sed -e 's% %%g'`
+ LIBDAR_LIBTOOL_CURRENT = $(LIBDAR_MAJOR)$(LIBDAR_MEDIUM_000)
+ LIBDAR_LIBTOOL_REVISION = $(LIBDAR_MINOR)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140722/69420c70/attachment.html>
More information about the macports-changes
mailing list