Update to 2.4.1. For a list of changes in this release, see the documentation.diff -r1.36 -r1.37 pkgsrc/archivers/dar/Makefile
(cheusov)
| @@ -1,91 +1,89 @@ | @@ -1,91 +1,89 @@ | |||
| 1 | # $NetBSD: Makefile,v 1.36 2011/04/22 13:42:49 obache Exp $ | 1 | # $NetBSD: Makefile,v 1.37 2011/08/20 16:02:23 cheusov Exp $ | |
| 2 | 2 | |||
| 3 | DISTNAME= dar-2.3.8 | 3 | DISTNAME= dar-2.4.1 | |
| 4 | PKGREVISION= 2 | |||
| 5 | CATEGORIES= archivers sysutils | 4 | CATEGORIES= archivers sysutils | |
| 6 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=dar/} | 5 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=dar/} | |
| 7 | 6 | |||
| 8 | MAINTAINER= pkgsrc-users@NetBSD.org | 7 | MAINTAINER= pkgsrc-users@NetBSD.org | |
| 9 | HOMEPAGE= http://dar.linux.free.fr/ | 8 | HOMEPAGE= http://dar.linux.free.fr/ | |
| 10 | COMMENT= Disk archiver | 9 | COMMENT= Disk archiver | |
| 10 | LICENSE= gnu-gpl-v2 | |||
| 11 | 11 | |||
| 12 | PKG_INSTALLATION_TYPES= overwrite pkgviews | 12 | PKG_INSTALLATION_TYPES= overwrite pkgviews | |
| 13 | PKG_DESTDIR_SUPPORT= user-destdir | 13 | PKG_DESTDIR_SUPPORT= user-destdir | |
| 14 | 14 | |||
| 15 | USE_LANGUAGES= c c++ | 15 | USE_LANGUAGES= c c++ | |
| 16 | USE_LIBTOOL= yes | 16 | USE_LIBTOOL= yes | |
| 17 | USE_PKGLOCALEDIR= yes | 17 | USE_PKGLOCALEDIR= yes | |
| 18 | USE_TOOLS+= gmake pkg-config | 18 | USE_TOOLS+= gmake pkg-config bash:run | |
| 19 | 19 | |||
| 20 | GNU_CONFIGURE= yes | 20 | GNU_CONFIGURE= yes | |
| 21 | CONFIGURE_ARGS+= --disable-dar-static | 21 | CONFIGURE_ARGS+= --disable-dar-static | |
| 22 | CONFIGURE_ARGS+= --enable-static=no | 22 | CONFIGURE_ARGS+= --enable-static=no | |
| 23 | CONFIGURE_ARGS+= --disable-nodump-flag | 23 | CONFIGURE_ARGS+= --disable-nodump-flag | |
| 24 | CONFIGURE_ARGS+= --disable-upx | 24 | CONFIGURE_ARGS+= --disable-upx | |
| 25 | CONFIGURE_ARGS+= --enable-examples | 25 | CONFIGURE_ARGS+= --enable-examples | |
| 26 | CONFIGURE_ARGS+= doxygen=no | 26 | CONFIGURE_ARGS+= doxygen=no | |
| 27 | 27 | |||
| 28 | PKGCONFIG_OVERRIDE= src/libdar/libdar.pc.tmpl.in | 28 | PKGCONFIG_OVERRIDE= src/libdar/libdar.pc.tmpl.in | |
| 29 | 29 | |||
| 30 | ## We use the logic below to find a path for a non-existent ${BASH}. | 30 | ## We use the logic below to find a path for a non-existent ${BASH}. | |
| 31 | ## Yeah, I suppose it's a hack, but it does work. | 31 | ## Yeah, I suppose it's a hack, but it does work. | |
| 32 | # | 32 | # | |
| 33 | CHECK_INTERPRETER_SKIP+= share/dar/samples/* | 33 | CHECK_INTERPRETER_SKIP+= share/dar/samples/* | |
| 34 | REPLACE_PERL+= doc/samples/dar_backup | 34 | REPLACE_PERL+= doc/samples/dar_backup | |
| 35 | REPLACE_BASH+= doc/samples/*.bash doc/samples/clust*.sh | 35 | REPLACE_BASH+= doc/samples/*.bash doc/samples/clust*.sh | |
| 36 | 36 | |||
| 37 | .if defined(TOOLS_PLATFORM.bash) && exists(${${TOOLS_PLATFORM.bash}:L}) | |||
| 38 | BASH?= ${TOOLS_PLATFORM.bash} | |||
| 39 | .else | |||
| 40 | BASH?= ${TOOLS_PREFIX.bash}/bin/bash | |||
| 41 | TOOLS_FIND_PREFIX+= TOOLS_PREFIX.bash=bash | |||
| 42 | .endif | |||
| 43 | ||||
| 44 | ## Our threading check here is the same as the one used in devel/perl5. | 37 | ## Our threading check here is the same as the one used in devel/perl5. | |
| 45 | # | 38 | # | |
| 46 | CHECK_BUILTIN.pthread:=yes | 39 | CHECK_BUILTIN.pthread:=yes | |
| 47 | . include "../../mk/pthread.builtin.mk" | 40 | . include "../../mk/pthread.builtin.mk" | |
| 48 | CHECK_BUILTIN.pthread:=no | 41 | CHECK_BUILTIN.pthread:=no | |
| 49 | 42 | |||
| 50 | ## XXX I'm following the USE_FEATURES semantics used in security/openssl. | 43 | ## XXX I'm following the USE_FEATURES semantics used in security/openssl. | |
| 51 | # | 44 | # | |
| 52 | .if !empty(USE_BUILTIN.pthread:tl:Myes) | 45 | .if !empty(USE_BUILTIN.pthread:tl:Myes) | |
| 53 | USE_FEATURES.dar= threads | 46 | USE_FEATURES.dar= threads | |
| 54 | .else | 47 | .else | |
| 55 | USE_FEATURES.dar= # empty | 48 | USE_FEATURES.dar= # empty | |
| 56 | .endif | 49 | .endif | |
| 57 | 50 | |||
| 58 | PKG_OPTIONS_VAR= PKG_OPTIONS.dar | 51 | PKG_OPTIONS_VAR= PKG_OPTIONS.dar | |
| 59 | PKG_OPTIONS_OPTIONAL_GROUPS+= int | 52 | PKG_OPTIONS_OPTIONAL_GROUPS= int | |
| 60 | PKG_OPTIONS_GROUP.int= dar-int32 dar-int64 | 53 | PKG_OPTIONS_GROUP.int= dar-int32 dar-int64 | |
| 61 | PKG_SUGGESTED_OPTIONS= dar-int64 ${USE_FEATURES.dar} | 54 | PKG_SUGGESTED_OPTIONS= dar-int64 ${USE_FEATURES.dar} | |
| 62 | PKG_SUPPORTED_OPTIONS= threads | 55 | PKG_SUPPORTED_OPTIONS= threads | |
| 63 | 56 | |||
| 64 | .include "../../mk/bsd.options.mk" | 57 | .include "../../mk/bsd.options.mk" | |
| 65 | 58 | |||
| 66 | ## Dar is built by default with an arbitrary-size-integer library for | 59 | ## Dar is built by default with an arbitrary-size-integer library for | |
| 67 | ## managing all file length/timestamp details. If 32-bit or 64-bit | 60 | ## managing all file length/timestamp details. If 32-bit or 64-bit | |
| 68 | ## integers (with overflow protection) are sufficient for requirements, | 61 | ## integers (with overflow protection) are sufficient for requirements, | |
| 69 | ## the following options can significantly reduce the run-time memory | 62 | ## the following options can significantly reduce the run-time memory | |
| 70 | ## and CPU overheads of Dar. | 63 | ## and CPU overheads of Dar. | |
| 71 | # | 64 | # | |
| 72 | DARBITS= ${PKG_OPTIONS:C/[^[:digit:]]*//:M[36][24]} | 65 | DARBITS= ${PKG_OPTIONS:C/[^[:digit:]]*//:M[36][24]} | |
| 73 | PLIST_SUBST+= DARBITS=${DARBITS} | 66 | PLIST_SUBST+= DARBITS=${DARBITS} | |
| 74 | 67 | |||
| 75 | .if !empty(DARBITS) | 68 | .if !empty(DARBITS) | |
| 76 | CONFIGURE_ARGS+= --enable-mode=${DARBITS:Q} | 69 | CONFIGURE_ARGS+= --enable-mode=${DARBITS:Q} | |
| 77 | .endif | 70 | .endif | |
| 78 | 71 | |||
| 72 | EGDIR= ${PREFIX}/share/examples/dar | |||
| 73 | INSTALL_MAKE_FLAGS+= sysconfdir=${EGDIR} | |||
| 74 | ||||
| 75 | CONF_FILES= ${EGDIR}/darrc ${PKG_SYSCONFDIR}/darrc | |||
| 76 | ||||
| 79 | ## We want the threading library to be specified by pkgsrc, and only | 77 | ## We want the threading library to be specified by pkgsrc, and only | |
| 80 | ## when desired, viz. in the case below. Using PTHREAD_AUTO_VARS | 78 | ## when desired, viz. in the case below. Using PTHREAD_AUTO_VARS | |
| 81 | ## with the accompanying BUILDLINK_TRANSFORM directive is easier | 79 | ## with the accompanying BUILDLINK_TRANSFORM directive is easier | |
| 82 | ## then patching configure. | 80 | ## then patching configure. | |
| 83 | # | 81 | # | |
| 84 | .if !empty(PKG_OPTIONS:Mthreads) | 82 | .if !empty(PKG_OPTIONS:Mthreads) | |
| 85 | USE_FEATURES.openssl+= threads | 83 | USE_FEATURES.openssl+= threads | |
| 86 | PTHREAD_AUTO_VARS= yes | 84 | PTHREAD_AUTO_VARS= yes | |
| 87 | BUILDLINK_TRANSFORM+= rm:-lpthread | 85 | BUILDLINK_TRANSFORM+= rm:-lpthread | |
| 88 | .else | 86 | .else | |
| 89 | CONFIGURE_ARGS+= --disable-thread-safe | 87 | CONFIGURE_ARGS+= --disable-thread-safe | |
| 90 | .endif | 88 | .endif | |
| 91 | 89 |
| @@ -1,98 +1,126 @@ | @@ -1,98 +1,126 @@ | |||
| 1 | @comment $NetBSD: PLIST,v 1.10 2009/06/14 17:28:16 joerg Exp $ | 1 | @comment $NetBSD: PLIST,v 1.11 2011/08/20 16:02:23 cheusov Exp $ | |
| 2 | bin/dar | 2 | bin/dar | |
| 3 | bin/dar_cp | 3 | bin/dar_cp | |
| 4 | bin/dar_manager | 4 | bin/dar_manager | |
| 5 | bin/dar_slave | 5 | bin/dar_slave | |
| 6 | bin/dar_xform | 6 | bin/dar_xform | |
| 7 | include/dar/archive.hpp | 7 | include/dar/archive.hpp | |
| 8 | include/dar/archive_options.hpp | |||
| 9 | include/dar/archive_version.hpp | |||
| 8 | include/dar/catalogue.hpp | 10 | include/dar/catalogue.hpp | |
| 11 | include/dar/compile_time_features.hpp | |||
| 9 | include/dar/compressor.hpp | 12 | include/dar/compressor.hpp | |
| 10 | include/dar/config.h | 13 | include/dar/crc.hpp | |
| 14 | include/dar/criterium.hpp | |||
| 11 | include/dar/crypto.hpp | 15 | include/dar/crypto.hpp | |
| 12 | include/dar/data_tree.hpp | 16 | include/dar/data_tree.hpp | |
| 13 | include/dar/database.hpp | 17 | include/dar/database.hpp | |
| 18 | include/dar/database_options.hpp | |||
| 14 | include/dar/deci.hpp | 19 | include/dar/deci.hpp | |
| 15 | include/dar/ea.hpp | 20 | include/dar/ea.hpp | |
| 16 | include/dar/erreurs.hpp | 21 | include/dar/erreurs.hpp | |
| 22 | include/dar/erreurs_ext.hpp | |||
| 23 | include/dar/escape.hpp | |||
| 24 | include/dar/escape_catalogue.hpp | |||
| 25 | include/dar/fichier.hpp | |||
| 17 | include/dar/generic_file.hpp | 26 | include/dar/generic_file.hpp | |
| 18 | include/dar/gettext.h | 27 | include/dar/gettext.h | |
| 28 | include/dar/hash_fichier.hpp | |||
| 19 | include/dar/header_version.hpp | 29 | include/dar/header_version.hpp | |
| 20 | include/dar/infinint.hpp | 30 | include/dar/infinint.hpp | |
| 21 | include/dar/int_tools.hpp | 31 | include/dar/int_tools.hpp | |
| 22 | include/dar/integers.hpp | 32 | include/dar/integers.hpp | |
| 33 | include/dar/label.hpp | |||
| 23 | include/dar/libdar.hpp | 34 | include/dar/libdar.hpp | |
| 35 | include/dar/libdar_4_4.hpp | |||
| 36 | include/dar/libdar_config.h | |||
| 37 | include/dar/libdar_my_config.h | |||
| 24 | include/dar/limitint.hpp | 38 | include/dar/limitint.hpp | |
| 25 | include/dar/mask.hpp | 39 | include/dar/mask.hpp | |
| 26 | include/dar/mask_list.hpp | 40 | include/dar/mask_list.hpp | |
| 27 | include/dar/my_config.h | 41 | include/dar/mem_ui.hpp | |
| 42 | include/dar/memory_file.hpp | |||
| 43 | include/dar/nls_swap.hpp | |||
| 28 | include/dar/path.hpp | 44 | include/dar/path.hpp | |
| 45 | include/dar/pile.hpp | |||
| 29 | include/dar/real_infinint.hpp | 46 | include/dar/real_infinint.hpp | |
| 30 | include/dar/scrambler.hpp | 47 | include/dar/scrambler.hpp | |
| 48 | include/dar/secu_string.hpp | |||
| 31 | include/dar/special_alloc.hpp | 49 | include/dar/special_alloc.hpp | |
| 32 | include/dar/statistics.hpp | 50 | include/dar/statistics.hpp | |
| 33 | include/dar/storage.hpp | 51 | include/dar/storage.hpp | |
| 34 | include/dar/string_file.hpp | 52 | include/dar/string_file.hpp | |
| 35 | include/dar/thread_cancellation.hpp | 53 | include/dar/thread_cancellation.hpp | |
| 54 | include/dar/tlv.hpp | |||
| 55 | include/dar/tlv_list.hpp | |||
| 36 | include/dar/tools.hpp | 56 | include/dar/tools.hpp | |
| 37 | include/dar/tronconneuse.hpp | 57 | include/dar/tronconneuse.hpp | |
| 58 | include/dar/trontextual.hpp | |||
| 38 | include/dar/tuyau.hpp | 59 | include/dar/tuyau.hpp | |
| 39 | include/dar/user_group_bases.hpp | 60 | include/dar/user_group_bases.hpp | |
| 40 | include/dar/user_interaction.hpp | 61 | include/dar/user_interaction.hpp | |
| 41 | include/dar/wrapperlib.hpp | 62 | include/dar/wrapperlib.hpp | |
| 42 | lib/libdar${DARBITS}.la | 63 | lib/libdar${DARBITS}.la | |
| 43 | lib/pkgconfig/libdar${DARBITS}.pc | 64 | lib/pkgconfig/libdar${DARBITS}.pc | |
| 44 | man/man1/dar.1 | 65 | man/man1/dar.1 | |
| 45 | man/man1/dar_cp.1 | 66 | man/man1/dar_cp.1 | |
| 46 | man/man1/dar_manager.1 | 67 | man/man1/dar_manager.1 | |
| 47 | man/man1/dar_slave.1 | 68 | man/man1/dar_slave.1 | |
| 48 | man/man1/dar_xform.1 | 69 | man/man1/dar_xform.1 | |
| 49 | share/dar/samples/JH-dar-make_user_backup.sh | 70 | share/dar/samples/JH-dar-make_user_backup.sh | |
| 50 | share/dar/samples/JH-readme.txt | 71 | share/dar/samples/JH-readme.txt | |
| 51 | share/dar/samples/JH_dar_archiver.options | 72 | share/dar/samples/JH_dar_archiver.options | |
| 52 | share/dar/samples/JH_darrc | 73 | share/dar/samples/JH_darrc | |
| 74 | share/dar/samples/MyBackup.sh.tar.gz | |||
| 53 | share/dar/samples/README | 75 | share/dar/samples/README | |
| 54 | share/dar/samples/automatic_backup | 76 | share/dar/samples/automatic_backup | |
| 55 | share/dar/samples/automatic_backup.txt | 77 | share/dar/samples/automatic_backup.txt | |
| 56 | share/dar/samples/cdbackup.sh | 78 | share/dar/samples/cdbackup.sh | |
| 57 | share/dar/samples/cluster_digital_backups.sh | 79 | share/dar/samples/cluster_digital_backups.sh | |
| 58 | share/dar/samples/cluster_digital_readme.txt | 80 | share/dar/samples/cluster_digital_readme.txt | |
| 59 | share/dar/samples/dar_backup | 81 | share/dar/samples/dar_backup | |
| 60 | share/dar/samples/dar_par.dcf | 82 | share/dar/samples/dar_par.dcf | |
| 61 | share/dar/samples/dar_par_create.duc | 83 | share/dar/samples/dar_par_create.duc | |
| 62 | share/dar/samples/dar_par_test.duc | 84 | share/dar/samples/dar_par_test.duc | |
| 63 | share/dar/samples/dar_rqck.bash | 85 | share/dar/samples/dar_rqck.bash | |
| 64 | share/dar/samples/darrc_sample | 86 | share/dar/samples/darrc_sample | |
| 65 | share/dar/samples/index.html | 87 | share/dar/samples/index.html | |
| 66 | share/dar/samples/pause_every_n_slice.duc | 88 | share/dar/samples/pause_every_n_slice.duc | |
| 67 | share/dar/samples/sample1.txt | 89 | share/dar/samples/sample1.txt | |
| 68 | share/doc/dar/FAQ.html | 90 | share/doc/dar/FAQ.html | |
| 69 | share/doc/dar/Features.html | 91 | share/doc/dar/Features.html | |
| 70 | share/doc/dar/Good_Backup_Practice.html | 92 | share/doc/dar/Good_Backup_Practice.html | |
| 71 | share/doc/dar/Known_Bugs.html | 93 | share/doc/dar/Known_Bugs.html | |
| 72 | share/doc/dar/Limitations.html | 94 | share/doc/dar/Limitations.html | |
| 73 | share/doc/dar/Notes.html | 95 | share/doc/dar/Notes.html | |
| 74 | share/doc/dar/README | 96 | share/doc/dar/README | |
| 75 | share/doc/dar/Tutorial.html | 97 | share/doc/dar/Tutorial.html | |
| 98 | share/doc/dar/api_4_4.html | |||
| 76 | share/doc/dar/api_tutorial.html | 99 | share/doc/dar/api_tutorial.html | |
| 77 | share/doc/dar/authentification.html | 100 | share/doc/dar/authentification.html | |
| 78 | share/doc/dar/dar-catalog-1.0.dtd | 101 | share/doc/dar/dar-catalog.dtd | |
| 79 | share/doc/dar/dar-differential-backup-mini-howto.en.html | 102 | share/doc/dar/dar-differential-backup-mini-howto.en.html | |
| 80 | share/doc/dar/dar-differential-backup-mini-howto.es.html | 103 | share/doc/dar/dar-differential-backup-mini-howto.es.html | |
| 81 | share/doc/dar/dar-differential-backup-mini-howto.it.html | 104 | share/doc/dar/dar-differential-backup-mini-howto.it.html | |
| 82 | share/doc/dar/dar_doc.jpg | 105 | share/doc/dar/dar_doc.jpg | |
| 83 | share/doc/dar/dar_key.txt | 106 | share/doc/dar/dar_key.txt | |
| 84 | share/doc/dar/dar_s_doc.jpg | 107 | share/doc/dar/dar_s_doc.jpg | |
| 108 | share/doc/dar/downloading.html | |||
| 109 | share/doc/dar/from_sources.html | |||
| 85 | share/doc/dar/index.html | 110 | share/doc/dar/index.html | |
| 86 | share/doc/dar/man/dar.html | 111 | share/doc/dar/man/dar.html | |
| 87 | share/doc/dar/man/dar_cp.html | 112 | share/doc/dar/man/dar_cp.html | |
| 88 | share/doc/dar/man/dar_manager.html | 113 | share/doc/dar/man/dar_manager.html | |
| 89 | share/doc/dar/man/dar_slave.html | 114 | share/doc/dar/man/dar_slave.html | |
| 90 | share/doc/dar/man/dar_xform.html | 115 | share/doc/dar/man/dar_xform.html | |
| 91 | share/doc/dar/man/index.html | 116 | share/doc/dar/man/index.html | |
| 92 | share/doc/dar/mini-howto/dar-differential-backup-mini-howto.en.html | 117 | share/doc/dar/mini-howto/dar-differential-backup-mini-howto.en.html | |
| 93 | share/doc/dar/mini-howto/dar-differential-backup-mini-howto.es.html | 118 | share/doc/dar/mini-howto/dar-differential-backup-mini-howto.es.html | |
| 94 | share/doc/dar/mini-howto/dar-differential-backup-mini-howto.it.html | 119 | share/doc/dar/mini-howto/dar-differential-backup-mini-howto.it.html | |
| 95 | share/doc/dar/mini-howto/index.html | 120 | share/doc/dar/mini-howto/index.html | |
| 121 | share/doc/dar/presentation.html | |||
| 122 | share/doc/dar/usage_notes.html | |||
| 123 | share/examples/dar/darrc | |||
| 96 | share/locale/de/LC_MESSAGES/dar.mo | 124 | share/locale/de/LC_MESSAGES/dar.mo | |
| 97 | share/locale/fr/LC_MESSAGES/dar.mo | 125 | share/locale/fr/LC_MESSAGES/dar.mo | |
| 98 | share/locale/sv/LC_MESSAGES/dar.mo | 126 | share/locale/sv/LC_MESSAGES/dar.mo |
| @@ -1,12 +1,13 @@ | @@ -1,12 +1,13 @@ | |||
| 1 | $NetBSD: distinfo,v 1.24 2008/08/02 17:10:13 dholland Exp $ | 1 | $NetBSD: distinfo,v 1.25 2011/08/20 16:02:23 cheusov Exp $ | |
| 2 | 2 | |||
| 3 | SHA1 (dar-2.3.8.tar.gz) = d0394ff9dd6a287e3b9b62ebe99e126bb6d8abd0 | 3 | SHA1 (dar-2.4.1.tar.gz) = 1fac505e2b6e2b05acd96c42e9bfb135974e9807 | |
| 4 | RMD160 (dar-2.3.8.tar.gz) = 0927b59ba0426634ba5c2ca8b7cad157d6579b13 | 4 | RMD160 (dar-2.4.1.tar.gz) = d835bd82f9f4f91defb2301084af4c0343e37faf | |
| 5 | Size (dar-2.3.8.tar.gz) = 1195944 bytes | 5 | Size (dar-2.4.1.tar.gz) = 1741146 bytes | |
| 6 | SHA1 (patch-aa) = d9d9cef20573582c2f56aa70ae1b3af98b11725a | 6 | SHA1 (patch-aa) = d9d9cef20573582c2f56aa70ae1b3af98b11725a | |
| 7 | SHA1 (patch-ab) = d442f8ec95909bf9a5e72e1ff10042ec263ec8d2 | 7 | SHA1 (patch-ab) = d442f8ec95909bf9a5e72e1ff10042ec263ec8d2 | |
| 8 | SHA1 (patch-ac) = 34ba67a1ae794c1069824347b67a204455d18f2e | 8 | SHA1 (patch-ac) = dcbf4e31071c83a167a60a20e4980b35f055a46e | |
| 9 | SHA1 (patch-ad) = a0089fd534a98d5daae87b92b61f869ed146bed3 | 9 | SHA1 (patch-ad) = df21f72b12ab19123f1c61e8e1645519c43d7f7b | |
| 10 | SHA1 (patch-ae) = 54220384bf2031df64c38f5abea038382ca37e8e | 10 | SHA1 (patch-ae) = 54220384bf2031df64c38f5abea038382ca37e8e | |
| 11 | SHA1 (patch-af) = c25351dbf2f115b649207f88981710e04a0a038e | 11 | SHA1 (patch-af) = 0fc93ae2638d77b247e6339f3a5819e5eeb059f0 | |
| 12 | SHA1 (patch-ag) = 3873d5dd9e387c90977b169e4532891bcf242e49 | 12 | SHA1 (patch-ag) = 3873d5dd9e387c90977b169e4532891bcf242e49 | |
| 13 | SHA1 (patch-src_check_all__features.cpp) = 2d962e4c17d93242b281b72bec8ed5cec8aa0e49 |
| @@ -1,20 +1,20 @@ | @@ -1,20 +1,20 @@ | |||
| 1 | $NetBSD: patch-ac,v 1.7 2006/08/30 15:58:25 rillig Exp $ | 1 | $NetBSD: patch-ac,v 1.8 2011/08/20 16:02:23 cheusov Exp $ | |
| 2 | 2 | |||
| 3 | Solaris has <getopt.h>, but the plain getopt() function is defined in | 3 | Solaris has <getopt.h>, but the plain getopt() function is defined in | |
| 4 | <unistd.h>, so it needs both headers. | 4 | <unistd.h>, so it needs both headers. | |
| 5 | 5 | |||
| 6 | --- configure.orig 2006-02-25 00:08:32.000000000 +0100 | 6 | --- configure.orig 2011-07-21 14:52:29.000000000 +0000 | |
| 7 | +++ configure 2006-08-30 17:51:23.544802744 +0200 | 7 | +++ configure | |
| 8 | @@ -29861,11 +29861,10 @@ cat >>conftest.$ac_ext <<_ACEOF | 8 | @@ -28383,11 +28383,10 @@ extern "C" { | |
| 9 | extern "C" { | 9 | #endif | |
| 10 | #if HAVE_GETOPT_H | 10 | #if HAVE_GETOPT_H | |
| 11 | #include <getopt.h> | 11 | #include <getopt.h> | |
| 12 | - #else | 12 | - #else | |
| 13 | + #endif | 13 | + #endif | |
| 14 | #if HAVE_UNISTD_H | 14 | #if HAVE_UNISTD_H | |
| 15 | #include <unistd.h> | 15 | #include <unistd.h> | |
| 16 | #endif | 16 | #endif | |
| 17 | - #endif | 17 | - #endif | |
| 18 | } | 18 | } | |
| 19 | int | 19 | int | |
| 20 | main () | 20 | main () |
| @@ -1,17 +1,18 @@ | @@ -1,17 +1,18 @@ | |||
| 1 | $NetBSD: patch-ad,v 1.5 2008/06/22 22:33:37 dsainty Exp $ | 1 | $NetBSD: patch-ad,v 1.6 2011/08/20 16:02:23 cheusov Exp $ | |
| 2 | 2 | |||
| 3 | On Solaris 10 with SunPro, vector<> does not have a method assign(). | 3 | On Solaris 10 with SunPro, vector<> does not have a method assign(). | |
| 4 | 4 | |||
| 5 | --- src/libdar/mask_list.cpp.orig 2008-06-22 20:15:54.000000000 +1200 | 5 | --- src/libdar/mask_list.cpp.orig 2011-02-11 20:23:42.000000000 +0000 | |
| 6 | +++ src/libdar/mask_list.cpp 2008-06-22 20:16:37.000000000 +1200 | 6 | +++ src/libdar/mask_list.cpp | |
| 7 | @@ -180,7 +180,9 @@ | 7 | @@ -200,7 +200,10 @@ namespace libdar | |
| 8 | my_tmp.unique(); // remove duplicates | 8 | my_tmp.unique(); // remove duplicates | |
| 9 | 9 | |||
| 10 | // but we need the indexing of vectors | 10 | // converting the sorted list to vector, to get the indexing feature of this type | |
| 11 | - contenu.assign(my_tmp.begin(), my_tmp.end()); | 11 | - contenu.assign(my_tmp.begin(), my_tmp.end()); | |
| 12 | + contenu.clear(); | 12 | + contenu.clear(); | |
| 13 | + for (list< basic_string<my_char> >::const_iterator it = my_tmp.begin(); it != my_tmp.end(); it++) | 13 | + for (list< basic_string<my_char> >::const_iterator it = my_tmp.begin(); it != my_tmp.end(); it++) | |
| 14 | + contenu.push_back(*it); | 14 | + contenu.push_back(*it); | |
| 15 | + | |||
| 15 | taille = contenu.size(); | 16 | taille = contenu.size(); | |
| 16 | if(taille < contenu.size()) | 17 | if(taille < contenu.size()) | |
| 17 | throw Erange("mask_list::mask_list", tools_printf(gettext("Too much line in file %s (integer overflow)"), filename_list)); | 18 | throw Erange("mask_list::mask_list", tools_printf(gettext("Too much line in file %S (integer overflow)"), &filename_list_st)); |
| @@ -1,34 +1,33 @@ | @@ -1,34 +1,33 @@ | |||
| 1 | $NetBSD: patch-af,v 1.3 2007/03/18 04:36:23 dsainty Exp $ | 1 | $NetBSD: patch-af,v 1.4 2011/08/20 16:02:23 cheusov Exp $ | |
| 2 | 2 | |||
| 3 | Make sure we link with AM_LDFLAGS, which arranges the link and rpath for | 3 | Make sure we link with AM_LDFLAGS, which arranges the link and rpath for | |
| 4 | libintl.so. | 4 | libintl.so. | |
| 5 | 5 | |||
| 6 | --- src/libdar/Makefile.in.orig 2007-02-26 11:05:04.000000000 +1300 | 6 | --- src/libdar/Makefile.in.orig 2011-07-21 14:52:31.000000000 +0000 | |
| 7 | +++ src/libdar/Makefile.in 2007-03-13 00:31:49.000000000 +1300 | 7 | +++ src/libdar/Makefile.in | |
| 8 | @@ -72,7 +72,7 @@ | 8 | @@ -78,7 +78,7 @@ am_libdar_la_OBJECTS = $(am__objects_1) | |
| 9 | libdar_la_OBJECTS = $(am_libdar_la_OBJECTS) | 9 | libdar_la_OBJECTS = $(am_libdar_la_OBJECTS) | |
| 10 | libdar_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ | 10 | libdar_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ | |
| 11 | $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ | 11 | $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ | |
| 12 | - $(CXXFLAGS) $(libdar_la_LDFLAGS) $(LDFLAGS) -o $@ | 12 | - $(CXXFLAGS) $(libdar_la_LDFLAGS) $(LDFLAGS) -o $@ | |
| 13 | + $(CXXFLAGS) $(AM_LDFLAGS) $(libdar_la_LDFLAGS) $(LDFLAGS) -o $@ | 13 | + $(CXXFLAGS) $(AM_LDFLAGS) $(libdar_la_LDFLAGS) $(LDFLAGS) -o $@ | |
| 14 | @BUILD_MODE32_FALSE@@BUILD_MODE64_FALSE@am_libdar_la_rpath = -rpath \ | 14 | @BUILD_MODE32_FALSE@@BUILD_MODE64_FALSE@am_libdar_la_rpath = -rpath \ | |
| 15 | @BUILD_MODE32_FALSE@@BUILD_MODE64_FALSE@ $(libdir) | 15 | @BUILD_MODE32_FALSE@@BUILD_MODE64_FALSE@ $(libdir) | |
| 16 | libdar32_la_LIBADD = | 16 | libdar32_la_LIBADD = | |
| 17 | @@ -89,7 +89,7 @@ | 17 | @@ -86,14 +86,14 @@ am_libdar32_la_OBJECTS = $(am__objects_1 | |
| 18 | libdar32_la_OBJECTS = $(am_libdar32_la_OBJECTS) | 18 | libdar32_la_OBJECTS = $(am_libdar32_la_OBJECTS) | |
| 19 | libdar32_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ | 19 | libdar32_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ | |
| 20 | $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ | 20 | $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ | |
| 21 | - $(CXXFLAGS) $(libdar32_la_LDFLAGS) $(LDFLAGS) -o $@ | 21 | - $(CXXFLAGS) $(libdar32_la_LDFLAGS) $(LDFLAGS) -o $@ | |
| 22 | + $(CXXFLAGS) $(AM_LDFLAGS) $(libdar32_la_LDFLAGS) $(LDFLAGS) -o $@ | 22 | + $(CXXFLAGS) $(AM_LDFLAGS) $(libdar32_la_LDFLAGS) $(LDFLAGS) -o $@ | |
| 23 | @BUILD_MODE32_TRUE@am_libdar32_la_rpath = -rpath $(libdir) | 23 | @BUILD_MODE32_TRUE@am_libdar32_la_rpath = -rpath $(libdir) | |
| 24 | libdar64_la_LIBADD = | 24 | libdar64_la_LIBADD = | |
| 25 | am_libdar64_la_OBJECTS = catalogue.lo compressor.lo deci.lo defile.lo \ | 25 | am_libdar64_la_OBJECTS = $(am__objects_1) limitint.lo | |
| 26 | @@ -105,7 +105,7 @@ | |||
| 27 | libdar64_la_OBJECTS = $(am_libdar64_la_OBJECTS) | 26 | libdar64_la_OBJECTS = $(am_libdar64_la_OBJECTS) | |
| 28 | libdar64_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ | 27 | libdar64_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ | |
| 29 | $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ | 28 | $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ | |
| 30 | - $(CXXFLAGS) $(libdar64_la_LDFLAGS) $(LDFLAGS) -o $@ | 29 | - $(CXXFLAGS) $(libdar64_la_LDFLAGS) $(LDFLAGS) -o $@ | |
| 31 | + $(CXXFLAGS) $(AM_LDFLAGS) $(libdar64_la_LDFLAGS) $(LDFLAGS) -o $@ | 30 | + $(CXXFLAGS) $(AM_LDFLAGS) $(libdar64_la_LDFLAGS) $(LDFLAGS) -o $@ | |
| 32 | @BUILD_MODE32_FALSE@@BUILD_MODE64_TRUE@am_libdar64_la_rpath = -rpath \ | 31 | @BUILD_MODE32_FALSE@@BUILD_MODE64_TRUE@am_libdar64_la_rpath = -rpath \ | |
| 33 | @BUILD_MODE32_FALSE@@BUILD_MODE64_TRUE@ $(libdir) | 32 | @BUILD_MODE32_FALSE@@BUILD_MODE64_TRUE@ $(libdir) | |
| 34 | DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ | 33 | DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@ |
$NetBSD: patch-src_check_all__features.cpp,v 1.1 2011/08/20 16:02:23 cheusov Exp $
exit(3) is declared in stdlib.h (fix for NetBSD)
--- src/check/all_features.cpp.orig 2011-03-31 19:21:02.000000000 +0000
+++ src/check/all_features.cpp
@@ -27,6 +27,8 @@
#include "libdar.hpp"
+#include <stdlib.h>
+
using namespace libdar;
using namespace std;