From 59c4fcd3380e95547bbb3ec361d74cd245dbe749 Mon Sep 17 00:00:00 2001 From: pkgsrc fixup Date: Mon, 6 May 2013 15:28:38 -0700 Subject: [PATCH] Fixup fromcvs/togit conversion --- audio/cmus/Makefile | 5 +- audio/cmus/PLIST | 3 +- audio/cmus/distinfo | 8 +- audio/daapd/distinfo | 3 +- audio/daapd/patches/patch-types.h | 55 +++++++++++ audio/easytag/Makefile | 4 +- audio/easytag/distinfo | 3 +- audio/easytag/patches/patch-easytag.desktop.in | 15 +++ audio/pulseaudio/Makefile | 6 +- audio/pulseaudio/PLIST | 6 +- audio/pulseaudio/distinfo | 6 +- audio/pulseaudio/patches/patch-configure | 12 +-- audio/pulseaudio/patches/patch-src_Makefile.in | 19 +++- biology/openbabel/distinfo | 5 +- .../patch-include_openbabel_obmolecformat.h | 25 +++++ .../patches/patch-include_openbabel_shared__ptr.h | 22 +++++ biology/openbabel/patches/patch-src_ops_unique.cpp | 23 +++++ chat/centerim/distinfo | 3 +- .../patches/patch-libicq2000_src_ContactTree.cpp | 12 +++ cross/h8300-elf-gcc34/Makefile | 7 +- databases/mysql56-client/distinfo | 73 +++++++++++++- .../mysql56-client/patches/patch-include_myisam.h | 50 +++++++--- .../patches/patch-libmysqld_lib__sql.cc | 13 +++ .../patches/patch-sql_event__db__repository.cc | 58 +++++++++++ .../mysql56-client/patches/patch-sql_field.cc | 22 +++++ databases/mysql56-client/patches/patch-sql_field.h | 29 ++++++ .../patches/patch-sql_field__conv.cc | 20 ++++ .../patches/patch-sql_ha__ndbcluster.cc | 13 +++ .../patches/patch-sql_ha__partition.cc | 31 ++++++ .../mysql56-client/patches/patch-sql_handler.cc | 58 +++++++++++ .../mysql56-client/patches/patch-sql_handler.h | 13 +++ databases/mysql56-client/patches/patch-sql_item.cc | 13 +++ databases/mysql56-client/patches/patch-sql_item.h | 31 ++++++ .../patches/patch-sql_item__cmpfunc.cc | 101 ++++++++++++++++++++ .../patches/patch-sql_item__cmpfunc.h | 22 +++++ .../mysql56-client/patches/patch-sql_item__func.cc | 40 ++++++++ .../patches/patch-sql_item__geofunc.cc | 13 +++ .../patches/patch-sql_item__strfunc.cc | 13 +++ .../patches/patch-sql_item__subselect.cc | 22 +++++ .../patches/patch-sql_item__subselect.h | 13 +++ .../mysql56-client/patches/patch-sql_item__sum.cc | 13 +++ .../patches/patch-sql_item__timefunc.cc | 13 +++ databases/mysql56-client/patches/patch-sql_key.cc | 31 ++++++ .../mysql56-client/patches/patch-sql_mysqld.cc | 53 ++++++----- .../mysql56-client/patches/patch-sql_opt__range.cc | 82 ++++++++++++++++ .../mysql56-client/patches/patch-sql_opt__range.h | 13 +++ .../mysql56-client/patches/patch-sql_opt__sum.cc | 40 ++++++++ .../mysql56-client/patches/patch-sql_rpl__mi.cc | 18 ++++ .../mysql56-client/patches/patch-sql_rpl__slave.cc | 13 +++ .../mysql56-client/patches/patch-sql_set__var.cc | 13 +++ .../mysql56-client/patches/patch-sql_sp__head.h | 13 +++ .../patches/patch-sql_sp__rcontext.h | 13 +++ .../mysql56-client/patches/patch-sql_sql__acl.cc | 61 ++++++++++++ .../mysql56-client/patches/patch-sql_sql__admin.cc | 13 +++ .../mysql56-client/patches/patch-sql_sql__base.cc | 31 ++++++ .../mysql56-client/patches/patch-sql_sql__bitmap.h | 22 +++++ .../mysql56-client/patches/patch-sql_sql__cache.cc | 56 +++++++++++ .../mysql56-client/patches/patch-sql_sql__class.cc | 41 ++++++++ .../mysql56-client/patches/patch-sql_sql__class.h | 22 +++++ .../patches/patch-sql_sql__delete.cc | 13 +++ .../patches/patch-sql_sql__executor.cc | 22 +++++ .../patches/patch-sql_sql__insert.cc | 31 ++++++ .../patches/patch-sql_sql__join__buffer.cc | 51 ++++++++++ .../mysql56-client/patches/patch-sql_sql__lex.cc | 22 +++++ .../mysql56-client/patches/patch-sql_sql__lex.h | 13 +++ .../mysql56-client/patches/patch-sql_sql__load.cc | 40 ++++++++ .../patches/patch-sql_sql__optimizer.cc | 40 ++++++++ .../patches/patch-sql_sql__optimizer.h | 13 +++ .../mysql56-client/patches/patch-sql_sql__parse.cc | 36 +++++++ .../patches/patch-sql_sql__partition.cc | 69 ++++++++++++++ .../patches/patch-sql_sql__planner.cc | 58 +++++++++++ .../patches/patch-sql_sql__prepare.cc | 22 +++++ .../patches/patch-sql_sql__prepare.h | 22 +++++ .../patches/patch-sql_sql__select.cc | 76 +++++++++++++++ .../mysql56-client/patches/patch-sql_sql__select.h | 13 +++ .../mysql56-client/patches/patch-sql_sql__show.cc | 57 +++++++++++ .../mysql56-client/patches/patch-sql_sql__table.cc | 31 ++++++ .../mysql56-client/patches/patch-sql_sql__time.cc | 17 ++++ .../patches/patch-sql_sql__tmp__table.cc | 40 ++++++++ .../mysql56-client/patches/patch-sql_sql__union.cc | 22 +++++ .../patches/patch-sql_sql__update.cc | 13 +++ .../mysql56-client/patches/patch-sql_sys__vars.cc | 13 +++ .../mysql56-client/patches/patch-sql_table.cc | 52 ++++++++++ .../patches/patch-sql_transaction.cc | 106 +++++++++++++++++++++ .../mysql56-client/patches/patch-sql_tztime.cc | 13 +++ .../mysql56-client/patches/patch-sql_unireg.cc | 13 +++ .../patch-storage_federated_ha__federated.cc | 22 +++++ .../patches/patch-storage_heap_ha__heap.cc | 22 +++++ .../patches/patch-storage_myisam_ha__myisam.cc | 44 +++++++++ databases/p5-DBD-CSV/Makefile | 5 +- databases/p5-DBD-CSV/distinfo | 8 +- databases/p5-DBIx-Connector/Makefile | 5 +- databases/p5-DBIx-Connector/distinfo | 8 +- devel/kyua-cli/distinfo | 24 ++++- devel/kyua-cli/patches/patch-engine_action.hpp | 27 ++++++ devel/kyua-cli/patches/patch-engine_context.hpp | 27 ++++++ devel/kyua-cli/patches/patch-engine_metadata.hpp | 27 +++++- devel/kyua-cli/patches/patch-engine_test__case.hpp | 36 +++++++ .../patches/patch-engine_test__program.hpp | 38 ++++++++ devel/kyua-cli/patches/patch-store_backend.hpp | 28 ++++++ devel/kyua-cli/patches/patch-store_transaction.cpp | 22 +++++ devel/kyua-cli/patches/patch-store_transaction.hpp | 40 ++++++++ .../patches/patch-utils_cmdline_exceptions.cpp | 12 +++ .../patches/patch-utils_cmdline_exceptions.hpp | 12 +++ devel/kyua-cli/patches/patch-utils_config_tree.hpp | 27 ++++++ devel/kyua-cli/patches/patch-utils_datetime.cpp | 40 ++++++++ devel/kyua-cli/patches/patch-utils_datetime.hpp | 30 ++++++ .../patches/patch-utils_format_exceptions.cpp | 12 +++ .../patches/patch-utils_format_exceptions.hpp | 12 +++ .../patches/patch-utils_fs_auto__cleaners.hpp | 36 +++++++ .../kyua-cli/patches/patch-utils_fs_exceptions.cpp | 12 +++ .../kyua-cli/patches/patch-utils_fs_exceptions.hpp | 12 +++ .../patches/patch-utils_sqlite_database.hpp | 27 ++++++ .../patches/patch-utils_sqlite_statement.hpp | 27 ++++++ .../patches/patch-utils_sqlite_transaction.hpp | 28 ++++++ devel/lutok/distinfo | 4 +- devel/lutok/patches/patch-debug.hpp | 29 ++++++ devel/lutok/patches/patch-state.hpp | 29 ++++++ devel/monotone/distinfo | 4 +- .../monotone/patches/patch-src_automate__reader.hh | 12 +++ devel/monotone/patches/patch-src_hash__map.hh | 49 ++++++++++ devel/p5-Moo/Makefile | 4 +- devel/p5-Moo/distinfo | 8 +- devel/p5-Test-Pod/Makefile | 5 +- devel/p5-Test-Pod/distinfo | 8 +- devel/p5-namespace-clean/Makefile | 4 +- doc/CHANGES-2013 | 12 ++- doc/TODO | 3 +- doc/guide/files/fixes.xml | 17 ++-- doc/pkgsrc.html | 43 +++++---- doc/pkgsrc.txt | 37 ++++--- emulators/suse121_krb5/Makefile | 5 +- emulators/suse121_krb5/distinfo | 14 +-- graphics/darktable/distinfo | 3 +- .../patches/patch-src_common_imageio__exr.hh | 29 ++++++ graphics/digikam/Makefile | 4 +- graphics/digikam/distinfo | 4 +- ...bs_3rdparty_kmemoryinfo_kmemoryinfo_backend.cpp | 14 ++- graphics/opencv/Makefile | 7 +- graphics/opencv/distinfo | 3 +- .../patch-modules_contrib_src_spinimages.cpp | 12 +++ ham/fldigi/Makefile | 7 +- ham/fldigi/distinfo | 15 ++- ham/fldigi/patches/patch-src_dominoex_dominoex.cxx | 13 +++ ham/fldigi/patches/patch-src_include_qrunner.h | 12 +++ .../patches/patch-src_logbook_logsupport.cxx | 39 ++++++++ ham/fldigi/patches/patch-src_misc_dxcc.cxx | 30 ++++++ ham/fldigi/patches/patch-src_misc_re.cxx | 24 +++++ ham/fldigi/patches/patch-src_navtex_navtex.cxx | 19 ++++ ham/fldigi/patches/patch-src_spot_notify.cxx | 16 ++++ ham/fldigi/patches/patch-src_spot_pskrep.cxx | 17 ++++ ham/fldigi/patches/patch-src_spot_spot.cxx | 38 ++++++++ ham/fldigi/patches/patch-src_thor_thor.cxx | 13 +++ .../patches/patch-src_xmlrpcpp_XmlRpcClient.cpp | 13 +++ .../patches/patch-src_xmlrpcpp_XmlRpcServer.cpp | 13 +++ ham/fldigi/patches/patch-src_xmlrpcpp_base64.h | 12 +++ lang/clang/distinfo | 3 +- .../clang/patches/patch-include_llvm_Support_CFG.h | 66 +++++++++++++ math/gnumeric112/Makefile | 3 +- math/gnumeric112/distinfo | 3 +- math/gnumeric112/patches/patch-gnumeric.desktop.in | 12 +++ math/openfst/distinfo | 22 +++-- math/openfst/patches/patch-src_bin_compile-main.h | 20 ++++ .../patches/patch-src_include_fst_config.h.in | 14 +++ .../patches/patch-src_include_fst_determinize.h | 29 +++++- .../openfst/patches/patch-src_include_fst_encode.h | 20 ++++ .../patches/patch-src_include_fst_epsnormalize.h | 21 ++++ .../patches/patch-src_include_fst_equivalent.h | 20 ++++ .../patches/patch-src_include_fst_factor-weight.h | 31 ++++-- math/openfst/patches/patch-src_include_fst_map.h | 30 ++++-- .../patches/patch-src_include_fst_relabel.h | 20 ++++ .../patches/patch-src_include_fst_replace.h | 30 ++++-- .../patches/patch-src_include_fst_rmepsilon.h | 20 ++++ .../patches/patch-src_include_fst_rmfinalepsilon.h | 20 ++++ math/openfst/patches/patch-src_include_fst_slist.h | 13 +++ .../patches/patch-src_include_fst_synchronize.h | 35 +++++-- .../patch-src_include_fst_test-properties.h | 20 ++++ misc/fbreader/distinfo | 6 +- ...patch-fbreader_src_fbreader_FBReaderActions.cpp | 12 +++ .../patches/patch-fbreader_src_fbreader_FBView.cpp | 12 +++ .../patch-fbreader_src_formats_html_HtmlReader.cpp | 12 +++ ...atch-zlibrary_text_src_area_ZLTextAreaStyle.cpp | 12 +++ mk/tools/msgfmt-msgctxt.awk | 52 +++++++++- multimedia/gst-plugins1-base/distinfo | 3 +- .../patches/patch-gst_audioresample_resample.c | 23 +++++ multimedia/kmix/distinfo | 11 ++- multimedia/kmix/patches/patch-apps_kmixd.cpp | 13 +++ .../kmix/patches/patch-backends_mixer__backend.cpp | 13 +++ .../kmix/patches/patch-backends_mixer__mpris2.cpp | 13 +++ multimedia/kmix/patches/patch-core_ControlPool.h | 18 ++++ multimedia/kmix/patches/patch-core_MasterControl.h | 17 ++++ multimedia/kmix/patches/patch-core_mixdevice.h | 17 ++++ .../kmix/patches/patch-core_mixertoolbox.cpp | 20 ++++ .../kmix/patches/patch-gui_kmixdockwidget.cpp | 22 +++++ .../kmix/patches/patch-gui_viewdockareapopup.cpp | 19 ++++ net/DarwinStreamingServer/Makefile | 6 +- net/kismet/distinfo | 5 +- net/kismet/patches/patch-gpsdump.cc | 13 +++ net/kismet/patches/patch-kismet__server.cc | 49 ++++++++++ net/kismet/patches/patch-macaddr.h | 12 +++ pkgtools/pkglint/Makefile | 4 +- pkgtools/pkglint/files/pkglint.pl | 28 ++++-- security/botan/distinfo | 17 +++- .../botan/patches/patch-src_cert_cvc_cvc__ado.cpp | 31 ++++++ .../botan/patches/patch-src_cert_cvc_cvc__ado.h | 13 +++ .../botan/patches/patch-src_cert_cvc_cvc__ca.cpp | 13 +++ .../botan/patches/patch-src_cert_cvc_cvc__cert.cpp | 22 +++++ .../botan/patches/patch-src_cert_cvc_cvc__cert.h | 13 +++ .../botan/patches/patch-src_cert_cvc_cvc__req.cpp | 22 +++++ .../botan/patches/patch-src_cert_cvc_cvc__req.h | 13 +++ .../botan/patches/patch-src_cert_cvc_cvc__self.cpp | 22 +++++ .../botan/patches/patch-src_cert_cvc_freestore.h | 39 ++++++++ .../patches/patch-src_math_gfpmath_curve__gfp.cpp | 105 ++++++++++++++++++++ .../patches/patch-src_math_gfpmath_curve__gfp.h | 56 +++++++++++ .../patch-src_math_gfpmath_gfp__element.cpp | 29 ++++++ .../patches/patch-src_math_gfpmath_gfp__element.h | 69 ++++++++++++++ .../patches/patch-src_math_gfpmath_point__gfp.cpp | 53 +++++++++++ .../patches/patch-src_math_gfpmath_point__gfp.h | 35 +++++++ security/gpgme/Makefile | 6 +- sysutils/btpin-qt/distinfo | 3 +- sysutils/btpin-qt/patches/patch-btclient.cpp | 12 +++ sysutils/xentools41/distinfo | 5 +- .../xentools41/patches/patch-libxl_xl__cmdimpl.c | 13 +++ textproc/FlightCrew/Makefile | 4 +- textproc/p5-Pod-Simple/Makefile | 4 +- textproc/p5-Pod-Simple/distinfo | 8 +- www/ap2-suphp/distinfo | 4 +- www/ap2-suphp/patches/patch-src_IniSection.cpp | 24 +++++ www/ap2-suphp/patches/patch-src_IniSection.hpp | 13 +++ www/p5-HTTP-Body/Makefile | 7 +- www/p5-HTTP-Body/distinfo | 8 +- x11/kdelibs4/distinfo | 5 +- x11/kdelibs4/patches/patch-kjs_interpreter.cpp | 12 +++ x11/kdelibs4/patches/patch-kjs_wtf_DisallowCType.h | 19 ++++ x11/kdelibs4/patches/patch-kjs_wtf_HashTable.h | 13 +++ 235 files changed, 4995 insertions(+), 264 deletions(-) create mode 100644 audio/daapd/patches/patch-types.h create mode 100644 audio/easytag/patches/patch-easytag.desktop.in create mode 100644 biology/openbabel/patches/patch-include_openbabel_obmolecformat.h create mode 100644 biology/openbabel/patches/patch-include_openbabel_shared__ptr.h create mode 100644 biology/openbabel/patches/patch-src_ops_unique.cpp create mode 100644 chat/centerim/patches/patch-libicq2000_src_ContactTree.cpp rewrite databases/mysql56-client/patches/patch-include_myisam.h (91%) create mode 100644 databases/mysql56-client/patches/patch-libmysqld_lib__sql.cc create mode 100644 databases/mysql56-client/patches/patch-sql_event__db__repository.cc create mode 100644 databases/mysql56-client/patches/patch-sql_field.cc create mode 100644 databases/mysql56-client/patches/patch-sql_field.h create mode 100644 databases/mysql56-client/patches/patch-sql_field__conv.cc create mode 100644 databases/mysql56-client/patches/patch-sql_ha__ndbcluster.cc create mode 100644 databases/mysql56-client/patches/patch-sql_ha__partition.cc create mode 100644 databases/mysql56-client/patches/patch-sql_handler.cc create mode 100644 databases/mysql56-client/patches/patch-sql_handler.h create mode 100644 databases/mysql56-client/patches/patch-sql_item.cc create mode 100644 databases/mysql56-client/patches/patch-sql_item.h create mode 100644 databases/mysql56-client/patches/patch-sql_item__cmpfunc.cc create mode 100644 databases/mysql56-client/patches/patch-sql_item__cmpfunc.h create mode 100644 databases/mysql56-client/patches/patch-sql_item__func.cc create mode 100644 databases/mysql56-client/patches/patch-sql_item__geofunc.cc create mode 100644 databases/mysql56-client/patches/patch-sql_item__strfunc.cc create mode 100644 databases/mysql56-client/patches/patch-sql_item__subselect.cc create mode 100644 databases/mysql56-client/patches/patch-sql_item__subselect.h create mode 100644 databases/mysql56-client/patches/patch-sql_item__sum.cc create mode 100644 databases/mysql56-client/patches/patch-sql_item__timefunc.cc create mode 100644 databases/mysql56-client/patches/patch-sql_key.cc rewrite databases/mysql56-client/patches/patch-sql_mysqld.cc (96%) create mode 100644 databases/mysql56-client/patches/patch-sql_opt__range.cc create mode 100644 databases/mysql56-client/patches/patch-sql_opt__range.h create mode 100644 databases/mysql56-client/patches/patch-sql_opt__sum.cc create mode 100644 databases/mysql56-client/patches/patch-sql_rpl__mi.cc create mode 100644 databases/mysql56-client/patches/patch-sql_rpl__slave.cc create mode 100644 databases/mysql56-client/patches/patch-sql_set__var.cc create mode 100644 databases/mysql56-client/patches/patch-sql_sp__head.h create mode 100644 databases/mysql56-client/patches/patch-sql_sp__rcontext.h create mode 100644 databases/mysql56-client/patches/patch-sql_sql__acl.cc create mode 100644 databases/mysql56-client/patches/patch-sql_sql__admin.cc create mode 100644 databases/mysql56-client/patches/patch-sql_sql__base.cc create mode 100644 databases/mysql56-client/patches/patch-sql_sql__bitmap.h create mode 100644 databases/mysql56-client/patches/patch-sql_sql__cache.cc create mode 100644 databases/mysql56-client/patches/patch-sql_sql__class.cc create mode 100644 databases/mysql56-client/patches/patch-sql_sql__class.h create mode 100644 databases/mysql56-client/patches/patch-sql_sql__delete.cc create mode 100644 databases/mysql56-client/patches/patch-sql_sql__executor.cc create mode 100644 databases/mysql56-client/patches/patch-sql_sql__insert.cc create mode 100644 databases/mysql56-client/patches/patch-sql_sql__join__buffer.cc create mode 100644 databases/mysql56-client/patches/patch-sql_sql__lex.cc create mode 100644 databases/mysql56-client/patches/patch-sql_sql__lex.h create mode 100644 databases/mysql56-client/patches/patch-sql_sql__load.cc create mode 100644 databases/mysql56-client/patches/patch-sql_sql__optimizer.cc create mode 100644 databases/mysql56-client/patches/patch-sql_sql__optimizer.h create mode 100644 databases/mysql56-client/patches/patch-sql_sql__parse.cc create mode 100644 databases/mysql56-client/patches/patch-sql_sql__partition.cc create mode 100644 databases/mysql56-client/patches/patch-sql_sql__planner.cc create mode 100644 databases/mysql56-client/patches/patch-sql_sql__prepare.cc create mode 100644 databases/mysql56-client/patches/patch-sql_sql__prepare.h create mode 100644 databases/mysql56-client/patches/patch-sql_sql__select.cc create mode 100644 databases/mysql56-client/patches/patch-sql_sql__select.h create mode 100644 databases/mysql56-client/patches/patch-sql_sql__show.cc create mode 100644 databases/mysql56-client/patches/patch-sql_sql__table.cc create mode 100644 databases/mysql56-client/patches/patch-sql_sql__time.cc create mode 100644 databases/mysql56-client/patches/patch-sql_sql__tmp__table.cc create mode 100644 databases/mysql56-client/patches/patch-sql_sql__union.cc create mode 100644 databases/mysql56-client/patches/patch-sql_sql__update.cc create mode 100644 databases/mysql56-client/patches/patch-sql_sys__vars.cc create mode 100644 databases/mysql56-client/patches/patch-sql_table.cc create mode 100644 databases/mysql56-client/patches/patch-sql_transaction.cc create mode 100644 databases/mysql56-client/patches/patch-sql_tztime.cc create mode 100644 databases/mysql56-client/patches/patch-sql_unireg.cc create mode 100644 databases/mysql56-client/patches/patch-storage_federated_ha__federated.cc create mode 100644 databases/mysql56-client/patches/patch-storage_heap_ha__heap.cc create mode 100644 databases/mysql56-client/patches/patch-storage_myisam_ha__myisam.cc create mode 100644 devel/kyua-cli/patches/patch-engine_action.hpp create mode 100644 devel/kyua-cli/patches/patch-engine_context.hpp create mode 100644 devel/kyua-cli/patches/patch-engine_test__case.hpp create mode 100644 devel/kyua-cli/patches/patch-engine_test__program.hpp create mode 100644 devel/kyua-cli/patches/patch-store_backend.hpp create mode 100644 devel/kyua-cli/patches/patch-store_transaction.cpp create mode 100644 devel/kyua-cli/patches/patch-store_transaction.hpp create mode 100644 devel/kyua-cli/patches/patch-utils_cmdline_exceptions.cpp create mode 100644 devel/kyua-cli/patches/patch-utils_cmdline_exceptions.hpp create mode 100644 devel/kyua-cli/patches/patch-utils_config_tree.hpp create mode 100644 devel/kyua-cli/patches/patch-utils_datetime.cpp create mode 100644 devel/kyua-cli/patches/patch-utils_datetime.hpp create mode 100644 devel/kyua-cli/patches/patch-utils_format_exceptions.cpp create mode 100644 devel/kyua-cli/patches/patch-utils_format_exceptions.hpp create mode 100644 devel/kyua-cli/patches/patch-utils_fs_auto__cleaners.hpp create mode 100644 devel/kyua-cli/patches/patch-utils_fs_exceptions.cpp create mode 100644 devel/kyua-cli/patches/patch-utils_fs_exceptions.hpp create mode 100644 devel/kyua-cli/patches/patch-utils_sqlite_database.hpp create mode 100644 devel/kyua-cli/patches/patch-utils_sqlite_statement.hpp create mode 100644 devel/kyua-cli/patches/patch-utils_sqlite_transaction.hpp create mode 100644 devel/lutok/patches/patch-debug.hpp create mode 100644 devel/lutok/patches/patch-state.hpp create mode 100644 devel/monotone/patches/patch-src_automate__reader.hh create mode 100644 devel/monotone/patches/patch-src_hash__map.hh create mode 100644 graphics/darktable/patches/patch-src_common_imageio__exr.hh create mode 100644 graphics/opencv/patches/patch-modules_contrib_src_spinimages.cpp create mode 100644 ham/fldigi/patches/patch-src_dominoex_dominoex.cxx create mode 100644 ham/fldigi/patches/patch-src_include_qrunner.h create mode 100644 ham/fldigi/patches/patch-src_logbook_logsupport.cxx create mode 100644 ham/fldigi/patches/patch-src_misc_dxcc.cxx create mode 100644 ham/fldigi/patches/patch-src_misc_re.cxx create mode 100644 ham/fldigi/patches/patch-src_navtex_navtex.cxx create mode 100644 ham/fldigi/patches/patch-src_spot_notify.cxx create mode 100644 ham/fldigi/patches/patch-src_spot_pskrep.cxx create mode 100644 ham/fldigi/patches/patch-src_spot_spot.cxx create mode 100644 ham/fldigi/patches/patch-src_thor_thor.cxx create mode 100644 ham/fldigi/patches/patch-src_xmlrpcpp_XmlRpcClient.cpp create mode 100644 ham/fldigi/patches/patch-src_xmlrpcpp_XmlRpcServer.cpp create mode 100644 ham/fldigi/patches/patch-src_xmlrpcpp_base64.h create mode 100644 lang/clang/patches/patch-include_llvm_Support_CFG.h create mode 100644 math/gnumeric112/patches/patch-gnumeric.desktop.in create mode 100644 math/openfst/patches/patch-src_bin_compile-main.h create mode 100644 math/openfst/patches/patch-src_include_fst_config.h.in create mode 100644 math/openfst/patches/patch-src_include_fst_encode.h create mode 100644 math/openfst/patches/patch-src_include_fst_epsnormalize.h create mode 100644 math/openfst/patches/patch-src_include_fst_equivalent.h create mode 100644 math/openfst/patches/patch-src_include_fst_relabel.h create mode 100644 math/openfst/patches/patch-src_include_fst_rmepsilon.h create mode 100644 math/openfst/patches/patch-src_include_fst_rmfinalepsilon.h create mode 100644 math/openfst/patches/patch-src_include_fst_slist.h create mode 100644 math/openfst/patches/patch-src_include_fst_test-properties.h create mode 100644 misc/fbreader/patches/patch-fbreader_src_fbreader_FBReaderActions.cpp create mode 100644 misc/fbreader/patches/patch-fbreader_src_fbreader_FBView.cpp create mode 100644 misc/fbreader/patches/patch-fbreader_src_formats_html_HtmlReader.cpp create mode 100644 misc/fbreader/patches/patch-zlibrary_text_src_area_ZLTextAreaStyle.cpp create mode 100644 multimedia/gst-plugins1-base/patches/patch-gst_audioresample_resample.c create mode 100644 multimedia/kmix/patches/patch-apps_kmixd.cpp create mode 100644 multimedia/kmix/patches/patch-backends_mixer__backend.cpp create mode 100644 multimedia/kmix/patches/patch-backends_mixer__mpris2.cpp create mode 100644 multimedia/kmix/patches/patch-core_ControlPool.h create mode 100644 multimedia/kmix/patches/patch-core_MasterControl.h create mode 100644 multimedia/kmix/patches/patch-core_mixdevice.h create mode 100644 multimedia/kmix/patches/patch-core_mixertoolbox.cpp create mode 100644 multimedia/kmix/patches/patch-gui_kmixdockwidget.cpp create mode 100644 multimedia/kmix/patches/patch-gui_viewdockareapopup.cpp create mode 100644 net/kismet/patches/patch-gpsdump.cc create mode 100644 net/kismet/patches/patch-kismet__server.cc create mode 100644 net/kismet/patches/patch-macaddr.h create mode 100644 security/botan/patches/patch-src_cert_cvc_cvc__ado.cpp create mode 100644 security/botan/patches/patch-src_cert_cvc_cvc__ado.h create mode 100644 security/botan/patches/patch-src_cert_cvc_cvc__ca.cpp create mode 100644 security/botan/patches/patch-src_cert_cvc_cvc__cert.cpp create mode 100644 security/botan/patches/patch-src_cert_cvc_cvc__cert.h create mode 100644 security/botan/patches/patch-src_cert_cvc_cvc__req.cpp create mode 100644 security/botan/patches/patch-src_cert_cvc_cvc__req.h create mode 100644 security/botan/patches/patch-src_cert_cvc_cvc__self.cpp create mode 100644 security/botan/patches/patch-src_cert_cvc_freestore.h create mode 100644 security/botan/patches/patch-src_math_gfpmath_curve__gfp.cpp create mode 100644 security/botan/patches/patch-src_math_gfpmath_curve__gfp.h create mode 100644 security/botan/patches/patch-src_math_gfpmath_gfp__element.cpp create mode 100644 security/botan/patches/patch-src_math_gfpmath_gfp__element.h create mode 100644 security/botan/patches/patch-src_math_gfpmath_point__gfp.cpp create mode 100644 security/botan/patches/patch-src_math_gfpmath_point__gfp.h create mode 100644 sysutils/btpin-qt/patches/patch-btclient.cpp create mode 100644 sysutils/xentools41/patches/patch-libxl_xl__cmdimpl.c create mode 100644 www/ap2-suphp/patches/patch-src_IniSection.cpp create mode 100644 www/ap2-suphp/patches/patch-src_IniSection.hpp create mode 100644 x11/kdelibs4/patches/patch-kjs_interpreter.cpp create mode 100644 x11/kdelibs4/patches/patch-kjs_wtf_DisallowCType.h create mode 100644 x11/kdelibs4/patches/patch-kjs_wtf_HashTable.h diff --git a/audio/cmus/Makefile b/audio/cmus/Makefile index 276c75db77d..7baec0f7ede 100644 --- a/audio/cmus/Makefile +++ b/audio/cmus/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.41 2012/09/22 13:48:15 ryoon Exp $ +# $NetBSD: Makefile,v 1.42 2013/02/09 22:11:31 ryoon Exp $ # -DISTNAME= cmus-v2.4.3 +DISTNAME= cmus-v2.5.0 PKGNAME= ${DISTNAME:S/-v/-/} -PKGREVISION= 7 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cmus/} EXTRACT_SUFX= .tar.bz2 diff --git a/audio/cmus/PLIST b/audio/cmus/PLIST index 897f45ef509..034e3bab25c 100644 --- a/audio/cmus/PLIST +++ b/audio/cmus/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.10 2010/03/16 16:46:22 ahoka Exp $ +@comment $NetBSD: PLIST,v 1.11 2011/02/27 10:51:51 wiz Exp $ bin/cmus bin/cmus-remote ${PLIST.flac}lib/cmus/ip/flac.so @@ -26,4 +26,5 @@ share/cmus/green-mono-88.theme share/cmus/green.theme share/cmus/rc share/cmus/xterm-white.theme +share/cmus/zenburn.theme share/doc/cmus/examples/cmus-status-display diff --git a/audio/cmus/distinfo b/audio/cmus/distinfo index c86c2007a39..c5b2c8c646f 100644 --- a/audio/cmus/distinfo +++ b/audio/cmus/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.14 2012/01/22 12:23:51 gls Exp $ +$NetBSD: distinfo,v 1.15 2012/02/15 20:15:42 hans Exp $ -SHA1 (cmus-v2.4.3.tar.bz2) = ba63a417b0df42fa9a4850dd8b922a95a426f7f5 -RMD160 (cmus-v2.4.3.tar.bz2) = e41adbda28db529b245447f7bdf22cf8de118a62 -Size (cmus-v2.4.3.tar.bz2) = 204508 bytes +SHA1 (cmus-v2.5.0.tar.bz2) = 244975a5ff642567acb047f6bd518e4a3271c25b +RMD160 (cmus-v2.5.0.tar.bz2) = ee7b285cbafd6449d853d669e25cb4997254cece +Size (cmus-v2.5.0.tar.bz2) = 224675 bytes SHA1 (patch-mixer__sun.c) = ffab27aa6c24715d78757015f4dcb2a53f2920b0 SHA1 (patch-sun.c) = b3abbd3446b695c8d0aec9d9132328e92511b475 diff --git a/audio/daapd/distinfo b/audio/daapd/distinfo index f60b4cea0c3..4e6247770ef 100644 --- a/audio/daapd/distinfo +++ b/audio/daapd/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.21 2011/11/26 17:09:32 joerg Exp $ +$NetBSD: distinfo,v 1.22 2012/02/15 21:20:24 hans Exp $ SHA1 (daapd-0.2.4b.tgz) = 0903303f155c19ae12cdc78be05799508156a16b RMD160 (daapd-0.2.4b.tgz) = 899b37b3872623ef918f7faa4eb8bad2dfc5b369 @@ -11,4 +11,5 @@ SHA1 (patch-af) = 1a453dde4dd7d33061a500729b9ef5d89e850133 SHA1 (patch-ag) = cf0dc389fb2a031883f52c348d8303dd36b33818 SHA1 (patch-daapd.cc) = 9107fc35ca6eb8a9841f986342781769bc29a9d2 SHA1 (patch-libhttpd_configure) = 91a7a942a078bda76582cbdf0cc1d3ae8b7029cb +SHA1 (patch-types.h) = 9ed8df565509947dbd471b26aa210d8b3ae58385 SHA1 (patch-util.cc) = 18f0158016f56d9253459b2efe6ed528bac750c0 diff --git a/audio/daapd/patches/patch-types.h b/audio/daapd/patches/patch-types.h new file mode 100644 index 00000000000..3df48b62736 --- /dev/null +++ b/audio/daapd/patches/patch-types.h @@ -0,0 +1,55 @@ +$NetBSD$ + +--- types.h.orig 2013-05-04 14:53:09.000000000 +0000 ++++ types.h +@@ -32,6 +32,7 @@ + #include + #include + #include ++#include + + // #include "mmgr.h" + +@@ -40,41 +41,7 @@ + + #include "dboutput.h" + #include "songcache.h" +- +- +-// STL defines no hash function for std::string. +-// How annoying. +- +-#ifdef __GNUC__ +-// gcc version < 3.1.0 ? +-#if __GNUC__ < 3 || \ +-(__GNUC__ == 3 && __GNUC_MINOR__ < 1) +- __STL_BEGIN_NAMESPACE +- template<> struct hash { +- size_t operator()(std::string __s) const { +- return __stl_hash_string( (const char*) __s.c_str() ); +- } +- }; +- __STL_END_NAMESPACE +-#else +- namespace __gnu_cxx { +- template<> struct hash { +- size_t operator()(std::string __s) const { +- return __stl_hash_string( (const char*) __s.c_str() ); +- } +- }; +- } +-#endif // GCC_VERSION +-#else +- __STL_BEGIN_NAMESPACE +- template<> struct hash { +- size_t operator()(std::string __s) const { +- return __stl_hash_string( (const char*) __s.c_str() ); +- } +- }; +- __STL_END_NAMESPACE +-#endif // __GNUC__ +- ++#include + + // database/server init parameters + struct InitParams { diff --git a/audio/easytag/Makefile b/audio/easytag/Makefile index aecc183360f..d798f513a6e 100644 --- a/audio/easytag/Makefile +++ b/audio/easytag/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.80 2013/02/12 12:37:14 drochner Exp $ +# $NetBSD: Makefile,v 1.81 2013/02/16 11:20:07 wiz Exp $ # DISTNAME= easytag-2.1.8 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_GNOME:=sources/easytag/2.1/} EXTRACT_SUFX= .tar.xz diff --git a/audio/easytag/distinfo b/audio/easytag/distinfo index f2f8976e0aa..6bc58d7482e 100644 --- a/audio/easytag/distinfo +++ b/audio/easytag/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.32 2013/02/11 08:56:39 wiz Exp $ +$NetBSD: distinfo,v 1.33 2013/04/27 23:05:27 joerg Exp $ SHA1 (easytag-2.1.8.tar.xz) = 7f9246b0eab97ed9739daf5356c89925634241a2 RMD160 (easytag-2.1.8.tar.xz) = 0b8ef3689730b2ae4fbf8131dbd1328bbf1da8a0 Size (easytag-2.1.8.tar.xz) = 2459496 bytes +SHA1 (patch-easytag.desktop.in) = f05c94a7a75dcfa76c1156d327a09622cd3f41c1 SHA1 (patch-src_log.h) = e94fb4b930304610907d82311500ce322830b167 SHA1 (patch-src_misc.c) = d1c6bdf0ee85a7a18a4891d121b6c1e6eb130a09 SHA1 (patch-src_wavpack__tag.c) = 7b4830930846818a8cdb869c6bc8f85d79d8b5be diff --git a/audio/easytag/patches/patch-easytag.desktop.in b/audio/easytag/patches/patch-easytag.desktop.in new file mode 100644 index 00000000000..aa9b32ff412 --- /dev/null +++ b/audio/easytag/patches/patch-easytag.desktop.in @@ -0,0 +1,15 @@ +$NetBSD$ + +Remove deprecated MIME type. + +--- easytag.desktop.in.orig 2013-01-16 09:02:13.000000000 +0000 ++++ easytag.desktop.in +@@ -6,7 +6,7 @@ _Keywords=mp3;tag;audio; + Type=Application + Icon=easytag + Categories=GTK;AudioVideo;AudioVideoEditing; +-MimeType=x-directory/normal;inode/directory;audio/x-mp3;audio/x-mpeg;audio/mpeg;application/ogg;audio/x-vorbis+ogg;audio/x-flac;audio/x-musepack;audio/x-ape; ++MimeType=inode/directory;audio/x-mp3;audio/x-mpeg;audio/mpeg;application/ogg;audio/x-vorbis+ogg;audio/x-flac;audio/x-musepack;audio/x-ape; + Exec=easytag %F + Terminal=false + StartupNotify=true diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile index 3c4238a04af..3af7dccfc03 100644 --- a/audio/pulseaudio/Makefile +++ b/audio/pulseaudio/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.68 2013/02/06 23:21:42 jperkin Exp $ +# $NetBSD: Makefile,v 1.69 2013/02/16 11:20:17 wiz Exp $ # DISTNAME= pulseaudio-2.1 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= audio MASTER_SITES= http://freedesktop.org/software/pulseaudio/releases/ EXTRACT_SUFX= .tar.xz @@ -32,6 +32,8 @@ MAKE_ENV+= EGDIR=${EGDIR} CONFIGURE_ARGS+= --enable-samplerate CONFIGURE_ARGS+= --disable-tcpwrap +CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR:Q} # Use native atomic ops on NetBSD >= 5.0, otherwise # fallback to libatomic_ops diff --git a/audio/pulseaudio/PLIST b/audio/pulseaudio/PLIST index 2e30640a6b3..7a0bab10841 100644 --- a/audio/pulseaudio/PLIST +++ b/audio/pulseaudio/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.10 2012/11/03 01:54:55 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.11 2012/11/17 22:20:48 markd Exp $ bin/esdcompat bin/pacat bin/pacmd @@ -13,8 +13,8 @@ ${PLIST.x11}bin/pax11publish bin/pulseaudio ${PLIST.x11}bin/start-pulseaudio-kde ${PLIST.x11}bin/start-pulseaudio-x11 -${PLIST.x11}etc/xdg/autostart/pulseaudio-kde.desktop -${PLIST.x11}etc/xdg/autostart/pulseaudio.desktop +${PLIST.x11}share/examples/pulseaudio/pulseaudio-kde.desktop +${PLIST.x11}share/examples/pulseaudio/pulseaudio.desktop include/pulse/cdecl.h include/pulse/channelmap.h include/pulse/context.h diff --git a/audio/pulseaudio/distinfo b/audio/pulseaudio/distinfo index 33d805b6356..ed9343684c8 100644 --- a/audio/pulseaudio/distinfo +++ b/audio/pulseaudio/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.34 2012/11/03 01:54:55 ryoon Exp $ +$NetBSD: distinfo,v 1.35 2013/01/29 15:34:55 wiz Exp $ SHA1 (pulseaudio-2.1.tar.xz) = 56b4ad9207ea3aec0ad1b8be4b55793b426a4f01 RMD160 (pulseaudio-2.1.tar.xz) = 87f6051bbbe59c26e505a9765f388d3ee4d3a485 Size (pulseaudio-2.1.tar.xz) = 1355004 bytes SHA1 (patch-aa) = 59dbd4e6670bc401d2254226b6ba1f4549f35ff7 -SHA1 (patch-configure) = 74eb6cbc606103c9a7c1a9e196a0fd58abc839d3 +SHA1 (patch-configure) = 79f938c79a2c3a714d9c81b22030084a421da360 SHA1 (patch-dc) = 48baff12528f09940d63c6bdaf4369cab7e56de3 -SHA1 (patch-src_Makefile.in) = 50f5903cf93e2b59318be177e38bd49a7a34557e +SHA1 (patch-src_Makefile.in) = 21daf6069ae067dd235de6d43a013e4e70bbca78 diff --git a/audio/pulseaudio/patches/patch-configure b/audio/pulseaudio/patches/patch-configure index c1335c4545f..b8311cbd23c 100644 --- a/audio/pulseaudio/patches/patch-configure +++ b/audio/pulseaudio/patches/patch-configure @@ -1,6 +1,5 @@ -$NetBSD: patch-configure,v 1.1 2012/11/03 01:54:55 ryoon Exp $ +$NetBSD: patch-configure,v 1.2 2013/01/29 15:02:24 tsutsui Exp $ -- use ${EGDIR} for config file - always use atomic_ops(3) on NetBSD, even on arm - kill test(1) bash'ism @@ -48,12 +47,3 @@ $NetBSD: patch-configure,v 1.1 2012/11/03 01:54:55 ryoon Exp $ $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h -@@ -26138,7 +26138,7 @@ _ACEOF - PA_SOEXT=.so - - --pulseconfdir="${sysconfdir}/pulse" -+pulseconfdir="${EGDIR}" - - - prefix_NONE= diff --git a/audio/pulseaudio/patches/patch-src_Makefile.in b/audio/pulseaudio/patches/patch-src_Makefile.in index 8bbe18675de..25c4d5356af 100644 --- a/audio/pulseaudio/patches/patch-src_Makefile.in +++ b/audio/pulseaudio/patches/patch-src_Makefile.in @@ -1,11 +1,24 @@ -$NetBSD: patch-src_Makefile.in,v 1.1 2012/11/03 01:54:55 ryoon Exp $ +$NetBSD: patch-src_Makefile.in,v 1.2 2013/01/29 15:34:47 wiz Exp $ Use pkgsrc infrastructure for config files. --- src/Makefile.in.orig 2012-07-19 11:30:13.000000000 +0000 +++ src/Makefile.in -@@ -2943,7 +2943,7 @@ pulselibexecdir = $(libexecdir)/pulse - @HAVE_X11_TRUE@xdgautostartdir = $(sysconfdir)/xdg/autostart +@@ -2927,7 +2927,7 @@ pdfdir = @pdfdir@ + prefix = @prefix@ + program_transform_name = @program_transform_name@ + psdir = @psdir@ +-pulseconfdir = @pulseconfdir@ ++pulseconfdir = ${EGDIR} + sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + srcdir = @srcdir@ +@@ -2940,10 +2940,10 @@ udevrulesdir = @udevrulesdir@ + pulseincludedir = $(includedir)/pulse + pulsecoreincludedir = $(includedir)/pulsecore + pulselibexecdir = $(libexecdir)/pulse +-@HAVE_X11_TRUE@xdgautostartdir = $(sysconfdir)/xdg/autostart ++@HAVE_X11_TRUE@xdgautostartdir = ${EGDIR} @HAVE_ALSA_TRUE@alsaprofilesetsdir = $(datadir)/pulseaudio/alsa-mixer/profile-sets @HAVE_ALSA_TRUE@alsapathsdir = $(datadir)/pulseaudio/alsa-mixer/paths -@HAVE_DBUS_TRUE@dbuspolicydir = $(sysconfdir)/dbus-1/system.d diff --git a/biology/openbabel/distinfo b/biology/openbabel/distinfo index c5337082158..519329f5662 100644 --- a/biology/openbabel/distinfo +++ b/biology/openbabel/distinfo @@ -1,6 +1,9 @@ -$NetBSD: distinfo,v 1.1.1.1 2011/10/05 22:15:48 ryoon Exp $ +$NetBSD: distinfo,v 1.2 2013/04/01 08:39:13 sbd Exp $ SHA1 (openbabel-2.3.0.tar.gz) = 408a4bddb7f052fd89c57ea51b4204b721856b16 RMD160 (openbabel-2.3.0.tar.gz) = 96dafa3c2aca544f79e08b5617ab0da845c28a16 Size (openbabel-2.3.0.tar.gz) = 14321281 bytes SHA1 (patch-doc_CMakeLists.txt) = c17443388bc482c9b523323ff925c326c87f4816 +SHA1 (patch-include_openbabel_obmolecformat.h) = e12a42b67106899d5285651f27e4830e0cc42fe2 +SHA1 (patch-include_openbabel_shared__ptr.h) = 6678f49249eacacb61ddc14a4d9e6af1c479c67b +SHA1 (patch-src_ops_unique.cpp) = 4ae8b0bbd3c3880bb971e59bcd90219762ca895c diff --git a/biology/openbabel/patches/patch-include_openbabel_obmolecformat.h b/biology/openbabel/patches/patch-include_openbabel_obmolecformat.h new file mode 100644 index 00000000000..1dcd674048d --- /dev/null +++ b/biology/openbabel/patches/patch-include_openbabel_obmolecformat.h @@ -0,0 +1,25 @@ +$NetBSD$ + +--- include/openbabel/obmolecformat.h.orig 2013-05-05 20:25:43.000000000 +0000 ++++ include/openbabel/obmolecformat.h +@@ -23,7 +23,10 @@ GNU General Public License for more deta + #include + #endif + +-#if __GNUC__ == 4 && __GNUC_MINOR__ >= 1 ++#include ++#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L ++#include ++#elif __GNUC__ == 4 && __GNUC_MINOR__ >= 1 + #include + #elif defined(USE_BOOST) + #include +@@ -141,6 +144,8 @@ public: + + #ifdef _MSC_VER + typedef stdext::hash_map NameIndexType; ++#elif defined(_LIBCPP_VERSION) || __cplusplus >= 201103L ++ typedef std::unordered_map NameIndexType; + #elif (__GNUC__ == 4 && __GNUC_MINOR__ >= 1 && !defined(__APPLE_CC__)) || defined (USE_BOOST) + typedef std::tr1::unordered_map NameIndexType; + #else diff --git a/biology/openbabel/patches/patch-include_openbabel_shared__ptr.h b/biology/openbabel/patches/patch-include_openbabel_shared__ptr.h new file mode 100644 index 00000000000..635d3cec212 --- /dev/null +++ b/biology/openbabel/patches/patch-include_openbabel_shared__ptr.h @@ -0,0 +1,22 @@ +$NetBSD$ + +--- include/openbabel/shared_ptr.h.orig 2013-05-05 20:23:37.000000000 +0000 ++++ include/openbabel/shared_ptr.h +@@ -21,10 +21,14 @@ GNU General Public License for more deta + #define shared_ptr boost::shared_ptr + #else + #include +- #if __GNUC__ == 4 //&& __GNUC_MINOR__ < 3 removed at the suggestion of Konstantin Tokarev +- #include ++ #if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L ++ using std::shared_ptr; ++ #else ++ #if __GNUC__ == 4 //&& __GNUC_MINOR__ < 3 removed at the suggestion of Konstantin Tokarev ++ #include ++ #endif ++ using std::tr1::shared_ptr; + #endif +- using std::tr1::shared_ptr; + #endif + + #endif // OB_SHARED_PTR_H diff --git a/biology/openbabel/patches/patch-src_ops_unique.cpp b/biology/openbabel/patches/patch-src_ops_unique.cpp new file mode 100644 index 00000000000..e174879e69f --- /dev/null +++ b/biology/openbabel/patches/patch-src_ops_unique.cpp @@ -0,0 +1,23 @@ +$NetBSD$ + +--- src/ops/unique.cpp.orig 2013-05-05 20:34:38.000000000 +0000 ++++ src/ops/unique.cpp +@@ -23,6 +23,9 @@ GNU General Public License for more deta + #include + #ifdef _MSC_VER + #include ++#elif defined(_LIBCPP_VERSION) || __cplusplus >= 201103L ++# include ++using std::unordered_map; + #elif (__GNUC__ == 4 && __GNUC_MINOR__ >= 1 && !defined(__APPLE_CC__)) + #include + #else +@@ -35,7 +38,7 @@ GNU General Public License for more deta + #endif + + using namespace std; +-#ifndef NO_UNORDERED_MAP ++#if !defined(NO_UNORDERED_MAP) && !defined(_LIBCPP_VERSION) && __cplusplus < 201103L + using std::tr1::unordered_map; + #endif + namespace OpenBabel diff --git a/chat/centerim/distinfo b/chat/centerim/distinfo index 49feab2159e..9493d8c2dcf 100644 --- a/chat/centerim/distinfo +++ b/chat/centerim/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2012/11/23 20:48:04 marino Exp $ +$NetBSD: distinfo,v 1.6 2013/03/02 18:20:19 joerg Exp $ SHA1 (centerim-4.22.9.tar.gz) = ebe9f4ee2064a2fa10f1084ce26083ccd295673e RMD160 (centerim-4.22.9.tar.gz) = 253007e466a211ec740f7843538e4f686ab95cad @@ -9,6 +9,7 @@ SHA1 (patch-ad) = bfe19ca98facfbb23a87dd28a176980fb4e986de SHA1 (patch-av) = 05758183016fb1bb297c9c3d2c0606e6a66f9901 SHA1 (patch-bb) = 7312d496cdde7f619eff6bfef6025fe9be14529d SHA1 (patch-libicq2000_libicq2000_sigslot.h) = a812915ad5b329a6c82ff90835d26f73552eeebb +SHA1 (patch-libicq2000_src_ContactTree.cpp) = 5be7af2c59d15a7e4d78d4d3ea36b1bfeb12c34a SHA1 (patch-libjabber_jconn.c) = 6c0eff8b52a8306c6fbb80ced1c187ec1861bb05 SHA1 (patch-src_hooks_msnhook.cc) = 9b0ee3bb3fb524cf9060a3e34dd0f8e4f4f32d5c SHA1 (patch-src_hooks_msnhook.h) = 63bce505a649642882093b49e5f298fc66954ef8 diff --git a/chat/centerim/patches/patch-libicq2000_src_ContactTree.cpp b/chat/centerim/patches/patch-libicq2000_src_ContactTree.cpp new file mode 100644 index 00000000000..6763a68a1cc --- /dev/null +++ b/chat/centerim/patches/patch-libicq2000_src_ContactTree.cpp @@ -0,0 +1,12 @@ +$NetBSD$ + +--- libicq2000/src/ContactTree.cpp.orig 2013-05-04 14:35:03.000000000 +0000 ++++ libicq2000/src/ContactTree.cpp +@@ -21,6 +21,7 @@ + + #include "ContactTree.h" + #include "events.h" ++#include + + namespace ICQ2000 { + diff --git a/cross/h8300-elf-gcc34/Makefile b/cross/h8300-elf-gcc34/Makefile index 6c1224d9601..44fae8cc14a 100644 --- a/cross/h8300-elf-gcc34/Makefile +++ b/cross/h8300-elf-gcc34/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2013/04/30 13:26:34 ryoon Exp $ +# $NetBSD: Makefile,v 1.2 2013/05/05 13:12:44 ryoon Exp $ DISTNAME= gcc-core-3.4.6 PKGNAME= cross-h8300-elf-${DISTNAME:S/-core//} @@ -7,14 +7,13 @@ MASTER_SITES= ${MASTER_SITE_GNU:=gcc/gcc-3.4.6/} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ ${DISTNAME:S/-core-/-g++-/}${EXTRACT_SUFX} \ newlib-${NEWLIBVER}${EXTRACT_SUFX} -SITES.newlib-1.14.0.tar.gz= ftp://sources.redhat.com/pub/newlib/ +NEWLIBVER= 1.14.0 +SITES.newlib-${NEWLIBVER}.tar.gz= ftp://sources.redhat.com/pub/newlib/ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= #empty COMMENT= GCC compiler for h8300-elf -NEWLIBVER= 1.14.0 - DEPENDS+= cross-h8300-elf-binutils-[0-9]*:../../cross/h8300-elf-binutils WRKSRC= ${WRKDIR}/${DISTNAME:S/-core//} diff --git a/databases/mysql56-client/distinfo b/databases/mysql56-client/distinfo index 59a6a140265..4d4df92cd0d 100644 --- a/databases/mysql56-client/distinfo +++ b/databases/mysql56-client/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2013/04/20 08:06:01 adam Exp $ +$NetBSD: distinfo,v 1.3 2013/04/29 21:16:56 joerg Exp $ SHA1 (mysql-5.6.11.tar.gz) = 31df6950a9dbf4fcc45f62f44f4dee96ec5b3193 RMD160 (mysql-5.6.11.tar.gz) = acd671ace63cab1ffc442dd7e3ffa10ff9fb4659 @@ -14,8 +14,9 @@ SHA1 (patch-include_my__global.h) = d4574aea74221fe3626f3a0c0f5cee9a4d2f36dc SHA1 (patch-include_my_compare.h) = f45bac4b488332a668b0005751856279b67401f5 SHA1 (patch-include_my_net.h) = b08aa36921efd023f9ecaac4cd3fb8a16d200abd SHA1 (patch-include_my_pthread.h) = ff3bf1fddd04edd7804d810f79de64387464b5ca -SHA1 (patch-include_myisam.h) = 475070d41b06c04c6ae692743fc1b0244afe0a88 +SHA1 (patch-include_myisam.h) = c554a594ea0169cb725cfdfe5accaf231eebdc23 SHA1 (patch-libmysql_libmysql.c) = ad78143ca78b7c512e86677b3dd59e497357f289 +SHA1 (patch-libmysqld_lib__sql.cc) = ffdd74cece2d7795cb4d8d738f81c2c8dc040a7d SHA1 (patch-mysql-test_CMakeLists.txt) = b7dd562d55678b13ac487aa0ee59bf2551af1f9d SHA1 (patch-mysys_mf__iocache.c) = 32a396bba5bdbf96104a9c74b695305d7367785a SHA1 (patch-mysys_my__copy.c) = af2827cdd91d74be1bbce8aba890acf59fa2247e @@ -25,14 +26,79 @@ SHA1 (patch-scripts_CMakeLists.txt) = 3f4621b3256034c5a3114e98c108658794f06008 SHA1 (patch-scripts_mysqld_safe.sh) = 0784314227657aa0bc3f4a0b4e21c173a86fa94b SHA1 (patch-sql-common_client.c) = f9ecb9bb381d44ca8b551a27150fc40da887a5e9 SHA1 (patch-sql_CMakeLists.txt) = 83c1e50de6b53a0af5ff010f248dd595745b3eb5 +SHA1 (patch-sql_event__db__repository.cc) = 7a7f95b9db61c690aa6edf55503311a13def59ec +SHA1 (patch-sql_field.cc) = 54bd0505251714d18840c79260a18dec92fd3d23 +SHA1 (patch-sql_field.h) = bf0d326ffb0ddf6ce31d962c2ddb1cde5042697d +SHA1 (patch-sql_field__conv.cc) = 10847e2fc2b7bb078b125877ffd9efbbc2ba6b28 +SHA1 (patch-sql_ha__ndbcluster.cc) = f46816ab5437ef4b2618e83dc6efa6009acf5167 +SHA1 (patch-sql_ha__partition.cc) = 712dfefe65f6671c3c834ab07111f828b44b9b92 +SHA1 (patch-sql_handler.cc) = e41db8bfae19a7638048ccc37a9f9511f4304b35 +SHA1 (patch-sql_handler.h) = e45c9fab750910ef7f02a714c1a4684303cb05a0 +SHA1 (patch-sql_item.cc) = cf523f4377788ca2342d6913f22e6e2be21e7b94 +SHA1 (patch-sql_item.h) = 8b8be81418254aac383464e9b358268343a9a55d +SHA1 (patch-sql_item__cmpfunc.cc) = 2b2fc56bc4d32d5d831432f5eaee02da3799ac1c +SHA1 (patch-sql_item__cmpfunc.h) = d8dad92cf35cb305de60d3b9a4a02f2b78bd4aed +SHA1 (patch-sql_item__func.cc) = 0516bd8c9ab2a75374b55d78c52853ba0be5ae7a +SHA1 (patch-sql_item__geofunc.cc) = 19d733b40f48ff0b2432c0b7f7f9eb48062bf831 +SHA1 (patch-sql_item__strfunc.cc) = a4d7113b090cca62c44c26e2a159d4c321082c44 +SHA1 (patch-sql_item__subselect.cc) = eb86202f925a931ac1dca1d087b61e00dc7c5287 +SHA1 (patch-sql_item__subselect.h) = b29a58e9373d81d52bcdb113ce5f447123f273a1 +SHA1 (patch-sql_item__sum.cc) = a2f2e21bc8ad4ee66fa638d3836b103590e052b9 +SHA1 (patch-sql_item__timefunc.cc) = f00211a5d4229767c09df155773386e3dc978073 +SHA1 (patch-sql_key.cc) = fe9010507c34187839c6fa9869badcda085487ae SHA1 (patch-sql_log__event.cc) = ce88494dbadbcebe41499eea6acf2990f4e3c4dc SHA1 (patch-sql_log_event.h) = a413038ffa29103c75e1d243864615ccb3d9621e -SHA1 (patch-sql_mysqld.cc) = 84e5e72e5f7c199bb15075549514df02a1ac61a1 +SHA1 (patch-sql_mysqld.cc) = 873100c333038666bcf34ea1f199b202881889cd SHA1 (patch-sql_net__serv.cc) = caec72290ef36ddbae82bdc09d11f7e2e69a20fc +SHA1 (patch-sql_opt__range.cc) = b6a1d2f9da0b343be634fd4ed0f9729990cf86f4 +SHA1 (patch-sql_opt__range.h) = 392cfb7bd5c24d250a8647de84bbb53cb502c5c3 +SHA1 (patch-sql_opt__sum.cc) = e949b6622c4d4482a64ed1200fa076ef378a3f69 SHA1 (patch-sql_password.c) = 347fee69188e4ab96e990fc431bad81a57ec0f4d +SHA1 (patch-sql_rpl__mi.cc) = a015854ad02b3ab074b50ec545f1e43ea8b6e416 +SHA1 (patch-sql_rpl__slave.cc) = a4a8140c2ebf5336374604c6a521427aa1035119 +SHA1 (patch-sql_set__var.cc) = a3760b8fdfb69ea91c2b8e39a2630af61e65068a +SHA1 (patch-sql_sp__head.h) = 6a5dfe3dbb6fcf1017df1762ea72e3831d231508 +SHA1 (patch-sql_sp__rcontext.h) = 8e6bd781d8df1b048223e5cf28080ab56e8dc128 +SHA1 (patch-sql_sql__acl.cc) = 43b3ab0b169450e125c8a1fc4b72285e28d296c9 +SHA1 (patch-sql_sql__admin.cc) = 7cea08b02526133d670ba9d4e2bf6da89527a6d2 +SHA1 (patch-sql_sql__base.cc) = 8072a33fd406ea92caca5643a05abbe9271d05cb +SHA1 (patch-sql_sql__bitmap.h) = 5317e0020f8b779ff3440a9da672c2e54a409428 +SHA1 (patch-sql_sql__cache.cc) = 52b013571237de20e38f6af7a02bdee40270bfe4 +SHA1 (patch-sql_sql__class.cc) = 862c025d2934d5dfd88c294dc7a5e37bbf45ecdb +SHA1 (patch-sql_sql__class.h) = 2c1ea583edac107d20e616ecaf6ef5d50837faaf +SHA1 (patch-sql_sql__delete.cc) = e7873801ad91d9a566bcb2aea7f5c306c2e4bdac +SHA1 (patch-sql_sql__executor.cc) = 8fcb5070c5651fea3207f872e88f33505db168d4 +SHA1 (patch-sql_sql__insert.cc) = e2dec778b9545039bfd3a0dae0519b71f8d17953 +SHA1 (patch-sql_sql__join__buffer.cc) = 52aab8731d7b2c9be8e4d5ab8b241d316d194d44 +SHA1 (patch-sql_sql__lex.cc) = b56d6b0e23123c9561416a1f3da35e3bd4cdac25 +SHA1 (patch-sql_sql__lex.h) = 480ff45d47c236297a62143fd9e634f71a3fb138 +SHA1 (patch-sql_sql__load.cc) = 2deaed8591f8de74c785551e25c446f1495f6761 +SHA1 (patch-sql_sql__optimizer.cc) = 0dd2fbe662fb9f5295fdc5f56b5bb31e21ef2b6e +SHA1 (patch-sql_sql__optimizer.h) = 6104052027b9270540a7050d546a0d013ae86b8c +SHA1 (patch-sql_sql__parse.cc) = 762aa7c8f535cfc31d0af64d8398bf45b83a01f2 +SHA1 (patch-sql_sql__partition.cc) = af69c918da14566b45beb757902b03b83aa8e36f +SHA1 (patch-sql_sql__planner.cc) = f3540275174e4ab68950c579d424a2bc118eb292 +SHA1 (patch-sql_sql__prepare.cc) = 886ee8ca5863704ddf172eb746c092f308e6ca1c +SHA1 (patch-sql_sql__prepare.h) = 30b520b1dea2b8d8225c528ba58b9231d94a85dd +SHA1 (patch-sql_sql__select.cc) = 30f2df455e1018088efdf896432f4fe35fb9b2f9 +SHA1 (patch-sql_sql__select.h) = 324ebb62c71d72e7a948921cfdec9f3401771100 +SHA1 (patch-sql_sql__show.cc) = e606a267e86b9c63a46db972739561325fef7ee4 +SHA1 (patch-sql_sql__table.cc) = 6f87b68bca9b0a50c50c2392ea342005d53fd5cd +SHA1 (patch-sql_sql__time.cc) = 7a27d9656020676cb8a211befcceb3e3b25670fb +SHA1 (patch-sql_sql__tmp__table.cc) = 5fa1a1b0bb7e245e1f618e7b7536bdf5f69b9528 +SHA1 (patch-sql_sql__union.cc) = 0e0dd504eb91512d9ea668d7b09b09d25b3b3c2e +SHA1 (patch-sql_sql__update.cc) = 9a56187727fd1538b059e2d87ca0ec15ebf3e0ff SHA1 (patch-sql_sql_string.h) = 1ce4d4db59310ea45e384f34e33c0d61935059bf +SHA1 (patch-sql_sys__vars.cc) = f122050ef87e673763db4fa64202139834400d2c +SHA1 (patch-sql_table.cc) = ec9bb0891319918c306b0349fe43647e979bec4c +SHA1 (patch-sql_transaction.cc) = 76316a7f0e7a81f47d194a0a1693b07873922969 +SHA1 (patch-sql_tztime.cc) = b17a31afe95cc220b57906d263c5783793c169f4 +SHA1 (patch-sql_unireg.cc) = 0d94b247c36838abe5cb683782dd16c05b322f32 +SHA1 (patch-storage_federated_ha__federated.cc) = 17e575d4382a6d4c9005be77e7b4254380226e7c +SHA1 (patch-storage_heap_ha__heap.cc) = 8c3e426b34f5bbf2b527e539a91abfb806e14aa5 SHA1 (patch-storage_heap_hp__hash.c) = a3bd242d72e398fcc6fe6450cf05066c1ddae664 SHA1 (patch-storage_myisam_ft__boolean__search.c) = dbace659ea15b5abe14008c1d798414cda708395 +SHA1 (patch-storage_myisam_ha__myisam.cc) = 758d5a161a2ef5daf864fa67a0d678d87b8be0aa SHA1 (patch-storage_myisam_mi__check.c) = 9a3101680f72329158947d04ccce07ef0db821aa SHA1 (patch-storage_myisam_mi__create.c) = 3267429a40936f1e134f5d309b6c2391d00ce708 SHA1 (patch-storage_myisam_mi__delete.c) = ba1cab21c4cc5b8a98d16742b77d66559cbef374 @@ -47,3 +113,4 @@ SHA1 (patch-storage_ndb_include_util_Parser.hpp) = 037fc153619bf79ee95cb03a5ac4a SHA1 (patch-strings_decimal.c) = 139d86a21d785873e83bd4c97f16fa8180194ebc SHA1 (patch-vio_vio.c) = 01fe3274ad967b1035e2c354287fd2e57547ab53 SHA1 (patch-vio_viosocket.c) = d3179887e8154f8b7560b083fff6d23bfef7bc39 +SHA1 (patch-vio_viossl.c) = 81f1386cd719d87c02ecf4fc47b1f7bb6e6ea389 diff --git a/databases/mysql56-client/patches/patch-include_myisam.h b/databases/mysql56-client/patches/patch-include_myisam.h dissimilarity index 91% index 689fdcc32e1..ddb6d5bf906 100644 --- a/databases/mysql56-client/patches/patch-include_myisam.h +++ b/databases/mysql56-client/patches/patch-include_myisam.h @@ -1,15 +1,35 @@ -$NetBSD: patch-include_myisam.h,v 1.2 2011/07/08 09:32:07 adam Exp $ - -Adjust MI_MAX_KEY_LENGTH x4. - ---- include/myisam.h.orig 2010-02-04 11:37:06.000000000 +0000 -+++ include/myisam.h -@@ -49,7 +49,7 @@ extern "C" { - The following defines can be increased if necessary. - But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and MI_MAX_KEY_LENGTH. - */ --#define MI_MAX_KEY_LENGTH 1000 /* Max length in bytes */ -+#define MI_MAX_KEY_LENGTH 4000 /* Max length in bytes */ - #define MI_MAX_KEY_SEG 16 /* Max segments for key */ - - #define MI_MAX_KEY_BUFF (MI_MAX_KEY_LENGTH+MI_MAX_KEY_SEG*6+8+8) +$NetBSD: patch-include_myisam.h,v 1.1 2013/02/13 21:00:05 adam Exp $ + +Adjust MI_MAX_KEY_LENGTH x4. + +--- include/myisam.h.orig 2013-05-05 21:55:07.000000000 +0000 ++++ include/myisam.h +@@ -80,8 +80,8 @@ extern "C" { + + #define mi_is_key_active(_keymap_,_keyno_) \ + (((_keyno_) < MI_KEYMAP_BITS) ? \ +- test((_keymap_) & (ULL(1) << (_keyno_))) : \ +- test((_keymap_) & MI_KEYMAP_HIGH_MASK)) ++ my_test((_keymap_) & (ULL(1) << (_keyno_))) : \ ++ my_test((_keymap_) & MI_KEYMAP_HIGH_MASK)) + #define mi_set_key_active(_keymap_,_keyno_) \ + (_keymap_)|= (((_keyno_) < MI_KEYMAP_BITS) ? \ + (ULL(1) << (_keyno_)) : \ +@@ -94,7 +94,7 @@ extern "C" { + #else + + #define mi_is_key_active(_keymap_,_keyno_) \ +- test((_keymap_) & (ULL(1) << (_keyno_))) ++ my_test((_keymap_) & (ULL(1) << (_keyno_))) + #define mi_set_key_active(_keymap_,_keyno_) \ + (_keymap_)|= (ULL(1) << (_keyno_)) + #define mi_clear_key_active(_keymap_,_keyno_) \ +@@ -103,7 +103,7 @@ extern "C" { + #endif + + #define mi_is_any_key_active(_keymap_) \ +- test((_keymap_)) ++ my_test((_keymap_)) + #define mi_is_all_keys_active(_keymap_,_keys_) \ + ((_keymap_) == mi_get_mask_all_keys_active(_keys_)) + #define mi_set_all_keys_active(_keymap_,_keys_) \ diff --git a/databases/mysql56-client/patches/patch-libmysqld_lib__sql.cc b/databases/mysql56-client/patches/patch-libmysqld_lib__sql.cc new file mode 100644 index 00000000000..bce15ef94fe --- /dev/null +++ b/databases/mysql56-client/patches/patch-libmysqld_lib__sql.cc @@ -0,0 +1,13 @@ +$NetBSD$ + +--- libmysqld/lib_sql.cc.orig 2013-05-05 21:46:06.000000000 +0000 ++++ libmysqld/lib_sql.cc +@@ -337,7 +337,7 @@ static int emb_stmt_execute(MYSQL_STMT * + thd->client_param_count= stmt->param_count; + thd->client_params= stmt->params; + +- res= test(emb_advanced_command(stmt->mysql, COM_STMT_EXECUTE, 0, 0, ++ res= my_test(emb_advanced_command(stmt->mysql, COM_STMT_EXECUTE, 0, 0, + header, sizeof(header), 1, stmt) || + emb_read_query_result(stmt->mysql)); + stmt->affected_rows= stmt->mysql->affected_rows; diff --git a/databases/mysql56-client/patches/patch-sql_event__db__repository.cc b/databases/mysql56-client/patches/patch-sql_event__db__repository.cc new file mode 100644 index 00000000000..2b2563f6336 --- /dev/null +++ b/databases/mysql56-client/patches/patch-sql_event__db__repository.cc @@ -0,0 +1,58 @@ +$NetBSD$ + +--- sql/event_db_repository.cc.orig 2013-04-05 12:27:18.000000000 +0000 ++++ sql/event_db_repository.cc +@@ -469,7 +469,7 @@ Event_db_repository::index_read_for_db_f + end: + event_table->file->ha_index_end(); + +- DBUG_RETURN(test(ret)); ++ DBUG_RETURN(my_test(ret)); + } + + +@@ -743,7 +743,7 @@ end: + thd->mdl_context.rollback_to_savepoint(mdl_savepoint); + + thd->variables.sql_mode= saved_mode; +- DBUG_RETURN(test(ret)); ++ DBUG_RETURN(my_test(ret)); + } + + +@@ -858,7 +858,7 @@ end: + thd->mdl_context.rollback_to_savepoint(mdl_savepoint); + + thd->variables.sql_mode= saved_mode; +- DBUG_RETURN(test(ret)); ++ DBUG_RETURN(my_test(ret)); + } + + +@@ -918,7 +918,7 @@ end: + close_thread_tables(thd); + thd->mdl_context.rollback_to_savepoint(mdl_savepoint); + +- DBUG_RETURN(test(ret)); ++ DBUG_RETURN(my_test(ret)); + } + + +@@ -1153,7 +1153,7 @@ end: + if (save_binlog_row_based) + thd->set_current_stmt_binlog_format_row(); + +- DBUG_RETURN(test(ret)); ++ DBUG_RETURN(my_test(ret)); + } + + +@@ -1230,7 +1230,7 @@ Event_db_repository::check_system_tables + close_mysql_tables(thd); + } + +- DBUG_RETURN(test(ret)); ++ DBUG_RETURN(my_test(ret)); + } + + /** diff --git a/databases/mysql56-client/patches/patch-sql_field.cc b/databases/mysql56-client/patches/patch-sql_field.cc new file mode 100644 index 00000000000..fdf096b6a8d --- /dev/null +++ b/databases/mysql56-client/patches/patch-sql_field.cc @@ -0,0 +1,22 @@ +$NetBSD$ + +--- sql/field.cc.orig 2013-04-05 12:27:18.000000000 +0000 ++++ sql/field.cc +@@ -1855,7 +1855,7 @@ type_conversion_status Field::store_time + + bool Field::optimize_range(uint idx, uint part) + { +- return test(table->file->index_flags(idx, part, 1) & HA_READ_RANGE); ++ return my_test(table->file->index_flags(idx, part, 1) & HA_READ_RANGE); + } + + +@@ -9514,7 +9514,7 @@ void Create_field::create_length_to_inte + { + pack_length= length / 8; + /* We need one extra byte to store the bits we save among the null bits */ +- key_length= pack_length + test(length & 7); ++ key_length= pack_length + my_test(length & 7); + } + break; + case MYSQL_TYPE_NEWDECIMAL: diff --git a/databases/mysql56-client/patches/patch-sql_field.h b/databases/mysql56-client/patches/patch-sql_field.h new file mode 100644 index 00000000000..b4e48601e41 --- /dev/null +++ b/databases/mysql56-client/patches/patch-sql_field.h @@ -0,0 +1,29 @@ +$NetBSD$ + +--- sql/field.h.orig 2013-05-05 20:53:17.000000000 +0000 ++++ sql/field.h +@@ -887,10 +887,10 @@ public: + } + + bool is_real_null(my_ptrdiff_t row_offset= 0) const +- { return real_maybe_null() ? test(null_ptr[row_offset] & null_bit) : false; } ++ { return real_maybe_null() ? my_test(null_ptr[row_offset] & null_bit) : false; } + + bool is_null_in_record(const uchar *record) const +- { return real_maybe_null() ? test(record[null_offset()] & null_bit) : false; } ++ { return real_maybe_null() ? my_test(record[null_offset()] & null_bit) : false; } + + void set_null(my_ptrdiff_t row_offset= 0) + { +@@ -3652,9 +3652,9 @@ public: + { + DBUG_ASSERT(ptr == a || ptr == b); + if (ptr == a) +- return Field_bit::key_cmp(b, bytes_in_rec+test(bit_len)); ++ return Field_bit::key_cmp(b, bytes_in_rec+my_test(bit_len)); + else +- return Field_bit::key_cmp(a, bytes_in_rec+test(bit_len)) * -1; ++ return Field_bit::key_cmp(a, bytes_in_rec+my_test(bit_len)) * -1; + } + int cmp_binary_offset(uint row_offset) + { return cmp_offset(row_offset); } diff --git a/databases/mysql56-client/patches/patch-sql_field__conv.cc b/databases/mysql56-client/patches/patch-sql_field__conv.cc new file mode 100644 index 00000000000..13ba6e7aead --- /dev/null +++ b/databases/mysql56-client/patches/patch-sql_field__conv.cc @@ -0,0 +1,20 @@ +$NetBSD$ + +--- sql/field_conv.cc.orig 2013-05-05 20:55:14.000000000 +0000 ++++ sql/field_conv.cc +@@ -330,7 +330,7 @@ static void do_field_int(Copy_field *cop + { + longlong value= copy->from_field->val_int(); + copy->to_field->store(value, +- test(copy->from_field->flags & UNSIGNED_FLAG)); ++ my_test(copy->from_field->flags & UNSIGNED_FLAG)); + } + + static void do_field_real(Copy_field *copy) +@@ -898,5 +898,5 @@ type_conversion_status field_conv(Field + return to->store_decimal(from->val_decimal(&buff)); + } + else +- return to->store(from->val_int(), test(from->flags & UNSIGNED_FLAG)); ++ return to->store(from->val_int(), my_test(from->flags & UNSIGNED_FLAG)); + } diff --git a/databases/mysql56-client/patches/patch-sql_ha__ndbcluster.cc b/databases/mysql56-client/patches/patch-sql_ha__ndbcluster.cc new file mode 100644 index 00000000000..dfbb70a3e3a --- /dev/null +++ b/databases/mysql56-client/patches/patch-sql_ha__ndbcluster.cc @@ -0,0 +1,13 @@ +$NetBSD$ + +--- sql/ha_ndbcluster.cc.orig 2013-05-05 20:55:16.000000000 +0000 ++++ sql/ha_ndbcluster.cc +@@ -2807,7 +2807,7 @@ int ha_ndbcluster::open_indexes(THD *thd + if (check_index_fields_not_null(key_info)) + m_index[i].null_in_unique_index= TRUE; + +- if (error == 0 && test(index_flags(i, 0, 0) & HA_READ_RANGE)) ++ if (error == 0 && my_test(index_flags(i, 0, 0) & HA_READ_RANGE)) + btree_keys.set_bit(i); + } + diff --git a/databases/mysql56-client/patches/patch-sql_ha__partition.cc b/databases/mysql56-client/patches/patch-sql_ha__partition.cc new file mode 100644 index 00000000000..29191050da8 --- /dev/null +++ b/databases/mysql56-client/patches/patch-sql_ha__partition.cc @@ -0,0 +1,31 @@ +$NetBSD$ + +--- sql/ha_partition.cc.orig 2013-05-05 20:55:18.000000000 +0000 ++++ sql/ha_partition.cc +@@ -3192,7 +3192,7 @@ int ha_partition::open(const char *name, + m_mode= mode; + m_open_test_lock= test_if_locked; + m_part_field_array= m_part_info->full_part_field_array; +- if (get_from_handler_file(name, &table->mem_root, test(m_is_clone_of))) ++ if (get_from_handler_file(name, &table->mem_root, my_test(m_is_clone_of))) + DBUG_RETURN(error); + name_buffer_ptr= m_name_buffer_ptr; + if (populate_partition_name_hash()) +@@ -5480,7 +5480,7 @@ int ha_partition::read_range_first(const + m_start_key.key= NULL; + + m_index_scan_type= partition_read_range; +- error= common_index_read(m_rec0, test(start_key)); ++ error= common_index_read(m_rec0, my_test(start_key)); + DBUG_RETURN(error); + } + +@@ -7480,7 +7480,7 @@ uint32 ha_partition::calculate_key_hash_ + ulong nr1= 1; + ulong nr2= 4; + bool use_51_hash; +- use_51_hash= test((*field_array)->table->part_info->key_algorithm == ++ use_51_hash= my_test((*field_array)->table->part_info->key_algorithm == + partition_info::KEY_ALGORITHM_51); + + do diff --git a/databases/mysql56-client/patches/patch-sql_handler.cc b/databases/mysql56-client/patches/patch-sql_handler.cc new file mode 100644 index 00000000000..befb860d13c --- /dev/null +++ b/databases/mysql56-client/patches/patch-sql_handler.cc @@ -0,0 +1,58 @@ +$NetBSD$ + +--- sql/handler.cc.orig 2013-05-05 20:55:20.000000000 +0000 ++++ sql/handler.cc +@@ -5722,7 +5722,7 @@ handler::multi_range_read_init(RANGE_SEQ + DBUG_ENTER("handler::multi_range_read_init"); + mrr_iter= seq_funcs->init(seq_init_param, n_ranges, mode); + mrr_funcs= *seq_funcs; +- mrr_is_output_sorted= test(mode & HA_MRR_SORTED); ++ mrr_is_output_sorted= my_test(mode & HA_MRR_SORTED); + mrr_have_range= FALSE; + DBUG_RETURN(0); + } +@@ -5778,7 +5778,7 @@ scan_it_again: + &mrr_cur_range.start_key : 0, + mrr_cur_range.end_key.keypart_map ? + &mrr_cur_range.end_key : 0, +- test(mrr_cur_range.range_flag & EQ_RANGE), ++ my_test(mrr_cur_range.range_flag & EQ_RANGE), + mrr_is_output_sorted); + if (result != HA_ERR_END_OF_FILE) + break; +@@ -5875,7 +5875,7 @@ int DsMrr_impl::dsmrr_init(handler *h_ar + + rowids_buf= buf->buffer; + +- is_mrr_assoc= !test(mode & HA_MRR_NO_ASSOCIATION); ++ is_mrr_assoc= !my_test(mode & HA_MRR_NO_ASSOCIATION); + + if (is_mrr_assoc) + status_var_increment(table->in_use->status_var.ha_multi_range_read_init_count); +@@ -6113,7 +6113,7 @@ int DsMrr_impl::dsmrr_fill_buffer() + + if (res && res != HA_ERR_END_OF_FILE) + DBUG_RETURN(res); +- dsmrr_eof= test(res == HA_ERR_END_OF_FILE); ++ dsmrr_eof= my_test(res == HA_ERR_END_OF_FILE); + + /* Sort the buffer contents by rowid */ + uint elem_size= h->ref_length + (int)is_mrr_assoc * sizeof(void*); +@@ -6166,7 +6166,7 @@ int DsMrr_impl::dsmrr_next(char **range_ + if (is_mrr_assoc) + memcpy(&cur_range_info, rowids_buf_cur + h->ref_length, sizeof(uchar**)); + +- rowids_buf_cur += h->ref_length + sizeof(void*) * test(is_mrr_assoc); ++ rowids_buf_cur += h->ref_length + sizeof(void*) * my_test(is_mrr_assoc); + if (h2->mrr_funcs.skip_record && + h2->mrr_funcs.skip_record(h2->mrr_iter, (char *) cur_range_info, rowid)) + continue; +@@ -6388,7 +6388,7 @@ bool DsMrr_impl::get_disk_sweep_mrr_cost + double index_read_cost; + + const uint elem_size= h->ref_length + +- sizeof(void*) * (!test(flags & HA_MRR_NO_ASSOCIATION)); ++ sizeof(void*) * (!my_test(flags & HA_MRR_NO_ASSOCIATION)); + const ha_rows max_buff_entries= *buffer_size / elem_size; + + if (!max_buff_entries) diff --git a/databases/mysql56-client/patches/patch-sql_handler.h b/databases/mysql56-client/patches/patch-sql_handler.h new file mode 100644 index 00000000000..e8b146d8089 --- /dev/null +++ b/databases/mysql56-client/patches/patch-sql_handler.h @@ -0,0 +1,13 @@ +$NetBSD$ + +--- sql/handler.h.orig 2013-05-05 20:53:53.000000000 +0000 ++++ sql/handler.h +@@ -3334,7 +3334,7 @@ static inline const char *ha_resolve_sto + + static inline bool ha_check_storage_engine_flag(const handlerton *db_type, uint32 flag) + { +- return db_type == NULL ? FALSE : test(db_type->flags & flag); ++ return db_type == NULL ? FALSE : my_test(db_type->flags & flag); + } + + static inline bool ha_storage_engine_is_enabled(const handlerton *db_type) diff --git a/databases/mysql56-client/patches/patch-sql_item.cc b/databases/mysql56-client/patches/patch-sql_item.cc new file mode 100644 index 00000000000..d3ff8d6083a --- /dev/null +++ b/databases/mysql56-client/patches/patch-sql_item.cc @@ -0,0 +1,13 @@ +$NetBSD$ + +--- sql/item.cc.orig 2013-04-05 12:27:18.000000000 +0000 ++++ sql/item.cc +@@ -2545,7 +2545,7 @@ void Item_field::set_field(Field *field_ + field_name= field_par->field_name; + db_name= field_par->table->s->db.str; + alias_name_used= field_par->table->alias_name_used; +- unsigned_flag=test(field_par->flags & UNSIGNED_FLAG); ++ unsigned_flag=my_test(field_par->flags & UNSIGNED_FLAG); + collation.set(field_par->charset(), field_par->derivation(), + field_par->repertoire()); + fix_char_length(field_par->char_length()); diff --git a/databases/mysql56-client/patches/patch-sql_item.h b/databases/mysql56-client/patches/patch-sql_item.h new file mode 100644 index 00000000000..9298ed79d3e --- /dev/null +++ b/databases/mysql56-client/patches/patch-sql_item.h @@ -0,0 +1,31 @@ +$NetBSD$ + +--- sql/item.h.orig 2013-05-05 20:52:25.000000000 +0000 ++++ sql/item.h +@@ -1637,7 +1637,7 @@ public: + { + if (is_expensive_cache < 0) + is_expensive_cache= walk(&Item::is_expensive_processor, 0, (uchar*)0); +- return test(is_expensive_cache); ++ return my_test(is_expensive_cache); + } + virtual bool can_be_evaluated_now() const; + uint32 max_char_length() const +@@ -2578,7 +2578,7 @@ public: + virtual void print(String *str, enum_query_type query_type); + Item_num *neg() { value= -value; return this; } + uint decimal_precision() const +- { return (uint)(max_length - test(value < 0)); } ++ { return (uint)(max_length - my_test(value < 0)); } + bool eq(const Item *, bool binary_cmp) const; + bool check_partition_func_processor(uchar *bool_arg) { return FALSE;} + }; +@@ -4168,7 +4168,7 @@ public: + virtual void store(Item *item); + virtual bool cache_value()= 0; + bool basic_const_item() const +- { return test(example && example->basic_const_item());} ++ { return my_test(example && example->basic_const_item());} + bool walk (Item_processor processor, bool walk_subquery, uchar *argument); + virtual void clear() { null_value= TRUE; value_cached= FALSE; } + bool is_null() { return value_cached ? null_value : example->is_null(); } diff --git a/databases/mysql56-client/patches/patch-sql_item__cmpfunc.cc b/databases/mysql56-client/patches/patch-sql_item__cmpfunc.cc new file mode 100644 index 00000000000..6714417d9b0 --- /dev/null +++ b/databases/mysql56-client/patches/patch-sql_item__cmpfunc.cc @@ -0,0 +1,101 @@ +$NetBSD$ + +--- sql/item_cmpfunc.cc.orig 2013-05-05 20:55:22.000000000 +0000 ++++ sql/item_cmpfunc.cc +@@ -497,7 +497,7 @@ static bool convert_constant_item(THD *t + *item) : + #endif + new Item_int_with_ref(field->val_int(), *item, +- test(field->flags & UNSIGNED_FLAG)); ++ my_test(field->flags & UNSIGNED_FLAG)); + if (tmp) + thd->change_item_tree(item, tmp); + result= 1; // Item was replaced +@@ -1425,8 +1425,8 @@ int Arg_comparator::compare_e_string() + res1= (*a)->val_str(&value1); + res2= (*b)->val_str(&value2); + if (!res1 || !res2) +- return test(res1 == res2); +- return test(sortcmp(res1, res2, cmp_collation.collation) == 0); ++ return my_test(res1 == res2); ++ return my_test(sortcmp(res1, res2, cmp_collation.collation) == 0); + } + + +@@ -1436,8 +1436,8 @@ int Arg_comparator::compare_e_binary_str + res1= (*a)->val_str(&value1); + res2= (*b)->val_str(&value2); + if (!res1 || !res2) +- return test(res1 == res2); +- return test(stringcmp(res1, res2) == 0); ++ return my_test(res1 == res2); ++ return my_test(stringcmp(res1, res2) == 0); + } + + +@@ -1492,8 +1492,8 @@ int Arg_comparator::compare_e_real() + double val1= (*a)->val_real(); + double val2= (*b)->val_real(); + if ((*a)->null_value || (*b)->null_value) +- return test((*a)->null_value && (*b)->null_value); +- return test(val1 == val2); ++ return my_test((*a)->null_value && (*b)->null_value); ++ return my_test(val1 == val2); + } + + int Arg_comparator::compare_e_decimal() +@@ -1502,8 +1502,8 @@ int Arg_comparator::compare_e_decimal() + my_decimal *val1= (*a)->val_decimal(&decimal1); + my_decimal *val2= (*b)->val_decimal(&decimal2); + if ((*a)->null_value || (*b)->null_value) +- return test((*a)->null_value && (*b)->null_value); +- return test(my_decimal_cmp(val1, val2) == 0); ++ return my_test((*a)->null_value && (*b)->null_value); ++ return my_test(my_decimal_cmp(val1, val2) == 0); + } + + +@@ -1541,8 +1541,8 @@ int Arg_comparator::compare_e_real_fixed + double val1= (*a)->val_real(); + double val2= (*b)->val_real(); + if ((*a)->null_value || (*b)->null_value) +- return test((*a)->null_value && (*b)->null_value); +- return test(val1 == val2 || fabs(val1 - val2) < precision); ++ return my_test((*a)->null_value && (*b)->null_value); ++ return my_test(val1 == val2 || fabs(val1 - val2) < precision); + } + + +@@ -1616,8 +1616,8 @@ int Arg_comparator::compare_e_time_packe + longlong val1= (*a)->val_time_temporal(); + longlong val2= (*b)->val_time_temporal(); + if ((*a)->null_value || (*b)->null_value) +- return test((*a)->null_value && (*b)->null_value); +- return test(val1 == val2); ++ return my_test((*a)->null_value && (*b)->null_value); ++ return my_test(val1 == val2); + } + + +@@ -1708,8 +1708,8 @@ int Arg_comparator::compare_e_int() + longlong val1= (*a)->val_int(); + longlong val2= (*b)->val_int(); + if ((*a)->null_value || (*b)->null_value) +- return test((*a)->null_value && (*b)->null_value); +- return test(val1 == val2); ++ return my_test((*a)->null_value && (*b)->null_value); ++ return my_test(val1 == val2); + } + + /** +@@ -1720,8 +1720,8 @@ int Arg_comparator::compare_e_int_diff_s + longlong val1= (*a)->val_int(); + longlong val2= (*b)->val_int(); + if ((*a)->null_value || (*b)->null_value) +- return test((*a)->null_value && (*b)->null_value); +- return (val1 >= 0) && test(val1 == val2); ++ return my_test((*a)->null_value && (*b)->null_value); ++ return (val1 >= 0) && my_test(val1 == val2); + } + + int Arg_comparator::compare_row() diff --git a/databases/mysql56-client/patches/patch-sql_item__cmpfunc.h b/databases/mysql56-client/patches/patch-sql_item__cmpfunc.h new file mode 100644 index 00000000000..f4a7bc68315 --- /dev/null +++ b/databases/mysql56-client/patches/patch-sql_item__cmpfunc.h @@ -0,0 +1,22 @@ +$NetBSD$ + +--- sql/item_cmpfunc.h.orig 2013-05-05 20:53:04.000000000 +0000 ++++ sql/item_cmpfunc.h +@@ -400,7 +400,7 @@ public: + Item_func::print_op(str, query_type); + } + +- bool is_null() { return test(args[0]->is_null() || args[1]->is_null()); } ++ bool is_null() { return my_test(args[0]->is_null() || args[1]->is_null()); } + const CHARSET_INFO *compare_collation() + { return cmp.cmp_collation.collation; } + void top_level_item() { abort_on_null= TRUE; } +@@ -950,7 +950,7 @@ public: + /* Compare values number pos1 and pos2 for equality */ + bool compare_elems(uint pos1, uint pos2) + { +- return test(compare(collation, base + pos1*size, base + pos2*size)); ++ return my_test(compare(collation, base + pos1*size, base + pos2*size)); + } + virtual Item_result result_type()= 0; + }; diff --git a/databases/mysql56-client/patches/patch-sql_item__func.cc b/databases/mysql56-client/patches/patch-sql_item__func.cc new file mode 100644 index 00000000000..84e8126b81d --- /dev/null +++ b/databases/mysql56-client/patches/patch-sql_item__func.cc @@ -0,0 +1,40 @@ +$NetBSD$ + +--- sql/item_func.cc.orig 2013-05-05 20:55:24.000000000 +0000 ++++ sql/item_func.cc +@@ -2474,7 +2474,7 @@ void Item_func_round::fix_length_and_dec + case INT_RESULT: + if ((!decimals_to_set && truncate) || (args[0]->decimal_precision() < DECIMAL_LONGLONG_DIGITS)) + { +- int length_can_increase= test(!truncate && (val1 < 0) && !val1_unsigned); ++ int length_can_increase= my_test(!truncate && (val1 < 0) && !val1_unsigned); + max_length= args[0]->max_length + length_can_increase; + /* Here we can keep INT_RESULT */ + hybrid_type= INT_RESULT; +@@ -4555,7 +4555,7 @@ longlong Item_func_sleep::val_int() + + mysql_cond_destroy(&cond); + +- return test(!error); // Return 1 killed ++ return my_test(!error); // Return 1 killed + } + + +@@ -4726,7 +4726,7 @@ bool user_var_entry::realloc(uint length + bool user_var_entry::store(void *from, uint length, Item_result type) + { + // Store strings with end \0 +- if (realloc(length + test(type == STRING_RESULT))) ++ if (realloc(length + my_test(type == STRING_RESULT))) + return true; + if (type == STRING_RESULT) + m_ptr[length]= 0; // Store end \0 +@@ -6694,7 +6694,7 @@ void Item_func_sp::fix_length_and_dec() + max_length= sp_result_field->field_length; + collation.set(sp_result_field->charset()); + maybe_null= 1; +- unsigned_flag= test(sp_result_field->flags & UNSIGNED_FLAG); ++ unsigned_flag= my_test(sp_result_field->flags & UNSIGNED_FLAG); + + DBUG_VOID_RETURN; + } diff --git a/databases/mysql56-client/patches/patch-sql_item__geofunc.cc b/databases/mysql56-client/patches/patch-sql_item__geofunc.cc new file mode 100644 index 00000000000..15ba612325e --- /dev/null +++ b/databases/mysql56-client/patches/patch-sql_item__geofunc.cc @@ -0,0 +1,13 @@ +$NetBSD$ + +--- sql/item_geofunc.cc.orig 2013-05-05 20:55:27.000000000 +0000 ++++ sql/item_geofunc.cc +@@ -262,7 +262,7 @@ String *Item_func_centroid::val_str(Stri + srid= uint4korr(swkb->ptr()); + str->q_append(srid); + +- return (null_value= test(geom->centroid(str))) ? 0 : str; ++ return (null_value= my_test(geom->centroid(str))) ? 0 : str; + } + + diff --git a/databases/mysql56-client/patches/patch-sql_item__strfunc.cc b/databases/mysql56-client/patches/patch-sql_item__strfunc.cc new file mode 100644 index 00000000000..db63285fa32 --- /dev/null +++ b/databases/mysql56-client/patches/patch-sql_item__strfunc.cc @@ -0,0 +1,13 @@ +$NetBSD$ + +--- sql/item_strfunc.cc.orig 2013-05-05 20:56:04.000000000 +0000 ++++ sql/item_strfunc.cc +@@ -100,7 +100,7 @@ bool Item_str_func::fix_fields(THD *thd, + bool res= Item_func::fix_fields(thd, ref); + /* + In Item_str_func::check_well_formed_result() we may set null_value +- flag on the same condition as in test() below. ++ flag on the same condition as in my_test() below. + */ + maybe_null= (maybe_null || thd->is_strict_mode()); + return res; diff --git a/databases/mysql56-client/patches/patch-sql_item__subselect.cc b/databases/mysql56-client/patches/patch-sql_item__subselect.cc new file mode 100644 index 00000000000..c6faf54dba8 --- /dev/null +++ b/databases/mysql56-client/patches/patch-sql_item__subselect.cc @@ -0,0 +1,22 @@ +$NetBSD$ + +--- sql/item_subselect.cc.orig 2013-05-05 20:56:04.000000000 +0000 ++++ sql/item_subselect.cc +@@ -3588,7 +3588,7 @@ bool subselect_hash_sj_engine::setup(Lis + /* TODO: + the NULL byte is taken into account in + key_parts[part_no].store_length, so instead of +- cur_ref_buff + test(maybe_null), we could ++ cur_ref_buff + my_test(maybe_null), we could + use that information instead. + */ + cur_ref_buff + (nullable ? 1 : 0), +@@ -3697,7 +3697,7 @@ bool subselect_hash_sj_engine::exec() + goto err; /* purecov: inspected */ + + materialize_engine->join->exec(); +- if ((res= test(materialize_engine->join->error || thd->is_fatal_error))) ++ if ((res= my_test(materialize_engine->join->error || thd->is_fatal_error))) + goto err; + + /* diff --git a/databases/mysql56-client/patches/patch-sql_item__subselect.h b/databases/mysql56-client/patches/patch-sql_item__subselect.h new file mode 100644 index 00000000000..dbb2109da31 --- /dev/null +++ b/databases/mysql56-client/patches/patch-sql_item__subselect.h @@ -0,0 +1,13 @@ +$NetBSD$ + +--- sql/item_subselect.h.orig 2013-05-05 20:54:13.000000000 +0000 ++++ sql/item_subselect.h +@@ -433,7 +433,7 @@ public: + if ( pushed_cond_guards) + pushed_cond_guards[i]= v; + } +- bool have_guarded_conds() { return test(pushed_cond_guards); } ++ bool have_guarded_conds() { return my_test(pushed_cond_guards); } + + Item_in_subselect(Item * left_expr, st_select_lex *select_lex); + Item_in_subselect() diff --git a/databases/mysql56-client/patches/patch-sql_item__sum.cc b/databases/mysql56-client/patches/patch-sql_item__sum.cc new file mode 100644 index 00000000000..62d2d4b9b2c --- /dev/null +++ b/databases/mysql56-client/patches/patch-sql_item__sum.cc @@ -0,0 +1,13 @@ +$NetBSD$ + +--- sql/item_sum.cc.orig 2013-05-05 20:56:04.000000000 +0000 ++++ sql/item_sum.cc +@@ -3417,7 +3417,7 @@ bool Item_func_group_concat::setup(THD * + { + List list; + SELECT_LEX *select_lex= thd->lex->current_select; +- const bool order_or_distinct= test(arg_count_order > 0 || distinct); ++ const bool order_or_distinct= my_test(arg_count_order > 0 || distinct); + DBUG_ENTER("Item_func_group_concat::setup"); + + /* diff --git a/databases/mysql56-client/patches/patch-sql_item__timefunc.cc b/databases/mysql56-client/patches/patch-sql_item__timefunc.cc new file mode 100644 index 00000000000..c619032343b --- /dev/null +++ b/databases/mysql56-client/patches/patch-sql_item__timefunc.cc @@ -0,0 +1,13 @@ +$NetBSD$ + +--- sql/item_timefunc.cc.orig 2013-05-05 20:56:04.000000000 +0000 ++++ sql/item_timefunc.cc +@@ -1337,7 +1337,7 @@ longlong Item_func_weekday::val_int() + + return (longlong) calc_weekday(calc_daynr(ltime.year, ltime.month, + ltime.day), +- odbc_type) + test(odbc_type); ++ odbc_type) + my_test(odbc_type); + } + + void Item_func_dayname::fix_length_and_dec() diff --git a/databases/mysql56-client/patches/patch-sql_key.cc b/databases/mysql56-client/patches/patch-sql_key.cc new file mode 100644 index 00000000000..14839e81b2a --- /dev/null +++ b/databases/mysql56-client/patches/patch-sql_key.cc @@ -0,0 +1,31 @@ +$NetBSD$ + +--- sql/key.cc.orig 2013-05-05 20:56:04.000000000 +0000 ++++ sql/key.cc +@@ -123,7 +123,7 @@ void key_copy(uchar *to_key, uchar *from + { + if (key_part->null_bit) + { +- *to_key++= test(from_record[key_part->null_offset] & ++ *to_key++= my_test(from_record[key_part->null_offset] & + key_part->null_bit); + key_length--; + } +@@ -299,7 +299,7 @@ bool key_cmp_if_same(TABLE *table,const + + if (key_part->null_bit) + { +- if (*key != test(table->record[0][key_part->null_offset] & ++ if (*key != my_test(table->record[0][key_part->null_offset] & + key_part->null_bit)) + return 1; + if (*key) +@@ -438,7 +438,7 @@ void key_unpack(String *to, TABLE *table + } + } + field_unpack(to, key_part->field, table->record[0], key_part->length, +- test(key_part->key_part_flag & HA_PART_KEY_SEG)); ++ my_test(key_part->key_part_flag & HA_PART_KEY_SEG)); + } + dbug_tmp_restore_column_map(table->read_set, old_map); + DBUG_VOID_RETURN; diff --git a/databases/mysql56-client/patches/patch-sql_mysqld.cc b/databases/mysql56-client/patches/patch-sql_mysqld.cc dissimilarity index 96% index 4fdf7b7ca54..08143aa7bd7 100644 --- a/databases/mysql56-client/patches/patch-sql_mysqld.cc +++ b/databases/mysql56-client/patches/patch-sql_mysqld.cc @@ -1,22 +1,31 @@ -$NetBSD: patch-sql_mysqld.cc,v 1.1 2013/02/13 21:00:07 adam Exp $ - ---- sql/mysqld.cc.orig 2013-01-22 16:54:50.000000000 +0000 -+++ sql/mysqld.cc -@@ -184,7 +184,7 @@ extern int memcntl(caddr_t, size_t, int, - int initgroups(const char *,unsigned int); - #endif - --#if defined(__FreeBSD__) && defined(HAVE_IEEEFP_H) && !defined(HAVE_FEDISABLEEXCEPT) -+#if (defined(__FreeBSD__) || defined(__DragonFly__)) && defined(HAVE_IEEEFP_H) && !defined(HAVE_FEDISABLEEXCEPT) - #include - #ifdef HAVE_FP_EXCEPT // Fix type conflict - typedef fp_except fp_except_t; -@@ -215,7 +215,7 @@ extern "C" my_bool reopen_fstreams(const - - inline void setup_fpu() - { --#if defined(__FreeBSD__) && defined(HAVE_IEEEFP_H) && !defined(HAVE_FEDISABLEEXCEPT) -+#if (defined(__FreeBSD__) || defined(__DragonFly__)) && defined(HAVE_IEEEFP_H) && !defined(HAVE_FEDISABLEEXCEPT) - /* We can't handle floating point exceptions with threads, so disable - this on freebsd - Don't fall for overflow, underflow,divide-by-zero or loss of precision. +$NetBSD: patch-sql_mysqld.cc,v 1.2 2013/04/20 08:06:01 adam Exp $ + +--- sql/mysqld.cc.orig 2013-05-05 21:55:08.000000000 +0000 ++++ sql/mysqld.cc +@@ -8268,7 +8268,7 @@ mysqld_get_one_option(int optid, + opt_myisam_log=1; + break; + case (int) OPT_BIN_LOG: +- opt_bin_log= test(argument != disabled_my_option); ++ opt_bin_log= my_test(argument != disabled_my_option); + break; + #ifdef HAVE_REPLICATION + case (int)OPT_REPLICATE_IGNORE_DB: +@@ -8766,7 +8766,7 @@ static int get_options(int *argc_ptr, ch + Set some global variables from the global_system_variables + In most cases the global variables will not be used + */ +- my_disable_locking= myisam_single_user= test(opt_external_locking == 0); ++ my_disable_locking= myisam_single_user= my_test(opt_external_locking == 0); + my_default_record_cache_size=global_system_variables.read_buff_size; + + global_system_variables.long_query_time= (ulonglong) +@@ -8793,7 +8793,7 @@ static int get_options(int *argc_ptr, ch + #endif + + global_system_variables.engine_condition_pushdown= +- test(global_system_variables.optimizer_switch & ++ my_test(global_system_variables.optimizer_switch & + OPTIMIZER_SWITCH_ENGINE_CONDITION_PUSHDOWN); + + opt_readonly= read_only; diff --git a/databases/mysql56-client/patches/patch-sql_opt__range.cc b/databases/mysql56-client/patches/patch-sql_opt__range.cc new file mode 100644 index 00000000000..bc8a6b2b86b --- /dev/null +++ b/databases/mysql56-client/patches/patch-sql_opt__range.cc @@ -0,0 +1,82 @@ +$NetBSD$ + +--- sql/opt_range.cc.orig 2013-05-05 20:56:04.000000000 +0000 ++++ sql/opt_range.cc +@@ -468,7 +468,7 @@ public: + new_max=arg->max_value; flag_max=arg->max_flag; + } + return new SEL_ARG(field, part, new_min, new_max, flag_min, flag_max, +- test(maybe_flag && arg->maybe_flag)); ++ my_test(maybe_flag && arg->maybe_flag)); + } + SEL_ARG *clone_first(SEL_ARG *arg) + { // min <= X < arg->min +@@ -2938,7 +2938,7 @@ free_mem: + Assume that if the user is using 'limit' we will only need to scan + limit rows if we are using a key + */ +- DBUG_RETURN(records ? test(quick) : -1); ++ DBUG_RETURN(records ? my_test(quick) : -1); + } + + /**************************************************************************** +@@ -3068,7 +3068,7 @@ typedef struct st_part_prune_param + int last_subpart_partno; /* Same as above for supartitioning */ + + /* +- is_part_keypart[i] == test(keypart #i in partitioning index is a member ++ is_part_keypart[i] == my_test(keypart #i in partitioning index is a member + used in partitioning) + Used to maintain current values of cur_part_fields and cur_subpart_fields + */ +@@ -3951,7 +3951,7 @@ process_next_key_part: + ppar->mark_full_partition_used(ppar->part_info, part_id); + found= TRUE; + } +- res= test(found); ++ res= my_test(found); + } + /* + Restore the "used partitions iterator" to the default setting that +@@ -4979,7 +4979,7 @@ static double ror_scan_selectivity(const + SEL_ARG *sel_arg, *tuple_arg= NULL; + key_part_map keypart_map= 0; + bool cur_covered; +- bool prev_covered= test(bitmap_is_set(&info->covered_fields, ++ bool prev_covered= my_test(bitmap_is_set(&info->covered_fields, + key_part->fieldnr-1)); + key_range min_range; + key_range max_range; +@@ -4994,7 +4994,7 @@ static double ror_scan_selectivity(const + sel_arg= sel_arg->next_key_part) + { + DBUG_PRINT("info",("sel_arg step")); +- cur_covered= test(bitmap_is_set(&info->covered_fields, ++ cur_covered= my_test(bitmap_is_set(&info->covered_fields, + key_part[sel_arg->part].fieldnr-1)); + if (cur_covered != prev_covered) + { +@@ -9550,12 +9550,12 @@ get_quick_select(PARAM *param,uint idx,S + if (param->table->key_info[param->real_keynr[idx]].flags & HA_SPATIAL) + quick=new QUICK_RANGE_SELECT_GEOM(param->thd, param->table, + param->real_keynr[idx], +- test(parent_alloc), ++ my_test(parent_alloc), + parent_alloc, &create_err); + else + quick=new QUICK_RANGE_SELECT(param->thd, param->table, + param->real_keynr[idx], +- test(parent_alloc), NULL, &create_err); ++ my_test(parent_alloc), NULL, &create_err); + + if (quick) + { +@@ -10607,7 +10607,7 @@ int QUICK_RANGE_SELECT::get_next_prefix( + const bool sorted= (mrr_flags & HA_MRR_SORTED); + result= file->read_range_first(last_range->min_keypart_map ? &start_key : 0, + last_range->max_keypart_map ? &end_key : 0, +- test(last_range->flag & EQ_RANGE), ++ my_test(last_range->flag & EQ_RANGE), + sorted); + if (last_range->flag == (UNIQUE_RANGE | EQ_RANGE)) + last_range= 0; // Stop searching diff --git a/databases/mysql56-client/patches/patch-sql_opt__range.h b/databases/mysql56-client/patches/patch-sql_opt__range.h new file mode 100644 index 00000000000..c2ee312e833 --- /dev/null +++ b/databases/mysql56-client/patches/patch-sql_opt__range.h @@ -0,0 +1,13 @@ +$NetBSD$ + +--- sql/opt_range.h.orig 2013-05-05 20:54:50.000000000 +0000 ++++ sql/opt_range.h +@@ -596,7 +596,7 @@ public: + THD *thd; + int read_keys_and_merge(); + +- bool clustered_pk_range() { return test(pk_quick_select); } ++ bool clustered_pk_range() { return my_test(pk_quick_select); } + + virtual bool is_valid() + { diff --git a/databases/mysql56-client/patches/patch-sql_opt__sum.cc b/databases/mysql56-client/patches/patch-sql_opt__sum.cc new file mode 100644 index 00000000000..4bdbebe1548 --- /dev/null +++ b/databases/mysql56-client/patches/patch-sql_opt__sum.cc @@ -0,0 +1,40 @@ +$NetBSD$ + +--- sql/opt_sum.cc.orig 2013-05-05 20:56:04.000000000 +0000 ++++ sql/opt_sum.cc +@@ -304,7 +304,7 @@ int opt_sum_query(THD *thd, + } + else + { +- maybe_exact_count&= test(table_filled && ++ maybe_exact_count&= my_test(table_filled && + (tl->table->file->ha_table_flags() & + HA_HAS_RECORDS)); + is_exact_count= FALSE; +@@ -379,7 +379,7 @@ int opt_sum_query(THD *thd, + case Item_sum::MIN_FUNC: + case Item_sum::MAX_FUNC: + { +- int is_max= test(item_sum->sum_func() == Item_sum::MAX_FUNC); ++ int is_max= my_test(item_sum->sum_func() == Item_sum::MAX_FUNC); + /* + If MIN/MAX(expr) is the first part of a key or if all previous + parts of the key is found in the COND, then we can use +@@ -811,7 +811,7 @@ static bool matching_cond(bool max_fl, T + Item *value= args[between && max_fl ? 2 : 1]; + value->save_in_field_no_warnings(part->field, true); + if (part->null_bit) +- *key_ptr++= (uchar) test(part->field->is_null()); ++ *key_ptr++= (uchar) my_test(part->field->is_null()); + part->field->get_key_image(key_ptr, part->length, Field::itRAW); + } + if (is_field_part) +@@ -831,7 +831,7 @@ static bool matching_cond(bool max_fl, T + else if (eq_type) + { + if ((!is_null && !cond->val_int()) || +- (is_null && !test(part->field->is_null()))) ++ (is_null && !my_test(part->field->is_null()))) + DBUG_RETURN(FALSE); // Impossible test + } + else if (is_field_part) diff --git a/databases/mysql56-client/patches/patch-sql_rpl__mi.cc b/databases/mysql56-client/patches/patch-sql_rpl__mi.cc new file mode 100644 index 00000000000..0d8813381f7 --- /dev/null +++ b/databases/mysql56-client/patches/patch-sql_rpl__mi.cc @@ -0,0 +1,18 @@ +$NetBSD$ + +--- sql/rpl_mi.cc.orig 2013-05-05 20:56:04.000000000 +0000 ++++ sql/rpl_mi.cc +@@ -478,10 +478,10 @@ bool Master_info::read_info(Rpl_info_han + DBUG_RETURN(true); + } + +- ssl= (my_bool) test(temp_ssl); +- ssl_verify_server_cert= (my_bool) test(temp_ssl_verify_server_cert); ++ ssl= (my_bool) my_test(temp_ssl); ++ ssl_verify_server_cert= (my_bool) my_test(temp_ssl_verify_server_cert); + master_log_pos= (my_off_t) temp_master_log_pos; +- auto_position= test(temp_auto_position); ++ auto_position= my_test(temp_auto_position); + + if (auto_position != 0 && gtid_mode != 3) + { diff --git a/databases/mysql56-client/patches/patch-sql_rpl__slave.cc b/databases/mysql56-client/patches/patch-sql_rpl__slave.cc new file mode 100644 index 00000000000..0ee6bd2c3e4 --- /dev/null +++ b/databases/mysql56-client/patches/patch-sql_rpl__slave.cc @@ -0,0 +1,13 @@ +$NetBSD$ + +--- sql/rpl_slave.cc.orig 2013-05-05 20:56:04.000000000 +0000 ++++ sql/rpl_slave.cc +@@ -3492,7 +3492,7 @@ apply_event_and_update_pos(Log_event** p + "skipped because event skip counter was non-zero" + }; + DBUG_PRINT("info", ("OPTION_BEGIN: %d; IN_STMT: %d", +- test(thd->variables.option_bits & OPTION_BEGIN), ++ my_test(thd->variables.option_bits & OPTION_BEGIN), + rli->get_flag(Relay_log_info::IN_STMT))); + DBUG_PRINT("skip_event", ("%s event was %s", + ev->get_type_str(), explain[reason])); diff --git a/databases/mysql56-client/patches/patch-sql_set__var.cc b/databases/mysql56-client/patches/patch-sql_set__var.cc new file mode 100644 index 00000000000..87a45ce3357 --- /dev/null +++ b/databases/mysql56-client/patches/patch-sql_set__var.cc @@ -0,0 +1,13 @@ +$NetBSD$ + +--- sql/set_var.cc.orig 2013-05-05 20:56:04.000000000 +0000 ++++ sql/set_var.cc +@@ -566,7 +566,7 @@ int sql_set_variables(THD *thd, Listcheck(thd))) + goto err; + } +- if (!(error= test(thd->is_error()))) ++ if (!(error= my_test(thd->is_error()))) + { + it.rewind(); + while ((var= it++)) diff --git a/databases/mysql56-client/patches/patch-sql_sp__head.h b/databases/mysql56-client/patches/patch-sql_sp__head.h new file mode 100644 index 00000000000..2b247351010 --- /dev/null +++ b/databases/mysql56-client/patches/patch-sql_sp__head.h @@ -0,0 +1,13 @@ +$NetBSD$ + +--- sql/sp_head.h.orig 2013-05-05 20:56:04.000000000 +0000 ++++ sql/sp_head.h +@@ -859,7 +859,7 @@ public: + else if (m_flags & HAS_SQLCOM_FLUSH) + my_error(ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG, MYF(0), "FLUSH"); + +- return test(m_flags & ++ return my_test(m_flags & + (CONTAINS_DYNAMIC_SQL|MULTI_RESULTS|HAS_SET_AUTOCOMMIT_STMT| + HAS_COMMIT_OR_ROLLBACK|HAS_SQLCOM_RESET|HAS_SQLCOM_FLUSH)); + } diff --git a/databases/mysql56-client/patches/patch-sql_sp__rcontext.h b/databases/mysql56-client/patches/patch-sql_sp__rcontext.h new file mode 100644 index 00000000000..c528a0e384d --- /dev/null +++ b/databases/mysql56-client/patches/patch-sql_sp__rcontext.h @@ -0,0 +1,13 @@ +$NetBSD$ + +--- sql/sp_rcontext.h.orig 2013-05-05 20:56:04.000000000 +0000 ++++ sql/sp_rcontext.h +@@ -453,7 +453,7 @@ public: + bool close(THD *thd); + + bool is_open() const +- { return test(m_server_side_cursor); } ++ { return my_test(m_server_side_cursor); } + + bool fetch(THD *thd, List *vars); + diff --git a/databases/mysql56-client/patches/patch-sql_sql__acl.cc b/databases/mysql56-client/patches/patch-sql_sql__acl.cc new file mode 100644 index 00000000000..4b884cb6b4f --- /dev/null +++ b/databases/mysql56-client/patches/patch-sql_sql__acl.cc @@ -0,0 +1,61 @@ +$NetBSD$ + +--- sql/sql_acl.cc.orig 2013-05-05 20:56:04.000000000 +0000 ++++ sql/sql_acl.cc +@@ -2732,9 +2732,9 @@ update_user_table(THD *thd, TABLE *table + static bool test_if_create_new_users(THD *thd) + { + Security_context *sctx= thd->security_ctx; +- bool create_new_users= test(sctx->master_access & INSERT_ACL) || ++ bool create_new_users= my_test(sctx->master_access & INSERT_ACL) || + (!opt_safe_user_create && +- test(sctx->master_access & CREATE_USER_ACL)); ++ my_test(sctx->master_access & CREATE_USER_ACL)); + if (!create_new_users) + { + TABLE_LIST tl; +@@ -4449,7 +4449,7 @@ int mysql_table_grant(THD *thd, TABLE_LI + /* Create user if needed */ + error=replace_user_table(thd, tables[0].table, Str, + 0, revoke_grant, create_new_users, +- test(thd->variables.sql_mode & ++ my_test(thd->variables.sql_mode & + MODE_NO_AUTO_CREATE_USER)); + if (error) + { +@@ -4694,7 +4694,7 @@ bool mysql_routine_grant(THD *thd, TABLE + /* Create user if needed */ + error=replace_user_table(thd, tables[0].table, Str, + 0, revoke_grant, create_new_users, +- test(thd->variables.sql_mode & ++ my_test(thd->variables.sql_mode & + MODE_NO_AUTO_CREATE_USER)); + if (error) + { +@@ -4971,7 +4971,7 @@ bool mysql_grant(THD *thd, const char *d + + if (replace_user_table(thd, tables[0].table, Str, + (!db ? rights : 0), revoke_grant, create_new_users, +- test(thd->variables.sql_mode & ++ my_test(thd->variables.sql_mode & + MODE_NO_AUTO_CREATE_USER))) + result= -1; + else if (db) +@@ -5470,7 +5470,7 @@ bool check_grant(THD *thd, ulong want_ac + tl && number-- && tl != first_not_own_table; + tl= tl->next_global) + { +- sctx = test(tl->security_ctx) ? tl->security_ctx : thd->security_ctx; ++ sctx = my_test(tl->security_ctx) ? tl->security_ctx : thd->security_ctx; + + const ACL_internal_table_access *access= + get_cached_table_access(&tl->grant.m_internal, +@@ -5680,7 +5680,7 @@ bool check_column_grant_in_table_ref(THD + GRANT_INFO *grant; + const char *db_name; + const char *table_name; +- Security_context *sctx= test(table_ref->security_ctx) ? ++ Security_context *sctx= my_test(table_ref->security_ctx) ? + table_ref->security_ctx : thd->security_ctx; + + if (table_ref->view || table_ref->field_translation) diff --git a/databases/mysql56-client/patches/patch-sql_sql__admin.cc b/databases/mysql56-client/patches/patch-sql_sql__admin.cc new file mode 100644 index 00000000000..140b8910be5 --- /dev/null +++ b/databases/mysql56-client/patches/patch-sql_sql__admin.cc @@ -0,0 +1,13 @@ +$NetBSD$ + +--- sql/sql_admin.cc.orig 2013-05-05 20:56:04.000000000 +0000 ++++ sql/sql_admin.cc +@@ -1123,7 +1123,7 @@ bool Sql_cmd_repair_table::execute(THD * + thd->enable_slow_log= opt_log_slow_admin_statements; + res= mysql_admin_table(thd, first_table, &thd->lex->check_opt, "repair", + TL_WRITE, 1, +- test(thd->lex->check_opt.sql_flags & TT_USEFRM), ++ my_test(thd->lex->check_opt.sql_flags & TT_USEFRM), + HA_OPEN_FOR_REPAIR, &prepare_for_repair, + &handler::ha_repair, 0); + diff --git a/databases/mysql56-client/patches/patch-sql_sql__base.cc b/databases/mysql56-client/patches/patch-sql_sql__base.cc new file mode 100644 index 00000000000..59f82e25db4 --- /dev/null +++ b/databases/mysql56-client/patches/patch-sql_sql__base.cc @@ -0,0 +1,31 @@ +$NetBSD$ + +--- sql/sql_base.cc.orig 2013-05-05 20:56:04.000000000 +0000 ++++ sql/sql_base.cc +@@ -1612,7 +1612,7 @@ bool close_temporary_tables(THD *thd) + + /* We always quote db,table names though it is slight overkill */ + if (found_user_tables && +- !(was_quote_show= test(thd->variables.option_bits & OPTION_QUOTE_SHOW_CREATE))) ++ !(was_quote_show= my_test(thd->variables.option_bits & OPTION_QUOTE_SHOW_CREATE))) + { + thd->variables.option_bits |= OPTION_QUOTE_SHOW_CREATE; + } +@@ -8211,7 +8211,7 @@ bool setup_fields(THD *thd, Ref_ptr_arra + thd->lex->allow_sum_func= save_allow_sum_func; + thd->mark_used_columns= save_mark_used_columns; + DBUG_PRINT("info", ("thd->mark_used_columns: %d", thd->mark_used_columns)); +- DBUG_RETURN(test(thd->is_error())); ++ DBUG_RETURN(my_test(thd->is_error())); + } + + +@@ -8775,7 +8775,7 @@ int setup_conds(THD *thd, TABLE_LIST *ta + } + + thd->lex->current_select->is_item_list_lookup= save_is_item_list_lookup; +- DBUG_RETURN(test(thd->is_error())); ++ DBUG_RETURN(my_test(thd->is_error())); + + err_no_arena: + select_lex->is_item_list_lookup= save_is_item_list_lookup; diff --git a/databases/mysql56-client/patches/patch-sql_sql__bitmap.h b/databases/mysql56-client/patches/patch-sql_sql__bitmap.h new file mode 100644 index 00000000000..bb3090a84db --- /dev/null +++ b/databases/mysql56-client/patches/patch-sql_sql__bitmap.h @@ -0,0 +1,22 @@ +$NetBSD$ + +--- sql/sql_bitmap.h.orig 2013-05-05 20:53:40.000000000 +0000 ++++ sql/sql_bitmap.h +@@ -60,7 +60,7 @@ public: + intersect(map2buff); + if (map.n_bits > sizeof(ulonglong) * 8) + bitmap_set_above(&map, sizeof(ulonglong), +- test(map2buff & (LL(1) << (sizeof(ulonglong) * 8 - 1)))); ++ my_test(map2buff & (LL(1) << (sizeof(ulonglong) * 8 - 1)))); + } + void subtract(const Bitmap& map2) { bitmap_subtract(&map, &map2.map); } + void merge(const Bitmap& map2) { bitmap_union(&map, &map2.map); } +@@ -135,7 +135,7 @@ public: + void intersect_extended(ulonglong map2) { map&= map2; } + void subtract(const Bitmap<64>& map2) { map&= ~map2.map; } + void merge(const Bitmap<64>& map2) { map|= map2.map; } +- my_bool is_set(uint n) const { return test(map & (((ulonglong)1) << n)); } ++ my_bool is_set(uint n) const { return my_test(map & (((ulonglong)1) << n)); } + my_bool is_prefix(uint n) const { return map == (((ulonglong)1) << n)-1; } + my_bool is_clear_all() const { return map == (ulonglong)0; } + my_bool is_set_all() const { return map == ~(ulonglong)0; } diff --git a/databases/mysql56-client/patches/patch-sql_sql__cache.cc b/databases/mysql56-client/patches/patch-sql_sql__cache.cc new file mode 100644 index 00000000000..9007f80c6df --- /dev/null +++ b/databases/mysql56-client/patches/patch-sql_sql__cache.cc @@ -0,0 +1,56 @@ +$NetBSD$ + +--- sql/sql_cache.cc.orig 2013-05-05 20:56:04.000000000 +0000 ++++ sql/sql_cache.cc +@@ -1209,8 +1209,8 @@ void Query_cache::store_query(THD *thd, + Query_cache_query_flags flags; + // fill all gaps between fields with 0 to get repeatable key + memset(&flags, 0, QUERY_CACHE_FLAGS_SIZE); +- flags.client_long_flag= test(thd->client_capabilities & CLIENT_LONG_FLAG); +- flags.client_protocol_41= test(thd->client_capabilities & ++ flags.client_long_flag= my_test(thd->client_capabilities & CLIENT_LONG_FLAG); ++ flags.client_protocol_41= my_test(thd->client_capabilities & + CLIENT_PROTOCOL_41); + /* + Protocol influences result format, so statement results in the binary +@@ -1220,10 +1220,10 @@ void Query_cache::store_query(THD *thd, + flags.protocol_type= (unsigned int) thd->protocol->type(); + /* PROTOCOL_LOCAL results are not cached. */ + DBUG_ASSERT(flags.protocol_type != (unsigned int) Protocol::PROTOCOL_LOCAL); +- flags.more_results_exists= test(thd->server_status & ++ flags.more_results_exists= my_test(thd->server_status & + SERVER_MORE_RESULTS_EXISTS); + flags.in_trans= thd->in_active_multi_stmt_transaction(); +- flags.autocommit= test(thd->server_status & SERVER_STATUS_AUTOCOMMIT); ++ flags.autocommit= my_test(thd->server_status & SERVER_STATUS_AUTOCOMMIT); + flags.pkt_nr= net->pkt_nr; + flags.character_set_client_num= + thd->variables.character_set_client->number; +@@ -1584,14 +1584,14 @@ Query_cache::send_result_to_client(THD * + + // fill all gaps between fields with 0 to get repeatable key + memset(&flags, 0, QUERY_CACHE_FLAGS_SIZE); +- flags.client_long_flag= test(thd->client_capabilities & CLIENT_LONG_FLAG); +- flags.client_protocol_41= test(thd->client_capabilities & ++ flags.client_long_flag= my_test(thd->client_capabilities & CLIENT_LONG_FLAG); ++ flags.client_protocol_41= my_test(thd->client_capabilities & + CLIENT_PROTOCOL_41); + flags.protocol_type= (unsigned int) thd->protocol->type(); +- flags.more_results_exists= test(thd->server_status & ++ flags.more_results_exists= my_test(thd->server_status & + SERVER_MORE_RESULTS_EXISTS); + flags.in_trans= thd->in_active_multi_stmt_transaction(); +- flags.autocommit= test(thd->server_status & SERVER_STATUS_AUTOCOMMIT); ++ flags.autocommit= my_test(thd->server_status & SERVER_STATUS_AUTOCOMMIT); + flags.pkt_nr= thd->net.pkt_nr; + flags.character_set_client_num= thd->variables.character_set_client->number; + flags.character_set_results_num= +@@ -3040,7 +3040,7 @@ my_bool Query_cache::register_all_tables + tmp++) + unlink_table(tmp); + } +- return test(n); ++ return my_test(n); + } + + diff --git a/databases/mysql56-client/patches/patch-sql_sql__class.cc b/databases/mysql56-client/patches/patch-sql_sql__class.cc new file mode 100644 index 00000000000..499316ba2a0 --- /dev/null +++ b/databases/mysql56-client/patches/patch-sql_sql__class.cc @@ -0,0 +1,41 @@ +$NetBSD$ + +--- sql/sql_class.cc.orig 2013-05-05 20:56:04.000000000 +0000 ++++ sql/sql_class.cc +@@ -553,14 +553,14 @@ extern "C" int mysql_tmpfile(const char + extern "C" + int thd_in_lock_tables(const THD *thd) + { +- return test(thd->in_lock_tables); ++ return my_test(thd->in_lock_tables); + } + + + extern "C" + int thd_tablespace_op(const THD *thd) + { +- return test(thd->tablespace_op); ++ return my_test(thd->tablespace_op); + } + + +@@ -2535,7 +2535,7 @@ void select_to_file::send_error(uint err + + bool select_to_file::send_eof() + { +- int error= test(end_io_cache(&cache)); ++ int error= my_test(end_io_cache(&cache)); + if (mysql_file_close(file, MYF(MY_WME)) || thd->is_error()) + error= true; + +@@ -2716,8 +2716,8 @@ select_export::prepare(List &list, + escape_char= (int) (uchar) (*exchange->escaped)[0]; + else + escape_char= -1; +- is_ambiguous_field_sep= test(strchr(ESCAPE_CHARS, field_sep_char)); +- is_unsafe_field_sep= test(strchr(NUMERIC_CHARS, field_sep_char)); ++ is_ambiguous_field_sep= my_test(strchr(ESCAPE_CHARS, field_sep_char)); ++ is_unsafe_field_sep= my_test(strchr(NUMERIC_CHARS, field_sep_char)); + line_sep_char= (exchange->line_term->length() ? + (int) (uchar) (*exchange->line_term)[0] : INT_MAX); + if (!field_term_length) diff --git a/databases/mysql56-client/patches/patch-sql_sql__class.h b/databases/mysql56-client/patches/patch-sql_sql__class.h new file mode 100644 index 00000000000..22d3ea95b60 --- /dev/null +++ b/databases/mysql56-client/patches/patch-sql_sql__class.h @@ -0,0 +1,22 @@ +$NetBSD$ + +--- sql/sql_class.h.orig 2013-05-05 20:51:58.000000000 +0000 ++++ sql/sql_class.h +@@ -3156,7 +3156,7 @@ public: + } + inline bool is_strict_mode() const + { +- return test(variables.sql_mode & (MODE_STRICT_TRANS_TABLES | ++ return my_test(variables.sql_mode & (MODE_STRICT_TRANS_TABLES | + MODE_STRICT_ALL_TABLES)); + } + inline Time_zone *time_zone() +@@ -4608,7 +4608,7 @@ public: + table.str= internal_table_name; + table.length=1; + } +- bool is_derived_table() const { return test(sel); } ++ bool is_derived_table() const { return my_test(sel); } + inline void change_db(char *db_name) + { + db.str= db_name; db.length= (uint) strlen(db_name); diff --git a/databases/mysql56-client/patches/patch-sql_sql__delete.cc b/databases/mysql56-client/patches/patch-sql_sql__delete.cc new file mode 100644 index 00000000000..e95ae804491 --- /dev/null +++ b/databases/mysql56-client/patches/patch-sql_sql__delete.cc @@ -0,0 +1,13 @@ +$NetBSD$ + +--- sql/sql_delete.cc.orig 2013-04-05 12:27:18.000000000 +0000 ++++ sql/sql_delete.cc +@@ -119,7 +119,7 @@ bool mysql_delete(THD *thd, TABLE_LIST * + DBUG_RETURN(true); + + const_cond= (!conds || conds->const_item()); +- safe_update=test(thd->variables.option_bits & OPTION_SAFE_UPDATES); ++ safe_update=my_test(thd->variables.option_bits & OPTION_SAFE_UPDATES); + if (safe_update && const_cond) + { + my_message(ER_UPDATE_WITHOUT_KEY_IN_SAFE_MODE, diff --git a/databases/mysql56-client/patches/patch-sql_sql__executor.cc b/databases/mysql56-client/patches/patch-sql_sql__executor.cc new file mode 100644 index 00000000000..ddfb2b07195 --- /dev/null +++ b/databases/mysql56-client/patches/patch-sql_sql__executor.cc @@ -0,0 +1,22 @@ +$NetBSD$ + +--- sql/sql_executor.cc.orig 2013-05-05 20:56:04.000000000 +0000 ++++ sql/sql_executor.cc +@@ -1455,7 +1455,7 @@ evaluate_join_record(JOIN *join, JOIN_TA + + if (condition) + { +- found= test(condition->val_int()); ++ found= my_test(condition->val_int()); + + if (join->thd->killed) + { +@@ -1863,7 +1863,7 @@ join_read_const_table(JOIN_TAB *tab, POS + { + // We cannot handle outer-joined tables with expensive join conditions here: + DBUG_ASSERT(!(*tab->on_expr_ref)->is_expensive()); +- if ((table->null_row= test((*tab->on_expr_ref)->val_int() == 0))) ++ if ((table->null_row= my_test((*tab->on_expr_ref)->val_int() == 0))) + mark_as_null_row(table); + } + if (!table->null_row) diff --git a/databases/mysql56-client/patches/patch-sql_sql__insert.cc b/databases/mysql56-client/patches/patch-sql_sql__insert.cc new file mode 100644 index 00000000000..15742ab6e0c --- /dev/null +++ b/databases/mysql56-client/patches/patch-sql_sql__insert.cc @@ -0,0 +1,31 @@ +$NetBSD$ + +--- sql/sql_insert.cc.orig 2013-05-05 20:56:04.000000000 +0000 ++++ sql/sql_insert.cc +@@ -759,7 +759,7 @@ bool mysql_insert(THD *thd,TABLE_LIST *t + update, + update_fields, + fields, +- !test(values->elements), ++ !my_test(values->elements), + &can_prune_partitions, + &prune_needs_default_values, + &used_partitions)) +@@ -1906,7 +1906,7 @@ int check_that_all_fields_are_given_valu + if (table_list) + { + table_list= table_list->top_table(); +- view= test(table_list->view); ++ view= my_test(table_list->view); + } + if (view) + { +@@ -3895,7 +3895,7 @@ static TABLE *create_table_from_items(TH + + tmp_table.s->db_create_options=0; + tmp_table.s->db_low_byte_first= +- test(create_info->db_type == myisam_hton || ++ my_test(create_info->db_type == myisam_hton || + create_info->db_type == heap_hton); + tmp_table.null_row=tmp_table.maybe_null=0; + diff --git a/databases/mysql56-client/patches/patch-sql_sql__join__buffer.cc b/databases/mysql56-client/patches/patch-sql_sql__join__buffer.cc new file mode 100644 index 00000000000..abf18ae4317 --- /dev/null +++ b/databases/mysql56-client/patches/patch-sql_sql__join__buffer.cc @@ -0,0 +1,51 @@ +$NetBSD$ + +--- sql/sql_join_buffer.cc.orig 2013-05-05 20:56:04.000000000 +0000 ++++ sql/sql_join_buffer.cc +@@ -184,8 +184,8 @@ void JOIN_CACHE::calc_record_fields() + for ( ; tab < join_tab ; tab++) + { + calc_used_field_length(join->thd, tab); +- flag_fields+= test(tab->used_null_fields || tab->used_uneven_bit_fields); +- flag_fields+= test(tab->table->maybe_null); ++ flag_fields+= my_test(tab->used_null_fields || tab->used_uneven_bit_fields); ++ flag_fields+= my_test(tab->table->maybe_null); + fields+= tab->used_fields; + blobs+= tab->used_blobs; + +@@ -1350,7 +1350,7 @@ void JOIN_CACHE::get_record_by_pos(uchar + bool JOIN_CACHE::get_match_flag_by_pos(uchar *rec_ptr) + { + if (with_match_flag) +- return test(*rec_ptr); ++ return my_test(*rec_ptr); + if (prev_cache) + { + uchar *prev_rec_ptr= prev_cache->get_rec_ref(rec_ptr); +@@ -1593,7 +1593,7 @@ bool JOIN_CACHE::skip_record_if_match() + if (prev_cache) + offset+= prev_cache->get_size_of_rec_offset(); + /* Check whether the match flag is on */ +- if (test(*(pos+offset))) ++ if (my_test(*(pos+offset))) + { + pos+= size_of_rec_len + get_rec_length(pos); + return TRUE; +@@ -1886,7 +1886,7 @@ enum_nested_loop_state JOIN_CACHE_BNL::j + reset_cache(false); + + /* Read each record from the join buffer and look for matches */ +- for (cnt= records - test(skip_last) ; cnt; cnt--) ++ for (cnt= records - my_test(skip_last) ; cnt; cnt--) + { + /* + If only the first match is needed and it has been already found for +@@ -2131,7 +2131,7 @@ enum_nested_loop_state JOIN_CACHE::join_ + if (!records) + DBUG_RETURN(NESTED_LOOP_OK); + +- cnt= records - (is_key_access() ? 0 : test(skip_last)); ++ cnt= records - (is_key_access() ? 0 : my_test(skip_last)); + + /* This function may be called only for inner tables of outer joins */ + DBUG_ASSERT(join_tab->first_inner); diff --git a/databases/mysql56-client/patches/patch-sql_sql__lex.cc b/databases/mysql56-client/patches/patch-sql_sql__lex.cc new file mode 100644 index 00000000000..a4c14274073 --- /dev/null +++ b/databases/mysql56-client/patches/patch-sql_sql__lex.cc @@ -0,0 +1,22 @@ +$NetBSD$ + +--- sql/sql_lex.cc.orig 2013-05-05 20:56:04.000000000 +0000 ++++ sql/sql_lex.cc +@@ -247,7 +247,7 @@ Lex_input_stream::reset(char *buffer, un + m_cpp_utf8_processed_ptr= NULL; + next_state= MY_LEX_START; + found_semicolon= NULL; +- ignore_space= test(m_thd->variables.sql_mode & MODE_IGNORE_SPACE); ++ ignore_space= my_test(m_thd->variables.sql_mode & MODE_IGNORE_SPACE); + stmt_prepare_mode= FALSE; + multi_statements= TRUE; + in_comment=NO_COMMENT; +@@ -3368,7 +3368,7 @@ TABLE_LIST *LEX::unlink_first_table(bool + /* + and from local list if it is not empty + */ +- if ((*link_to_local= test(select_lex.table_list.first))) ++ if ((*link_to_local= my_test(select_lex.table_list.first))) + { + select_lex.context.table_list= + select_lex.context.first_name_resolution_table= first->next_local; diff --git a/databases/mysql56-client/patches/patch-sql_sql__lex.h b/databases/mysql56-client/patches/patch-sql_sql__lex.h new file mode 100644 index 00000000000..ad904961bdd --- /dev/null +++ b/databases/mysql56-client/patches/patch-sql_sql__lex.h @@ -0,0 +1,13 @@ +$NetBSD$ + +--- sql/sql_lex.h.orig 2013-05-05 20:52:49.000000000 +0000 ++++ sql/sql_lex.h +@@ -1201,7 +1201,7 @@ public: + } + bool requires_prelocking() + { +- return test(query_tables_own_last); ++ return my_test(query_tables_own_last); + } + void mark_as_requiring_prelocking(TABLE_LIST **tables_own_last) + { diff --git a/databases/mysql56-client/patches/patch-sql_sql__load.cc b/databases/mysql56-client/patches/patch-sql_sql__load.cc new file mode 100644 index 00000000000..4ee7d070c63 --- /dev/null +++ b/databases/mysql56-client/patches/patch-sql_sql__load.cc @@ -0,0 +1,40 @@ +$NetBSD$ + +--- sql/sql_load.cc.orig 2013-04-05 12:27:18.000000000 +0000 ++++ sql/sql_load.cc +@@ -475,7 +475,7 @@ int mysql_load(THD *thd,sql_exchange *ex + } + } + +- if (!(error=test(read_info.error))) ++ if (!(error=my_test(read_info.error))) + { + + table->next_number_field=table->found_next_number_field; +@@ -908,7 +908,7 @@ read_fixed_length(THD *thd, COPY_INFO &i + thd->get_stmt_da()->inc_current_row_for_warning(); + continue_loop:; + } +- DBUG_RETURN(test(read_info.error)); ++ DBUG_RETURN(my_test(read_info.error)); + } + + +@@ -1118,7 +1118,7 @@ read_sep_field(THD *thd, COPY_INFO &info + thd->get_stmt_da()->inc_current_row_for_warning(); + continue_loop:; + } +- DBUG_RETURN(test(read_info.error)); ++ DBUG_RETURN(my_test(read_info.error)); + } + + +@@ -1280,7 +1280,7 @@ read_xml_field(THD *thd, COPY_INFO &info + thd->get_stmt_da()->inc_current_row_for_warning(); + continue_loop:; + } +- DBUG_RETURN(test(read_info.error) || thd->is_error()); ++ DBUG_RETURN(my_test(read_info.error) || thd->is_error()); + } /* load xml end */ + + diff --git a/databases/mysql56-client/patches/patch-sql_sql__optimizer.cc b/databases/mysql56-client/patches/patch-sql_sql__optimizer.cc new file mode 100644 index 00000000000..204e60b04ec --- /dev/null +++ b/databases/mysql56-client/patches/patch-sql_sql__optimizer.cc @@ -0,0 +1,40 @@ +$NetBSD$ + +--- sql/sql_optimizer.cc.orig 2013-05-05 20:56:04.000000000 +0000 ++++ sql/sql_optimizer.cc +@@ -739,13 +739,13 @@ JOIN::optimize() + need_tmp= ((!plan_is_const() && + ((select_distinct || !simple_order || !simple_group) || + (group_list && order) || +- test(select_options & OPTION_BUFFER_RESULT))) || ++ my_test(select_options & OPTION_BUFFER_RESULT))) || + (rollup.state != ROLLUP::STATE_NONE && select_distinct)); + + /* Perform FULLTEXT search before all regular searches */ + if (!(select_options & SELECT_DESCRIBE)) + { +- init_ftfuncs(thd, select_lex, test(order)); ++ init_ftfuncs(thd, select_lex, my_test(order)); + optimize_fts_query(); + } + +@@ -2504,7 +2504,7 @@ simplify_joins(JOIN *join, List li(*join_list); +- bool straight_join= test(join->select_options & SELECT_STRAIGHT_JOIN); ++ bool straight_join= my_test(join->select_options & SELECT_STRAIGHT_JOIN); + DBUG_ENTER("simplify_joins"); + + /* +@@ -5416,8 +5416,8 @@ static int sort_keyuse(Key_use *a, Key_u + if (a->keypart != b->keypart) + return (int) (a->keypart - b->keypart); + // Place const values before other ones +- if ((res= test((a->used_tables & ~OUTER_REF_TABLE_BIT)) - +- test((b->used_tables & ~OUTER_REF_TABLE_BIT)))) ++ if ((res= my_test((a->used_tables & ~OUTER_REF_TABLE_BIT)) - ++ my_test((b->used_tables & ~OUTER_REF_TABLE_BIT)))) + return res; + /* Place rows that are not 'OPTIMIZE_REF_OR_NULL' first */ + return (int) ((a->optimize & KEY_OPTIMIZE_REF_OR_NULL) - diff --git a/databases/mysql56-client/patches/patch-sql_sql__optimizer.h b/databases/mysql56-client/patches/patch-sql_sql__optimizer.h new file mode 100644 index 00000000000..bf257aa4b4b --- /dev/null +++ b/databases/mysql56-client/patches/patch-sql_sql__optimizer.h @@ -0,0 +1,13 @@ +$NetBSD$ + +--- sql/sql_optimizer.h.orig 2013-05-05 20:54:46.000000000 +0000 ++++ sql/sql_optimizer.h +@@ -433,7 +433,7 @@ public: + result= result_arg; + lock= thd_arg->lock; + select_lex= 0; //for safety +- select_distinct= test(select_options & SELECT_DISTINCT); ++ select_distinct= my_test(select_options & SELECT_DISTINCT); + no_order= 0; + simple_order= 0; + simple_group= 0; diff --git a/databases/mysql56-client/patches/patch-sql_sql__parse.cc b/databases/mysql56-client/patches/patch-sql_sql__parse.cc new file mode 100644 index 00000000000..b50d3fd6123 --- /dev/null +++ b/databases/mysql56-client/patches/patch-sql_sql__parse.cc @@ -0,0 +1,36 @@ +$NetBSD$ + +--- sql/sql_parse.cc.orig 2013-05-05 20:56:04.000000000 +0000 ++++ sql/sql_parse.cc +@@ -6427,7 +6427,7 @@ TABLE_LIST *st_select_lex::add_table_to_ + if (!table) + DBUG_RETURN(0); // End of memory + alias_str= alias ? alias->str : table->table.str; +- if (!test(table_options & TL_OPTION_ALIAS)) ++ if (!my_test(table_options & TL_OPTION_ALIAS)) + { + enum_ident_name_check ident_check_status= + check_table_name(table->table.str, table->table.length, FALSE); +@@ -6477,10 +6477,10 @@ TABLE_LIST *st_select_lex::add_table_to_ + ptr->table_name=table->table.str; + ptr->table_name_length=table->table.length; + ptr->lock_type= lock_type; +- ptr->updating= test(table_options & TL_OPTION_UPDATING); ++ ptr->updating= my_test(table_options & TL_OPTION_UPDATING); + /* TODO: remove TL_OPTION_FORCE_INDEX as it looks like it's not used */ +- ptr->force_index= test(table_options & TL_OPTION_FORCE_INDEX); +- ptr->ignore_leaves= test(table_options & TL_OPTION_IGNORE_LEAVES); ++ ptr->force_index= my_test(table_options & TL_OPTION_FORCE_INDEX); ++ ptr->ignore_leaves= my_test(table_options & TL_OPTION_IGNORE_LEAVES); + ptr->derived= table->sel; + if (!ptr->derived && is_infoschema_db(ptr->db, ptr->db_length)) + { +@@ -6571,7 +6571,7 @@ TABLE_LIST *st_select_lex::add_table_to_ + lex->add_to_query_tables(ptr); + + // Pure table aliases do not need to be locked: +- if (!test(table_options & TL_OPTION_ALIAS)) ++ if (!my_test(table_options & TL_OPTION_ALIAS)) + { + ptr->mdl_request.init(MDL_key::TABLE, ptr->db, ptr->table_name, mdl_type, + MDL_TRANSACTION); diff --git a/databases/mysql56-client/patches/patch-sql_sql__partition.cc b/databases/mysql56-client/patches/patch-sql_sql__partition.cc new file mode 100644 index 00000000000..a10c082eb9f --- /dev/null +++ b/databases/mysql56-client/patches/patch-sql_sql__partition.cc @@ -0,0 +1,69 @@ +$NetBSD$ + +--- sql/sql_partition.cc.orig 2013-05-05 20:56:04.000000000 +0000 ++++ sql/sql_partition.cc +@@ -3294,7 +3294,7 @@ uint32 get_partition_id_cols_list_for_en + } + else + { +- DBUG_RETURN(list_index + test(!tailf)); ++ DBUG_RETURN(list_index + my_test(!tailf)); + } + } while (max_list_index >= min_list_index); + if (cmp > 0) +@@ -3370,7 +3370,7 @@ uint32 get_list_array_idx_for_endpoint(p + } + else + { +- DBUG_RETURN(list_index + test(left_endpoint ^ include_endpoint)); ++ DBUG_RETURN(list_index + my_test(left_endpoint ^ include_endpoint)); + } + } while (max_list_index >= min_list_index); + notfound: +@@ -5846,7 +5846,7 @@ static bool mysql_change_partitions(ALTE + if (mysql_trans_commit_alter_copy_data(thd)) + error= 1; /* The error has been reported */ + +- DBUG_RETURN(test(error)); ++ DBUG_RETURN(my_test(error)); + } + + +@@ -7720,7 +7720,7 @@ uint32 get_partition_id_cols_range_for_e + loc_part_id * num_columns, + nparts, tailf); + if (!res) +- loc_part_id += test(include_endpoint); ++ loc_part_id += my_test(include_endpoint); + else if (res > 0) + loc_part_id++; + } +@@ -7902,7 +7902,7 @@ int get_part_iter_for_interval_via_mappi + index-in-ordered-array-of-list-constants (for LIST) space. + */ + store_key_image_to_rec(field, min_value, field_len); +- bool include_endp= !test(flags & NEAR_MIN); ++ bool include_endp= !my_test(flags & NEAR_MIN); + part_iter->part_nums.start= get_endpoint(part_info, 1, include_endp); + if (!can_match_multiple_values && part_info->part_expr->null_value) + { +@@ -7937,7 +7937,7 @@ int get_part_iter_for_interval_via_mappi + else + { + store_key_image_to_rec(field, max_value, field_len); +- bool include_endp= !test(flags & NEAR_MAX); ++ bool include_endp= !my_test(flags & NEAR_MAX); + part_iter->part_nums.end= get_endpoint(part_info, 0, include_endp); + if (check_zero_dates && + !zero_in_start_date && +@@ -8104,8 +8104,8 @@ int get_part_iter_for_interval_via_walki + if ((ulonglong)b - (ulonglong)a == ~0ULL) + DBUG_RETURN(-1); + +- a += test(flags & NEAR_MIN); +- b += test(!(flags & NEAR_MAX)); ++ a += my_test(flags & NEAR_MIN); ++ b += my_test(!(flags & NEAR_MAX)); + ulonglong n_values= b - a; + + /* diff --git a/databases/mysql56-client/patches/patch-sql_sql__planner.cc b/databases/mysql56-client/patches/patch-sql_sql__planner.cc new file mode 100644 index 00000000000..a33c62eeecd --- /dev/null +++ b/databases/mysql56-client/patches/patch-sql_sql__planner.cc @@ -0,0 +1,58 @@ +$NetBSD$ + +--- sql/sql_planner.cc.orig 2013-05-05 20:56:04.000000000 +0000 ++++ sql/sql_planner.cc +@@ -193,7 +193,7 @@ public: + } + } + +- bool have_a_case() { return test(handled_sj_equalities); } ++ bool have_a_case() { return my_test(handled_sj_equalities); } + + /** + Check if an index can be used for LooseScan, part 1 +@@ -571,7 +571,7 @@ void Optimize_table_order::best_access_p + } + else + { +- found_constraint= test(found_part); ++ found_constraint= my_test(found_part); + loose_scan_opt.check_ref_access_part1(s, key, start_key, found_part); + + /* Check if we found full key */ +@@ -711,7 +711,7 @@ void Optimize_table_order::best_access_p + */ + if (table->quick_keys.is_set(key) && !found_ref && //(C1) + table->quick_key_parts[key] == max_key_part && //(C2) +- table->quick_n_ranges[key] == 1+test(ref_or_null_part)) //(C3) ++ table->quick_n_ranges[key] == 1+my_test(ref_or_null_part)) //(C3) + { + tmp= records= (double) table->quick_rows[key]; + } +@@ -813,7 +813,7 @@ void Optimize_table_order::best_access_p + table->quick_key_parts[key] <= max_key_part && + const_part & + ((key_part_map)1 << table->quick_key_parts[key]) && +- table->quick_n_ranges[key] == 1 + test(ref_or_null_part & ++ table->quick_n_ranges[key] == 1 + my_test(ref_or_null_part & + const_part) && + records > (double) table->quick_rows[key]) + { +@@ -1037,7 +1037,7 @@ void Optimize_table_order::best_access_p + best_key= 0; + /* range/index_merge/ALL/index access method are "independent", so: */ + best_ref_depends_map= 0; +- best_uses_jbuf= test(!disable_jbuf); ++ best_uses_jbuf= my_test(!disable_jbuf); + } + } + +@@ -1101,7 +1101,7 @@ bool Optimize_table_order::choose_table_ + + reset_nj_counters(join->join_list); + +- const bool straight_join= test(join->select_options & SELECT_STRAIGHT_JOIN); ++ const bool straight_join= my_test(join->select_options & SELECT_STRAIGHT_JOIN); + table_map join_tables; ///< The tables involved in order selection + + if (emb_sjm_nest) diff --git a/databases/mysql56-client/patches/patch-sql_sql__prepare.cc b/databases/mysql56-client/patches/patch-sql_sql__prepare.cc new file mode 100644 index 00000000000..48afcaf3b3f --- /dev/null +++ b/databases/mysql56-client/patches/patch-sql_sql__prepare.cc @@ -0,0 +1,22 @@ +$NetBSD$ + +--- sql/sql_prepare.cc.orig 2013-05-05 20:56:04.000000000 +0000 ++++ sql/sql_prepare.cc +@@ -978,7 +978,7 @@ static bool setup_conversion_functions(P + + typecode= sint2korr(read_pos); + read_pos+= 2; +- (**it).unsigned_flag= test(typecode & signed_bit); ++ (**it).unsigned_flag= my_test(typecode & signed_bit); + setup_one_conversion_function(thd, *it, (uchar) (typecode & ~signed_bit)); + } + } +@@ -2653,7 +2653,7 @@ void mysqld_stmt_execute(THD *thd, char + DBUG_PRINT("exec_query", ("%s", stmt->query())); + DBUG_PRINT("info",("stmt: 0x%lx", (long) stmt)); + +- open_cursor= test(flags & (ulong) CURSOR_TYPE_READ_ONLY); ++ open_cursor= my_test(flags & (ulong) CURSOR_TYPE_READ_ONLY); + + thd->protocol= &thd->protocol_binary; + stmt->execute_loop(&expanded_query, open_cursor, packet, packet_end); diff --git a/databases/mysql56-client/patches/patch-sql_sql__prepare.h b/databases/mysql56-client/patches/patch-sql_sql__prepare.h new file mode 100644 index 00000000000..f4daf4a4385 --- /dev/null +++ b/databases/mysql56-client/patches/patch-sql_sql__prepare.h @@ -0,0 +1,22 @@ +$NetBSD$ + +--- sql/sql_prepare.h.orig 2013-05-05 20:54:42.000000000 +0000 ++++ sql/sql_prepare.h +@@ -289,7 +289,7 @@ public: + one. + Never fails. + */ +- bool has_next_result() const { return test(m_current_rset->m_next_rset); } ++ bool has_next_result() const { return my_test(m_current_rset->m_next_rset); } + /** + Only valid to call if has_next_result() returned true. + Otherwise the result is undefined. +@@ -297,7 +297,7 @@ public: + bool move_to_next_result() + { + m_current_rset= m_current_rset->m_next_rset; +- return test(m_current_rset); ++ return my_test(m_current_rset); + } + + ~Ed_connection() { free_old_result(); } diff --git a/databases/mysql56-client/patches/patch-sql_sql__select.cc b/databases/mysql56-client/patches/patch-sql_sql__select.cc new file mode 100644 index 00000000000..97293b4972c --- /dev/null +++ b/databases/mysql56-client/patches/patch-sql_sql__select.cc @@ -0,0 +1,76 @@ +$NetBSD$ + +--- sql/sql_select.cc.orig 2013-05-05 20:56:04.000000000 +0000 ++++ sql/sql_select.cc +@@ -789,7 +789,7 @@ void JOIN::reset() + } + + if (!(select_options & SELECT_DESCRIBE)) +- init_ftfuncs(thd, select_lex, test(order)); ++ init_ftfuncs(thd, select_lex, my_test(order)); + + DBUG_VOID_RETURN; + } +@@ -931,7 +931,7 @@ bool JOIN::destroy() + sjm_exec_list.empty(); + + keyuse.clear(); +- DBUG_RETURN(test(error)); ++ DBUG_RETURN(my_test(error)); + } + + +@@ -1687,7 +1687,7 @@ bool create_ref_for_key(JOIN *join, JOIN + for (uint part_no= 0 ; part_no < keyparts ; part_no++) + { + keyuse= chosen_keyuses[part_no]; +- uint maybe_null= test(keyinfo->key_part[part_no].null_bit); ++ uint maybe_null= my_test(keyinfo->key_part[part_no].null_bit); + + if (keyuse->val->type() == Item::FIELD_ITEM) + { +@@ -1925,7 +1925,7 @@ static Item *make_cond_for_index(Item *c + new_cond->argument_list()->push_back(fix); + used_tables|= fix->used_tables(); + } +- n_marked += test(item->marker == ICP_COND_USES_INDEX_ONLY); ++ n_marked += my_test(item->marker == ICP_COND_USES_INDEX_ONLY); + } + if (n_marked ==((Item_cond*)cond)->argument_list()->elements) + cond->marker= ICP_COND_USES_INDEX_ONLY; +@@ -1954,7 +1954,7 @@ static Item *make_cond_for_index(Item *c + if (!fix) + return NULL; + new_cond->argument_list()->push_back(fix); +- n_marked += test(item->marker == ICP_COND_USES_INDEX_ONLY); ++ n_marked += my_test(item->marker == ICP_COND_USES_INDEX_ONLY); + } + if (n_marked ==((Item_cond*)cond)->argument_list()->elements) + cond->marker= ICP_COND_USES_INDEX_ONLY; +@@ -2759,7 +2759,7 @@ bool JOIN::setup_materialized_table(JOIN + bool + make_join_readinfo(JOIN *join, ulonglong options, uint no_jbuf_after) + { +- const bool statistics= test(!(join->select_options & SELECT_DESCRIBE)); ++ const bool statistics= my_test(!(join->select_options & SELECT_DESCRIBE)); + + DBUG_ENTER("make_join_readinfo"); + +@@ -4397,7 +4397,7 @@ test_if_subpart(ORDER *a,ORDER *b) + else + return 0; + } +- return test(!b); ++ return my_test(!b); + } + + /** +@@ -5147,7 +5147,7 @@ bool JOIN::make_tmp_tables_info() + or end_write_group()) if JOIN::group is set to false. + */ + // the temporary table was explicitly requested +- DBUG_ASSERT(test(select_options & OPTION_BUFFER_RESULT)); ++ DBUG_ASSERT(my_test(select_options & OPTION_BUFFER_RESULT)); + // the temporary table does not have a grouping expression + DBUG_ASSERT(!join_tab[curr_tmp_table].table->group); + } diff --git a/databases/mysql56-client/patches/patch-sql_sql__select.h b/databases/mysql56-client/patches/patch-sql_sql__select.h new file mode 100644 index 00000000000..86cb326d19a --- /dev/null +++ b/databases/mysql56-client/patches/patch-sql_sql__select.h @@ -0,0 +1,13 @@ +$NetBSD$ + +--- sql/sql_select.h.orig 2013-05-05 20:54:55.000000000 +0000 ++++ sql/sql_select.h +@@ -789,7 +789,7 @@ public: + used_rowid_fields= 1; + used_fieldlength+= table->file->ref_length; + } +- return test(used_rowid_fields); ++ return my_test(used_rowid_fields); + } + bool is_inner_table_of_outer_join() + { diff --git a/databases/mysql56-client/patches/patch-sql_sql__show.cc b/databases/mysql56-client/patches/patch-sql_sql__show.cc new file mode 100644 index 00000000000..8d9b2652507 --- /dev/null +++ b/databases/mysql56-client/patches/patch-sql_sql__show.cc @@ -0,0 +1,57 @@ +$NetBSD$ + +--- sql/sql_show.cc.orig 2013-05-05 20:56:04.000000000 +0000 ++++ sql/sql_show.cc +@@ -740,7 +740,7 @@ public: + m_view_access_denied_message_ptr(NULL) + { + +- m_sctx = test(m_top_view->security_ctx) ? ++ m_sctx = my_test(m_top_view->security_ctx) ? + m_top_view->security_ctx : thd->security_ctx; + } + +@@ -1835,7 +1835,7 @@ static void store_key_options(THD *thd, + end= longlong10_to_str(key_info->block_size, buff, 10); + packet->append(buff, (uint) (end - buff)); + } +- DBUG_ASSERT(test(key_info->flags & HA_USES_COMMENT) == ++ DBUG_ASSERT(my_test(key_info->flags & HA_USES_COMMENT) == + (key_info->comment.length > 0)); + if (key_info->flags & HA_USES_COMMENT) + { +@@ -4634,7 +4634,7 @@ static int get_schema_column_record(THD + #ifndef NO_EMBEDDED_ACCESS_CHECKS + uint col_access; + check_access(thd,SELECT_ACL, db_name->str, +- &tables->grant.privilege, 0, 0, test(tables->schema_table)); ++ &tables->grant.privilege, 0, 0, my_test(tables->schema_table)); + col_access= get_column_grant(thd, &tables->grant, + db_name->str, table_name->str, + field->field_name) & COL_ACLS; +@@ -4775,13 +4775,13 @@ static my_bool iter_schema_engines(THD * + table->field[1]->store(option_name, strlen(option_name), scs); + table->field[2]->store(plugin_decl(plugin)->descr, + strlen(plugin_decl(plugin)->descr), scs); +- tmp= &yesno[test(hton->commit)]; ++ tmp= &yesno[my_test(hton->commit)]; + table->field[3]->store(tmp->str, tmp->length, scs); + table->field[3]->set_notnull(); +- tmp= &yesno[test(hton->prepare)]; ++ tmp= &yesno[my_test(hton->prepare)]; + table->field[4]->store(tmp->str, tmp->length, scs); + table->field[4]->set_notnull(); +- tmp= &yesno[test(hton->savepoint_set)]; ++ tmp= &yesno[my_test(hton->savepoint_set)]; + table->field[5]->store(tmp->str, tmp->length, scs); + table->field[5]->set_notnull(); + +@@ -5357,7 +5357,7 @@ static int get_schema_stat_record(THD *t + else + table->field[14]->store("", 0, cs); + table->field[14]->set_notnull(); +- DBUG_ASSERT(test(key_info->flags & HA_USES_COMMENT) == ++ DBUG_ASSERT(my_test(key_info->flags & HA_USES_COMMENT) == + (key_info->comment.length > 0)); + if (key_info->flags & HA_USES_COMMENT) + table->field[15]->store(key_info->comment.str, diff --git a/databases/mysql56-client/patches/patch-sql_sql__table.cc b/databases/mysql56-client/patches/patch-sql_sql__table.cc new file mode 100644 index 00000000000..3efc88ce0dd --- /dev/null +++ b/databases/mysql56-client/patches/patch-sql_sql__table.cc @@ -0,0 +1,31 @@ +$NetBSD$ + +--- sql/sql_table.cc.orig 2013-05-05 20:56:04.000000000 +0000 ++++ sql/sql_table.cc +@@ -3870,7 +3870,7 @@ mysql_prepare_create_table(THD *thd, HA_ + with length (unlike blobs, where ft code takes data length from a + data prefix, ignoring column->length). + */ +- column->length=test(f_is_blob(sql_field->pack_flag)); ++ column->length=my_test(f_is_blob(sql_field->pack_flag)); + } + else + { +@@ -7012,7 +7012,7 @@ mysql_prepare_alter_table(THD *thd, TABL + + key= new Key(key_type, key_name, strlen(key_name), + &key_create_info, +- test(key_info->flags & HA_GENERATED_KEY), ++ my_test(key_info->flags & HA_GENERATED_KEY), + key_parts); + new_key_list.push_back(key); + } +@@ -9029,7 +9029,7 @@ static bool check_engine(THD *thd, const + handlerton **new_engine= &create_info->db_type; + handlerton *req_engine= *new_engine; + bool no_substitution= +- test(thd->variables.sql_mode & MODE_NO_ENGINE_SUBSTITUTION); ++ my_test(thd->variables.sql_mode & MODE_NO_ENGINE_SUBSTITUTION); + if (!(*new_engine= ha_checktype(thd, ha_legacy_type(req_engine), + no_substitution, 1))) + DBUG_RETURN(true); diff --git a/databases/mysql56-client/patches/patch-sql_sql__time.cc b/databases/mysql56-client/patches/patch-sql_sql__time.cc new file mode 100644 index 00000000000..b8a9673287e --- /dev/null +++ b/databases/mysql56-client/patches/patch-sql_sql__time.cc @@ -0,0 +1,17 @@ +$NetBSD$ + +--- sql/sql_time.cc.orig 2013-05-05 20:56:04.000000000 +0000 ++++ sql/sql_time.cc +@@ -105,9 +105,9 @@ uint calc_week(MYSQL_TIME *l_time, uint + uint days; + ulong daynr=calc_daynr(l_time->year,l_time->month,l_time->day); + ulong first_daynr=calc_daynr(l_time->year,1,1); +- bool monday_first= test(week_behaviour & WEEK_MONDAY_FIRST); +- bool week_year= test(week_behaviour & WEEK_YEAR); +- bool first_weekday= test(week_behaviour & WEEK_FIRST_WEEKDAY); ++ bool monday_first= my_test(week_behaviour & WEEK_MONDAY_FIRST); ++ bool week_year= my_test(week_behaviour & WEEK_YEAR); ++ bool first_weekday= my_test(week_behaviour & WEEK_FIRST_WEEKDAY); + + uint weekday=calc_weekday(first_daynr, !monday_first); + *year=l_time->year; diff --git a/databases/mysql56-client/patches/patch-sql_sql__tmp__table.cc b/databases/mysql56-client/patches/patch-sql_sql__tmp__table.cc new file mode 100644 index 00000000000..101d82cea24 --- /dev/null +++ b/databases/mysql56-client/patches/patch-sql_sql__tmp__table.cc @@ -0,0 +1,40 @@ +$NetBSD$ + +--- sql/sql_tmp_table.cc.orig 2013-05-05 20:56:04.000000000 +0000 ++++ sql/sql_tmp_table.cc +@@ -1006,7 +1006,7 @@ update_hidden: + table->group=group; /* Table is grouped by key */ + param->group_buff=group_buff; + share->keys=1; +- share->uniques= test(using_unique_constraint); ++ share->uniques= my_test(using_unique_constraint); + table->key_info= share->key_info= keyinfo; + keyinfo->key_part= key_part_info; + keyinfo->flags=HA_NOSAME; +@@ -1028,7 +1028,7 @@ update_hidden: + { + cur_group->buff=(char*) group_buff; + cur_group->field= field->new_key_field(thd->mem_root, table, +- group_buff + test(maybe_null)); ++ group_buff + my_test(maybe_null)); + + if (!cur_group->field) + goto err; /* purecov: inspected */ +@@ -1076,7 +1076,7 @@ update_hidden: + null_pack_length-=hidden_null_pack_length; + keyinfo->user_defined_key_parts= + ((field_count-param->hidden_field_count) + +- (share->uniques ? test(null_pack_length) : 0)); ++ (share->uniques ? my_test(null_pack_length) : 0)); + keyinfo->actual_key_parts= keyinfo->user_defined_key_parts; + table->distinct= 1; + share->keys= 1; +@@ -1400,7 +1400,7 @@ TABLE *create_duplicate_weedout_tmp_tabl + { + DBUG_PRINT("info",("Creating group key in temporary table")); + share->keys=1; +- share->uniques= test(using_unique_constraint); ++ share->uniques= my_test(using_unique_constraint); + table->key_info= table->s->key_info= keyinfo; + keyinfo->key_part=key_part_info; + keyinfo->actual_flags= keyinfo->flags= HA_NOSAME; diff --git a/databases/mysql56-client/patches/patch-sql_sql__union.cc b/databases/mysql56-client/patches/patch-sql_sql__union.cc new file mode 100644 index 00000000000..1c1ba2a5ae6 --- /dev/null +++ b/databases/mysql56-client/patches/patch-sql_sql__union.cc @@ -0,0 +1,22 @@ +$NetBSD$ + +--- sql/sql_union.cc.orig 2013-05-05 20:56:04.000000000 +0000 ++++ sql/sql_union.cc +@@ -271,7 +271,7 @@ bool st_select_lex_unit::prepare(THD *th + bool is_union_select; + DBUG_ENTER("st_select_lex_unit::prepare"); + +- describe= test(additional_options & SELECT_DESCRIBE); ++ describe= my_test(additional_options & SELECT_DESCRIBE); + + /* + result object should be reassigned even if preparing already done for +@@ -462,7 +462,7 @@ bool st_select_lex_unit::prepare(THD *th + if (global_parameters->ftfunc_list->elements) + create_options= create_options | TMP_TABLE_FORCE_MYISAM; + +- if (union_result->create_result_table(thd, &types, test(union_distinct), ++ if (union_result->create_result_table(thd, &types, my_test(union_distinct), + create_options, "", FALSE, TRUE)) + goto err; + memset(&result_table_list, 0, sizeof(result_table_list)); diff --git a/databases/mysql56-client/patches/patch-sql_sql__update.cc b/databases/mysql56-client/patches/patch-sql_sql__update.cc new file mode 100644 index 00000000000..1115719e88a --- /dev/null +++ b/databases/mysql56-client/patches/patch-sql_sql__update.cc @@ -0,0 +1,13 @@ +$NetBSD$ + +--- sql/sql_update.cc.orig 2013-05-05 20:56:04.000000000 +0000 ++++ sql/sql_update.cc +@@ -222,7 +222,7 @@ int mysql_update(THD *thd, + ha_rows *found_return, ha_rows *updated_return) + { + bool using_limit= limit != HA_POS_ERROR; +- bool safe_update= test(thd->variables.option_bits & OPTION_SAFE_UPDATES); ++ bool safe_update= my_test(thd->variables.option_bits & OPTION_SAFE_UPDATES); + bool used_key_is_modified= FALSE, transactional_table, will_batch; + int res; + int error= 1; diff --git a/databases/mysql56-client/patches/patch-sql_sys__vars.cc b/databases/mysql56-client/patches/patch-sql_sys__vars.cc new file mode 100644 index 00000000000..0c4eef22761 --- /dev/null +++ b/databases/mysql56-client/patches/patch-sql_sys__vars.cc @@ -0,0 +1,13 @@ +$NetBSD$ + +--- sql/sys_vars.cc.orig 2013-05-05 20:56:04.000000000 +0000 ++++ sql/sys_vars.cc +@@ -2055,7 +2055,7 @@ static bool fix_optimizer_switch(sys_var + { + SV *sv= (type == OPT_GLOBAL) ? &global_system_variables : &thd->variables; + sv->engine_condition_pushdown= +- test(sv->optimizer_switch & OPTIMIZER_SWITCH_ENGINE_CONDITION_PUSHDOWN); ++ my_test(sv->optimizer_switch & OPTIMIZER_SWITCH_ENGINE_CONDITION_PUSHDOWN); + + return false; + } diff --git a/databases/mysql56-client/patches/patch-sql_table.cc b/databases/mysql56-client/patches/patch-sql_table.cc new file mode 100644 index 00000000000..76576b68e32 --- /dev/null +++ b/databases/mysql56-client/patches/patch-sql_table.cc @@ -0,0 +1,52 @@ +$NetBSD$ + +--- sql/table.cc.orig 2013-05-05 20:56:04.000000000 +0000 ++++ sql/table.cc +@@ -1076,7 +1076,7 @@ static int open_binary_frm(THD *thd, TAB + } + share->db_record_offset= 1; + /* Set temporarily a good value for db_low_byte_first */ +- share->db_low_byte_first= test(legacy_db_type != DB_TYPE_ISAM); ++ share->db_low_byte_first= my_test(legacy_db_type != DB_TYPE_ISAM); + error=4; + share->max_rows= uint4korr(head+18); + share->min_rows= uint4korr(head+22); +@@ -1206,7 +1206,7 @@ static int open_binary_frm(THD *thd, TAB + keyinfo->comment.length); + strpos+= 2 + keyinfo->comment.length; + } +- DBUG_ASSERT(test(keyinfo->flags & HA_USES_COMMENT) == ++ DBUG_ASSERT(my_test(keyinfo->flags & HA_USES_COMMENT) == + (keyinfo->comment.length > 0)); + } + +@@ -2374,9 +2374,9 @@ partititon_err: + else if (outparam->file) + { + handler::Table_flags flags= outparam->file->ha_table_flags(); +- outparam->no_replicate= ! test(flags & (HA_BINLOG_STMT_CAPABLE ++ outparam->no_replicate= ! my_test(flags & (HA_BINLOG_STMT_CAPABLE + | HA_BINLOG_ROW_CAPABLE)) +- || test(flags & HA_HAS_OWN_BINLOGGING); ++ || my_test(flags & HA_HAS_OWN_BINLOGGING); + } + else + { +@@ -2928,7 +2928,7 @@ File create_frm(THD *thd, const char *na + /* header */ + fileinfo[0]=(uchar) 254; + fileinfo[1]= 1; +- fileinfo[2]= FRM_VER+3+ test(create_info->varchar); ++ fileinfo[2]= FRM_VER+3+ my_test(create_info->varchar); + + fileinfo[3]= (uchar) ha_legacy_type( + ha_checktype(thd,ha_legacy_type(create_info->db_type),0,0)); +@@ -2948,7 +2948,7 @@ File create_frm(THD *thd, const char *na + */ + for (i= 0; i < keys; i++) + { +- DBUG_ASSERT(test(key_info[i].flags & HA_USES_COMMENT) == ++ DBUG_ASSERT(my_test(key_info[i].flags & HA_USES_COMMENT) == + (key_info[i].comment.length > 0)); + if (key_info[i].flags & HA_USES_COMMENT) + key_comment_total_bytes += 2 + key_info[i].comment.length; diff --git a/databases/mysql56-client/patches/patch-sql_transaction.cc b/databases/mysql56-client/patches/patch-sql_transaction.cc new file mode 100644 index 00000000000..7dcd2f01770 --- /dev/null +++ b/databases/mysql56-client/patches/patch-sql_transaction.cc @@ -0,0 +1,106 @@ +$NetBSD$ + +--- sql/transaction.cc.orig 2013-05-05 20:56:04.000000000 +0000 ++++ sql/transaction.cc +@@ -134,7 +134,7 @@ bool trans_begin(THD *thd, uint flags) + thd->server_status&= + ~(SERVER_STATUS_IN_TRANS | SERVER_STATUS_IN_TRANS_READONLY); + DBUG_PRINT("info", ("clearing SERVER_STATUS_IN_TRANS")); +- res= test(ha_commit_trans(thd, TRUE)); ++ res= my_test(ha_commit_trans(thd, TRUE)); + } + + thd->variables.option_bits&= ~OPTION_BEGIN; +@@ -163,7 +163,7 @@ bool trans_begin(THD *thd, uint flags) + compatibility. + */ + const bool user_is_super= +- test(thd->security_ctx->master_access & SUPER_ACL); ++ my_test(thd->security_ctx->master_access & SUPER_ACL); + if (opt_readonly && !user_is_super) + { + my_error(ER_OPTION_PREVENTS_STATEMENT, MYF(0), "--read-only"); +@@ -182,7 +182,7 @@ bool trans_begin(THD *thd, uint flags) + if (flags & MYSQL_START_TRANS_OPT_WITH_CONS_SNAPSHOT) + res= ha_start_consistent_snapshot(thd); + +- DBUG_RETURN(test(res)); ++ DBUG_RETURN(my_test(res)); + } + + +@@ -221,7 +221,7 @@ bool trans_commit(THD *thd) + thd->transaction.all.reset_unsafe_rollback_flags(); + thd->lex->start_transaction_opt= 0; + +- DBUG_RETURN(test(res)); ++ DBUG_RETURN(my_test(res)); + } + + +@@ -263,7 +263,7 @@ bool trans_commit_implicit(THD *thd) + thd->server_status&= + ~(SERVER_STATUS_IN_TRANS | SERVER_STATUS_IN_TRANS_READONLY); + DBUG_PRINT("info", ("clearing SERVER_STATUS_IN_TRANS")); +- res= test(ha_commit_trans(thd, TRUE)); ++ res= my_test(ha_commit_trans(thd, TRUE)); + } + else if (tc_log) + tc_log->commit(thd, true); +@@ -319,7 +319,7 @@ bool trans_rollback(THD *thd) + thd->transaction.all.reset_unsafe_rollback_flags(); + thd->lex->start_transaction_opt= 0; + +- DBUG_RETURN(test(res)); ++ DBUG_RETURN(my_test(res)); + } + + +@@ -382,7 +382,7 @@ bool trans_commit_stmt(THD *thd) + + thd->transaction.stmt.reset(); + +- DBUG_RETURN(test(res)); ++ DBUG_RETURN(my_test(res)); + } + + +@@ -588,7 +588,7 @@ bool trans_rollback_to_savepoint(THD *th + if (!res && !binlog_on) + thd->mdl_context.rollback_to_savepoint(sv->mdl_savepoint); + +- DBUG_RETURN(test(res)); ++ DBUG_RETURN(my_test(res)); + } + + +@@ -630,7 +630,7 @@ bool trans_release_savepoint(THD *thd, L + + thd->transaction.savepoints= sv->prev; + +- DBUG_RETURN(test(res)); ++ DBUG_RETURN(my_test(res)); + } + + +@@ -794,7 +794,7 @@ bool trans_xa_commit(THD *thd) + else if (xa_state == XA_IDLE && thd->lex->xa_opt == XA_ONE_PHASE) + { + int r= ha_commit_trans(thd, TRUE); +- if ((res= test(r))) ++ if ((res= my_test(r))) + my_error(r == 1 ? ER_XA_RBROLLBACK : ER_XAER_RMERR, MYF(0)); + } + else if (xa_state == XA_PREPARED && thd->lex->xa_opt == XA_NONE) +@@ -822,9 +822,9 @@ bool trans_xa_commit(THD *thd) + DEBUG_SYNC(thd, "trans_xa_commit_after_acquire_commit_lock"); + + if (tc_log) +- res= test(tc_log->commit(thd, /* all */ true)); ++ res= my_test(tc_log->commit(thd, /* all */ true)); + else +- res= test(ha_commit_low(thd, /* all */ true)); ++ res= my_test(ha_commit_low(thd, /* all */ true)); + + if (res) + my_error(ER_XAER_RMERR, MYF(0)); diff --git a/databases/mysql56-client/patches/patch-sql_tztime.cc b/databases/mysql56-client/patches/patch-sql_tztime.cc new file mode 100644 index 00000000000..2a16ffb1040 --- /dev/null +++ b/databases/mysql56-client/patches/patch-sql_tztime.cc @@ -0,0 +1,13 @@ +$NetBSD$ + +--- sql/tztime.cc.orig 2013-05-05 20:56:04.000000000 +0000 ++++ sql/tztime.cc +@@ -2643,7 +2643,7 @@ main(int argc, char **argv) + if (TYPE_SIGNED(time_t)) + { + t= -100; +- localtime_negative= test(localtime_r(&t, &tmp) != 0); ++ localtime_negative= my_test(localtime_r(&t, &tmp) != 0); + printf("localtime_r %s negative params \ + (time_t=%d is %d-%d-%d %d:%d:%d)\n", + (localtime_negative ? "supports" : "doesn't support"), (int)t, diff --git a/databases/mysql56-client/patches/patch-sql_unireg.cc b/databases/mysql56-client/patches/patch-sql_unireg.cc new file mode 100644 index 00000000000..1f9dcfb67ff --- /dev/null +++ b/databases/mysql56-client/patches/patch-sql_unireg.cc @@ -0,0 +1,13 @@ +$NetBSD$ + +--- sql/unireg.cc.orig 2013-05-05 20:56:04.000000000 +0000 ++++ sql/unireg.cc +@@ -287,7 +287,7 @@ bool mysql_create_frm(THD *thd, const ch + maxlength=(uint) next_io_size((ulong) (uint2korr(forminfo_p)+1000)); + int2store(forminfo+2,maxlength); + int4store(fileinfo+10,(ulong) (filepos+maxlength)); +- fileinfo[26]= (uchar) test((create_info->max_rows == 1) && ++ fileinfo[26]= (uchar) my_test((create_info->max_rows == 1) && + (create_info->min_rows == 1) && (keys == 0)); + int2store(fileinfo+28,key_info_length); + diff --git a/databases/mysql56-client/patches/patch-storage_federated_ha__federated.cc b/databases/mysql56-client/patches/patch-storage_federated_ha__federated.cc new file mode 100644 index 00000000000..f97c8393f75 --- /dev/null +++ b/databases/mysql56-client/patches/patch-storage_federated_ha__federated.cc @@ -0,0 +1,22 @@ +$NetBSD$ + +--- storage/federated/ha_federated.cc.orig 2013-05-05 20:50:46.000000000 +0000 ++++ storage/federated/ha_federated.cc +@@ -1463,7 +1463,7 @@ prepare_for_next_key_part: + ptr was incremented by 1. Since store_length still counts null-byte, + we need to subtract 1 from store_length. + */ +- ptr+= store_length - test(key_part->null_bit); ++ ptr+= store_length - my_test(key_part->null_bit); + if (tmp.append(STRING_WITH_LEN(" AND "))) + goto err; + +@@ -2105,7 +2105,7 @@ int ha_federated::update_row(const uchar + this? Because we only are updating one record, and LIMIT enforces + this. + */ +- bool has_a_primary_key= test(table->s->primary_key != MAX_KEY); ++ bool has_a_primary_key= my_test(table->s->primary_key != MAX_KEY); + + /* + buffers for following strings diff --git a/databases/mysql56-client/patches/patch-storage_heap_ha__heap.cc b/databases/mysql56-client/patches/patch-storage_heap_ha__heap.cc new file mode 100644 index 00000000000..2f0f8d5adf3 --- /dev/null +++ b/databases/mysql56-client/patches/patch-storage_heap_ha__heap.cc @@ -0,0 +1,22 @@ +$NetBSD$ + +--- storage/heap/ha_heap.cc.orig 2013-04-05 12:27:17.000000000 +0000 ++++ storage/heap/ha_heap.cc +@@ -97,7 +97,7 @@ const char **ha_heap::bas_ext() const + + int ha_heap::open(const char *name, int mode, uint test_if_locked) + { +- internal_table= test(test_if_locked & HA_OPEN_INTERNAL_TABLE); ++ internal_table= my_test(test_if_locked & HA_OPEN_INTERNAL_TABLE); + if (internal_table || (!(file= heap_open(name, mode)) && my_errno == ENOENT)) + { + HP_CREATE_INFO create_info; +@@ -113,7 +113,7 @@ int ha_heap::open(const char *name, int + if (rc) + goto end; + +- implicit_emptied= test(created_new_share); ++ implicit_emptied= my_test(created_new_share); + if (internal_table) + file= heap_open_from_share(internal_share, mode); + else diff --git a/databases/mysql56-client/patches/patch-storage_myisam_ha__myisam.cc b/databases/mysql56-client/patches/patch-storage_myisam_ha__myisam.cc new file mode 100644 index 00000000000..31f57422832 --- /dev/null +++ b/databases/mysql56-client/patches/patch-storage_myisam_ha__myisam.cc @@ -0,0 +1,44 @@ +$NetBSD$ + +--- storage/myisam/ha_myisam.cc.orig 2013-05-05 21:01:47.000000000 +0000 ++++ storage/myisam/ha_myisam.cc +@@ -464,8 +464,8 @@ int check_definition(MI_KEYDEF *t1_keyin + { + DBUG_PRINT("error", ("Key %d has different definition", i)); + DBUG_PRINT("error", ("t1_fulltext= %d, t2_fulltext=%d", +- test(t1_keyinfo[i].flag & HA_FULLTEXT), +- test(t2_keyinfo[i].flag & HA_FULLTEXT))); ++ my_test(t1_keyinfo[i].flag & HA_FULLTEXT), ++ my_test(t2_keyinfo[i].flag & HA_FULLTEXT))); + DBUG_RETURN(1); + } + if (t1_keyinfo[i].flag & HA_SPATIAL && t2_keyinfo[i].flag & HA_SPATIAL) +@@ -475,8 +475,8 @@ int check_definition(MI_KEYDEF *t1_keyin + { + DBUG_PRINT("error", ("Key %d has different definition", i)); + DBUG_PRINT("error", ("t1_spatial= %d, t2_spatial=%d", +- test(t1_keyinfo[i].flag & HA_SPATIAL), +- test(t2_keyinfo[i].flag & HA_SPATIAL))); ++ my_test(t1_keyinfo[i].flag & HA_SPATIAL), ++ my_test(t2_keyinfo[i].flag & HA_SPATIAL))); + DBUG_RETURN(1); + } + if ((!mysql_40_compat && +@@ -1067,7 +1067,7 @@ int ha_myisam::repair(THD *thd, MI_CHECK + share->state.key_map); + uint testflag=param.testflag; + #ifdef HAVE_MMAP +- bool remap= test(share->file_map); ++ bool remap= my_test(share->file_map); + /* + mi_repair*() functions family use file I/O even if memory + mapping is available. +@@ -1609,7 +1609,7 @@ ICP_RESULT index_cond_func_myisam(void * + if (h->end_range && h->compare_key_icp(h->end_range) > 0) + return ICP_OUT_OF_RANGE; /* caller should return HA_ERR_END_OF_FILE already */ + +- return (ICP_RESULT) test(h->pushed_idx_cond->val_int()); ++ return (ICP_RESULT) my_test(h->pushed_idx_cond->val_int()); + } + + C_MODE_END diff --git a/databases/p5-DBD-CSV/Makefile b/databases/p5-DBD-CSV/Makefile index f30195bfab1..9000a70bc5c 100644 --- a/databases/p5-DBD-CSV/Makefile +++ b/databases/p5-DBD-CSV/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.34 2012/10/02 21:25:26 asau Exp $ +# $NetBSD: Makefile,v 1.35 2012/10/03 21:54:15 wiz Exp $ -DISTNAME= DBD-CSV-0.36 +DISTNAME= DBD-CSV-0.38 PKGNAME= p5-${DISTNAME} -PKGREVISION= 1 SVR4_PKGNAME= p5dcs CATEGORIES= databases perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=DBD/} diff --git a/databases/p5-DBD-CSV/distinfo b/databases/p5-DBD-CSV/distinfo index 6eb8b58ba30..0bb658b90e1 100644 --- a/databases/p5-DBD-CSV/distinfo +++ b/databases/p5-DBD-CSV/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.14 2012/07/06 08:30:48 sno Exp $ +$NetBSD: distinfo,v 1.15 2012/09/07 11:41:08 sno Exp $ -SHA1 (DBD-CSV-0.36.tgz) = 2202d2d96318090b638a3a1fa33b46f95b623a3b -RMD160 (DBD-CSV-0.36.tgz) = 80bfa70c825e351d8fb49d0e571b916e514feb5d -Size (DBD-CSV-0.36.tgz) = 31447 bytes +SHA1 (DBD-CSV-0.38.tgz) = 373767942730037f1e5524ae12697c1888b7baab +RMD160 (DBD-CSV-0.38.tgz) = e923f3efa84781059033ff19cc0083631268cd9c +Size (DBD-CSV-0.38.tgz) = 30794 bytes diff --git a/databases/p5-DBIx-Connector/Makefile b/databases/p5-DBIx-Connector/Makefile index 112d6227c0c..4dc3ed657c6 100644 --- a/databases/p5-DBIx-Connector/Makefile +++ b/databases/p5-DBIx-Connector/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.7 2012/10/02 21:25:31 asau Exp $ +# $NetBSD: Makefile,v 1.8 2012/10/03 21:54:19 wiz Exp $ # -DISTNAME= DBIx-Connector-0.52 +DISTNAME= DBIx-Connector-0.53 PKGNAME= p5-${DISTNAME} -PKGREVISION= 1 CATEGORIES= databases perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=DBIx/} diff --git a/databases/p5-DBIx-Connector/distinfo b/databases/p5-DBIx-Connector/distinfo index 506f872797a..d47130c3f2a 100644 --- a/databases/p5-DBIx-Connector/distinfo +++ b/databases/p5-DBIx-Connector/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.3 2011/10/24 09:36:01 hiramatsu Exp $ +$NetBSD: distinfo,v 1.4 2012/05/30 08:21:47 wiz Exp $ -SHA1 (DBIx-Connector-0.52.tar.gz) = 4fa9602e31502e3731a7d25b4c93a54e3b4b3be1 -RMD160 (DBIx-Connector-0.52.tar.gz) = 753c3c66b92191e1e56eae1bf9eeee10064c3b96 -Size (DBIx-Connector-0.52.tar.gz) = 35709 bytes +SHA1 (DBIx-Connector-0.53.tar.gz) = b5af0eeba1053ee44ff6698c84086dbfd85edcef +RMD160 (DBIx-Connector-0.53.tar.gz) = fa4fe7b5c46491cf2d845c5cfe26a6c011d31651 +Size (DBIx-Connector-0.53.tar.gz) = 35777 bytes diff --git a/devel/kyua-cli/distinfo b/devel/kyua-cli/distinfo index b81dc844a30..d4e90cfdd04 100644 --- a/devel/kyua-cli/distinfo +++ b/devel/kyua-cli/distinfo @@ -1,8 +1,28 @@ -$NetBSD: distinfo,v 1.12 2013/02/23 03:37:40 jmmv Exp $ +$NetBSD: distinfo,v 1.13 2013/03/02 18:16:38 joerg Exp $ SHA1 (kyua-cli-0.6.tar.gz) = 85453765a497d381570d6f658d90038af894a90f RMD160 (kyua-cli-0.6.tar.gz) = a60e317639e60fd688a76297791670b680e7d505 Size (kyua-cli-0.6.tar.gz) = 487249 bytes -SHA1 (patch-engine_metadata.hpp) = 49939194e11a31d77b27f21ba4fa90438d165db6 +SHA1 (patch-engine_action.hpp) = b90db41a66614e4aceda84687370b8f0092e8686 +SHA1 (patch-engine_context.hpp) = b4c35db43745e334ab1d7e5c654744b3b30c95e9 +SHA1 (patch-engine_metadata.hpp) = 134fd2ebcbef63d018f3032dbba5ed5b888be068 +SHA1 (patch-engine_test__case.hpp) = a98337a39252a0a5685f25bf707009dd95190883 +SHA1 (patch-engine_test__program.hpp) = af343296fe3df794b66472c2784e1c8b3297ba1d +SHA1 (patch-store_backend.hpp) = 5633b5780833bb2c3a09963932eca9d08710a807 +SHA1 (patch-store_transaction.cpp) = 98179f580b2d2f053f3d51c6ddd923af03de5941 +SHA1 (patch-store_transaction.hpp) = 5c4066c41d4b56d304aff5a12bf9f765e8abed09 +SHA1 (patch-utils_cmdline_exceptions.cpp) = f1e524db998802d3979595abd496ae609b32a1ea +SHA1 (patch-utils_cmdline_exceptions.hpp) = 7f893a224b263aaefde1232ab594c403849581f1 +SHA1 (patch-utils_config_tree.hpp) = b5cef0e44597c2a1c9936c51050c5e77d22add0f +SHA1 (patch-utils_datetime.cpp) = cb5fd42fb737f8fe862a3bddcd1ecba27d71be8f +SHA1 (patch-utils_datetime.hpp) = 458d6c061f6bb4363c0e107660fd169abf04cb7c +SHA1 (patch-utils_format_exceptions.cpp) = 065c4f51d5bca6ecfc8b27fb65c2dc65a4986c08 +SHA1 (patch-utils_format_exceptions.hpp) = 31041332e10f4936f02bbd07a32f59b50e45fe2f +SHA1 (patch-utils_fs_auto__cleaners.hpp) = 9ad6c230654ee270aa99a591060b975aae39b86f +SHA1 (patch-utils_fs_exceptions.cpp) = a74fc2f7f13339a69edb0c157da1928610890646 +SHA1 (patch-utils_fs_exceptions.hpp) = 06c0b7cef761b218a1b570bcd889ab82e9eb8720 +SHA1 (patch-utils_sqlite_database.hpp) = 899bfe56fdaf4328f27653313572aeda54a8b764 +SHA1 (patch-utils_sqlite_statement.hpp) = bd4fdadba994d7125c2d5d4ba3c98ca4b2a8f69f +SHA1 (patch-utils_sqlite_transaction.hpp) = 4020ff30555b20d669a57ceab55c27954913165f SHA1 (patch-utils_units.cpp) = cc1870352204fcd39fb4dc6d66134635cf6a46bb SHA1 (patch-utils_units.hpp) = 3cbbcc8889f2cfedd070202a1a9942c35f2f63eb diff --git a/devel/kyua-cli/patches/patch-engine_action.hpp b/devel/kyua-cli/patches/patch-engine_action.hpp new file mode 100644 index 00000000000..6968d07784f --- /dev/null +++ b/devel/kyua-cli/patches/patch-engine_action.hpp @@ -0,0 +1,27 @@ +$NetBSD$ + +--- engine/action.hpp.orig 2013-05-06 08:08:05.000000000 +0000 ++++ engine/action.hpp +@@ -33,7 +33,13 @@ + #define ENGINE_ACTION_HPP + + #include ++#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L ++#include ++using std::shared_ptr; ++#else + #include ++using std::tr1::shared_ptr; ++#endif + + namespace engine { + +@@ -50,7 +56,7 @@ class action { + struct impl; + + /// Pointer to the shared internal implementation. +- std::tr1::shared_ptr< impl > _pimpl; ++ shared_ptr< impl > _pimpl; + + public: + explicit action(const context&); diff --git a/devel/kyua-cli/patches/patch-engine_context.hpp b/devel/kyua-cli/patches/patch-engine_context.hpp new file mode 100644 index 00000000000..fcafa6726b6 --- /dev/null +++ b/devel/kyua-cli/patches/patch-engine_context.hpp @@ -0,0 +1,27 @@ +$NetBSD$ + +--- engine/context.hpp.orig 2013-05-06 08:09:15.000000000 +0000 ++++ engine/context.hpp +@@ -35,7 +35,13 @@ + #include + #include + #include ++#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L ++#include ++using std::shared_ptr; ++#else + #include ++using std::tr1::shared_ptr; ++#endif + + #include "utils/fs/path.hpp" + +@@ -51,7 +57,7 @@ class context { + struct impl; + + /// Pointer to the shared internal implementation. +- std::tr1::shared_ptr< impl > _pimpl; ++ shared_ptr< impl > _pimpl; + + public: + context(const utils::fs::path&, diff --git a/devel/kyua-cli/patches/patch-engine_metadata.hpp b/devel/kyua-cli/patches/patch-engine_metadata.hpp index 55c2520d4d5..9e255530ec4 100644 --- a/devel/kyua-cli/patches/patch-engine_metadata.hpp +++ b/devel/kyua-cli/patches/patch-engine_metadata.hpp @@ -1,8 +1,20 @@ -$NetBSD$ +$NetBSD: patch-engine_metadata.hpp,v 1.1 2013/03/02 18:16:39 joerg Exp $ ---- engine/metadata.hpp.orig 2013-02-28 21:58:41.000000000 +0000 +--- engine/metadata.hpp.orig 2013-01-26 03:01:41.000000000 +0000 +++ engine/metadata.hpp -@@ -44,7 +44,7 @@ +@@ -38,13 +38,19 @@ + #include + #include + ++#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L ++#include ++using std::shared_ptr; ++#else + #include ++using std::tr1::shared_ptr; ++#endif + + #include "utils/noncopyable.hpp" namespace utils { namespace config { class tree; } @@ -11,3 +23,12 @@ $NetBSD$ namespace fs { class path; } namespace units { class bytes; } } // namespace utils +@@ -73,7 +79,7 @@ class metadata { + struct impl; + + /// Pointer to the shared internal implementation. +- std::tr1::shared_ptr< impl > _pimpl; ++ shared_ptr< impl > _pimpl; + + friend class metadata_builder; + diff --git a/devel/kyua-cli/patches/patch-engine_test__case.hpp b/devel/kyua-cli/patches/patch-engine_test__case.hpp new file mode 100644 index 00000000000..5bdc93c15a0 --- /dev/null +++ b/devel/kyua-cli/patches/patch-engine_test__case.hpp @@ -0,0 +1,36 @@ +$NetBSD$ + +--- engine/test_case.hpp.orig 2013-05-06 08:06:18.000000000 +0000 ++++ engine/test_case.hpp +@@ -34,7 +34,13 @@ + + #include + #include ++#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L ++#include ++using std::shared_ptr; ++#else + #include ++using std::tr1::shared_ptr; ++#endif + + #include "engine/metadata.hpp" + #include "utils/config/tree.hpp" +@@ -71,7 +77,7 @@ class test_case { + struct impl; + + /// Pointer to the shared internal implementation. +- std::tr1::shared_ptr< impl > _pimpl; ++ shared_ptr< impl > _pimpl; + + public: + test_case(const std::string&, const test_program&, +@@ -96,7 +102,7 @@ std::ostream& operator<<(std::ostream&, + + + /// Pointer to a test case. +-typedef std::tr1::shared_ptr< test_case > test_case_ptr; ++typedef shared_ptr< test_case > test_case_ptr; + + + test_result debug_test_case(const test_case*, const utils::config::tree&, diff --git a/devel/kyua-cli/patches/patch-engine_test__program.hpp b/devel/kyua-cli/patches/patch-engine_test__program.hpp new file mode 100644 index 00000000000..c83e29a7e96 --- /dev/null +++ b/devel/kyua-cli/patches/patch-engine_test__program.hpp @@ -0,0 +1,38 @@ +$NetBSD$ + +--- engine/test_program.hpp.orig 2013-05-06 08:09:43.000000000 +0000 ++++ engine/test_program.hpp +@@ -40,8 +40,14 @@ + + #include + #include +-#include + #include ++#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L ++#include ++using std::shared_ptr; ++#else ++#include ++using std::tr1::shared_ptr; ++#endif + + #include "engine/test_case.hpp" + #include "utils/fs/path.hpp" +@@ -61,7 +67,7 @@ class test_program { + struct impl; + + /// Pointer to the shared internal implementation. +- std::tr1::shared_ptr< impl > _pimpl; ++ shared_ptr< impl > _pimpl; + + public: + test_program(const std::string&, const utils::fs::path&, +@@ -89,7 +95,7 @@ std::ostream& operator<<(std::ostream&, + + + /// Pointer to a test program. +-typedef std::tr1::shared_ptr< test_program > test_program_ptr; ++typedef shared_ptr< test_program > test_program_ptr; + + + /// Collection of test programs. diff --git a/devel/kyua-cli/patches/patch-store_backend.hpp b/devel/kyua-cli/patches/patch-store_backend.hpp new file mode 100644 index 00000000000..8399c257701 --- /dev/null +++ b/devel/kyua-cli/patches/patch-store_backend.hpp @@ -0,0 +1,28 @@ +$NetBSD$ + +--- store/backend.hpp.orig 2013-05-06 07:36:42.000000000 +0000 ++++ store/backend.hpp +@@ -32,7 +32,14 @@ + #if !defined(STORE_BACKEND_HPP) + #define STORE_BACKEND_HPP + ++#include ++#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L ++#include ++using std::shared_ptr; ++#else + #include ++using std::tr1::shared_ptr; ++#endif + + namespace utils { + namespace fs { +@@ -72,7 +79,7 @@ class backend { + struct impl; + + /// Pointer to the shared internal implementation. +- std::tr1::shared_ptr< impl > _pimpl; ++ shared_ptr< impl > _pimpl; + + friend class metadata; + diff --git a/devel/kyua-cli/patches/patch-store_transaction.cpp b/devel/kyua-cli/patches/patch-store_transaction.cpp new file mode 100644 index 00000000000..e26d374cc22 --- /dev/null +++ b/devel/kyua-cli/patches/patch-store_transaction.cpp @@ -0,0 +1,22 @@ +$NetBSD$ + +--- store/transaction.cpp.orig 2013-05-06 08:17:59.000000000 +0000 ++++ store/transaction.cpp +@@ -437,7 +437,7 @@ struct store::results_iterator::impl { + /// + /// \param pimpl_ The internal implementation details of the iterator. + store::results_iterator::results_iterator( +- std::tr1::shared_ptr< impl > pimpl_) : ++ shared_ptr< impl > pimpl_) : + _pimpl(pimpl_) + { + } +@@ -680,7 +680,7 @@ store::results_iterator + store::transaction::get_action_results(const int64_t action_id) + { + try { +- return results_iterator(std::tr1::shared_ptr< results_iterator::impl >( ++ return results_iterator(shared_ptr< results_iterator::impl >( + new results_iterator::impl(_pimpl->_backend, action_id))); + } catch (const sqlite::error& e) { + throw error(e.what()); diff --git a/devel/kyua-cli/patches/patch-store_transaction.hpp b/devel/kyua-cli/patches/patch-store_transaction.hpp new file mode 100644 index 00000000000..93c82b62239 --- /dev/null +++ b/devel/kyua-cli/patches/patch-store_transaction.hpp @@ -0,0 +1,40 @@ +$NetBSD$ + +--- store/transaction.hpp.orig 2013-05-06 08:16:11.000000000 +0000 ++++ store/transaction.hpp +@@ -37,7 +37,13 @@ extern "C" { + } + + #include ++#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L ++#include ++using std::shared_ptr; ++#else + #include ++using std::tr1::shared_ptr; ++#endif + #include + + #include "engine/test_program.hpp" +@@ -77,10 +83,10 @@ class results_iterator { + struct impl; + + /// Pointer to the shared internal implementation. +- std::tr1::shared_ptr< impl > _pimpl; ++ shared_ptr< impl > _pimpl; + + friend class transaction; +- results_iterator(std::tr1::shared_ptr< impl >); ++ results_iterator(shared_ptr< impl >); + + public: + ~results_iterator(void); +@@ -106,7 +112,7 @@ class transaction { + struct impl; + + /// Pointer to the shared internal implementation. +- std::tr1::shared_ptr< impl > _pimpl; ++ shared_ptr< impl > _pimpl; + + friend class backend; + transaction(backend&); diff --git a/devel/kyua-cli/patches/patch-utils_cmdline_exceptions.cpp b/devel/kyua-cli/patches/patch-utils_cmdline_exceptions.cpp new file mode 100644 index 00000000000..810f691b76c --- /dev/null +++ b/devel/kyua-cli/patches/patch-utils_cmdline_exceptions.cpp @@ -0,0 +1,12 @@ +$NetBSD$ + +--- utils/cmdline/exceptions.cpp.orig 2013-05-06 08:19:49.000000000 +0000 ++++ utils/cmdline/exceptions.cpp +@@ -26,6 +26,7 @@ + // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + ++#include + #include "utils/cmdline/exceptions.hpp" + + #include "utils/format/macros.hpp" diff --git a/devel/kyua-cli/patches/patch-utils_cmdline_exceptions.hpp b/devel/kyua-cli/patches/patch-utils_cmdline_exceptions.hpp new file mode 100644 index 00000000000..878463780bf --- /dev/null +++ b/devel/kyua-cli/patches/patch-utils_cmdline_exceptions.hpp @@ -0,0 +1,12 @@ +$NetBSD$ + +--- utils/cmdline/exceptions.hpp.orig 2013-05-06 08:24:33.000000000 +0000 ++++ utils/cmdline/exceptions.hpp +@@ -33,6 +33,7 @@ + #define UTILS_CMDLINE_EXCEPTIONS_HPP + + #include ++#include + + namespace utils { + namespace cmdline { diff --git a/devel/kyua-cli/patches/patch-utils_config_tree.hpp b/devel/kyua-cli/patches/patch-utils_config_tree.hpp new file mode 100644 index 00000000000..743246303ae --- /dev/null +++ b/devel/kyua-cli/patches/patch-utils_config_tree.hpp @@ -0,0 +1,27 @@ +$NetBSD$ + +--- utils/config/tree.hpp.orig 2013-01-26 03:01:41.000000000 +0000 ++++ utils/config/tree.hpp +@@ -34,7 +34,13 @@ + + #include + #include ++#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L ++#include ++using std::shared_ptr; ++#else + #include ++using std::tr1::shared_ptr; ++#endif + + #include + +@@ -82,7 +88,7 @@ typedef std::map< std::string, std::stri + /// deep_copy(). + class tree { + /// The root of the tree. +- std::tr1::shared_ptr< detail::static_inner_node > _root; ++ shared_ptr< detail::static_inner_node > _root; + + explicit tree(detail::static_inner_node*); + diff --git a/devel/kyua-cli/patches/patch-utils_datetime.cpp b/devel/kyua-cli/patches/patch-utils_datetime.cpp new file mode 100644 index 00000000000..20bb41881a3 --- /dev/null +++ b/devel/kyua-cli/patches/patch-utils_datetime.cpp @@ -0,0 +1,40 @@ +$NetBSD$ + +--- utils/datetime.cpp.orig 2013-05-06 08:18:02.000000000 +0000 ++++ utils/datetime.cpp +@@ -183,7 +183,7 @@ struct timestamp::impl { + /// Constructs a new timestamp. + /// + /// \param pimpl_ An existing impl representation. +-datetime::timestamp::timestamp(std::tr1::shared_ptr< impl > pimpl_) : ++datetime::timestamp::timestamp(shared_ptr< impl > pimpl_) : + _pimpl(pimpl_) + { + } +@@ -201,7 +201,7 @@ datetime::timestamp::from_microseconds(c + ::timeval data; + data.tv_sec = static_cast< time_t >(value / 1000000); + data.tv_usec = static_cast< suseconds_t >(value % 1000000); +- return timestamp(std::tr1::shared_ptr< impl >(new impl(data))); ++ return timestamp(shared_ptr< impl >(new impl(data))); + } + + +@@ -257,7 +257,7 @@ datetime::timestamp::from_values(const i + ::timeval data; + data.tv_sec = ::mktime(&timedata); + data.tv_usec = static_cast< suseconds_t >(microsecond); +- return timestamp(std::tr1::shared_ptr< impl >(new impl(data))); ++ return timestamp(shared_ptr< impl >(new impl(data))); + } + + +@@ -276,7 +276,7 @@ datetime::timestamp::now(void) + INV(ret != -1); + } + +- return timestamp(std::tr1::shared_ptr< impl >(new impl(data))); ++ return timestamp(shared_ptr< impl >(new impl(data))); + } + + diff --git a/devel/kyua-cli/patches/patch-utils_datetime.hpp b/devel/kyua-cli/patches/patch-utils_datetime.hpp new file mode 100644 index 00000000000..37a02badc7d --- /dev/null +++ b/devel/kyua-cli/patches/patch-utils_datetime.hpp @@ -0,0 +1,30 @@ +$NetBSD$ + +--- utils/datetime.hpp.orig 2013-05-06 07:34:28.000000000 +0000 ++++ utils/datetime.hpp +@@ -40,7 +40,13 @@ extern "C" { + #include + #include + ++#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L ++#include ++using std::shared_ptr; ++#else + #include ++using std::tr1::shared_ptr; ++#endif + + namespace utils { + namespace datetime { +@@ -81,9 +87,9 @@ class timestamp { + struct impl; + + /// Pointer to the shared internal implementation. +- std::tr1::shared_ptr< impl > _pimpl; ++ shared_ptr< impl > _pimpl; + +- timestamp(std::tr1::shared_ptr< impl >); ++ timestamp(shared_ptr< impl >); + + public: + static timestamp from_microseconds(const int64_t); diff --git a/devel/kyua-cli/patches/patch-utils_format_exceptions.cpp b/devel/kyua-cli/patches/patch-utils_format_exceptions.cpp new file mode 100644 index 00000000000..280c5b22ecf --- /dev/null +++ b/devel/kyua-cli/patches/patch-utils_format_exceptions.cpp @@ -0,0 +1,12 @@ +$NetBSD$ + +--- utils/format/exceptions.cpp.orig 2013-05-06 08:20:35.000000000 +0000 ++++ utils/format/exceptions.cpp +@@ -26,6 +26,7 @@ + // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + ++#include + #include "utils/format/exceptions.hpp" + + using utils::format::bad_format_error; diff --git a/devel/kyua-cli/patches/patch-utils_format_exceptions.hpp b/devel/kyua-cli/patches/patch-utils_format_exceptions.hpp new file mode 100644 index 00000000000..9dec67a76ab --- /dev/null +++ b/devel/kyua-cli/patches/patch-utils_format_exceptions.hpp @@ -0,0 +1,12 @@ +$NetBSD$ + +--- utils/format/exceptions.hpp.orig 2013-05-06 08:27:56.000000000 +0000 ++++ utils/format/exceptions.hpp +@@ -33,6 +33,7 @@ + #define UTILS_FORMAT_EXCEPTIONS_HPP + + #include ++#include + + namespace utils { + namespace format { diff --git a/devel/kyua-cli/patches/patch-utils_fs_auto__cleaners.hpp b/devel/kyua-cli/patches/patch-utils_fs_auto__cleaners.hpp new file mode 100644 index 00000000000..c3070e28c56 --- /dev/null +++ b/devel/kyua-cli/patches/patch-utils_fs_auto__cleaners.hpp @@ -0,0 +1,36 @@ +$NetBSD$ + +--- utils/fs/auto_cleaners.hpp.orig 2013-05-06 08:10:18.000000000 +0000 ++++ utils/fs/auto_cleaners.hpp +@@ -33,7 +33,13 @@ + #define UTILS_FS_AUTO_CLEANERS_HPP + + #include ++#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L ++#include ++using std::shared_ptr; ++#else + #include ++using std::tr1::shared_ptr; ++#endif + + #include "utils/fs/path.hpp" + +@@ -48,7 +54,7 @@ namespace fs { + class auto_directory { + struct impl; + /// Reference-counted, shared implementation. +- std::tr1::shared_ptr< impl > _pimpl; ++ shared_ptr< impl > _pimpl; + + public: + explicit auto_directory(const path&); +@@ -68,7 +74,7 @@ public: + class auto_file { + struct impl; + /// Reference-counted, shared implementation. +- std::tr1::shared_ptr< impl > _pimpl; ++ shared_ptr< impl > _pimpl; + + public: + explicit auto_file(const path&); diff --git a/devel/kyua-cli/patches/patch-utils_fs_exceptions.cpp b/devel/kyua-cli/patches/patch-utils_fs_exceptions.cpp new file mode 100644 index 00000000000..93f76a325aa --- /dev/null +++ b/devel/kyua-cli/patches/patch-utils_fs_exceptions.cpp @@ -0,0 +1,12 @@ +$NetBSD$ + +--- utils/fs/exceptions.cpp.orig 2013-05-06 08:21:29.000000000 +0000 ++++ utils/fs/exceptions.cpp +@@ -29,6 +29,7 @@ + #include "utils/fs/exceptions.hpp" + + #include ++#include + + #include "utils/format/macros.hpp" + diff --git a/devel/kyua-cli/patches/patch-utils_fs_exceptions.hpp b/devel/kyua-cli/patches/patch-utils_fs_exceptions.hpp new file mode 100644 index 00000000000..bba599c6c3f --- /dev/null +++ b/devel/kyua-cli/patches/patch-utils_fs_exceptions.hpp @@ -0,0 +1,12 @@ +$NetBSD$ + +--- utils/fs/exceptions.hpp.orig 2013-05-06 08:21:46.000000000 +0000 ++++ utils/fs/exceptions.hpp +@@ -33,6 +33,7 @@ + #define UTILS_FS_EXCEPTIONS_HPP + + #include ++#include + + namespace utils { + namespace fs { diff --git a/devel/kyua-cli/patches/patch-utils_sqlite_database.hpp b/devel/kyua-cli/patches/patch-utils_sqlite_database.hpp new file mode 100644 index 00000000000..213240dcc8c --- /dev/null +++ b/devel/kyua-cli/patches/patch-utils_sqlite_database.hpp @@ -0,0 +1,27 @@ +$NetBSD$ + +--- utils/sqlite/database.hpp.orig 2013-05-06 07:46:57.000000000 +0000 ++++ utils/sqlite/database.hpp +@@ -40,7 +40,13 @@ extern "C" { + } + + #include ++#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L ++#include ++using std::shared_ptr; ++#else + #include ++using std::tr1::shared_ptr; ++#endif + + #include "utils/fs/path.hpp" + +@@ -79,7 +85,7 @@ class database { + struct impl; + + /// Pointer to the shared internal implementation. +- std::tr1::shared_ptr< impl > _pimpl; ++ shared_ptr< impl > _pimpl; + + friend class database_c_gate; + database(void*, const bool); diff --git a/devel/kyua-cli/patches/patch-utils_sqlite_statement.hpp b/devel/kyua-cli/patches/patch-utils_sqlite_statement.hpp new file mode 100644 index 00000000000..a065436aaa0 --- /dev/null +++ b/devel/kyua-cli/patches/patch-utils_sqlite_statement.hpp @@ -0,0 +1,27 @@ +$NetBSD$ + +--- utils/sqlite/statement.hpp.orig 2013-05-06 08:04:34.000000000 +0000 ++++ utils/sqlite/statement.hpp +@@ -40,7 +40,13 @@ extern "C" { + } + + #include ++#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L ++#include ++using std::shared_ptr; ++#else + #include ++using std::tr1::shared_ptr; ++#endif + + namespace utils { + namespace sqlite { +@@ -92,7 +98,7 @@ class statement { + struct impl; + + /// Pointer to the shared internal implementation. +- std::tr1::shared_ptr< impl > _pimpl; ++ shared_ptr< impl > _pimpl; + + statement(database&, void*); + friend class database; diff --git a/devel/kyua-cli/patches/patch-utils_sqlite_transaction.hpp b/devel/kyua-cli/patches/patch-utils_sqlite_transaction.hpp new file mode 100644 index 00000000000..be26f0ab435 --- /dev/null +++ b/devel/kyua-cli/patches/patch-utils_sqlite_transaction.hpp @@ -0,0 +1,28 @@ +$NetBSD$ + +--- utils/sqlite/transaction.hpp.orig 2013-05-06 08:10:32.000000000 +0000 ++++ utils/sqlite/transaction.hpp +@@ -32,7 +32,14 @@ + #if !defined(UTILS_SQLITE_TRANSACTION_HPP) + #define UTILS_SQLITE_TRANSACTION_HPP + ++#include ++#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L ++#include ++using std::shared_ptr; ++#else + #include ++using std::tr1::shared_ptr; ++#endif + + namespace utils { + namespace sqlite { +@@ -49,7 +56,7 @@ class transaction { + struct impl; + + /// Pointer to the shared internal implementation. +- std::tr1::shared_ptr< impl > _pimpl; ++ shared_ptr< impl > _pimpl; + + explicit transaction(database&); + friend class database; diff --git a/devel/lutok/distinfo b/devel/lutok/distinfo index 856c90ef6c3..96cbe43592f 100644 --- a/devel/lutok/distinfo +++ b/devel/lutok/distinfo @@ -1,5 +1,7 @@ -$NetBSD: distinfo,v 1.1.1.1 2012/01/29 20:59:59 jmmv Exp $ +$NetBSD: distinfo,v 1.3 2013/05/06 14:44:07 joerg Exp $ SHA1 (lutok-0.2.tar.gz) = ca44640bba4bd50aca28e2ed10fb2ec99f14573f RMD160 (lutok-0.2.tar.gz) = ee91a8acf896baac276fab7d748d6e695702cf24 Size (lutok-0.2.tar.gz) = 492333 bytes +SHA1 (patch-debug.hpp) = a917bbc468d883b86e2283b37134b32be6a73a05 +SHA1 (patch-state.hpp) = 8eb974f60eeaca5c0c097cc155d1056564cd9c49 diff --git a/devel/lutok/patches/patch-debug.hpp b/devel/lutok/patches/patch-debug.hpp new file mode 100644 index 00000000000..56d3d0dcbdd --- /dev/null +++ b/devel/lutok/patches/patch-debug.hpp @@ -0,0 +1,29 @@ +$NetBSD$ + +--- debug.hpp.orig 2013-04-30 22:44:05.000000000 +0000 ++++ debug.hpp +@@ -33,8 +33,11 @@ + #define LUTOK_DEBUG_HPP + + #include ++#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L ++#include ++#else + #include +- ++#endif + + namespace lutok { + +@@ -56,7 +59,11 @@ class debug { + struct impl; + + /// Pointer to the shared internal implementation. ++#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L ++ std::shared_ptr< impl > _pimpl; ++#else + std::tr1::shared_ptr< impl > _pimpl; ++#endif + + public: + debug(void); diff --git a/devel/lutok/patches/patch-state.hpp b/devel/lutok/patches/patch-state.hpp new file mode 100644 index 00000000000..e4506f838a7 --- /dev/null +++ b/devel/lutok/patches/patch-state.hpp @@ -0,0 +1,29 @@ +$NetBSD$ + +--- state.hpp.orig 2013-04-30 22:43:07.000000000 +0000 ++++ state.hpp +@@ -33,7 +33,12 @@ + #define LUTOK_STATE_HPP + + #include ++ ++#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L ++#include ++#else + #include ++#endif + + namespace lutok { + +@@ -72,7 +77,11 @@ class state { + struct impl; + + /// Pointer to the shared internal implementation. ++#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L ++ std::shared_ptr< impl > _pimpl; ++#else + std::tr1::shared_ptr< impl > _pimpl; ++#endif + + void* new_userdata_voidp(const size_t); + void* to_userdata_voidp(const int); diff --git a/devel/monotone/distinfo b/devel/monotone/distinfo index 0a3df043e17..5a0f79f6496 100644 --- a/devel/monotone/distinfo +++ b/devel/monotone/distinfo @@ -1,8 +1,10 @@ -$NetBSD: distinfo,v 1.48 2011/04/01 13:51:54 jmmv Exp $ +$NetBSD: distinfo,v 1.49 2013/03/02 18:15:39 joerg Exp $ SHA1 (monotone-1.0.tar.bz2) = aac556bb26d92910b74b65450a0be6c5045e2052 RMD160 (monotone-1.0.tar.bz2) = 4c0813ae0c11f271dc88f42dd8814e474a67e988 Size (monotone-1.0.tar.bz2) = 3588074 bytes +SHA1 (patch-src_automate__reader.hh) = 90da65f7eb0ae329ad6324b3c747e2d449cb25cb SHA1 (patch-src_database.cc) = 7f8213917256c395d0cf994eb218647c3f44a63f +SHA1 (patch-src_hash__map.hh) = 03b3da72bc4a953ccc7b7ae0be4a2975e85ea0b3 SHA1 (patch-src_key__store.cc) = 4225dff8f1533794c0390822c8e17795bf805b6a SHA1 (patch-src_ssh__agent.cc) = 404c17a7c0194ee8185fa26f377112ae35fd1ca2 diff --git a/devel/monotone/patches/patch-src_automate__reader.hh b/devel/monotone/patches/patch-src_automate__reader.hh new file mode 100644 index 00000000000..ff494d26098 --- /dev/null +++ b/devel/monotone/patches/patch-src_automate__reader.hh @@ -0,0 +1,12 @@ +$NetBSD$ + +--- src/automate_reader.hh.orig 2013-05-06 13:23:37.000000000 +0000 ++++ src/automate_reader.hh +@@ -12,6 +12,7 @@ + #ifndef __AUTOMATE_READER_HH__ + #define __AUTOMATE_READER_HH__ + ++#include + #include + + class automate_reader diff --git a/devel/monotone/patches/patch-src_hash__map.hh b/devel/monotone/patches/patch-src_hash__map.hh new file mode 100644 index 00000000000..17a56220377 --- /dev/null +++ b/devel/monotone/patches/patch-src_hash__map.hh @@ -0,0 +1,49 @@ +$NetBSD$ + +--- src/hash_map.hh.orig 2013-05-06 13:12:19.000000000 +0000 ++++ src/hash_map.hh +@@ -50,7 +50,43 @@ namespace hashmap { + }; + } + +-#if HAVE_TR1_UNORDERED_MAP_AND_SET && HAVE_WORKING_TR1_UNORDERED_MAP_AND_SET ++#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L ++#define HASHMAP_PRESENT ++#include ++#include ++ ++namespace hashmap { ++ template<> ++ struct hash ++ { ++ size_t operator()(std::string const & s) const ++ { ++ return std::hash()(s); ++ } ++ }; ++ ++ template ++ class hash_map : public std::unordered_map<_Key, ++ _Value, ++ hash<_Key>, ++ equal_to<_Key> > ++ {}; ++ ++ template ++ class hash_set : public std::unordered_set<_Key, ++ hash<_Key>, ++ equal_to<_Key> > ++ {}; ++ ++ template ++ class hash_multimap : public std::unordered_multimap<_Key, ++ _Value, ++ hash<_Key>, ++ equal_to<_Key> > ++ {}; ++} ++ ++#elif HAVE_TR1_UNORDERED_MAP_AND_SET && HAVE_WORKING_TR1_UNORDERED_MAP_AND_SET + #define HASHMAP_PRESENT + #include + #include diff --git a/devel/p5-Moo/Makefile b/devel/p5-Moo/Makefile index 942da23b67f..534031819c9 100644 --- a/devel/p5-Moo/Makefile +++ b/devel/p5-Moo/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.9 2013/01/26 13:31:10 rhaen Exp $ +# $NetBSD: Makefile,v 1.10 2013/04/13 14:22:05 wen Exp $ -DISTNAME= Moo-1.001000 +DISTNAME= Moo-1.002000 PKGNAME= p5-${DISTNAME} CATEGORIES= devel perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=../../authors/id/M/MS/MSTROUT/} diff --git a/devel/p5-Moo/distinfo b/devel/p5-Moo/distinfo index 466bc0d3970..9ba4b7b9c0e 100644 --- a/devel/p5-Moo/distinfo +++ b/devel/p5-Moo/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.7 2013/01/26 13:31:10 rhaen Exp $ +$NetBSD: distinfo,v 1.8 2013/04/13 14:22:05 wen Exp $ -SHA1 (Moo-1.001000.tar.gz) = d79d03c50007e9bdd3f978864d501d561e9019b7 -RMD160 (Moo-1.001000.tar.gz) = eec88fcab9bd6053e7b7781ce9d960ffeb563e26 -Size (Moo-1.001000.tar.gz) = 59682 bytes +SHA1 (Moo-1.002000.tar.gz) = 3e53c1772d37c9d1ecdf7e57b7107ed26235410d +RMD160 (Moo-1.002000.tar.gz) = a8a77e43968856048c2c137e0d9fbfe0c4d99132 +Size (Moo-1.002000.tar.gz) = 63981 bytes diff --git a/devel/p5-Test-Pod/Makefile b/devel/p5-Test-Pod/Makefile index c239fb0872b..d0a6b8c7246 100644 --- a/devel/p5-Test-Pod/Makefile +++ b/devel/p5-Test-Pod/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.24 2012/10/03 21:55:44 wiz Exp $ +# $NetBSD: Makefile,v 1.25 2012/10/31 11:19:09 asau Exp $ -DISTNAME= Test-Pod-1.45 +DISTNAME= Test-Pod-1.48 PKGNAME= p5-${DISTNAME} -PKGREVISION= 1 SVR4_PKGNAME= p5tp CATEGORIES= devel perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Test/} diff --git a/devel/p5-Test-Pod/distinfo b/devel/p5-Test-Pod/distinfo index 8d97b82294b..6483fcb038f 100644 --- a/devel/p5-Test-Pod/distinfo +++ b/devel/p5-Test-Pod/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.8 2010/05/24 21:43:26 seb Exp $ +$NetBSD: distinfo,v 1.9 2012/01/26 15:59:16 rhaen Exp $ -SHA1 (Test-Pod-1.45.tar.gz) = 5f44b590877a33b7b09623dded15ee9c1dae224f -RMD160 (Test-Pod-1.45.tar.gz) = 9695e51b6f1e5a79644f739582c6e6f429d32abf -Size (Test-Pod-1.45.tar.gz) = 11034 bytes +SHA1 (Test-Pod-1.48.tar.gz) = e6c157c12e60ceb4c9d1365996bbfa9de0292533 +RMD160 (Test-Pod-1.48.tar.gz) = 46a9af1addf1e7eff5ffb31da422c792e55d8e4d +Size (Test-Pod-1.48.tar.gz) = 11291 bytes diff --git a/devel/p5-namespace-clean/Makefile b/devel/p5-namespace-clean/Makefile index a5e8b4e2009..ca1f77e93ce 100644 --- a/devel/p5-namespace-clean/Makefile +++ b/devel/p5-namespace-clean/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.14 2012/10/31 11:19:19 asau Exp $ +# $NetBSD: Makefile,v 1.15 2013/05/02 06:50:42 wen Exp $ DISTNAME= namespace-clean-0.24 PKGNAME= p5-${DISTNAME} +PKGREVISION= 1 CATEGORIES= devel perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=namespace/} @@ -14,6 +15,7 @@ USE_LANGUAGES= # empty DEPENDS+= p5-B-Hooks-EndOfScope>=0.12:../../devel/p5-B-Hooks-EndOfScope DEPENDS+= p5-Package-Stash>=0.23:../../devel/p5-Package-Stash +DEPENDS+= p5-Module-Implementation-[0-9]*:../../devel/p5-Module-Implementation BUILD_DEPENDS+= {perl>=5.10.1,p5-Test-Simple>=0.88}:../../devel/p5-Test-Simple diff --git a/doc/CHANGES-2013 b/doc/CHANGES-2013 index 730d97cff72..53ba9353274 100644 --- a/doc/CHANGES-2013 +++ b/doc/CHANGES-2013 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2013,v 1.1585 2013/05/05 20:43:56 schmonz Exp $ +$NetBSD: CHANGES-2013,v 1.1594 2013/05/06 19:06:15 gls Exp $ Changes to the packages collection and infrastructure in 2013: @@ -2416,3 +2416,13 @@ Changes to the packages collection and infrastructure in 2013: Updated sysutils/salt to 0.15.0 [imil 2013-05-05] Updated devel/mr to 1.15 [schmonz 2013-05-05] Updated www/ikiwiki to 3.20130504 [schmonz 2013-05-05] + Updated pkgtools/pkglint to 4.129 [obache 2013-05-06] + Updated audio/easytag to 2.1.8nb2 [wiz 2013-05-06] + Updated devel/p5-Test-Pod to 1.48 [wen 2013-05-06] + Updated textproc/p5-Pod-Simple to 3.28 [wen 2013-05-06] + Updated devel/p5-Moo to 1.002000 [wen 2013-05-06] + Updated databases/p5-DBIx-Connector to 0.53 [wen 2013-05-06] + Updated databases/p5-DBD-CSV to 0.38 [hiramatsu 2013-05-06] + Updated www/p5-HTTP-Body to 1.17 [hiramatsu 2013-05-06] + Updated emulators/suse121_krb5 to 12.1nb1 [gls 2013-05-06] + Updated audio/cmus to 2.5.0 [gls 2013-05-06] diff --git a/doc/TODO b/doc/TODO index 22a4fd221a6..850be36128a 100644 --- a/doc/TODO +++ b/doc/TODO @@ -1,4 +1,4 @@ -$NetBSD: TODO,v 1.12127 2013/05/05 02:36:29 jnemeth Exp $ +$NetBSD: TODO,v 1.12128 2013/05/05 21:15:52 wiz Exp $ Suggested new packages ====================== @@ -462,7 +462,6 @@ For possible Perl packages updates, see http://www.NetBSD.org/~wiz/perl.html. o clutter-1.14.2 o clutter-gst-2.0.2 o cmake-fedora-1.0.5 - o cmus-2.5.0 o coccigrep-1.12 o colorize-0.3.4 o colortail-0.3.3 diff --git a/doc/guide/files/fixes.xml b/doc/guide/files/fixes.xml index 57e5167c5e0..21444ec9491 100644 --- a/doc/guide/files/fixes.xml +++ b/doc/guide/files/fixes.xml @@ -1,4 +1,4 @@ - + Making your package work @@ -715,8 +715,8 @@ FETCH_MESSAGE+= "manually from "${MASTER_SITES:Q}"." sure the distfile was really updated on purpose, and that no trojan horse or so crept in. Please mention that the distfiles were compared and what was found - in your commit message. - Then, the correct way to work around this is to + in your commit message. + Then, the correct way to work around this is to set DIST_SUBDIR to a unique directory name, usually based on PKGNAME_NOREV. All DISTFILES and @@ -726,11 +726,12 @@ FETCH_MESSAGE+= "manually from "${MASTER_SITES:Q}"." In case this happens more often, PKGNAME can be used (thus including the nbX suffix) or a date stamp - can be appended, like ${PKGNAME_NOREV}-YYYYMMDD. - Do not forget regenerating the distinfo file + can be appended, like ${PKGNAME_NOREV}-YYYYMMDD. + DIST_SUBDIR is also used when a distfile's name does not contain a version and the distfile is apt to change. In cases where the likelihood of this is very small, DIST_SUBDIR might not be required. Additionally, DIST_SUBDIR must not be removed unless the distfile name changes, even if a package is being moved or renamed. + Do not forget regenerating the distinfo file after that, since it contains the DIST_SUBDIR path in the filenames. - Also increase the PKGREVISION if the installed package is different. + Also, increase the PKGREVISION if the installed package is different. Furthermore, a mail to the package's authors seems appropriate telling them that changing distfiles after releases without changing the file names is not good practice. @@ -1912,8 +1913,8 @@ PERL5_PACKLIST= auto/Pg/.packlist If a package installs .desktop files under share/applications and these include - MIME information, you need to take extra steps to ensure that they - are registered into the MIME database: + MIME information (MimeType key), you need to take extra steps to + ensure that they are registered into the MIME database: diff --git a/doc/pkgsrc.html b/doc/pkgsrc.html index fce52ea3ede..6f83fc6b3fa 100644 --- a/doc/pkgsrc.html +++ b/doc/pkgsrc.html @@ -7658,7 +7658,7 @@ TOOLS_PLATFORM.true?= true # shell builtin

18.4. Questions regarding the tools

-
+
18.4.1. How do I add a new tool?
18.4.2. How do I get a list of all available @@ -7677,7 +7677,7 @@ TOOLS_PLATFORM.true?= true # shell builtin -

18.4.1.

+

18.4.1.

How do I add a new tool?

@@ -7687,7 +7687,7 @@ TOOLS_PLATFORM.true?= true # shell builtin -

18.4.2.

+

18.4.2.

How do I get a list of all available tools?

@@ -7698,7 +7698,7 @@ TOOLS_PLATFORM.true?= true # shell builtin -

18.4.3.

+

18.4.3.

How can I get a list of all the tools that a package is using while being built? I want to know whether it @@ -8395,8 +8395,8 @@ FETCH_MESSAGE+= "manually from "${MASTER_SITES:Q}"." sure the distfile was really updated on purpose, and that no trojan horse or so crept in. Please mention that the distfiles were compared and what was found - in your commit message. - Then, the correct way to work around this is to + in your commit message.

+

Then, the correct way to work around this is to set DIST_SUBDIR to a unique directory name, usually based on PKGNAME_NOREV. All DISTFILES and @@ -8406,11 +8406,12 @@ FETCH_MESSAGE+= "manually from "${MASTER_SITES:Q}"." In case this happens more often, PKGNAME can be used (thus including the nbX suffix) or a date stamp - can be appended, like ${PKGNAME_NOREV}-YYYYMMDD. - Do not forget regenerating the distinfo file + can be appended, like ${PKGNAME_NOREV}-YYYYMMDD.

+

DIST_SUBDIR is also used when a distfile's name does not contain a version and the distfile is apt to change. In cases where the likelihood of this is very small, DIST_SUBDIR might not be required. Additionally, DIST_SUBDIR must not be removed unless the distfile name changes, even if a package is being moved or renamed.

+

Do not forget regenerating the distinfo file after that, since it contains the DIST_SUBDIR path in the filenames. - Also increase the PKGREVISION if the installed package is different. + Also, increase the PKGREVISION if the installed package is different. Furthermore, a mail to the package's authors seems appropriate telling them that changing distfiles after releases without changing the file names is not good practice.

@@ -9413,8 +9414,8 @@ PERL5_PACKLIST= auto/Pg/.packlist 19.6.20. Packages installing desktop files

If a package installs .desktop files under share/applications and these include - MIME information, you need to take extra steps to ensure that they - are registered into the MIME database:

+ MIME information (MimeType key), you need to take extra steps to + ensure that they are registered into the MIME database:

  1. Include ../../sysutils/desktop-file-utils/desktopdb.mk.

    2. @@ -9747,7 +9748,7 @@ place.

    and if you still don't have the answer, ask on the pkgsrc-users mailing list.

    -
    +
    22.1. What is the difference between MAKEFLAGS, .MAKEFLAGS and MAKE_FLAGS? @@ -9792,7 +9793,7 @@ do? -

    22.1.

    +

    22.1.

    What is the difference between MAKEFLAGS, .MAKEFLAGS and @@ -9808,7 +9809,7 @@ do? -

    22.2.

    +

    22.2.

    What is the difference between MAKE, GMAKE and @@ -9826,7 +9827,7 @@ do? -

    22.3.

    +

    22.3.

    What is the difference between CC, PKG_CC and @@ -9844,7 +9845,7 @@ do? -

    22.4.

    +

    22.4.

    What is the difference between BUILDLINK_LDFLAGS, @@ -9857,7 +9858,7 @@ do? -

    22.5.

    +

    22.5.

    Why does make show-var VARNAME=BUILDLINK_PREFIX.foo @@ -9873,7 +9874,7 @@ do? -

    22.6.

    +

    22.6.

    What does ${MASTER_SITE_SOURCEFORGE:=package/} mean? I @@ -9897,7 +9898,7 @@ do? -

    22.7.

    +

    22.7.

    Which mailing lists are there for package developers?

    @@ -9922,7 +9923,7 @@ do? -

    22.8.

    +

    22.8.

    Where is the pkgsrc documentation?

    @@ -9970,7 +9971,7 @@ do? -

    22.9.

    +

    22.9.

    I have a little time to kill. What shall I do?

    diff --git a/doc/pkgsrc.txt b/doc/pkgsrc.txt index ada7e1a86dc..b841779522c 100644 --- a/doc/pkgsrc.txt +++ b/doc/pkgsrc.txt @@ -7065,18 +7065,27 @@ checksum will no longer match. The contents of the new distfile should be compared against the old one before changing anything, to make sure the distfile was really updated on purpose, and that no trojan horse or so crept in. Please mention that the distfiles were compared and what was found in your -commit message. Then, the correct way to work around this is to set DIST_SUBDIR -to a unique directory name, usually based on PKGNAME_NOREV. All DISTFILES and -PATCHFILES for this package will be put in that subdirectory of the local -distfiles directory. (See Section 19.1.11, "How to handle incrementing versions -when fixing an existing package" for more details.) In case this happens more -often, PKGNAME can be used (thus including the nbX suffix) or a date stamp can -be appended, like ${PKGNAME_NOREV}-YYYYMMDD. Do not forget regenerating the -distinfo file after that, since it contains the DIST_SUBDIR path in the -filenames. Also increase the PKGREVISION if the installed package is different. -Furthermore, a mail to the package's authors seems appropriate telling them -that changing distfiles after releases without changing the file names is not -good practice. +commit message. + +Then, the correct way to work around this is to set DIST_SUBDIR to a unique +directory name, usually based on PKGNAME_NOREV. All DISTFILES and PATCHFILES +for this package will be put in that subdirectory of the local distfiles +directory. (See Section 19.1.11, "How to handle incrementing versions when +fixing an existing package" for more details.) In case this happens more often, +PKGNAME can be used (thus including the nbX suffix) or a date stamp can be +appended, like ${PKGNAME_NOREV}-YYYYMMDD. + +DIST_SUBDIR is also used when a distfile's name does not contain a version and +the distfile is apt to change. In cases where the likelihood of this is very +small, DIST_SUBDIR might not be required. Additionally, DIST_SUBDIR must not be +removed unless the distfile name changes, even if a package is being moved or +renamed. + +Do not forget regenerating the distinfo file after that, since it contains the +DIST_SUBDIR path in the filenames. Also, increase the PKGREVISION if the +installed package is different. Furthermore, a mail to the package's authors +seems appropriate telling them that changing distfiles after releases without +changing the file names is not good practice. 19.3. Fixing problems in the configure phase @@ -7833,8 +7842,8 @@ points is to regenerate it using make print-PLIST. 19.6.20. Packages installing desktop files If a package installs .desktop files under share/applications and these include -MIME information, you need to take extra steps to ensure that they are -registered into the MIME database: +MIME information (MimeType key), you need to take extra steps to ensure that +they are registered into the MIME database: 1. Include ../../sysutils/desktop-file-utils/desktopdb.mk. diff --git a/emulators/suse121_krb5/Makefile b/emulators/suse121_krb5/Makefile index d7e850b8fa1..2a83794b168 100644 --- a/emulators/suse121_krb5/Makefile +++ b/emulators/suse121_krb5/Makefile @@ -1,8 +1,9 @@ -# $NetBSD$ +# $NetBSD: Makefile,v 1.1.1.1 2012/03/21 13:37:21 obache Exp $ DISTNAME= suse_krb5-${SUSE_VERSION} +PKGREVISION= 1 CATEGORIES= emulators -RPMUPDPKGS+= krb5-1.9.1-24.3.1.${SUSE_ARCH} +RPMUPDPKGS+= krb5-1.9.1-24.20.1.${SUSE_ARCH} RPMPKGS+= libcom_err2-1.41.14-10.1.2.${SUSE_ARCH} RPMPKGS+= libkeyutils1-1.5.3-2.1.2.${SUSE_ARCH} diff --git a/emulators/suse121_krb5/distinfo b/emulators/suse121_krb5/distinfo index fb22cfd824d..a1e9c812bc0 100644 --- a/emulators/suse121_krb5/distinfo +++ b/emulators/suse121_krb5/distinfo @@ -1,11 +1,11 @@ -$NetBSD$ +$NetBSD: distinfo,v 1.1.1.1 2012/03/21 13:37:21 obache Exp $ -SHA1 (suse121/krb5-1.9.1-24.3.1.i586.rpm) = 7d361fe6122a4590e2efdf4332ef021fc175b78e -RMD160 (suse121/krb5-1.9.1-24.3.1.i586.rpm) = a5117529753097ec489e0d987cab89eea3e3ac31 -Size (suse121/krb5-1.9.1-24.3.1.i586.rpm) = 532309 bytes -SHA1 (suse121/krb5-1.9.1-24.3.1.x86_64.rpm) = b97374acc07e6d699618427aa3d2d312bd8d9818 -RMD160 (suse121/krb5-1.9.1-24.3.1.x86_64.rpm) = f78d0b66bea335cdddc45ab4de2edbfd29fe07d3 -Size (suse121/krb5-1.9.1-24.3.1.x86_64.rpm) = 525992 bytes +SHA1 (suse121/krb5-1.9.1-24.20.1.i586.rpm) = c61cb882c8dd453d6a231ac729f8bd92ec735261 +RMD160 (suse121/krb5-1.9.1-24.20.1.i586.rpm) = 494d16ff516583fc42d7cba30e09376eafc9a29e +Size (suse121/krb5-1.9.1-24.20.1.i586.rpm) = 532757 bytes +SHA1 (suse121/krb5-1.9.1-24.20.1.x86_64.rpm) = 0f17f23e66bae51366d3cb816efd476415df61d0 +RMD160 (suse121/krb5-1.9.1-24.20.1.x86_64.rpm) = 3e8cc10b07f2d873efd555e46b2f8c2fee1bca4a +Size (suse121/krb5-1.9.1-24.20.1.x86_64.rpm) = 526684 bytes SHA1 (suse121/libcom_err2-1.41.14-10.1.2.i586.rpm) = ec87babea9fa0e54ef5f592e6fed6bb3bb3907a1 RMD160 (suse121/libcom_err2-1.41.14-10.1.2.i586.rpm) = d476f9815cc0476e50cae734ef5a1d815e439651 Size (suse121/libcom_err2-1.41.14-10.1.2.i586.rpm) = 21667 bytes diff --git a/graphics/darktable/distinfo b/graphics/darktable/distinfo index ae1ace292d2..7061eba17f4 100644 --- a/graphics/darktable/distinfo +++ b/graphics/darktable/distinfo @@ -1,10 +1,11 @@ -$NetBSD: distinfo,v 1.17 2013/03/15 19:14:05 drochner Exp $ +$NetBSD: distinfo,v 1.18 2013/04/21 14:12:23 wiz Exp $ SHA1 (darktable-1.2.tar.xz) = 2a444a691bd7cf77a9cdbb174d3ce5b2e247efd2 RMD160 (darktable-1.2.tar.xz) = 765267bcde5d7970af03f3be23ad1dc8a85a7212 Size (darktable-1.2.tar.xz) = 2399856 bytes SHA1 (patch-cmake_modules_FindGTK2.cmake) = de1273594801ab82da31b624845e0b36a77b53b3 SHA1 (patch-src_LibRaw_libraw_libraw__alloc.h) = 8227a7180383cd4379313b07ff964bb7fb9ce694 +SHA1 (patch-src_common_imageio__exr.hh) = 310fe043db5dcc107d710e411c11493f698a1b65 SHA1 (patch-src_common_imageio__rgbe.c) = 5c396754d6dbb7390062e78afde315ee293215d6 SHA1 (patch-src_develop_blend.c) = d847c5d6a9f2c0e914d1fced8eb76ce79f127f70 SHA1 (patch-src_iop_lens.c) = 28b5462311f778184143152bdef4e59ee18a6a3f diff --git a/graphics/darktable/patches/patch-src_common_imageio__exr.hh b/graphics/darktable/patches/patch-src_common_imageio__exr.hh new file mode 100644 index 00000000000..73e1e22fbd3 --- /dev/null +++ b/graphics/darktable/patches/patch-src_common_imageio__exr.hh @@ -0,0 +1,29 @@ +$NetBSD$ + +--- src/common/imageio_exr.hh.orig 2013-05-04 14:59:46.000000000 +0000 ++++ src/common/imageio_exr.hh +@@ -21,7 +21,15 @@ + #include "common/image.h" + #include "common/mipmap_cache.h" + ++#include ++ ++#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L ++#include ++using std::shared_ptr; ++#else + #include ++using std::tr1::shared_ptr; ++#endif + + #include + #include +@@ -50,7 +58,7 @@ public: + } + + uint32_t size; +- std::tr1::shared_ptr data; ++ shared_ptr data; + }; + + diff --git a/graphics/digikam/Makefile b/graphics/digikam/Makefile index 03e91654cfa..bd2a46faeb1 100644 --- a/graphics/digikam/Makefile +++ b/graphics/digikam/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.93 2013/04/03 12:52:04 markd Exp $ +# $NetBSD: Makefile,v 1.94 2013/04/28 02:03:37 markd Exp $ # DISTNAME= digikam-3.1.0 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_KDE:=digikam/} EXTRACT_SUFX= .tar.bz2 diff --git a/graphics/digikam/distinfo b/graphics/digikam/distinfo index d2b7738aeaf..c41f9c1d87b 100644 --- a/graphics/digikam/distinfo +++ b/graphics/digikam/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.37 2012/11/16 20:06:08 joerg Exp $ +$NetBSD: distinfo,v 1.39 2013/04/03 12:52:04 markd Exp $ SHA1 (digikam-3.1.0.tar.bz2) = f4ce304acdf10e859ab8f70ce9d53a05d92d4fbd RMD160 (digikam-3.1.0.tar.bz2) = 511550a7ee37aac958a0d2e5afaa0a07aa1eab0e Size (digikam-3.1.0.tar.bz2) = 58559707 bytes SHA1 (patch-CMakeLists.txt) = 83bdf0398c3a4120ce6dc83d205ca32c50229ff2 SHA1 (patch-bootstrap.local) = 9164d0d162b4d8333961ee653f4c416dbdd530c9 -SHA1 (patch-core_libs_3rdparty_kmemoryinfo_kmemoryinfo_backend.cpp) = 1cce43cd6a1575cfd6c75e9008972e2a521b05e6 +SHA1 (patch-core_libs_3rdparty_kmemoryinfo_kmemoryinfo_backend.cpp) = d98ddf66a7d95868e4efa0f03935097f2e8a7795 SHA1 (patch-core_libs_dimg_filters_icc_iccmanager.h) = 999bd32312fbe840913a8d29613b351384061b65 SHA1 (patch-doc_CMakeLists.txt) = 5b4ba1daa49607b8773c3903d953e11bebc4d661 diff --git a/graphics/digikam/patches/patch-core_libs_3rdparty_kmemoryinfo_kmemoryinfo_backend.cpp b/graphics/digikam/patches/patch-core_libs_3rdparty_kmemoryinfo_kmemoryinfo_backend.cpp index 52610118fcb..23f8c7017c3 100644 --- a/graphics/digikam/patches/patch-core_libs_3rdparty_kmemoryinfo_kmemoryinfo_backend.cpp +++ b/graphics/digikam/patches/patch-core_libs_3rdparty_kmemoryinfo_kmemoryinfo_backend.cpp @@ -1,4 +1,4 @@ -$NetBSD: patch-core_libs_3rdparty_kmemoryinfo_kmemoryinfo_backend.cpp,v 1.1 2012/03/21 21:14:47 markd Exp $ +$NetBSD: patch-core_libs_3rdparty_kmemoryinfo_kmemoryinfo_backend.cpp,v 1.2 2013/04/03 12:52:04 markd Exp $ Make memory info backend compile on NetBSD. Need to check it actually returns the correct results. @@ -24,12 +24,16 @@ it actually returns the correct results. mib[0] = CTL_VM; mib[1] = VM_UVMEXP; -@@ -422,7 +423,7 @@ int get_mem_stats(Digikam::KMemoryInfo:: +@@ -420,9 +421,9 @@ int get_mem_stats(Digikam::KMemoryInfo:: + return 0; + } - data->totalRam = uvm->pagesize * uvm->npages; - data->cacheRam = uvm->pagesize * (uvm->filepages + uvm->execpages); +- data->totalRam = uvm->pagesize * uvm->npages; +- data->cacheRam = uvm->pagesize * (uvm->filepages + uvm->execpages); - data->freeRam = uvm->pagesize * (uvm->free + uvm->inactive); -+ data->freeRam = uvm->pagesize * (uvm->free + uvm->paging); ++ data->totalRam = (qint64) uvm->pagesize * (qint64) uvm->npages; ++ data->cacheRam = (qint64) uvm->pagesize * (qint64) (uvm->filepages + uvm->execpages); ++ data->freeRam = (qint64) uvm->pagesize * (qint64) (uvm->free + uvm->paging); data->usedRam = data->totalRam - data->freeRam; return 1; diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile index cc91a0dc063..11a0ca7c277 100644 --- a/graphics/opencv/Makefile +++ b/graphics/opencv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2013/01/26 21:37:55 adam Exp $ +# $NetBSD: Makefile,v 1.34 2013/02/16 11:22:18 wiz Exp $ DISTNAME= OpenCV-2.4.3 PKGNAME= ${DISTNAME:S/a$//:tl} @@ -33,6 +33,11 @@ CHECK_WRKREF_SKIP= ${PREFIX}/lib/libopencv_core.* .include "options.mk" +.include "../../mk/compiler.mk" +.if !empty(PKGSRC_COMPILER:Mclang) +CXXFLAGS+= -std=c++11 +.endif + .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/jasper/buildlink3.mk" .include "../../graphics/openexr/buildlink3.mk" diff --git a/graphics/opencv/distinfo b/graphics/opencv/distinfo index dbf98394c95..b98104af598 100644 --- a/graphics/opencv/distinfo +++ b/graphics/opencv/distinfo @@ -1,8 +1,9 @@ -$NetBSD: distinfo,v 1.17 2013/02/26 23:38:08 joerg Exp $ +$NetBSD: distinfo,v 1.18 2013/04/29 21:31:11 joerg Exp $ SHA1 (OpenCV-2.4.3.tar.bz2) = 982be2c3e52dfc3e9d14692c60bc856b2b766be2 RMD160 (OpenCV-2.4.3.tar.bz2) = b862ddd9e7fefd885d78835660a9f5c9320889c2 Size (OpenCV-2.4.3.tar.bz2) = 67240491 bytes +SHA1 (patch-modules_contrib_src_spinimages.cpp) = b3e465700059616be991d597230bc8dc42f15be1 SHA1 (patch-modules_core_include_opencv2_core_types_c.h) = c056068c01c417dc262f21c00324da7f86c0cd8e SHA1 (patch-modules_core_src_system.cpp) = 3b7ac545585a430d28c7077f360357079f127580 SHA1 (patch-modules_legacy_src_dpstereo.cpp) = da9955fb6cc81054427b69efb97a58160b64f262 diff --git a/graphics/opencv/patches/patch-modules_contrib_src_spinimages.cpp b/graphics/opencv/patches/patch-modules_contrib_src_spinimages.cpp new file mode 100644 index 00000000000..de91db7d1de --- /dev/null +++ b/graphics/opencv/patches/patch-modules_contrib_src_spinimages.cpp @@ -0,0 +1,12 @@ +$NetBSD$ + +--- modules/contrib/src/spinimages.cpp.orig 2013-05-05 18:32:00.000000000 +0000 ++++ modules/contrib/src/spinimages.cpp +@@ -46,6 +46,7 @@ + #include + #include + #include ++#include + #include + + using namespace cv; diff --git a/ham/fldigi/Makefile b/ham/fldigi/Makefile index e9391e60d5f..7e77fe11cfa 100644 --- a/ham/fldigi/Makefile +++ b/ham/fldigi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2013/02/06 23:22:35 jperkin Exp $ +# $NetBSD: Makefile,v 1.30 2013/02/16 11:22:36 wiz Exp $ # DISTNAME= fldigi-3.21.65 @@ -49,6 +49,11 @@ CHECK_WRKREF_SKIP+= bin/fldigi CONFIGURE_ENV+= ac_cv_header_execinfo_h=no .endif +.include "../../mk/compiler.mk" +.if !empty(PKGSRC_COMPILER:Mclang) +CXXFLAGS+= -std=c++11 -Wno-error=c++11-narrowing +.endif + .include "../../audio/libsamplerate/buildlink3.mk" .include "../../audio/libsndfile/buildlink3.mk" .include "../../audio/portaudio-devel/buildlink3.mk" diff --git a/ham/fldigi/distinfo b/ham/fldigi/distinfo index a0849effe4b..dc15052de96 100644 --- a/ham/fldigi/distinfo +++ b/ham/fldigi/distinfo @@ -1,7 +1,20 @@ -$NetBSD$ +$NetBSD: distinfo,v 1.11 2013/01/16 02:54:54 mef Exp $ SHA1 (fldigi-3.21.65.tar.gz) = 02b5a63e5895e39a3727bc717b5fe6ffefc602de RMD160 (fldigi-3.21.65.tar.gz) = 7cca0f4e066d02ca8141e8a8097ee721666888f2 Size (fldigi-3.21.65.tar.gz) = 2134500 bytes +SHA1 (patch-src_dominoex_dominoex.cxx) = f1f94bb21856f1911c75ee0a138170fba17432b4 +SHA1 (patch-src_include_qrunner.h) = 575a142fa935be760e6d440de5b6d965c6259388 +SHA1 (patch-src_logbook_logsupport.cxx) = f5540103677064d8a6da61db8f445b792729305c +SHA1 (patch-src_misc_dxcc.cxx) = 05fe507377334dd2787a76395dec21afeacf499a SHA1 (patch-src_misc_newinstall.cxx) = 2c215e9423d27dd4f4657221b17cf4ed3f12355c +SHA1 (patch-src_misc_re.cxx) = 9daf70fa7844546e6ad761b5bdf924b6de74843c +SHA1 (patch-src_navtex_navtex.cxx) = 13c70ecfa6c7052c0e42bbbc9829d559b6ea2cd3 +SHA1 (patch-src_spot_notify.cxx) = e0f2889f1ae2405326b2883f13f618c3d9bfd412 +SHA1 (patch-src_spot_pskrep.cxx) = 1ea5838d80224b06fe940802f4f6ee7ac4207a72 +SHA1 (patch-src_spot_spot.cxx) = e69b10e9f9e884d3ef3cf5bb18d882cb1a5db5a7 +SHA1 (patch-src_thor_thor.cxx) = 7df1c77f79f9746e243440740bb35994a09ac66e SHA1 (patch-src_throb_throb.cxx) = a5dc3edc64058076d046ee99e76dfc84663f756e +SHA1 (patch-src_xmlrpcpp_XmlRpcClient.cpp) = 5d7aab9e194cd51ca0bd56430e751db1491dd1f7 +SHA1 (patch-src_xmlrpcpp_XmlRpcServer.cpp) = 30da72b30c6f66ecaa1e05ac1b53450db9a1c2cc +SHA1 (patch-src_xmlrpcpp_base64.h) = 1f1b27e010c5e4ce0f9d5b0bf4a729eefc7535ac diff --git a/ham/fldigi/patches/patch-src_dominoex_dominoex.cxx b/ham/fldigi/patches/patch-src_dominoex_dominoex.cxx new file mode 100644 index 00000000000..c569acbd4db --- /dev/null +++ b/ham/fldigi/patches/patch-src_dominoex_dominoex.cxx @@ -0,0 +1,13 @@ +$NetBSD$ + +--- src/dominoex/dominoex.cxx.orig 2013-05-03 14:18:53.000000000 +0000 ++++ src/dominoex/dominoex.cxx +@@ -64,7 +64,7 @@ void dominoex::tx_init(SoundBase *sc) + + strSecXmtText = progdefaults.secText; + if (strSecXmtText.length() == 0) +- strSecXmtText = "fldigi "PACKAGE_VERSION" "; ++ strSecXmtText = "fldigi " PACKAGE_VERSION " "; + + videoText(); + } diff --git a/ham/fldigi/patches/patch-src_include_qrunner.h b/ham/fldigi/patches/patch-src_include_qrunner.h new file mode 100644 index 00000000000..8977c272adc --- /dev/null +++ b/ham/fldigi/patches/patch-src_include_qrunner.h @@ -0,0 +1,12 @@ +$NetBSD$ + +--- src/include/qrunner.h.orig 2013-05-03 14:32:45.000000000 +0000 ++++ src/include/qrunner.h +@@ -32,6 +32,7 @@ + #include + #include + #include ++#include + + #if HAVE_STD_BIND + # include diff --git a/ham/fldigi/patches/patch-src_logbook_logsupport.cxx b/ham/fldigi/patches/patch-src_logbook_logsupport.cxx new file mode 100644 index 00000000000..7b9aa2356a2 --- /dev/null +++ b/ham/fldigi/patches/patch-src_logbook_logsupport.cxx @@ -0,0 +1,39 @@ +$NetBSD$ + +--- src/logbook/logsupport.cxx.orig 2013-05-03 14:19:39.000000000 +0000 ++++ src/logbook/logsupport.cxx +@@ -211,7 +211,7 @@ void Export_ADIF() + } + } + string sp = p; +- if (sp.find("."ADIF_SUFFIX) == string::npos) sp.append("."ADIF_SUFFIX); ++ if (sp.find("." ADIF_SUFFIX) == string::npos) sp.append("." ADIF_SUFFIX); + adifFile.writeFile (sp.c_str(), &qsodb); + } + +@@ -308,8 +308,8 @@ void cb_mnuSaveLogbook(Fl_Menu_*m, void* + const char* p = FSEL::saveas( title.c_str(), filter.c_str(), logbook_filename.c_str()); + if (p) { + logbook_filename = p; +- if (logbook_filename.find("."ADIF_SUFFIX) == string::npos) +- logbook_filename.append("."ADIF_SUFFIX); ++ if (logbook_filename.find("." ADIF_SUFFIX) == string::npos) ++ logbook_filename.append("." ADIF_SUFFIX); + dlgLogbook->label(fl_filename_name(logbook_filename.c_str())); + + cQsoDb::reverse = false; +@@ -1542,9 +1542,13 @@ SOAPBOX: \n\n", + return; + } + +- ++#if __cplusplus >= 200103L ++#include ++typedef unordered_map dxcc_entity_cache_t; ++#else + #include + typedef tr1::unordered_map dxcc_entity_cache_t; ++#endif + static dxcc_entity_cache_t dxcc_entity_cache; + static bool dxcc_entity_cache_enabled = false; + diff --git a/ham/fldigi/patches/patch-src_misc_dxcc.cxx b/ham/fldigi/patches/patch-src_misc_dxcc.cxx new file mode 100644 index 00000000000..36fcffb4f38 --- /dev/null +++ b/ham/fldigi/patches/patch-src_misc_dxcc.cxx @@ -0,0 +1,30 @@ +$NetBSD$ + +--- src/misc/dxcc.cxx.orig 2013-05-03 14:21:04.000000000 +0000 ++++ src/misc/dxcc.cxx +@@ -30,7 +30,6 @@ + #include + #include + #include +-#include + #include + + #include +@@ -43,8 +42,16 @@ + #include "confdialog.h" + #include "main.h" + ++#if __cplusplus >= 201103L ++#include ++using std::unordered_map; ++#else ++#include ++using std::tr1::unordered_map; ++#endif ++ + using namespace std; +-using tr1::unordered_map; ++ + + + dxcc::dxcc(const char* cn, int cq, int itu, const char* ct, float lat, float lon, float tz) diff --git a/ham/fldigi/patches/patch-src_misc_re.cxx b/ham/fldigi/patches/patch-src_misc_re.cxx new file mode 100644 index 00000000000..f846c9ef7fe --- /dev/null +++ b/ham/fldigi/patches/patch-src_misc_re.cxx @@ -0,0 +1,24 @@ +$NetBSD$ + +--- src/misc/re.cxx.orig 2013-05-03 14:24:52.000000000 +0000 ++++ src/misc/re.cxx +@@ -120,12 +120,17 @@ void re_t::suboff(size_t n, int* start, + } + } + ++#if __cplusplus >= 201103L ++#include ++#else + #include ++using tr1::hash; ++#endif + + size_t re_t::hash(void) const + { +- size_t h = tr1::hash()(pattern); +- return h ^ (tr1::hash()(cflags) + 0x9e3779b9 + (h << 6) + (h >> 2)); ++ size_t h = ::hash()(pattern); ++ return h ^ (::hash()(cflags) + 0x9e3779b9 + (h << 6) + (h >> 2)); + } + + // ------------------------------------------------------------------------ diff --git a/ham/fldigi/patches/patch-src_navtex_navtex.cxx b/ham/fldigi/patches/patch-src_navtex_navtex.cxx new file mode 100644 index 00000000000..cedba97ae9f --- /dev/null +++ b/ham/fldigi/patches/patch-src_navtex_navtex.cxx @@ -0,0 +1,19 @@ +$NetBSD$ + +--- src/navtex/navtex.cxx.orig 2013-05-03 14:31:34.000000000 +0000 ++++ src/navtex/navtex.cxx +@@ -177,12 +177,12 @@ bool read_until_delim( std::istream & is + if( ! std::getline( istrm, parsed_str, delim ) ) return false ; + std::stringstream sstrm( parsed_str ); + sstrm >> ref ; +- return sstrm ; ++ return sstrm.good(); + } + + static bool read_until_delim( std::istream & istrm, std::string & ref ) + { +- return std::getline( istrm, ref, delim ); ++ return std::getline( istrm, ref, delim ).good(); + } + + class NavtexRecord diff --git a/ham/fldigi/patches/patch-src_spot_notify.cxx b/ham/fldigi/patches/patch-src_spot_notify.cxx new file mode 100644 index 00000000000..bf1b58a1428 --- /dev/null +++ b/ham/fldigi/patches/patch-src_spot_notify.cxx @@ -0,0 +1,16 @@ +$NetBSD$ + +--- src/spot/notify.cxx.orig 2013-05-03 14:35:28.000000000 +0000 ++++ src/spot/notify.cxx +@@ -33,7 +33,10 @@ + #include + #include + +-#if (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1) ++#if __cplusplus >= 201103L ++# define MAP_TYPE std::unordered_map ++# include ++#elif (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1) + # define MAP_TYPE std::tr1::unordered_map + # include + #else diff --git a/ham/fldigi/patches/patch-src_spot_pskrep.cxx b/ham/fldigi/patches/patch-src_spot_pskrep.cxx new file mode 100644 index 00000000000..faa8b255bc3 --- /dev/null +++ b/ham/fldigi/patches/patch-src_spot_pskrep.cxx @@ -0,0 +1,17 @@ +$NetBSD$ + +--- src/spot/pskrep.cxx.orig 2013-05-03 14:36:37.000000000 +0000 ++++ src/spot/pskrep.cxx +@@ -50,7 +50,11 @@ + #include + #include + +-#if (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1) ++#if __cplusplus >= 201103L ++# define MAP_TYPE std::unordered_map ++# define HASH_TYPE std::hash ++# include ++#elif (__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1) + # define MAP_TYPE std::tr1::unordered_map + #define HASH_TYPE std::tr1::hash + # include diff --git a/ham/fldigi/patches/patch-src_spot_spot.cxx b/ham/fldigi/patches/patch-src_spot_spot.cxx new file mode 100644 index 00000000000..45fde9505b3 --- /dev/null +++ b/ham/fldigi/patches/patch-src_spot_spot.cxx @@ -0,0 +1,38 @@ +$NetBSD$ + +--- src/spot/spot.cxx.orig 2013-05-03 14:37:33.000000000 +0000 ++++ src/spot/spot.cxx +@@ -23,7 +23,6 @@ + #include + + #include +-#include + #include + + #include "trx.h" +@@ -33,6 +32,13 @@ + #include "debug.h" + #include "spot.h" + ++#if __cplusplus >= 201103L ++#include ++#else ++#include ++using std::tr1::unordered_map; ++#endif ++ + // the number of characters that we match our REs against + #define SEARCHLEN 32 + #define DECBUFSIZE 8 * SEARCHLEN +@@ -60,9 +66,9 @@ struct fre_comp : std::unary_function callback_p_list_t; +-typedef tr1::unordered_map rcblist_t; ++typedef unordered_map rcblist_t; + +-static tr1::unordered_map buffers; ++static unordered_map buffers; + static cblist_t cblist; + static rcblist_t rcblist; + diff --git a/ham/fldigi/patches/patch-src_thor_thor.cxx b/ham/fldigi/patches/patch-src_thor_thor.cxx new file mode 100644 index 00000000000..be850f0f3a8 --- /dev/null +++ b/ham/fldigi/patches/patch-src_thor_thor.cxx @@ -0,0 +1,13 @@ +$NetBSD$ + +--- src/thor/thor.cxx.orig 2013-05-03 14:19:08.000000000 +0000 ++++ src/thor/thor.cxx +@@ -63,7 +63,7 @@ void thor::tx_init(SoundBase *sc) + videoText(); + strSecXmtText = progdefaults.THORsecText; + if (strSecXmtText.length() == 0) +- strSecXmtText = "fldigi "PACKAGE_VERSION" "; ++ strSecXmtText = "fldigi " PACKAGE_VERSION " "; + cptr = 0; + } + diff --git a/ham/fldigi/patches/patch-src_xmlrpcpp_XmlRpcClient.cpp b/ham/fldigi/patches/patch-src_xmlrpcpp_XmlRpcClient.cpp new file mode 100644 index 00000000000..08e23a0ea17 --- /dev/null +++ b/ham/fldigi/patches/patch-src_xmlrpcpp_XmlRpcClient.cpp @@ -0,0 +1,13 @@ +$NetBSD$ + +--- src/xmlrpcpp/XmlRpcClient.cpp.orig 2013-05-03 14:41:57.000000000 +0000 ++++ src/xmlrpcpp/XmlRpcClient.cpp +@@ -319,7 +319,7 @@ XmlRpcClient::generateHeader(std::string + + header += "Content-Type: text/xml\r\nContent-length: "; + +- sprintf(buff,"%"PRIuSZ"\r\n\r\n", body.size()); ++ sprintf(buff,"%" PRIuSZ "\r\n\r\n", body.size()); + + return header + buff; + } diff --git a/ham/fldigi/patches/patch-src_xmlrpcpp_XmlRpcServer.cpp b/ham/fldigi/patches/patch-src_xmlrpcpp_XmlRpcServer.cpp new file mode 100644 index 00000000000..9aeb680785c --- /dev/null +++ b/ham/fldigi/patches/patch-src_xmlrpcpp_XmlRpcServer.cpp @@ -0,0 +1,13 @@ +$NetBSD$ + +--- src/xmlrpcpp/XmlRpcServer.cpp.orig 2013-05-03 14:42:36.000000000 +0000 ++++ src/xmlrpcpp/XmlRpcServer.cpp +@@ -481,7 +481,7 @@ XmlRpcServer::generateHeader(std::string + "Content-length: "; + + char buffLen[40]; +- sprintf(buffLen,"%"PRIuSZ"\r\n\r\n", body.size()); ++ sprintf(buffLen,"%" PRIuSZ "\r\n\r\n", body.size()); + + return header + buffLen; + } diff --git a/ham/fldigi/patches/patch-src_xmlrpcpp_base64.h b/ham/fldigi/patches/patch-src_xmlrpcpp_base64.h new file mode 100644 index 00000000000..a6e93aee491 --- /dev/null +++ b/ham/fldigi/patches/patch-src_xmlrpcpp_base64.h @@ -0,0 +1,12 @@ +$NetBSD$ + +--- src/xmlrpcpp/base64.h.orig 2013-05-03 14:39:47.000000000 +0000 ++++ src/xmlrpcpp/base64.h +@@ -10,6 +10,7 @@ + #define __BASE64_H_INCLUDED__ 1 + + #include ++#include + + static + int _base64Chars[]= {'A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z', diff --git a/lang/clang/distinfo b/lang/clang/distinfo index fd176497d92..ca36c87a56e 100644 --- a/lang/clang/distinfo +++ b/lang/clang/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.15 2013/01/03 15:36:01 adam Exp $ +$NetBSD: distinfo,v 1.16 2013/04/02 12:00:04 joerg Exp $ SHA1 (clang-3.2.src.tar.gz) = b0515298c4088aa294edc08806bd671f8819f870 RMD160 (clang-3.2.src.tar.gz) = 99468c17f3262d8af5dd5a6672fb958a72963ffc @@ -9,6 +9,7 @@ Size (llvm-3.2.src.tar.gz) = 12275252 bytes SHA1 (patch-ab) = 8dd0da6d47a57ac25eea358996cf874dd3289e08 SHA1 (patch-ac) = 7fce5070338dcee073aa429b70b47855cd213ec4 SHA1 (patch-ad) = f563a1016b17632afaa68639d59ee427b6c760f5 +SHA1 (patch-include_llvm_Support_CFG.h) = 7ea9caf7f483f65c33e79a5e03bc02a48ffdd1f3 SHA1 (patch-lib_Target_X86_X86JITInfo.cpp) = 8090d84a164a85ac3d2fccc475d2eeb541574f56 SHA1 (patch-tools_clang_lib_Driver_ToolChains.cpp) = 1e184e83636b4089e694a079e168188cb60b7e9c SHA1 (patch-tools_clang_lib_Driver_Tools.cpp) = 5359329457a2acf7854beef19369679074b44f43 diff --git a/lang/clang/patches/patch-include_llvm_Support_CFG.h b/lang/clang/patches/patch-include_llvm_Support_CFG.h new file mode 100644 index 00000000000..7a204f5f646 --- /dev/null +++ b/lang/clang/patches/patch-include_llvm_Support_CFG.h @@ -0,0 +1,66 @@ +$NetBSD$ + +LLVM r178240: Fix iterator interface. + +--- include/llvm/Support/CFG.h.orig 2012-02-17 18:59:53.000000000 +0000 ++++ include/llvm/Support/CFG.h +@@ -27,8 +27,9 @@ namespace llvm { + + template // Predecessor Iterator + class PredIterator : public std::iterator { +- typedef std::iterator super; ++ Ptr, ptrdiff_t, Ptr*, Ptr*> { ++ typedef std::iterator super; + typedef PredIterator Self; + USE_iterator It; + +@@ -40,6 +41,7 @@ class PredIterator : public std::iterato + + public: + typedef typename super::pointer pointer; ++ typedef typename super::reference reference; + + PredIterator() {} + explicit inline PredIterator(Ptr *bb) : It(bb->use_begin()) { +@@ -50,7 +52,7 @@ public: + inline bool operator==(const Self& x) const { return It == x.It; } + inline bool operator!=(const Self& x) const { return !operator==(x); } + +- inline pointer operator*() const { ++ inline reference operator*() const { + assert(!It.atEnd() && "pred_iterator out of range!"); + return cast(*It)->getParent(); + } +@@ -100,10 +102,11 @@ inline const_pred_iterator pred_end(cons + + template // Successor Iterator + class SuccIterator : public std::iterator { ++ BB_, ptrdiff_t, BB_*, BB_*> { + const Term_ Term; + unsigned idx; +- typedef std::iterator super; ++ typedef std::iterator super; + typedef SuccIterator Self; + + inline bool index_is_valid(int idx) { +@@ -112,6 +115,7 @@ class SuccIterator : public std::iterato + + public: + typedef typename super::pointer pointer; ++ typedef typename super::reference reference; + // TODO: This can be random access iterator, only operator[] missing. + + explicit inline SuccIterator(Term_ T) : Term(T), idx(0) {// begin iterator +@@ -142,7 +146,7 @@ public: + inline bool operator==(const Self& x) const { return idx == x.idx; } + inline bool operator!=(const Self& x) const { return !operator==(x); } + +- inline pointer operator*() const { return Term->getSuccessor(idx); } ++ inline reference operator*() const { return Term->getSuccessor(idx); } + inline pointer operator->() const { return operator*(); } + + inline Self& operator++() { ++idx; return *this; } // Preincrement diff --git a/math/gnumeric112/Makefile b/math/gnumeric112/Makefile index 94623090444..dc7f370283b 100644 --- a/math/gnumeric112/Makefile +++ b/math/gnumeric112/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.1 2013/03/14 19:00:45 drochner Exp $ +# $NetBSD: Makefile,v 1.2 2013/05/03 15:54:46 drochner Exp $ DISTNAME= gnumeric-1.12.2 +PKGREVISION= 1 CATEGORIES= math gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnumeric/1.12/} EXTRACT_SUFX= .tar.xz diff --git a/math/gnumeric112/distinfo b/math/gnumeric112/distinfo index 5f0ce8cbd10..ed420c198c3 100644 --- a/math/gnumeric112/distinfo +++ b/math/gnumeric112/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.1 2013/03/14 19:00:45 drochner Exp $ +$NetBSD: distinfo,v 1.2 2013/05/03 15:54:46 drochner Exp $ SHA1 (gnumeric-1.12.2.tar.xz) = 716b4f4e87996ff9e55505479fbee0e26b1fa96d RMD160 (gnumeric-1.12.2.tar.xz) = 4e89fcce381631c6c0a07f8ac22c99eb4a207a82 Size (gnumeric-1.12.2.tar.xz) = 15517296 bytes SHA1 (patch-aa) = f1cefe02242eebccef616365bd08627d5e9fb4cd SHA1 (patch-ab) = cb1f97384986219f8f54c3a87af5499d27dc8b1b +SHA1 (patch-gnumeric.desktop.in) = f9167ce617a9991e4f3d55b24b1719e2baf814d9 diff --git a/math/gnumeric112/patches/patch-gnumeric.desktop.in b/math/gnumeric112/patches/patch-gnumeric.desktop.in new file mode 100644 index 00000000000..df34fc94976 --- /dev/null +++ b/math/gnumeric112/patches/patch-gnumeric.desktop.in @@ -0,0 +1,12 @@ +$NetBSD$ + +Remove deprecated MIME type. + +--- gnumeric.desktop.in.orig 2009-11-11 00:25:31.000000000 +0000 ++++ gnumeric.desktop.in +@@ -15,4 +15,4 @@ X-GNOME-Bugzilla-Product=Gnumeric + X-GNOME-Bugzilla-Version=BUGZILLAVERSION + X-GNOME-Bugzilla-Component=General + X-GNOME-DocPath=gnumeric +-MimeType=application/x-gnumeric;application/vnd.ms-excel;application/excel;application/msexcel;application/x-excel;application/x-ms-excel;application/x-msexcel;application/x-xls;application/xls;application/x-dos_ms_excel;zz-application/zz-winassoc-xls;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/tab-separated-values;text/csv;text/x-csv;text/spreadsheet;text/tab-separated-values;application/vnd.lotus-1-2-3;application/x-123;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/x-applix-spreadsheet;application/x-mps;application/x-oleo;application/x-planperfect;application/x-quattropro;application/x-sc;application/x-sylk;application/x-dbase;application/x-dbf;application/x-xbase; ++MimeType=application/x-gnumeric;application/vnd.ms-excel;application/excel;application/msexcel;application/x-excel;application/x-ms-excel;application/x-msexcel;application/x-xls;application/xls;application/x-dos_ms_excel;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/tab-separated-values;text/csv;text/x-csv;text/spreadsheet;text/tab-separated-values;application/vnd.lotus-1-2-3;application/x-123;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/x-applix-spreadsheet;application/x-mps;application/x-oleo;application/x-planperfect;application/x-quattropro;application/x-sc;application/x-sylk;application/x-dbase;application/x-dbf;application/x-xbase; diff --git a/math/openfst/distinfo b/math/openfst/distinfo index 5a388e55a5c..85077e9d25e 100644 --- a/math/openfst/distinfo +++ b/math/openfst/distinfo @@ -1,16 +1,26 @@ -$NetBSD: distinfo,v 1.1.1.1 2009/11/03 17:53:44 wiz Exp $ +$NetBSD: distinfo,v 1.2 2012/07/03 17:42:05 joerg Exp $ SHA1 (openfst-1.1.tar.gz) = b070f84a981dfadc4c049f505bd3406a43dfa55d RMD160 (openfst-1.1.tar.gz) = 45657bb11f91ffdce5261ff6f4c103c164cc161b Size (openfst-1.1.tar.gz) = 513404 bytes +SHA1 (patch-src_bin_compile-main.h) = b0f77cf8876acea5597b0ddb622dcddc52103cf0 SHA1 (patch-src_include_fst_cache.h) = 6a29b49f07b61a0ed9d9e2349805b836c45a25bc SHA1 (patch-src_include_fst_compact-fst.h) = f1a2b9ec65d3c8be4d0574c96fa5e5a52c9e680c SHA1 (patch-src_include_fst_compose.h) = 4fb25482929aecf37e69d9b6c23491f5512554f8 +SHA1 (patch-src_include_fst_config.h.in) = 6c1eba23afe7d30026b37b9e7cf7c6552778c3e4 SHA1 (patch-src_include_fst_const-fst.h) = 758b60a5238f9f6f4a1a5a05c5abc41d81faa3a2 -SHA1 (patch-src_include_fst_determinize.h) = 825ad312b52933d981a1ea8dd7103da90b1f3e80 +SHA1 (patch-src_include_fst_determinize.h) = c0ec374166a57c3df97cab25b5ec87231ec86df5 SHA1 (patch-src_include_fst_difference.h) = e66c128b621d1be4f9b7501d969cd2097f32aa04 -SHA1 (patch-src_include_fst_factor-weight.h) = 88229131e6de6daf950f85db32b1dbcbf4507733 -SHA1 (patch-src_include_fst_map.h) = 7c46539d7b72f1f24ea275bfff1678bbb64f932c -SHA1 (patch-src_include_fst_replace.h) = 87604a022040f3f825eede69c36917b37b515cda -SHA1 (patch-src_include_fst_synchronize.h) = 8a43aab991bf48f1e656d4e47dea8f0326d12773 +SHA1 (patch-src_include_fst_encode.h) = ad9c3662b63dc40a40fa827fa011ea8332f04962 +SHA1 (patch-src_include_fst_epsnormalize.h) = 1bee82d16fab4bdb4d635eb27aa22f9573d57fb9 +SHA1 (patch-src_include_fst_equivalent.h) = dbc925b9de2b859a0a5493db4e5823dc8ed57e6c +SHA1 (patch-src_include_fst_factor-weight.h) = 311911d8308cdc073cffa2a2d0a52202330c4324 +SHA1 (patch-src_include_fst_map.h) = 61faf469de577c944d2e66c10f1b877619ae0889 +SHA1 (patch-src_include_fst_relabel.h) = 6fce070b426dfbcfb2aa89c05daec96b03cd6349 +SHA1 (patch-src_include_fst_replace.h) = 2f8984463d5f083d3bc1fa439dc1a88e27f1954f +SHA1 (patch-src_include_fst_rmepsilon.h) = e371a2145c571378a49b707710b9ab5cc592f352 +SHA1 (patch-src_include_fst_rmfinalepsilon.h) = fb1834d54a343982eb433f6c7ffddf1315a2b797 +SHA1 (patch-src_include_fst_slist.h) = c63321cf232ec861ec07dc0c26a9c5c773c35f49 +SHA1 (patch-src_include_fst_synchronize.h) = aed6efedd865bda3a881d5516487c4abdac36217 +SHA1 (patch-src_include_fst_test-properties.h) = d82a8e542a8afbe10a7232c12a22a724a9fe0a0c SHA1 (patch-src_include_fst_vector-fst.h) = 51178b6757e89e5c18807ec8521223dacaeb6c16 diff --git a/math/openfst/patches/patch-src_bin_compile-main.h b/math/openfst/patches/patch-src_bin_compile-main.h new file mode 100644 index 00000000000..34167187d4d --- /dev/null +++ b/math/openfst/patches/patch-src_bin_compile-main.h @@ -0,0 +1,20 @@ +$NetBSD$ + +--- src/bin/compile-main.h.orig 2013-05-03 17:26:20.000000000 +0000 ++++ src/bin/compile-main.h +@@ -22,8 +22,15 @@ + #ifndef FST_COMPILE_MAIN_H__ + #define FST_COMPILE_MAIN_H__ + ++#include ++ ++#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L ++#include ++using std::unordered_map; ++#else + #include + using std::tr1::unordered_map; ++#endif + #include + #include + #include diff --git a/math/openfst/patches/patch-src_include_fst_config.h.in b/math/openfst/patches/patch-src_include_fst_config.h.in new file mode 100644 index 00000000000..386892a8176 --- /dev/null +++ b/math/openfst/patches/patch-src_include_fst_config.h.in @@ -0,0 +1,14 @@ +$NetBSD$ + +--- src/include/fst/config.h.in.orig 2013-05-03 17:47:24.000000000 +0000 ++++ src/include/fst/config.h.in +@@ -2,7 +2,7 @@ + + /* Define to 1 if the system has the type `std::tr1::hash'. */ +-#define HAVE_STD__TR1__HASH_LONG_LONG_UNSIGNED_ 1 ++#undef HAVE_STD__TR1__HASH_LONG_LONG_UNSIGNED_ + + /* Define to 1 if the system has the type `__gnu_cxx::slist'. */ +-#define HAVE___GNU_CXX__SLIST_INT_ 1 ++#undef HAVE___GNU_CXX__SLIST_INT_ diff --git a/math/openfst/patches/patch-src_include_fst_determinize.h b/math/openfst/patches/patch-src_include_fst_determinize.h index d6fc5bda9b3..22abc00e69f 100644 --- a/math/openfst/patches/patch-src_include_fst_determinize.h +++ b/math/openfst/patches/patch-src_include_fst_determinize.h @@ -1,8 +1,27 @@ -$NetBSD$ +$NetBSD: patch-src_include_fst_determinize.h,v 1.1 2012/07/03 17:42:05 joerg Exp $ ---- src/include/fst/determinize.h.orig 2012-07-03 09:55:10.000000000 +0000 +--- src/include/fst/determinize.h.orig 2009-03-21 03:35:33.000000000 +0000 +++ src/include/fst/determinize.h -@@ -171,7 +171,7 @@ class DeterminizeFstImplBase : public Ca +@@ -21,9 +21,17 @@ + #ifndef FST_LIB_DETERMINIZE_H__ + #define FST_LIB_DETERMINIZE_H__ + +-#include ++#include ++ ++#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L ++#include ++using std::unordered_map; ++#else + #include + using std::tr1::unordered_map; ++#endif ++ ++#include + #include + #include + #include +@@ -171,7 +179,7 @@ class DeterminizeFstImplBase : public Ca if (!HasStart()) { StateId start = ComputeStart(); if (start != kNoStateId) { @@ -11,7 +30,7 @@ $NetBSD$ } } return CacheImpl::Start(); -@@ -180,7 +180,7 @@ class DeterminizeFstImplBase : public Ca +@@ -180,7 +188,7 @@ class DeterminizeFstImplBase : public Ca Weight Final(StateId s) { if (!HasFinal(s)) { Weight final = ComputeFinal(s); @@ -20,7 +39,7 @@ $NetBSD$ } return CacheImpl::Final(s); } -@@ -363,7 +363,7 @@ class DeterminizeFsaImpl : public Determ +@@ -363,7 +371,7 @@ class DeterminizeFsaImpl : public Determ liter != label_map.end(); ++liter) AddArc(s, liter->first, liter->second); diff --git a/math/openfst/patches/patch-src_include_fst_encode.h b/math/openfst/patches/patch-src_include_fst_encode.h new file mode 100644 index 00000000000..ce51ac3ec2b --- /dev/null +++ b/math/openfst/patches/patch-src_include_fst_encode.h @@ -0,0 +1,20 @@ +$NetBSD$ + +--- src/include/fst/encode.h.orig 2013-05-03 17:23:12.000000000 +0000 ++++ src/include/fst/encode.h +@@ -20,8 +20,15 @@ + #ifndef FST_LIB_ENCODE_H__ + #define FST_LIB_ENCODE_H__ + ++#include ++ ++#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L ++#include ++using std::unordered_map; ++#else + #include + using std::tr1::unordered_map; ++#endif + #include + #include + #include diff --git a/math/openfst/patches/patch-src_include_fst_epsnormalize.h b/math/openfst/patches/patch-src_include_fst_epsnormalize.h new file mode 100644 index 00000000000..1070cc20a93 --- /dev/null +++ b/math/openfst/patches/patch-src_include_fst_epsnormalize.h @@ -0,0 +1,21 @@ +$NetBSD$ + +--- src/include/fst/epsnormalize.h.orig 2013-05-03 17:30:15.000000000 +0000 ++++ src/include/fst/epsnormalize.h +@@ -20,8 +20,16 @@ + #ifndef FST_LIB_EPSNORMALIZE_H__ + #define FST_LIB_EPSNORMALIZE_H__ + ++#include ++ ++#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L ++#include ++using std::unordered_map; ++#else + #include + using std::tr1::unordered_map; ++#endif ++ + #include + + #include diff --git a/math/openfst/patches/patch-src_include_fst_equivalent.h b/math/openfst/patches/patch-src_include_fst_equivalent.h new file mode 100644 index 00000000000..f6430e290d2 --- /dev/null +++ b/math/openfst/patches/patch-src_include_fst_equivalent.h @@ -0,0 +1,20 @@ +$NetBSD$ + +--- src/include/fst/equivalent.h.orig 2013-05-03 17:31:26.000000000 +0000 ++++ src/include/fst/equivalent.h +@@ -22,8 +22,15 @@ + + #include + #include ++#include ++ ++#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L ++#include ++using std::unordered_map; ++#else + #include + using std::tr1::unordered_map; ++#endif + #include + #include + #include diff --git a/math/openfst/patches/patch-src_include_fst_factor-weight.h b/math/openfst/patches/patch-src_include_fst_factor-weight.h index 7dbb0940044..f9740581412 100644 --- a/math/openfst/patches/patch-src_include_fst_factor-weight.h +++ b/math/openfst/patches/patch-src_include_fst_factor-weight.h @@ -1,8 +1,27 @@ -$NetBSD$ +$NetBSD: patch-src_include_fst_factor-weight.h,v 1.1 2012/07/03 17:42:05 joerg Exp $ ---- src/include/fst/factor-weight.h.orig 2012-07-03 09:54:33.000000000 +0000 +--- src/include/fst/factor-weight.h.orig 2009-03-21 03:35:33.000000000 +0000 +++ src/include/fst/factor-weight.h -@@ -215,7 +215,7 @@ class FactorWeightFstImpl +@@ -20,9 +20,17 @@ + #ifndef FST_LIB_FACTOR_WEIGHT_H__ + #define FST_LIB_FACTOR_WEIGHT_H__ + +-#include ++#include ++ ++#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L ++#include ++using std::unordered_map; ++#else + #include + using std::tr1::unordered_map; ++#endif ++ ++#include + #include + #include + #include +@@ -215,7 +223,7 @@ class FactorWeightFstImpl if (s == kNoStateId) return kNoStateId; StateId start = FindState(Element(fst_->Start(), Weight::One())); @@ -11,7 +30,7 @@ $NetBSD$ } return CacheImpl::Start(); } -@@ -229,9 +229,9 @@ class FactorWeightFstImpl +@@ -229,9 +237,9 @@ class FactorWeightFstImpl : (Weight) Times(e.weight, fst_->Final(e.state)); FactorIterator f(w); if (!(mode_ & kFactorFinalWeights) || f.Done()) @@ -23,7 +42,7 @@ $NetBSD$ } return CacheImpl::Final(s); } -@@ -298,13 +298,13 @@ class FactorWeightFstImpl +@@ -298,13 +306,13 @@ class FactorWeightFstImpl FactorIterator fit(w); if (!(mode_ & kFactorArcWeights) || fit.Done()) { StateId d = FindState(Element(arc.nextstate, Weight::One())); @@ -39,7 +58,7 @@ $NetBSD$ } } } -@@ -322,10 +322,10 @@ class FactorWeightFstImpl +@@ -322,10 +330,10 @@ class FactorWeightFstImpl const pair &p = fit.Value(); StateId d = FindState(Element(kNoStateId, p.second.Quantize(delta_))); diff --git a/math/openfst/patches/patch-src_include_fst_map.h b/math/openfst/patches/patch-src_include_fst_map.h index 8358ceed228..e63e9a9656b 100644 --- a/math/openfst/patches/patch-src_include_fst_map.h +++ b/math/openfst/patches/patch-src_include_fst_map.h @@ -1,8 +1,24 @@ -$NetBSD$ +$NetBSD: patch-src_include_fst_map.h,v 1.1 2012/07/03 17:42:05 joerg Exp $ ---- src/include/fst/map.h.orig 2012-07-03 09:55:26.000000000 +0000 +--- src/include/fst/map.h.orig 2009-03-21 03:35:34.000000000 +0000 +++ src/include/fst/map.h -@@ -336,7 +336,7 @@ class MapFstImpl : public CacheImpl { +@@ -21,8 +21,15 @@ + #ifndef FST_LIB_MAP_H__ + #define FST_LIB_MAP_H__ + ++#include ++ ++#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L ++#include ++using std::unordered_map; ++#else + #include + using std::tr1::unordered_map; ++#endif + #include + #include + #include +@@ -336,7 +343,7 @@ class MapFstImpl : public CacheImpl { StateId Start() { if (!HasStart()) @@ -11,7 +27,7 @@ $NetBSD$ return CacheImpl::Start(); } -@@ -348,24 +348,24 @@ class MapFstImpl : public CacheImpl { +@@ -348,24 +355,24 @@ class MapFstImpl : public CacheImpl { B final_arc = (*mapper_)(A(0, 0, fst_->Final(FindIState(s)), kNoStateId)); CHECK(final_arc.ilabel == 0 && final_arc.olabel == 0); @@ -41,7 +57,7 @@ $NetBSD$ break; } } -@@ -399,14 +399,14 @@ class MapFstImpl : public CacheImpl { +@@ -399,14 +406,14 @@ class MapFstImpl : public CacheImpl { void Expand(StateId s) { // Add exiting arcs. @@ -58,7 +74,7 @@ $NetBSD$ } // Check for superfinal arcs. -@@ -422,7 +422,7 @@ class MapFstImpl : public CacheImpl { +@@ -422,7 +429,7 @@ class MapFstImpl : public CacheImpl { if (superfinal_ == kNoStateId) superfinal_ = nstates_++; final_arc.nextstate = superfinal_; @@ -67,7 +83,7 @@ $NetBSD$ } break; } -@@ -431,12 +431,12 @@ class MapFstImpl : public CacheImpl { +@@ -431,12 +438,12 @@ class MapFstImpl : public CacheImpl { kNoStateId)); if (final_arc.ilabel != 0 || final_arc.olabel != 0 || final_arc.weight != B::Weight::Zero()) diff --git a/math/openfst/patches/patch-src_include_fst_relabel.h b/math/openfst/patches/patch-src_include_fst_relabel.h new file mode 100644 index 00000000000..83ea426309c --- /dev/null +++ b/math/openfst/patches/patch-src_include_fst_relabel.h @@ -0,0 +1,20 @@ +$NetBSD$ + +--- src/include/fst/relabel.h.orig 2013-05-03 17:35:08.000000000 +0000 ++++ src/include/fst/relabel.h +@@ -20,8 +20,15 @@ + #ifndef FST_LIB_RELABEL_H__ + #define FST_LIB_RELABEL_H__ + ++#include ++ ++#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L ++#include ++using std::unordered_map; ++#else + #include + using std::tr1::unordered_map; ++#endif + #include + #include + #include diff --git a/math/openfst/patches/patch-src_include_fst_replace.h b/math/openfst/patches/patch-src_include_fst_replace.h index 50bbea7469c..dc1b56f3189 100644 --- a/math/openfst/patches/patch-src_include_fst_replace.h +++ b/math/openfst/patches/patch-src_include_fst_replace.h @@ -1,8 +1,24 @@ -$NetBSD$ +$NetBSD: patch-src_include_fst_replace.h,v 1.1 2012/07/03 17:42:05 joerg Exp $ ---- src/include/fst/replace.h.orig 2012-07-03 10:02:47.000000000 +0000 +--- src/include/fst/replace.h.orig 2009-03-21 03:35:34.000000000 +0000 +++ src/include/fst/replace.h -@@ -424,16 +424,16 @@ class ReplaceFstImpl : public CacheImpl< +@@ -21,8 +21,15 @@ + #ifndef FST_LIB_REPLACE_H__ + #define FST_LIB_REPLACE_H__ + ++#include ++ ++#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L ++#include ++using std::unordered_map; ++#else + #include + using std::tr1::unordered_map; ++#endif + #include + #include + #include +@@ -424,16 +431,16 @@ class ReplaceFstImpl : public CacheImpl< // return final weight of state (kInfWeight means state is not final) Weight Final(StateId s) { @@ -22,7 +38,7 @@ $NetBSD$ } return CacheImpl::Final(s); } -@@ -471,7 +471,7 @@ class ReplaceFstImpl : public CacheImpl< +@@ -471,7 +478,7 @@ class ReplaceFstImpl : public CacheImpl< const Fst* fst = fst_array_[tuple.fst_id]; StateId fst_state = tuple.fst_state; if (fst_state == kNoStateId) { @@ -31,7 +47,7 @@ $NetBSD$ return; } -@@ -483,7 +483,7 @@ class ReplaceFstImpl : public CacheImpl< +@@ -483,7 +490,7 @@ class ReplaceFstImpl : public CacheImpl< StateId nextstate = state_table_->FindState( StateTuple(prefix_id, top.fst_id, top.nextstate)); @@ -40,7 +56,7 @@ $NetBSD$ } // extend arcs leaving the state -@@ -493,7 +493,7 @@ class ReplaceFstImpl : public CacheImpl< +@@ -493,7 +500,7 @@ class ReplaceFstImpl : public CacheImpl< if (arc.olabel == 0) { // expand local fst StateId nextstate = state_table_->FindState( StateTuple(tuple.prefix_id, tuple.fst_id, arc.nextstate)); @@ -49,7 +65,7 @@ $NetBSD$ } else { // check for non terminal typename NonTerminalHash::const_iterator it = -@@ -511,17 +511,17 @@ class ReplaceFstImpl : public CacheImpl< +@@ -511,17 +518,17 @@ class ReplaceFstImpl : public CacheImpl< StateId nt_nextstate = state_table_->FindState( StateTuple(nt_prefix, nonterminal, nt_start)); Label ilabel = (epsilon_on_replace_) ? 0 : arc.ilabel; diff --git a/math/openfst/patches/patch-src_include_fst_rmepsilon.h b/math/openfst/patches/patch-src_include_fst_rmepsilon.h new file mode 100644 index 00000000000..c91ff5d7b3d --- /dev/null +++ b/math/openfst/patches/patch-src_include_fst_rmepsilon.h @@ -0,0 +1,20 @@ +$NetBSD$ + +--- src/include/fst/rmepsilon.h.orig 2013-05-03 17:30:43.000000000 +0000 ++++ src/include/fst/rmepsilon.h +@@ -20,8 +20,15 @@ + #ifndef FST_LIB_RMEPSILON_H__ + #define FST_LIB_RMEPSILON_H__ + ++#include ++ ++#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L ++#include ++using std::unordered_map; ++#else + #include + using std::tr1::unordered_map; ++#endif + #include + #include + #include diff --git a/math/openfst/patches/patch-src_include_fst_rmfinalepsilon.h b/math/openfst/patches/patch-src_include_fst_rmfinalepsilon.h new file mode 100644 index 00000000000..a5e44f59c6e --- /dev/null +++ b/math/openfst/patches/patch-src_include_fst_rmfinalepsilon.h @@ -0,0 +1,20 @@ +$NetBSD$ + +--- src/include/fst/rmfinalepsilon.h.orig 2013-05-03 17:24:31.000000000 +0000 ++++ src/include/fst/rmfinalepsilon.h +@@ -20,8 +20,15 @@ + #ifndef FST_LIB_RMFINALEPSILON_H__ + #define FST_LIB_RMFINALEPSILON_H__ + ++#include ++ ++#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L ++#include ++using std::unordered_set; ++#else + #include + using std::tr1::unordered_set; ++#endif + #include + + #include diff --git a/math/openfst/patches/patch-src_include_fst_slist.h b/math/openfst/patches/patch-src_include_fst_slist.h new file mode 100644 index 00000000000..dccf91b8e7f --- /dev/null +++ b/math/openfst/patches/patch-src_include_fst_slist.h @@ -0,0 +1,13 @@ +$NetBSD$ + +--- src/include/fst/slist.h.orig 2013-05-03 17:49:34.000000000 +0000 ++++ src/include/fst/slist.h +@@ -47,7 +47,7 @@ template class slist : publ + + iterator erase_after(iterator pos) { + iterator npos = pos; +- erase(++npos); ++ this->erase(++npos); + return pos; + } + }; diff --git a/math/openfst/patches/patch-src_include_fst_synchronize.h b/math/openfst/patches/patch-src_include_fst_synchronize.h index f9faabfa6ac..ca583c7c2a4 100644 --- a/math/openfst/patches/patch-src_include_fst_synchronize.h +++ b/math/openfst/patches/patch-src_include_fst_synchronize.h @@ -1,8 +1,31 @@ -$NetBSD$ +$NetBSD: patch-src_include_fst_synchronize.h,v 1.1 2012/07/03 17:42:05 joerg Exp $ ---- src/include/fst/synchronize.h.orig 2012-07-03 10:05:34.000000000 +0000 +--- src/include/fst/synchronize.h.orig 2009-03-21 03:35:34.000000000 +0000 +++ src/include/fst/synchronize.h -@@ -111,7 +111,7 @@ class SynchronizeFstImpl +@@ -20,11 +20,21 @@ + #ifndef FST_LIB_SYNCHRONIZE_H__ + #define FST_LIB_SYNCHRONIZE_H__ + +-#include ++#include ++ ++#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L ++#include ++using std::unordered_map; ++#include ++using std::unordered_set; ++#else + #include + using std::tr1::unordered_map; + #include + using std::tr1::unordered_set; ++#endif ++ ++#include + #include + #include + #include +@@ -111,7 +121,7 @@ class SynchronizeFstImpl return kNoStateId; const String *empty = FindString(new String()); StateId start = FindState(Element(fst_->Start(), empty, empty)); @@ -11,7 +34,7 @@ $NetBSD$ } return CacheImpl::Start(); } -@@ -121,9 +121,9 @@ class SynchronizeFstImpl +@@ -121,9 +131,9 @@ class SynchronizeFstImpl const Element &e = elements_[s]; Weight w = e.state == kNoStateId ? Weight::One() : fst_->Final(e.state); if ((w != Weight::Zero()) && (e.istring)->empty() && (e.ostring)->empty()) @@ -23,7 +46,7 @@ $NetBSD$ } return CacheImpl::Final(s); } -@@ -230,13 +230,13 @@ class SynchronizeFstImpl +@@ -230,13 +240,13 @@ class SynchronizeFstImpl const String *istring = Cdr(e.istring, arc.ilabel); const String *ostring = Cdr(e.ostring, arc.olabel); StateId d = FindState(Element(arc.nextstate, istring, ostring)); @@ -39,7 +62,7 @@ $NetBSD$ } } -@@ -246,9 +246,9 @@ class SynchronizeFstImpl +@@ -246,9 +256,9 @@ class SynchronizeFstImpl const String *istring = Cdr(e.istring); const String *ostring = Cdr(e.ostring); StateId d = FindState(Element(kNoStateId, istring, ostring)); diff --git a/math/openfst/patches/patch-src_include_fst_test-properties.h b/math/openfst/patches/patch-src_include_fst_test-properties.h new file mode 100644 index 00000000000..77bd2a60e75 --- /dev/null +++ b/math/openfst/patches/patch-src_include_fst_test-properties.h @@ -0,0 +1,20 @@ +$NetBSD$ + +--- src/include/fst/test-properties.h.orig 2013-05-03 17:21:06.000000000 +0000 ++++ src/include/fst/test-properties.h +@@ -20,8 +20,15 @@ + #ifndef FST_LIB_TEST_PROPERTIES_H__ + #define FST_LIB_TEST_PROPERTIES_H__ + ++#include ++ ++#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L ++#include ++using std::unordered_set; ++#else + #include + using std::tr1::unordered_set; ++#endif + #include + #include + #include diff --git a/misc/fbreader/distinfo b/misc/fbreader/distinfo index 32e6f3d97f0..f6ac52f25b5 100644 --- a/misc/fbreader/distinfo +++ b/misc/fbreader/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2012/10/01 12:40:36 ryoon Exp $ +$NetBSD: distinfo,v 1.6 2012/10/01 12:47:30 wiz Exp $ SHA1 (fbreader-sources-0.99.2.tgz) = 16391ac7d5e38c014c48f9f9f8c0a21342926ffe RMD160 (fbreader-sources-0.99.2.tgz) = b143d8bb2aa3879f2c4b273011ffef5ec93532be @@ -6,4 +6,8 @@ Size (fbreader-sources-0.99.2.tgz) = 2423279 bytes SHA1 (patch-ab) = 4fcbbc7c9fe7fe2e9d841d226ba69624e36e08a5 SHA1 (patch-ah) = 8b30ee01cdb05d1680ce45cb57ba37011c33fa6c SHA1 (patch-ai) = 4e1e7f400277461853deba91536d25c13d9b6426 +SHA1 (patch-fbreader_src_fbreader_FBReaderActions.cpp) = ac2d5937d3628abd6db2e4b2fe869d95262d2689 +SHA1 (patch-fbreader_src_fbreader_FBView.cpp) = f9018b813b92d31c67e13eb68d6e50c8a7637a5c +SHA1 (patch-fbreader_src_formats_html_HtmlReader.cpp) = fe0ebe4dff97a11581a6d7b079f8f19f4e3be019 SHA1 (patch-zlibrary_text_Makefile) = 626331a0fe20419613029ad1337c1d60d73837c9 +SHA1 (patch-zlibrary_text_src_area_ZLTextAreaStyle.cpp) = ec87bd8072c2385df6e224c7cb1a914bef595f78 diff --git a/misc/fbreader/patches/patch-fbreader_src_fbreader_FBReaderActions.cpp b/misc/fbreader/patches/patch-fbreader_src_fbreader_FBReaderActions.cpp new file mode 100644 index 00000000000..43bb34b12a2 --- /dev/null +++ b/misc/fbreader/patches/patch-fbreader_src_fbreader_FBReaderActions.cpp @@ -0,0 +1,12 @@ +$NetBSD$ + +--- fbreader/src/fbreader/FBReaderActions.cpp.orig 2013-05-04 15:09:20.000000000 +0000 ++++ fbreader/src/fbreader/FBReaderActions.cpp +@@ -18,6 +18,7 @@ + */ + + #include ++#include + + #include + #include diff --git a/misc/fbreader/patches/patch-fbreader_src_fbreader_FBView.cpp b/misc/fbreader/patches/patch-fbreader_src_fbreader_FBView.cpp new file mode 100644 index 00000000000..302f810644b --- /dev/null +++ b/misc/fbreader/patches/patch-fbreader_src_fbreader_FBView.cpp @@ -0,0 +1,12 @@ +$NetBSD$ + +--- fbreader/src/fbreader/FBView.cpp.orig 2013-05-04 15:09:39.000000000 +0000 ++++ fbreader/src/fbreader/FBView.cpp +@@ -18,6 +18,7 @@ + */ + + #include ++#include + #include + + #include diff --git a/misc/fbreader/patches/patch-fbreader_src_formats_html_HtmlReader.cpp b/misc/fbreader/patches/patch-fbreader_src_formats_html_HtmlReader.cpp new file mode 100644 index 00000000000..952ded9c2c0 --- /dev/null +++ b/misc/fbreader/patches/patch-fbreader_src_formats_html_HtmlReader.cpp @@ -0,0 +1,12 @@ +$NetBSD$ + +--- fbreader/src/formats/html/HtmlReader.cpp.orig 2013-05-04 15:08:25.000000000 +0000 ++++ fbreader/src/formats/html/HtmlReader.cpp +@@ -19,6 +19,7 @@ + + #include + #include ++#include + + #include + #include diff --git a/misc/fbreader/patches/patch-zlibrary_text_src_area_ZLTextAreaStyle.cpp b/misc/fbreader/patches/patch-zlibrary_text_src_area_ZLTextAreaStyle.cpp new file mode 100644 index 00000000000..3bd5383ca3a --- /dev/null +++ b/misc/fbreader/patches/patch-zlibrary_text_src_area_ZLTextAreaStyle.cpp @@ -0,0 +1,12 @@ +$NetBSD$ + +--- zlibrary/text/src/area/ZLTextAreaStyle.cpp.orig 2013-05-04 15:07:13.000000000 +0000 ++++ zlibrary/text/src/area/ZLTextAreaStyle.cpp +@@ -18,6 +18,7 @@ + */ + + #include ++#include + + #include + #include diff --git a/mk/tools/msgfmt-msgctxt.awk b/mk/tools/msgfmt-msgctxt.awk index 15298a4fe9e..e9cc5ca8157 100644 --- a/mk/tools/msgfmt-msgctxt.awk +++ b/mk/tools/msgfmt-msgctxt.awk @@ -1,4 +1,4 @@ -# $NetBSD: msgfmt-msgctxt.awk,v 1.4 2013/05/03 12:31:43 obache Exp $ +# $NetBSD: msgfmt-msgctxt.awk,v 1.5 2013/05/05 00:34:22 obache Exp $ # # Simple awk script to strip out .po entries with msgctxt and "#~|", so the # resultant file can be handled by the msgfmt<0.15. @@ -19,6 +19,7 @@ BEGIN { s = 0 p = 0 obsolete = "" + msgid_begin_with_nl = 0 while (result == 1) { @@ -58,8 +59,11 @@ BEGIN { MSGID_RE = OBSOLETE_RE "msgid" if ($0 ~ MSGID_RE KEYWORD_SEP) { obsolete = "" + msgid_begin_with_nl = 0 + msgid_find_first_str = 0 if ($0 ~ OBSOLETE_RE_MATCH) obsolete = OBSOLETE if (s > 0) { + msgid_find_first_str = 1 print obsolete "msgid " singular[0] for (i = 1; i < s; i++) print obsolete singular[i] @@ -86,16 +90,60 @@ BEGIN { if (t > 0) { if (s > 0) { print obsolete msgid[0] + if (msgid[0] !~ /^""$/) { + msgid_find_first_str = 0 + if (msgid[0] ~ /^"\\n/) { + msgid_begin_with_nl = 1 + } + } } else { print obsolete "msgid " msgid[0] } - for (i = 1; i < t; i++) + for (i = 1; i < t; i++) { print obsolete msgid[i] + if (msgid_find_first_str && (msgid[i] !~ /^""$/)) { + msgid_find_first_str = 0 + if (msgid[i] ~ /^"\\n/) { + msgid_begin_with_nl = 1 + } + } + } } s = 0 continue } + # insert a SPACE before "msgstr" if "msgid" is start with "\n" + # but msgctx is inserted before it to avoid msgfmt(1)'s format + # mismatch check. + # + if (msgid_begin_with_nl) { + MSGSTR_RE = OBSOLETE_RE "msgstr" + if ($0 ~ MSGSTR_RE KEYWORD_SEP) { + if ($0 ~ OBSOLETE_RE_MATCH) obsolete = OBSOLETE + sub(MSGSTR_RE SPACE, "") + if ($0 ~ EMPTY) $0 = "\"\"" + sub(/\r$/, "") + if ($0 ~ /\"\\n/) { + sub(/\\n/, " \\n") + } + print obsolete "msgstr " $0 + while (result = getline) { + if ($0 !~ MSG_CONTINUATION_RE) break + sub(OBSOLETE_RE, "") + $sub(/\r$/,"") + if (msgid_begin_with_nl && $0 ~ /^"\\n/) { + sub(/^"\\n/, "\" \\n") + msgid_begin_with_nl = 0 + + } + print obsolete $0 + } + } + msgid_begin_with_nl = 0 + continue + } + # Pass everything else verbatim. if ($0 !~ /^#~\|/) { sub(/\r$/, "") diff --git a/multimedia/gst-plugins1-base/distinfo b/multimedia/gst-plugins1-base/distinfo index 91af5d1e7ea..9f725225cb3 100644 --- a/multimedia/gst-plugins1-base/distinfo +++ b/multimedia/gst-plugins1-base/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.3 2013/04/08 16:57:46 drochner Exp $ +$NetBSD: distinfo,v 1.4 2013/05/03 15:58:36 drochner Exp $ SHA1 (gst-plugins-base-1.0.7.tar.xz) = c9e057774746c6dea07052fa0fec9cfc2519ceea RMD160 (gst-plugins-base-1.0.7.tar.xz) = c3751b5e09290513df96e3496196ff8e07610016 Size (gst-plugins-base-1.0.7.tar.xz) = 2388380 bytes SHA1 (patch-ext_alsa_gstalsasink.c) = f344b819e65b42f49c2328f8bf3e8c075e5dd24b SHA1 (patch-ext_alsa_gstalsasrc.c) = dd966d2a7f1b952a90c1aa78e726b8272ac40f9d +SHA1 (patch-gst_audioresample_resample.c) = 492cc82935e63a58f6d6e0ed04eacfce47c09146 diff --git a/multimedia/gst-plugins1-base/patches/patch-gst_audioresample_resample.c b/multimedia/gst-plugins1-base/patches/patch-gst_audioresample_resample.c new file mode 100644 index 00000000000..66412a8ae8b --- /dev/null +++ b/multimedia/gst-plugins1-base/patches/patch-gst_audioresample_resample.c @@ -0,0 +1,23 @@ +$NetBSD$ + +* fix build on i386 without SSE/SSE2 support. +https://bugzilla.gnome.org/show_bug.cgi?id=670690 + +--- gst/audioresample/resample.c.orig 2013-04-26 07:26:19.000000000 +0000 ++++ gst/audioresample/resample.c +@@ -77,13 +77,13 @@ + #define EXPORT G_GNUC_INTERNAL + + #ifdef _USE_SSE +-#ifndef HAVE_XMMINTRIN_H ++#ifndef __SSE__ + #undef _USE_SSE + #endif + #endif + + #ifdef _USE_SSE2 +-#ifndef HAVE_EMMINTRIN_H ++#ifndef __SSE2__ + #undef _USE_SSE2 + #endif + #endif diff --git a/multimedia/kmix/distinfo b/multimedia/kmix/distinfo index b35cd00097f..f7e25992266 100644 --- a/multimedia/kmix/distinfo +++ b/multimedia/kmix/distinfo @@ -1,7 +1,16 @@ -$NetBSD$ +$NetBSD: distinfo,v 1.1 2013/04/03 11:13:10 markd Exp $ SHA1 (kmix-4.10.2.tar.xz) = 26617eeac172e3375cd097c8350ebdb32412e9fa RMD160 (kmix-4.10.2.tar.xz) = a09bcba9375863b42cd415a7e9ece2f60b4cb425 Size (kmix-4.10.2.tar.xz) = 385736 bytes SHA1 (patch-CMakeLists.txt) = be774815cf3c8ae99f6bae31d5de010f37a6ef29 +SHA1 (patch-apps_kmixd.cpp) = c43b33328d398ce47ae6c9d0803af7ed10dcdd1e +SHA1 (patch-backends_mixer__backend.cpp) = d5c24ee2d7d2154df22a4ed203625b36d7e41eb9 +SHA1 (patch-backends_mixer__mpris2.cpp) = 64d7a988d5ded5651aad2208f421e35b0ca1aa79 +SHA1 (patch-core_ControlPool.h) = fba837f300478e015941fa5aa7355372b294bb38 +SHA1 (patch-core_MasterControl.h) = ab348a5ffc440650c9f1fd529335f87e5c81ed12 +SHA1 (patch-core_mixdevice.h) = 75dd0c84517ec0e8fe647a2b8e84370b1e8afea9 +SHA1 (patch-core_mixertoolbox.cpp) = c2559b56b998c78e8f25c667c8c91a180a90622f +SHA1 (patch-gui_kmixdockwidget.cpp) = 756358740a958c49b6c94432dece885822b6fd25 +SHA1 (patch-gui_viewdockareapopup.cpp) = cd36f687336cabdecb9387b88be989f8b3ed553b SHA1 (patch-tests_CMakeLists.txt) = 4c39d6268e6c690099d06a8ba6946cb90242791e diff --git a/multimedia/kmix/patches/patch-apps_kmixd.cpp b/multimedia/kmix/patches/patch-apps_kmixd.cpp new file mode 100644 index 00000000000..f8714a69ab6 --- /dev/null +++ b/multimedia/kmix/patches/patch-apps_kmixd.cpp @@ -0,0 +1,13 @@ +$NetBSD$ + +--- apps/kmixd.cpp.orig 2013-05-04 01:50:10.000000000 +0000 ++++ apps/kmixd.cpp +@@ -156,7 +156,7 @@ void KMixD::saveBaseConfig() + config.writeEntry( "MasterMixer", mixerMasterCard->id() ); + } + shared_ptr mdMaster = Mixer::getGlobalMasterMD(); +- if ( mdMaster != 0 ) { ++ if ( mdMaster != nullptr ) { + config.writeEntry( "MasterMixerDevice", mdMaster->id() ); + } + QString mixerIgnoreExpression = MixerToolBox::instance()->mixerIgnoreExpression(); diff --git a/multimedia/kmix/patches/patch-backends_mixer__backend.cpp b/multimedia/kmix/patches/patch-backends_mixer__backend.cpp new file mode 100644 index 00000000000..fb21cc43ddb --- /dev/null +++ b/multimedia/kmix/patches/patch-backends_mixer__backend.cpp @@ -0,0 +1,13 @@ +$NetBSD$ + +--- backends/mixer_backend.cpp.orig 2013-05-04 01:47:44.000000000 +0000 ++++ backends/mixer_backend.cpp +@@ -237,7 +237,7 @@ void Mixer_Backend::readSetFromHW() + */ + shared_ptr Mixer_Backend::recommendedMaster() + { +- if ( m_recommendedMaster != 0 ) ++ if ( m_recommendedMaster != nullptr ) + { + // Backend has set a recommended master. Thats fine. Using it. + return m_recommendedMaster; diff --git a/multimedia/kmix/patches/patch-backends_mixer__mpris2.cpp b/multimedia/kmix/patches/patch-backends_mixer__mpris2.cpp new file mode 100644 index 00000000000..eb2f806a79c --- /dev/null +++ b/multimedia/kmix/patches/patch-backends_mixer__mpris2.cpp @@ -0,0 +1,13 @@ +$NetBSD$ + +--- backends/mixer_mpris2.cpp.orig 2013-05-04 01:48:09.000000000 +0000 ++++ backends/mixer_mpris2.cpp +@@ -394,7 +394,7 @@ void Mixer_MPRIS2::newMediaPlayer(QStrin + QString id = ( lastDot == -1 ) ? name : name.mid(lastDot+1); + apps.remove(id); + shared_ptr md = m_mixDevices.get(id); +- if (md != 0) ++ if (md != nullptr) + { + // We know about the player that is unregistering => remove internally + md->close(); diff --git a/multimedia/kmix/patches/patch-core_ControlPool.h b/multimedia/kmix/patches/patch-core_ControlPool.h new file mode 100644 index 00000000000..509d74f2dba --- /dev/null +++ b/multimedia/kmix/patches/patch-core_ControlPool.h @@ -0,0 +1,18 @@ +$NetBSD$ + +--- core/ControlPool.h.orig 2013-05-04 01:52:19.000000000 +0000 ++++ core/ControlPool.h +@@ -25,9 +25,12 @@ + + // std::shared_ptr + #include ++#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L ++using std::shared_ptr; ++#else + #include +- + using namespace ::std::tr1; ++#endif + + #include "core/mixdevice.h" + diff --git a/multimedia/kmix/patches/patch-core_MasterControl.h b/multimedia/kmix/patches/patch-core_MasterControl.h new file mode 100644 index 00000000000..b676b0c45a1 --- /dev/null +++ b/multimedia/kmix/patches/patch-core_MasterControl.h @@ -0,0 +1,17 @@ +$NetBSD$ + +--- core/MasterControl.h.orig 2013-05-04 01:44:08.000000000 +0000 ++++ core/MasterControl.h +@@ -12,8 +12,12 @@ + + // std::shared_ptr + #include ++#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L ++using std::shared_ptr; ++#else + #include + using namespace ::std::tr1; ++#endif + + class MasterControl + { diff --git a/multimedia/kmix/patches/patch-core_mixdevice.h b/multimedia/kmix/patches/patch-core_mixdevice.h new file mode 100644 index 00000000000..c256ff9438e --- /dev/null +++ b/multimedia/kmix/patches/patch-core_mixdevice.h @@ -0,0 +1,17 @@ +$NetBSD$ + +--- core/mixdevice.h.orig 2013-05-04 01:42:48.000000000 +0000 ++++ core/mixdevice.h +@@ -23,8 +23,12 @@ + + // std::shared_ptr + #include ++#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L ++using std::shared_ptr; ++#else + #include + using namespace ::std::tr1; ++#endif + + //KMix + class Mixer; diff --git a/multimedia/kmix/patches/patch-core_mixertoolbox.cpp b/multimedia/kmix/patches/patch-core_mixertoolbox.cpp new file mode 100644 index 00000000000..23595daac51 --- /dev/null +++ b/multimedia/kmix/patches/patch-core_mixertoolbox.cpp @@ -0,0 +1,20 @@ +$NetBSD$ + +--- core/mixertoolbox.cpp.orig 2013-05-04 01:52:48.000000000 +0000 ++++ core/mixertoolbox.cpp +@@ -249,13 +249,13 @@ void MixerToolBox::initMixerInternal(Mul + + + // Add a master device (if we haven't defined one yet) +- if ( Mixer::getGlobalMasterMD(false) == 0 ) { ++ if ( Mixer::getGlobalMasterMD(false) == nullptr ) { + // We have no master card yet. This actually only happens when there was + // not one defined in the kmixrc. + // So lets just set the first card as master card. + if ( Mixer::mixers().count() > 0 ) { + shared_ptr master = Mixer::mixers().first()->getLocalMasterMD(); +- if ( master != 0 ) { ++ if ( master != nullptr ) { + QString controlId = master->id(); + Mixer::setGlobalMaster( Mixer::mixers().first()->id(), controlId, true); + } diff --git a/multimedia/kmix/patches/patch-gui_kmixdockwidget.cpp b/multimedia/kmix/patches/patch-gui_kmixdockwidget.cpp new file mode 100644 index 00000000000..52fcee9a02d --- /dev/null +++ b/multimedia/kmix/patches/patch-gui_kmixdockwidget.cpp @@ -0,0 +1,22 @@ +$NetBSD$ + +--- gui/kmixdockwidget.cpp.orig 2013-05-04 01:54:44.000000000 +0000 ++++ gui/kmixdockwidget.cpp +@@ -217,7 +217,7 @@ void KMixDockWidget::updatePixmap() + shared_ptr md = Mixer::getGlobalMasterMD(); + + char newPixmapType; +- if ( md == 0 ) ++ if ( md == nullptr ) + { + newPixmapType = 'e'; + } +@@ -407,7 +407,7 @@ void KMixDockWidget::contextMenuAboutToS + void KMixDockWidget::updateDockMuteAction ( KToggleAction* dockMuteAction ) + { + shared_ptr md = Mixer::getGlobalMasterMD(); +- if ( md != 0 && dockMuteAction != 0 ) ++ if ( md != nullptr && dockMuteAction != 0 ) + { + Volume& vol = md->playbackVolume().hasVolume() ? md->playbackVolume() : md->captureVolume(); + bool isInactive = vol.isCapture() ? !md->isRecSource() : md->isMuted(); diff --git a/multimedia/kmix/patches/patch-gui_viewdockareapopup.cpp b/multimedia/kmix/patches/patch-gui_viewdockareapopup.cpp new file mode 100644 index 00000000000..cf8a0759de1 --- /dev/null +++ b/multimedia/kmix/patches/patch-gui_viewdockareapopup.cpp @@ -0,0 +1,19 @@ +$NetBSD$ + +--- gui/viewdockareapopup.cpp.orig 2013-05-04 01:56:15.000000000 +0000 ++++ gui/viewdockareapopup.cpp +@@ -244,12 +244,12 @@ Application: KMix (kmix), signal: Segmen + { + kDebug() << "ADD? mixerId=" << mixer->id(); + shared_ptrdockMD = mixer->getLocalMasterMD(); +- if ( dockMD == 0 && mixer->size() > 0 ) ++ if ( dockMD == nullptr && mixer->size() > 0 ) + { + // If we have no dock device yet, we will take the first available mixer device. + dockMD = (*mixer)[0]; + } +- if ( dockMD != 0 ) ++ if ( dockMD != nullptr ) + { + kDebug() << "ADD? mixerId=" << mixer->id() << ", md=" << dockMD->id(); + if ( !dockMD->isApplicationStream() && dockMD->playbackVolume().hasVolume()) diff --git a/net/DarwinStreamingServer/Makefile b/net/DarwinStreamingServer/Makefile index 56eaea95592..d4c5bdd5506 100644 --- a/net/DarwinStreamingServer/Makefile +++ b/net/DarwinStreamingServer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2012/10/23 17:18:07 asau Exp $ +# $NetBSD: Makefile,v 1.12 2013/03/24 16:51:07 joerg Exp $ DISTNAME= DarwinStreamingSrvr5.5.5-Source PKGNAME= DarwinStreamingServer-5.5.5 @@ -24,8 +24,8 @@ USE_LANGUAGES= c c++ MAKE_FILE= Makefile.POSIX MAKE_ENV+= CCOMP=${CC:Q} CPLUS=${CXX:Q}\ -fPIC LINKER=${CXX:Q} MAKE_ENV+= COMPILER_FLAGS=${CFLAGS:Q} INCLUDE_FLAG="-include" -MAKE_ENV+= CORE_LINK_LIBS="-pthread -lm -lcrypt -lstdc++" -MAKE_ENV+= SHARED="-shared" MODULE_LIBS="-lgcc -lstdc++" +MAKE_ENV+= CORE_LINK_LIBS="-pthread -lm -lcrypt" +MAKE_ENV+= SHARED="-shared" MODULE_LIBS="" BUILD_DIRS= CommonUtilitiesLib BUILD_DIRS+= QTFileLib diff --git a/net/kismet/distinfo b/net/kismet/distinfo index e97696b4ea9..6b89cf3e7e9 100644 --- a/net/kismet/distinfo +++ b/net/kismet/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.7 2011/11/24 13:43:11 joerg Exp $ +$NetBSD: distinfo,v 1.8 2013/03/02 17:59:10 joerg Exp $ SHA1 (kismet-2008-05-R1.tar.gz) = 8355aeb0374a39549dfdc0c73160125eadd7c6e2 RMD160 (kismet-2008-05-R1.tar.gz) = 5613207b45f85fa72d146009434df984f721ccdc @@ -9,4 +9,7 @@ SHA1 (patch-ae) = 5c6e69e7c7490d27433e67c0fc15a4352ff2b99d SHA1 (patch-af) = e4e176998e78a657178b3e14e614adf27b517eb6 SHA1 (patch-ag) = cb1e1eaf07ae40128fbe9760c95cfdecc200d22c SHA1 (patch-ah) = 67dfa5a2aedb1b651671863177baace4a65c6f26 +SHA1 (patch-gpsdump.cc) = 2ef05923053bd887249427db286cbb5c485018f5 +SHA1 (patch-kismet__server.cc) = 611f22eb7746d7d210f01cc9ceb9bc28e998a866 +SHA1 (patch-macaddr.h) = c5841ecd5c9ddb2b008c88e78665740a0e23195b SHA1 (patch-panelfront.cc) = 5a09a92598c8ffb7851b74fe87577a997f69e4f6 diff --git a/net/kismet/patches/patch-gpsdump.cc b/net/kismet/patches/patch-gpsdump.cc new file mode 100644 index 00000000000..a0c0b2c2fc1 --- /dev/null +++ b/net/kismet/patches/patch-gpsdump.cc @@ -0,0 +1,13 @@ +$NetBSD$ + +--- gpsdump.cc.orig 2013-05-06 07:12:44.000000000 +0000 ++++ gpsdump.cc +@@ -108,7 +108,7 @@ int GPSDump::DumpTrack(GPSD *in_gps) { + + int sig = 0, qual = 0, noise = 0; + +- if (time(0) - last_info.ts.tv_sec < decay && last_info.quality != -1) { ++ if (time(0) - last_info.ts.tv_sec < ::decay && last_info.quality != -1) { + sig = last_info.signal; + qual = last_info.quality; + noise = last_info.noise; diff --git a/net/kismet/patches/patch-kismet__server.cc b/net/kismet/patches/patch-kismet__server.cc new file mode 100644 index 00000000000..232e0baaf51 --- /dev/null +++ b/net/kismet/patches/patch-kismet__server.cc @@ -0,0 +1,49 @@ +$NetBSD$ + +--- kismet_server.cc.orig 2013-05-06 07:13:15.000000000 +0000 ++++ kismet_server.cc +@@ -759,7 +759,7 @@ void NetWriteInfo() { + snprintf(tmpstr, 32, "%d", tracker.FetchNumPackets() - last_packnum); + idata.rate = tmpstr; + +- if (time(0) - last_info.ts.tv_sec < decay && last_info.signal != -1) ++ if (time(0) - last_info.ts.tv_sec < ::decay && last_info.signal != -1) + snprintf(tmpstr, 16, "%d %d" , last_info.signal, last_info.noise); + else if (last_info.quality == -1) + snprintf(tmpstr, 16, "-1 -1"); +@@ -1543,7 +1543,7 @@ int ProcessBulkConf(ConfigFile *conf) { + } + + if (conf->FetchOpt("decay") != "") { +- if (sscanf(conf->FetchOpt("decay").c_str(), "%d", &decay) != 1) { ++ if (sscanf(conf->FetchOpt("decay").c_str(), "%d", &::decay) != 1) { + fprintf(stderr, "FATAL: Illegal config file value for decay.\n"); + ErrorShutdown(); + } +@@ -2237,7 +2237,7 @@ int main(int argc,char *argv[]) { + { 0, 0, 0, 0 } + }; + int option_index; +- decay = 5; ++ ::decay = 5; + + // Catch the interrupt handler to shut down + signal(SIGINT, CatchShutdown); +@@ -2950,7 +2950,7 @@ int main(int argc,char *argv[]) { + timetracker.RegisterTimer(datainterval * SERVER_TIMESLICES_SEC, NULL, 1, &ExportSyncEvent, NULL); + // Write waypoints if requested + if (waypoint) +- timetracker.RegisterTimer(decay * SERVER_TIMESLICES_SEC, NULL, 1, &WaypointSyncEvent, NULL); ++ timetracker.RegisterTimer(::decay * SERVER_TIMESLICES_SEC, NULL, 1, &WaypointSyncEvent, NULL); + // Channel hop if requested + if (channel_hop) { + if (channel_dwell) +@@ -3175,7 +3175,7 @@ daemon_parent_cleanup: + num_networks = tracker.FetchNumNetworks(); + + if (tracker.FetchNumPackets() != num_packets) { +- if (cur_time - last_click >= decay && sound == 1) { ++ if (cur_time - last_click >= ::decay && sound == 1) { + if (tracker.FetchNumPackets() - num_packets > + tracker.FetchNumDropped() + localdropnum - num_dropped) { + sound = PlaySound("traffic"); diff --git a/net/kismet/patches/patch-macaddr.h b/net/kismet/patches/patch-macaddr.h new file mode 100644 index 00000000000..7f00702c30d --- /dev/null +++ b/net/kismet/patches/patch-macaddr.h @@ -0,0 +1,12 @@ +$NetBSD$ + +--- macaddr.h.orig 2013-05-06 07:11:44.000000000 +0000 ++++ macaddr.h +@@ -22,6 +22,7 @@ + #include "config.h" + + #include ++#include + #include + #include + #include diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile index a6fcc55ce8d..80761677563 100644 --- a/pkgtools/pkglint/Makefile +++ b/pkgtools/pkglint/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.427 2013/03/26 15:10:31 schmonz Exp $ +# $NetBSD: Makefile,v 1.428 2013/03/26 15:11:36 schmonz Exp $ # Note: if you update the version number, please have a look at the # changes between the CVS tag "pkglint_current" and HEAD. # After updating, please re-set the CVS tag to HEAD. -DISTNAME= pkglint-4.128 +DISTNAME= pkglint-4.129 CATEGORIES= pkgtools MASTER_SITES= # none DISTFILES= # none diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl index d3e80db1b3c..bd1ac62cf12 100644 --- a/pkgtools/pkglint/files/pkglint.pl +++ b/pkgtools/pkglint/files/pkglint.pl @@ -1,5 +1,5 @@ #! @PERL@ -# $NetBSD: pkglint.pl,v 1.853 2013/03/26 15:10:57 schmonz Exp $ +# $NetBSD: pkglint.pl,v 1.854 2013/03/26 15:11:20 schmonz Exp $ # # pkglint - static analyzer and checker for pkgsrc packages @@ -6754,11 +6754,6 @@ sub checkfile_PLIST($) { "Directories are removed automatically when they are empty.", "When a package needs an empty directory, it can use the \@pkgdir", "command in the PLIST"); - - # XXX: this check should be made independent of dirrm - if ($pkgpath ne "graphics/hicolor-icon-theme" && $arg =~ m"^share/icons/hicolor(?:$|/)") { - $line->log_error("Please .include \"../../graphics/hicolor-icon-theme/buildlink3.mk\" and remove this line."); - } } elsif ($cmd eq "imake-man") { my (@args) = split(/\s+/, $arg); if (@args != 3) { @@ -6910,9 +6905,28 @@ sub checkfile_PLIST($) { } elsif ($text =~ m"^share/applications/.*\.desktop$") { my $f = "../../sysutils/desktop-file-utils/desktopdb.mk"; if (defined($pkgctx_included) && !exists($pkgctx_included->{$f})) { - $line->log_warning("Packages that install a .desktop entry should .include \"$f\"."); + $line->log_warning("Packages that install a .desktop entry may .include \"$f\"."); + $line->explain_warning( +"If *.desktop files contain MimeType keys, global MIME Type registory DB", +"must be updated by desktop-file-utils.", +"Otherwise, this warning is harmless."); + } + + } elsif ($pkgpath ne "graphics/hicolor-icon-theme" && $text =~ m"^share/icons/hicolor(?:$|/)") { + my $f = "../../graphics/hicolor-icon-theme/buildlink3.mk"; + if (defined($pkgctx_included) && !exists($pkgctx_included->{$f})) { + $line->log_error("Please .include \"$f\""); + $line->explain_error( +"If hicolor icon themes are installed, icon theme cache must be maintained."); } + } elsif ($pkgpath ne "graphics/gnome-icon-theme" && $text =~ m"^share/icons/gnome(?:$|/)") { + my $f = "../../graphics/gnome-icon-theme/buildlink3.mk"; + if (defined($pkgctx_included) && !exists($pkgctx_included->{$f})) { + $line->log_error("Please .include \"$f\""); + $line->explain_error( +"If Gnome icon themes are installed, icon theme cache must be maintained."); + } } elsif ($dirname eq "share/aclocal" && $basename =~ m"\.m4$") { # Fine. diff --git a/security/botan/distinfo b/security/botan/distinfo index 481816802e6..1a12137c387 100644 --- a/security/botan/distinfo +++ b/security/botan/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.11 2011/12/17 16:09:46 marino Exp $ +$NetBSD: distinfo,v 1.12 2012/10/08 20:46:38 pettai Exp $ SHA1 (Botan-1.8.14.tgz) = a845a5e6d0386e0bdbd7a8cfc646d5a4cdec8649 RMD160 (Botan-1.8.14.tgz) = 6125937c13860b67a18dbbee71c477b4d06ad5b2 @@ -6,5 +6,20 @@ Size (Botan-1.8.14.tgz) = 2632909 bytes SHA1 (patch-ab) = a53a3e23722d8f478c5a6c5ecf1df08d74fd21c0 SHA1 (patch-ac) = 4f98ff086983b27ed17d048486a8afced47e7970 SHA1 (patch-ak) = 7bf66c1faa84971b490be96efefac0ef44f97b70 +SHA1 (patch-src_cert_cvc_cvc__ado.cpp) = 94c632fcdf6d8df903135c7abe9bb26ab194f803 +SHA1 (patch-src_cert_cvc_cvc__ado.h) = b10593175baf2787b5522a05369773877c135a8a +SHA1 (patch-src_cert_cvc_cvc__ca.cpp) = 2bd37cbd9432d605b1306d43612e35a37565d490 +SHA1 (patch-src_cert_cvc_cvc__cert.cpp) = 4cac9f415e1e60b04b97ba8fbb29d891f08cbab9 +SHA1 (patch-src_cert_cvc_cvc__cert.h) = de72a3c9a4f1d6eb107ff07f209516e9ffca8e1c +SHA1 (patch-src_cert_cvc_cvc__req.cpp) = 576d874e570a271ffb3ac81e57890401d900583a +SHA1 (patch-src_cert_cvc_cvc__req.h) = 419916c1b2089e27d5e9f2a2f714793e6fcc1809 +SHA1 (patch-src_cert_cvc_cvc__self.cpp) = 251a097a699633e3537cc87c28aeed41e885344f +SHA1 (patch-src_cert_cvc_freestore.h) = 620892af8b6caf688c1c1789acd2a2f712f5d441 SHA1 (patch-src_entropy_unix_procs_info.txt) = c2685db5fbd16a67b008b738730518858265ebc0 SHA1 (patch-src_hash_sha1_amd64_info.txt) = d83a7b88b5860a596607e529b29090afa16dcda7 +SHA1 (patch-src_math_gfpmath_curve__gfp.cpp) = 4a24c751bc5a8ae049b633b0ac2fcb48a6f606ff +SHA1 (patch-src_math_gfpmath_curve__gfp.h) = f0338064ba2dda12c36af9ad18d3a036f99fea50 +SHA1 (patch-src_math_gfpmath_gfp__element.cpp) = 6b787da2e8d9d3e6d00c3a4d3de907d0466dbfbc +SHA1 (patch-src_math_gfpmath_gfp__element.h) = 59bf2a7d1ccde428e5c42977f1185e4b15c2d02f +SHA1 (patch-src_math_gfpmath_point__gfp.cpp) = e9727610d64b103991f2b5ce82de26627e8e02f6 +SHA1 (patch-src_math_gfpmath_point__gfp.h) = 3b2b93e11cb0b49bfb983147d36259060daff782 diff --git a/security/botan/patches/patch-src_cert_cvc_cvc__ado.cpp b/security/botan/patches/patch-src_cert_cvc_cvc__ado.cpp new file mode 100644 index 00000000000..71e7778bb4d --- /dev/null +++ b/security/botan/patches/patch-src_cert_cvc_cvc__ado.cpp @@ -0,0 +1,31 @@ +$NetBSD$ + +--- src/cert/cvc/cvc_ado.cpp.orig 2013-04-30 23:02:37.000000000 +0000 ++++ src/cert/cvc/cvc_ado.cpp +@@ -12,7 +12,7 @@ + + namespace Botan { + +-EAC1_1_ADO::EAC1_1_ADO(std::tr1::shared_ptr in) ++EAC1_1_ADO::EAC1_1_ADO(shared_ptr in) + { + init(in); + do_decode(); +@@ -20,7 +20,7 @@ EAC1_1_ADO::EAC1_1_ADO(std::tr1::shared_ + + EAC1_1_ADO::EAC1_1_ADO(const std::string& in) + { +- std::tr1::shared_ptr stream(new DataSource_Stream(in, true)); ++ shared_ptr stream(new DataSource_Stream(in, true)); + init(stream); + do_decode(); + } +@@ -41,7 +41,7 @@ void EAC1_1_ADO::force_decode() + .end_cons() + .get_contents(); + +- std::tr1::shared_ptr req_source(new DataSource_Memory(req_bits)); ++ shared_ptr req_source(new DataSource_Memory(req_bits)); + m_req = EAC1_1_Req(req_source); + sig_algo = m_req.sig_algo; + } diff --git a/security/botan/patches/patch-src_cert_cvc_cvc__ado.h b/security/botan/patches/patch-src_cert_cvc_cvc__ado.h new file mode 100644 index 00000000000..f80898a3755 --- /dev/null +++ b/security/botan/patches/patch-src_cert_cvc_cvc__ado.h @@ -0,0 +1,13 @@ +$NetBSD$ + +--- src/cert/cvc/cvc_ado.h.orig 2013-04-30 23:02:27.000000000 +0000 ++++ src/cert/cvc/cvc_ado.h +@@ -39,7 +39,7 @@ class BOTAN_DLL EAC1_1_ADO : public EAC1 + * Construct a CVC ADO request from a data source + * @param source the data source + */ +- EAC1_1_ADO(std::tr1::shared_ptr source); ++ EAC1_1_ADO(shared_ptr source); + + /** + * Create a signed CVC ADO request from to be signed (TBS) data diff --git a/security/botan/patches/patch-src_cert_cvc_cvc__ca.cpp b/security/botan/patches/patch-src_cert_cvc_cvc__ca.cpp new file mode 100644 index 00000000000..00462e72dea --- /dev/null +++ b/security/botan/patches/patch-src_cert_cvc_cvc__ca.cpp @@ -0,0 +1,13 @@ +$NetBSD$ + +--- src/cert/cvc/cvc_ca.cpp.orig 2013-04-30 23:02:49.000000000 +0000 ++++ src/cert/cvc/cvc_ca.cpp +@@ -38,7 +38,7 @@ EAC1_1_CVC EAC1_1_CVC_CA::make_cert(std: + EAC1_1_CVC::build_cert_body(tbs), + rng); + +- std::tr1::shared_ptr source(new DataSource_Memory(signed_cert)); ++ shared_ptr source(new DataSource_Memory(signed_cert)); + + return EAC1_1_CVC(source); + } diff --git a/security/botan/patches/patch-src_cert_cvc_cvc__cert.cpp b/security/botan/patches/patch-src_cert_cvc_cvc__cert.cpp new file mode 100644 index 00000000000..8d89fc51f1b --- /dev/null +++ b/security/botan/patches/patch-src_cert_cvc_cvc__cert.cpp @@ -0,0 +1,22 @@ +$NetBSD$ + +--- src/cert/cvc/cvc_cert.cpp.orig 2013-04-30 23:03:08.000000000 +0000 ++++ src/cert/cvc/cvc_cert.cpp +@@ -78,7 +78,7 @@ void EAC1_1_CVC::force_decode() + /* + * CVC Certificate Constructor + */ +-EAC1_1_CVC::EAC1_1_CVC(std::tr1::shared_ptr& in) ++EAC1_1_CVC::EAC1_1_CVC(shared_ptr& in) + { + init(in); + self_signed = false; +@@ -87,7 +87,7 @@ EAC1_1_CVC::EAC1_1_CVC(std::tr1::shared_ + + EAC1_1_CVC::EAC1_1_CVC(const std::string& in) + { +- std::tr1::shared_ptr stream(new DataSource_Stream(in, true)); ++ shared_ptr stream(new DataSource_Stream(in, true)); + init(stream); + self_signed = false; + do_decode(); diff --git a/security/botan/patches/patch-src_cert_cvc_cvc__cert.h b/security/botan/patches/patch-src_cert_cvc_cvc__cert.h new file mode 100644 index 00000000000..0a029b899a5 --- /dev/null +++ b/security/botan/patches/patch-src_cert_cvc_cvc__cert.h @@ -0,0 +1,13 @@ +$NetBSD$ + +--- src/cert/cvc/cvc_cert.h.orig 2013-04-30 23:03:11.000000000 +0000 ++++ src/cert/cvc/cvc_cert.h +@@ -59,7 +59,7 @@ class BOTAN_DLL EAC1_1_CVC : public EAC1 + * Construct a CVC from a data source + * @param source the data source + */ +- EAC1_1_CVC(std::tr1::shared_ptr& source); ++ EAC1_1_CVC(shared_ptr& source); + + /** + * Construct a CVC from a file diff --git a/security/botan/patches/patch-src_cert_cvc_cvc__req.cpp b/security/botan/patches/patch-src_cert_cvc_cvc__req.cpp new file mode 100644 index 00000000000..07f73b8a97d --- /dev/null +++ b/security/botan/patches/patch-src_cert_cvc_cvc__req.cpp @@ -0,0 +1,22 @@ +$NetBSD$ + +--- src/cert/cvc/cvc_req.cpp.orig 2013-04-30 23:48:36.000000000 +0000 ++++ src/cert/cvc/cvc_req.cpp +@@ -50,7 +50,7 @@ void EAC1_1_Req::force_decode() + #endif + } + +-EAC1_1_Req::EAC1_1_Req(std::tr1::shared_ptr in) ++EAC1_1_Req::EAC1_1_Req(shared_ptr in) + { + init(in); + self_signed = true; +@@ -59,7 +59,7 @@ EAC1_1_Req::EAC1_1_Req(std::tr1::shared_ + + EAC1_1_Req::EAC1_1_Req(const std::string& in) + { +- std::tr1::shared_ptr stream(new DataSource_Stream(in, true)); ++ shared_ptr stream(new DataSource_Stream(in, true)); + init(stream); + self_signed = true; + do_decode(); diff --git a/security/botan/patches/patch-src_cert_cvc_cvc__req.h b/security/botan/patches/patch-src_cert_cvc_cvc__req.h new file mode 100644 index 00000000000..fdf078a045f --- /dev/null +++ b/security/botan/patches/patch-src_cert_cvc_cvc__req.h @@ -0,0 +1,13 @@ +$NetBSD$ + +--- src/cert/cvc/cvc_req.h.orig 2013-04-30 23:01:50.000000000 +0000 ++++ src/cert/cvc/cvc_req.h +@@ -36,7 +36,7 @@ class BOTAN_DLL EAC1_1_Req : public EAC1 + * Construct a CVC request from a data source. + * @param source the data source + */ +- EAC1_1_Req(std::tr1::shared_ptr source); ++ EAC1_1_Req(shared_ptr source); + + /** + * Construct a CVC request from a DER encoded CVC reqeust file. diff --git a/security/botan/patches/patch-src_cert_cvc_cvc__self.cpp b/security/botan/patches/patch-src_cert_cvc_cvc__self.cpp new file mode 100644 index 00000000000..4a03c2577b1 --- /dev/null +++ b/security/botan/patches/patch-src_cert_cvc_cvc__self.cpp @@ -0,0 +1,22 @@ +$NetBSD$ + +--- src/cert/cvc/cvc_self.cpp.orig 2013-04-30 23:02:54.000000000 +0000 ++++ src/cert/cvc/cvc_self.cpp +@@ -131,7 +131,7 @@ EAC1_1_Req create_cvc_req(Private_Key co + .get_contents(); + + MemoryVector signed_cert = EAC1_1_gen_CVC::make_signed(signer, EAC1_1_gen_CVC::build_cert_body(tbs), rng); +- std::tr1::shared_ptr source(new DataSource_Memory(signed_cert)); ++ shared_ptr source(new DataSource_Memory(signed_cert)); + return EAC1_1_Req(source); + } + +@@ -151,7 +151,7 @@ EAC1_1_ADO create_ado_req(Private_Key co + SecureVector tbs_bits = req.BER_encode(); + tbs_bits.append(DER_Encoder().encode(car).get_contents()); + MemoryVector signed_cert = EAC1_1_ADO::make_signed(signer, tbs_bits, rng); +- std::tr1::shared_ptr source(new DataSource_Memory(signed_cert)); ++ shared_ptr source(new DataSource_Memory(signed_cert)); + return EAC1_1_ADO(source); + } + diff --git a/security/botan/patches/patch-src_cert_cvc_freestore.h b/security/botan/patches/patch-src_cert_cvc_freestore.h new file mode 100644 index 00000000000..520a3f44b3f --- /dev/null +++ b/security/botan/patches/patch-src_cert_cvc_freestore.h @@ -0,0 +1,39 @@ +$NetBSD$ + +--- src/cert/cvc/freestore.h.orig 2013-04-30 22:56:51.000000000 +0000 ++++ src/cert/cvc/freestore.h +@@ -8,7 +8,9 @@ + + #include + +-#if defined(BOTAN_USE_STD_TR1) ++#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L ++ #include ++#elif defined(BOTAN_USE_STD_TR1) + #include + #elif defined(BOTAN_USE_BOOST_TR1) + #include +@@ -17,6 +19,14 @@ + #endif + + namespace Botan { ++#ifndef BOTAN_SHARED_PTR ++#define BOTAN_SHARED_PTR ++#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L ++ using std::shared_ptr; ++#else ++ using std::tr1::shared_ptr; ++#endif ++#endif + + /** + * This class is intended as an function call parameter type and +@@ -30,7 +40,7 @@ template + class BOTAN_DLL SharedPtrConverter + { + public: +- typedef std::tr1::shared_ptr SharedPtr; ++ typedef shared_ptr SharedPtr; + + /** + * Construct a null pointer equivalent object. diff --git a/security/botan/patches/patch-src_math_gfpmath_curve__gfp.cpp b/security/botan/patches/patch-src_math_gfpmath_curve__gfp.cpp new file mode 100644 index 00000000000..2e0b7f9aeea --- /dev/null +++ b/security/botan/patches/patch-src_math_gfpmath_curve__gfp.cpp @@ -0,0 +1,105 @@ +$NetBSD$ + +--- src/math/gfpmath/curve_gfp.cpp.orig 2013-04-30 23:08:27.000000000 +0000 ++++ src/math/gfpmath/curve_gfp.cpp +@@ -14,7 +14,7 @@ + + namespace Botan { + +-void CurveGFp::set_shrd_mod(const std::tr1::shared_ptr mod) ++void CurveGFp::set_shrd_mod(const shared_ptr mod) + { + mp_mod = mod; + mA.turn_off_sp_red_mul();// m.m. is not needed, must be trf. back +@@ -34,7 +34,7 @@ CurveGFp::CurveGFp(const GFpElement& a, + { + throw Invalid_Argument("could not construct curve: moduli of arguments differ"); + } +- std::tr1::shared_ptr p_mod = std::tr1::shared_ptr(new GFpModulus(p)); ++ shared_ptr p_mod = shared_ptr(new GFpModulus(p)); + // the above is the creation of the GFpModuls object which will be shared point-wide + // (in the context of a point of course) + set_shrd_mod(p_mod); +@@ -44,21 +44,21 @@ CurveGFp::CurveGFp(const CurveGFp& other + : mA(other.get_a()), + mB(other.get_b()) + { +- mp_mod = std::tr1::shared_ptr(new GFpModulus(*other.mp_mod)); ++ mp_mod = shared_ptr(new GFpModulus(*other.mp_mod)); + assert(mp_mod->p_equal_to(mA.get_p())); + assert(mp_mod->p_equal_to(mB.get_p())); + set_shrd_mod(mp_mod); + if(other.mp_mres_a.get()) + { +- mp_mres_a = std::tr1::shared_ptr(new GFpElement(*other.mp_mres_a)); ++ mp_mres_a = shared_ptr(new GFpElement(*other.mp_mres_a)); + } + if(other.mp_mres_b.get()) + { +- mp_mres_b = std::tr1::shared_ptr(new GFpElement(*other.mp_mres_b)); ++ mp_mres_b = shared_ptr(new GFpElement(*other.mp_mres_b)); + } + if(other.mp_mres_one.get()) + { +- mp_mres_one = std::tr1::shared_ptr(new GFpElement(*other.mp_mres_one)); ++ mp_mres_one = shared_ptr(new GFpElement(*other.mp_mres_one)); + } + + } +@@ -72,21 +72,21 @@ const CurveGFp& CurveGFp::operator=(cons + mA.swap(a_tmp); + mB.swap(b_tmp); + +- std::tr1::shared_ptr p_mod = std::tr1::shared_ptr(new GFpModulus(*other.mp_mod)); ++ shared_ptr p_mod = shared_ptr(new GFpModulus(*other.mp_mod)); + set_shrd_mod(p_mod); + + // exception safety note: no problem if we have a throw from here on... + if(other.mp_mres_a.get()) + { +- mp_mres_a = std::tr1::shared_ptr(new GFpElement(*other.mp_mres_a)); ++ mp_mres_a = shared_ptr(new GFpElement(*other.mp_mres_a)); + } + if(other.mp_mres_b.get()) + { +- mp_mres_b = std::tr1::shared_ptr(new GFpElement(*other.mp_mres_b)); ++ mp_mres_b = shared_ptr(new GFpElement(*other.mp_mres_b)); + } + if(other.mp_mres_one.get()) + { +- mp_mres_one = std::tr1::shared_ptr(new GFpElement(*other.mp_mres_one)); ++ mp_mres_one = shared_ptr(new GFpElement(*other.mp_mres_one)); + } + return *this; + } +@@ -123,7 +123,7 @@ GFpElement const CurveGFp::get_mres_a() + { + if(mp_mres_a.get() == 0) + { +- mp_mres_a = std::tr1::shared_ptr(new GFpElement(mA)); ++ mp_mres_a = shared_ptr(new GFpElement(mA)); + mp_mres_a->turn_on_sp_red_mul(); + mp_mres_a->get_mres(); + } +@@ -134,18 +134,18 @@ GFpElement const CurveGFp::get_mres_b() + { + if(mp_mres_b.get() == 0) + { +- mp_mres_b = std::tr1::shared_ptr(new GFpElement(mB)); ++ mp_mres_b = shared_ptr(new GFpElement(mB)); + mp_mres_b->turn_on_sp_red_mul(); + mp_mres_b->get_mres(); + } + return GFpElement(*mp_mres_b); + } + +-std::tr1::shared_ptr const CurveGFp::get_mres_one() const ++shared_ptr const CurveGFp::get_mres_one() const + { + if(mp_mres_one.get() == 0) + { +- mp_mres_one = std::tr1::shared_ptr(new GFpElement(mp_mod->get_p(), 1)); ++ mp_mres_one = shared_ptr(new GFpElement(mp_mod->get_p(), 1)); + mp_mres_one->turn_on_sp_red_mul(); + mp_mres_one->get_mres(); + } diff --git a/security/botan/patches/patch-src_math_gfpmath_curve__gfp.h b/security/botan/patches/patch-src_math_gfpmath_curve__gfp.h new file mode 100644 index 00000000000..335f9460af5 --- /dev/null +++ b/security/botan/patches/patch-src_math_gfpmath_curve__gfp.h @@ -0,0 +1,56 @@ +$NetBSD$ + +--- src/math/gfpmath/curve_gfp.h.orig 2013-04-30 22:53:40.000000000 +0000 ++++ src/math/gfpmath/curve_gfp.h +@@ -57,7 +57,7 @@ class BOTAN_DLL CurveGFp + * @param mod a shared pointer to a GFpModulus object suitable for + * *this. + */ +- void set_shrd_mod(const std::tr1::shared_ptr mod); ++ void set_shrd_mod(const shared_ptr mod); + + // getters + +@@ -99,14 +99,14 @@ class BOTAN_DLL CurveGFp + * function. + * @result the GFpElement 1, transformed to its m-residue + */ +- std::tr1::shared_ptr const get_mres_one() const; ++ shared_ptr const get_mres_one() const; + + /** + * Get prime modulus of the field of the curve + * @result prime modulus of the field of the curve + */ + BigInt const get_p() const; +- /*inline std::tr1::shared_ptr const get_ptr_p() const ++ /*inline shared_ptr const get_ptr_p() const + { + return mp_p; + }*/ +@@ -119,7 +119,7 @@ class BOTAN_DLL CurveGFp + * Do NOT spread pointers to a GFpModulus over different threads! + * @result a shared pointer to a GFpModulus object + */ +- inline std::tr1::shared_ptr const get_ptr_mod() const ++ inline shared_ptr const get_ptr_mod() const + { + return mp_mod; + } +@@ -131,12 +131,12 @@ class BOTAN_DLL CurveGFp + void swap(CurveGFp& other); + + private: +- std::tr1::shared_ptr mp_mod; ++ shared_ptr mp_mod; + GFpElement mA; + GFpElement mB; +- mutable std::tr1::shared_ptr mp_mres_a; +- mutable std::tr1::shared_ptr mp_mres_b; +- mutable std::tr1::shared_ptr mp_mres_one; ++ mutable shared_ptr mp_mres_a; ++ mutable shared_ptr mp_mres_b; ++ mutable shared_ptr mp_mres_one; + }; + + // relational operators diff --git a/security/botan/patches/patch-src_math_gfpmath_gfp__element.cpp b/security/botan/patches/patch-src_math_gfpmath_gfp__element.cpp new file mode 100644 index 00000000000..d7382a6d509 --- /dev/null +++ b/security/botan/patches/patch-src_math_gfpmath_gfp__element.cpp @@ -0,0 +1,29 @@ +$NetBSD$ + +--- src/math/gfpmath/gfp_element.cpp.orig 2013-04-30 23:08:30.000000000 +0000 ++++ src/math/gfpmath/gfp_element.cpp +@@ -174,13 +174,13 @@ GFpElement::GFpElement(const BigInt& p, + m_is_trf(false) + { + assert(mp_mod.get() == 0); +- mp_mod = std::tr1::shared_ptr(new GFpModulus(p)); ++ mp_mod = shared_ptr(new GFpModulus(p)); + assert(mp_mod->m_p_dash == 0); + if(m_use_montgm) + ensure_montgm_precomp(); + } + +-GFpElement::GFpElement(std::tr1::shared_ptr const mod, const BigInt& value, bool use_montgm) ++GFpElement::GFpElement(shared_ptr const mod, const BigInt& value, bool use_montgm) + : mp_mod(), + m_value(value % mod->m_p), + m_use_montgm(use_montgm), +@@ -247,7 +247,7 @@ void GFpElement::ensure_montgm_precomp() + + } + +-void GFpElement::set_shrd_mod(std::tr1::shared_ptr const p_mod) ++void GFpElement::set_shrd_mod(shared_ptr const p_mod) + { + mp_mod = p_mod; + } diff --git a/security/botan/patches/patch-src_math_gfpmath_gfp__element.h b/security/botan/patches/patch-src_math_gfpmath_gfp__element.h new file mode 100644 index 00000000000..af65baf4f1d --- /dev/null +++ b/security/botan/patches/patch-src_math_gfpmath_gfp__element.h @@ -0,0 +1,69 @@ +$NetBSD$ + +--- src/math/gfpmath/gfp_element.h.orig 2013-04-30 22:49:33.000000000 +0000 ++++ src/math/gfpmath/gfp_element.h +@@ -14,9 +14,12 @@ + + #include + #include ++#include + #include + +-#if defined(BOTAN_USE_STD_TR1) ++#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L ++ #include ++#elif defined(BOTAN_USE_STD_TR1) + #include + #elif defined(BOTAN_USE_BOOST_TR1) + #include +@@ -25,6 +28,14 @@ + #endif + + namespace Botan { ++#ifndef BOTAN_SHARED_PTR ++#define BOTAN_SHARED_PTR ++#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L ++ using std::shared_ptr; ++#else ++ using std::tr1::shared_ptr; ++#endif ++#endif + + struct Illegal_Transformation : public Exception + { +@@ -40,7 +51,7 @@ struct Illegal_Transformation : public E + class BOTAN_DLL GFpElement + { + private: +- std::tr1::shared_ptr mp_mod; ++ shared_ptr mp_mod; + mutable BigInt m_value; // ordinary residue or m-residue respectively + mutable BigInt workspace; + +@@ -79,7 +90,7 @@ class BOTAN_DLL GFpElement + * @param value the element value + * @param use_montgm whether this object will use Montgomery multiplication + */ +- explicit GFpElement(std::tr1::shared_ptr const mod, ++ explicit GFpElement(shared_ptr const mod, + const BigInt& value, bool use_mongm = false); + + /** +@@ -190,7 +201,7 @@ class BOTAN_DLL GFpElement + * the shared GFpModulus objects! + * @result the shared pointer to the GFpModulus of *this + */ +- inline std::tr1::shared_ptr const get_ptr_mod() const ++ inline shared_ptr const get_ptr_mod() const + { + return mp_mod; + } +@@ -203,7 +214,7 @@ class BOTAN_DLL GFpElement + * the shared GFpModulus objects! + * @param mod a shared pointer to a GFpModulus that will be held in *this + */ +- void set_shrd_mod(std::tr1::shared_ptr const mod); ++ void set_shrd_mod(shared_ptr const mod); + + /** + * Tells whether this GFpElement is currently transformed to it´ m-residue, diff --git a/security/botan/patches/patch-src_math_gfpmath_point__gfp.cpp b/security/botan/patches/patch-src_math_gfpmath_point__gfp.cpp new file mode 100644 index 00000000000..7cca6efa5df --- /dev/null +++ b/security/botan/patches/patch-src_math_gfpmath_point__gfp.cpp @@ -0,0 +1,53 @@ +$NetBSD$ + +--- src/math/gfpmath/point_gfp.cpp.orig 2013-04-30 23:08:32.000000000 +0000 ++++ src/math/gfpmath/point_gfp.cpp +@@ -109,7 +109,7 @@ const PointGFp& PointGFp::assign_within_ + return *this; + } + +-void PointGFp::set_shrd_mod(std::tr1::shared_ptr p_mod) ++void PointGFp::set_shrd_mod(shared_ptr p_mod) + { + mX.set_shrd_mod(p_mod); + mY.set_shrd_mod(p_mod); +@@ -133,7 +133,7 @@ void PointGFp::ensure_worksp() const + } + } + +- mp_worksp_gfp_el = std::tr1::shared_ptr >(new std::vector); ++ mp_worksp_gfp_el = shared_ptr >(new std::vector); + mp_worksp_gfp_el->reserve(9); + for (u32bit i=0; iturn_on_sp_red_mul(); + +- std::tr1::shared_ptr H(new PointGFp(this->mC)); +- std::tr1::shared_ptr tmp; // used for AADA ++ shared_ptr H(new PointGFp(this->mC)); ++ shared_ptr tmp; // used for AADA + + PointGFp P(*this); + BigInt m(scalar); +@@ -477,15 +477,15 @@ PointGFp& PointGFp::operator*=(const Big + return *this; + } + +-inline std::tr1::shared_ptr PointGFp::mult_loop(int l, ++inline shared_ptr PointGFp::mult_loop(int l, + const BigInt& m, +- std::tr1::shared_ptr H, +- std::tr1::shared_ptr tmp, ++ shared_ptr H, ++ shared_ptr tmp, + const PointGFp& P) + { + //assert(l >= (int)m.bits()- 1); + tmp = H; +- std::tr1::shared_ptr to_add(new PointGFp(P)); // we just need some point ++ shared_ptr to_add(new PointGFp(P)); // we just need some point + // so that we can use op= + // inside the loop + for (int i=l; i >=0; i--) diff --git a/security/botan/patches/patch-src_math_gfpmath_point__gfp.h b/security/botan/patches/patch-src_math_gfpmath_point__gfp.h new file mode 100644 index 00000000000..60a92551540 --- /dev/null +++ b/security/botan/patches/patch-src_math_gfpmath_point__gfp.h @@ -0,0 +1,35 @@ +$NetBSD$ + +--- src/math/gfpmath/point_gfp.h.orig 2013-04-30 22:54:19.000000000 +0000 ++++ src/math/gfpmath/point_gfp.h +@@ -234,7 +234,7 @@ class BOTAN_DLL PointGFp + * @param mod a shared pointer to a GFpModulus that will + * be held in the members *this + */ +- void set_shrd_mod(std::tr1::shared_ptr p_mod); ++ void set_shrd_mod(shared_ptr p_mod); + + static GFpElement decompress(bool yMod2, GFpElement const& x, const CurveGFp& curve); + +@@ -242,9 +242,9 @@ class BOTAN_DLL PointGFp + static const u32bit GFPEL_WKSP_SIZE = 9; + void ensure_worksp() const; + +- inline std::tr1::shared_ptr mult_loop(int l, const BigInt& m, +- std::tr1::shared_ptr H, +- std::tr1::shared_ptr tmp, ++ inline shared_ptr mult_loop(int l, const BigInt& m, ++ shared_ptr H, ++ shared_ptr tmp, + const PointGFp& P); + + CurveGFp mC; +@@ -257,7 +257,7 @@ class BOTAN_DLL PointGFp + mutable bool mZpow2_set; + mutable bool mZpow3_set; + mutable bool mAZpow4_set; +- mutable std::tr1::shared_ptr > mp_worksp_gfp_el; ++ mutable shared_ptr > mp_worksp_gfp_el; + + }; + diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile index d73e36fe171..9110ad312a9 100644 --- a/security/gpgme/Makefile +++ b/security/gpgme/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.70 2013/05/03 16:36:04 drochner Exp $ +# $NetBSD: Makefile,v 1.71 2013/05/04 02:50:41 obache Exp $ DISTNAME= gpgme-1.4.1 CATEGORIES= security @@ -43,7 +43,9 @@ CONFIGURE_ARGS+= --without-pth --without-pth-test CONFIGURE_ENV+= ac_cv_lib_pthread_pthread_create=yes .endif -.if !empty(MACHINE_PLATFORM:MNetBSD-[0-5].*-*) +# TLS is unsupported on NetBSD<=5, but causes crashes on -current too +#.if !empty(MACHINE_PLATFORM:MNetBSD-[0-5].*-*) +.if !empty(MACHINE_PLATFORM:MNetBSD-*-*) CONFIGURE_ENV+= gpgme_cv_tls_works=no .endif diff --git a/sysutils/btpin-qt/distinfo b/sysutils/btpin-qt/distinfo index 1bef967a79a..bad0db8a5a9 100644 --- a/sysutils/btpin-qt/distinfo +++ b/sysutils/btpin-qt/distinfo @@ -1,5 +1,6 @@ -$NetBSD$ +$NetBSD: distinfo,v 1.5 2012/02/24 09:03:29 plunky Exp $ SHA1 (btpin-qt-1.5.tar.gz) = d8a198caa3e3cb45bbe17deac07f3c96989b42e9 RMD160 (btpin-qt-1.5.tar.gz) = b1ac5653eb621dc75ca2805b8a55375c8027f0b3 Size (btpin-qt-1.5.tar.gz) = 5185 bytes +SHA1 (patch-btclient.cpp) = 50723353cbc95328afb3c445f47b191815f29cb3 diff --git a/sysutils/btpin-qt/patches/patch-btclient.cpp b/sysutils/btpin-qt/patches/patch-btclient.cpp new file mode 100644 index 00000000000..10dfe23f919 --- /dev/null +++ b/sysutils/btpin-qt/patches/patch-btclient.cpp @@ -0,0 +1,12 @@ +$NetBSD$ + +--- btclient.cpp.orig 2013-05-04 14:26:39.000000000 +0000 ++++ btclient.cpp +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + + #include + #include diff --git a/sysutils/xentools41/distinfo b/sysutils/xentools41/distinfo index ae8c1af23e4..0caa6d7a506 100644 --- a/sysutils/xentools41/distinfo +++ b/sysutils/xentools41/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.28 2013/04/19 14:03:51 bouyer Exp $ +$NetBSD: distinfo,v 1.29 2013/05/03 16:48:38 drochner Exp $ SHA1 (ipxe-git-v1.0.0.tar.gz) = da052c8de5f3485fe0253c19cf52ed6d72528485 RMD160 (ipxe-git-v1.0.0.tar.gz) = dcd9b6eaafa1ce05c1ebf2a15f2f73ad7a8c5547 @@ -40,7 +40,9 @@ SHA1 (patch-dc) = d860fe3725978227278d58f09e7d5157001e463e SHA1 (patch-dd) = e66d9cc0028ba922b050fc142862b4095cd018f3 SHA1 (patch-de) = fae94b61a430a1a7dd98c9a6a04e4513824c6d8d SHA1 (patch-df) = d20bf9d3fd05f5334f77c9154bf0fb9944c1292c +SHA1 (patch-examples_Makefile) = da39a3ee5e6b4b0d3255bfef95601890afd80709 SHA1 (patch-firmware_hvmloader_Makefile) = b2914e4988ba004d45403d67f1580b1f9725d006 +SHA1 (patch-hotplug_common_Makefile) = da39a3ee5e6b4b0d3255bfef95601890afd80709 SHA1 (patch-ioemu-qemu-xen_hw_pass-through.c) = 76185c239078f29cb42b953d6c2cd1f59e240989 SHA1 (patch-ioemu-qemu-xen_hw_pass-through.h) = 98c26798d1ad99d3eee8b33deb08f747c958c886 SHA1 (patch-ioemu-qemu-xen_hw_piix4acpi.c) = ca19457e9bde2d844a86a866960ac6de1f3d084c @@ -50,6 +52,7 @@ SHA1 (patch-ioemu-qemu-xen_hw_pt-msi.h) = d1bb1a8ad90d6577056f11df96f5469ffe74a3 SHA1 (patch-ioemu-qemu-xen_xen-hooks.mak) = a00d9a9fd0fbb9fd89788b9dfaf5b389a28d47e2 SHA1 (patch-libxl_libxl_create.c) = 02b661ca684609939c6ef762c0ddd1c5e62ad4d0 SHA1 (patch-libxl_libxl_internal.h) = e126e5e998117903f0c66cc370d350c504ed33d9 +SHA1 (patch-libxl_xl__cmdimpl.c) = 0e038b9702e131ec527d49cb2c21e4acf581cbfe SHA1 (patch-ocaml_Makefile.rules) = 104f9d40186e5e4ca6a2e6359bbb369c3c91d1dc SHA1 (patch-ocaml_common.make) = c59d32301198d65691ab23529dd791de5ac40199 SHA1 (patch-ocaml_xenstored_define.ml) = f44841625554ceba6e83dbb41f688993c2a8d9a2 diff --git a/sysutils/xentools41/patches/patch-libxl_xl__cmdimpl.c b/sysutils/xentools41/patches/patch-libxl_xl__cmdimpl.c new file mode 100644 index 00000000000..dffa2adf819 --- /dev/null +++ b/sysutils/xentools41/patches/patch-libxl_xl__cmdimpl.c @@ -0,0 +1,13 @@ +$NetBSD$ + +--- libxl/xl_cmdimpl.c.orig 2013-05-05 19:37:21.000000000 +0000 ++++ libxl/xl_cmdimpl.c +@@ -922,7 +922,7 @@ skip: + + for (p = strtok(buf2, ","); p; p = strtok(NULL, ",")) { + char* val; +- while (isblank(*p)) ++ while (isblank((unsigned char)*p)) + p++; + val = strchr(p, '='); + if (val == NULL) diff --git a/textproc/FlightCrew/Makefile b/textproc/FlightCrew/Makefile index a7525effd20..98d00035a8f 100644 --- a/textproc/FlightCrew/Makefile +++ b/textproc/FlightCrew/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2013/02/15 11:54:09 obache Exp $ +# $NetBSD: Makefile,v 1.22 2013/02/16 11:24:38 wiz Exp $ # DISTNAME= FlightCrew-0.7.2-Code @@ -41,6 +41,8 @@ SUBST_FILTER_CMD.d2u= ${TR} -d '\r' # GCC 4.4 and above needs this .if !empty(PKGSRC_COMPILER:Mgcc) && !empty(CC_VERSION:Mgcc-4.[4-9]*) _WRAP_EXTRA_ARGS.CXX+= -std=c++0x +.elif !empty(PKGSRC_COMPILER:Mclang) +_WRAP_EXTRA_ARGS.CXX+= -std=c++11 .endif .include "../../devel/googletest/buildlink3.mk" diff --git a/textproc/p5-Pod-Simple/Makefile b/textproc/p5-Pod-Simple/Makefile index d8aa5a66e63..ce7cd057aac 100644 --- a/textproc/p5-Pod-Simple/Makefile +++ b/textproc/p5-Pod-Simple/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.28 2012/10/25 06:56:18 asau Exp $ +# $NetBSD: Makefile,v 1.29 2013/02/17 12:57:07 wen Exp $ -DISTNAME= Pod-Simple-3.25 +DISTNAME= Pod-Simple-3.28 PKGNAME= p5-${DISTNAME} CATEGORIES= devel perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Pod/} diff --git a/textproc/p5-Pod-Simple/distinfo b/textproc/p5-Pod-Simple/distinfo index 22bb95b32aa..db004974cfe 100644 --- a/textproc/p5-Pod-Simple/distinfo +++ b/textproc/p5-Pod-Simple/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.16 2012/08/17 15:40:16 wen Exp $ +$NetBSD: distinfo,v 1.17 2013/02/17 12:57:07 wen Exp $ -SHA1 (Pod-Simple-3.25.tar.gz) = c7df80edc7b0e19d83ee2ebe24426a761e0852ba -RMD160 (Pod-Simple-3.25.tar.gz) = 53ffe441591bfbe25d9b78ec8f1e230c9264122e -Size (Pod-Simple-3.25.tar.gz) = 242663 bytes +SHA1 (Pod-Simple-3.28.tar.gz) = 2a53a0bbaa4ca6d182c1d2400d555be454d3d890 +RMD160 (Pod-Simple-3.28.tar.gz) = ef7998debf3c0931661d6a9b8e88eda76c1cc9b6 +Size (Pod-Simple-3.28.tar.gz) = 244687 bytes diff --git a/www/ap2-suphp/distinfo b/www/ap2-suphp/distinfo index 33f77334c16..099de24e776 100644 --- a/www/ap2-suphp/distinfo +++ b/www/ap2-suphp/distinfo @@ -1,6 +1,8 @@ -$NetBSD: distinfo,v 1.5 2011/04/11 19:57:54 gls Exp $ +$NetBSD: distinfo,v 1.6 2011/09/21 12:54:16 adam Exp $ SHA1 (suphp-0.7.1.tar.gz) = 9eb82b62b5f71c01d7d8b2510c685141b78e54f5 RMD160 (suphp-0.7.1.tar.gz) = e5e7e71494af322c3ab33d6a35fbcf96334c098c Size (suphp-0.7.1.tar.gz) = 386521 bytes +SHA1 (patch-src_IniSection.cpp) = 8effa733d567c6a724370e53b008e271aab23ad3 +SHA1 (patch-src_IniSection.hpp) = c97e0e71fc2041d19026bae41838018d5fb991d3 SHA1 (patch-src_SmartPtr.hpp) = 91c20832b140d6fa49ddb2a6fa9b616ff7fc565d diff --git a/www/ap2-suphp/patches/patch-src_IniSection.cpp b/www/ap2-suphp/patches/patch-src_IniSection.cpp new file mode 100644 index 00000000000..6d5d474ddb3 --- /dev/null +++ b/www/ap2-suphp/patches/patch-src_IniSection.cpp @@ -0,0 +1,24 @@ +$NetBSD$ + +--- src/IniSection.cpp.orig 2013-05-04 14:22:11.000000000 +0000 ++++ src/IniSection.cpp +@@ -36,8 +36,8 @@ void suPHP::IniSection::putValue(const s + const std::vector suPHP::IniSection::getValues(const std::string& key) const + throw (KeyNotFoundException) { + std::vector values; +- std::pair::const_iterator, std::multimap::const_iterator> range = this->entries.equal_range(key); +- for (std::multimap::const_iterator pos = ++ std::pair::const_iterator, std::multimap::const_iterator> range = this->entries.equal_range(key); ++ for (std::multimap::const_iterator pos = + range.first; pos != range.second; pos++) { + values.push_back(pos->second); + } +@@ -62,7 +62,7 @@ std::string suPHP::IniSection::getValue( + + const std::vector suPHP::IniSection::getKeys() const { + std::vector keys; +- for (std::multimap::const_iterator pos = ++ for (std::multimap::const_iterator pos = + this->entries.begin(); + pos != this->entries.end(); pos++) { + keys.push_back(pos->first); diff --git a/www/ap2-suphp/patches/patch-src_IniSection.hpp b/www/ap2-suphp/patches/patch-src_IniSection.hpp new file mode 100644 index 00000000000..1e595328c66 --- /dev/null +++ b/www/ap2-suphp/patches/patch-src_IniSection.hpp @@ -0,0 +1,13 @@ +$NetBSD$ + +--- src/IniSection.hpp.orig 2013-05-04 14:21:17.000000000 +0000 ++++ src/IniSection.hpp +@@ -40,7 +40,7 @@ namespace suPHP { + */ + class IniSection { + private: +- std::multimap entries; ++ std::multimap entries; + void putValue(const std::string key, const std::string value); + void removeValues(const std::string& key); + diff --git a/www/p5-HTTP-Body/Makefile b/www/p5-HTTP-Body/Makefile index eb4d656f593..dd056d59610 100644 --- a/www/p5-HTTP-Body/Makefile +++ b/www/p5-HTTP-Body/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.12 2012/10/03 21:58:47 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2012/10/28 06:30:40 asau Exp $ -DISTNAME= HTTP-Body-1.15 +DISTNAME= HTTP-Body-1.17 PKGNAME= p5-${DISTNAME} -PKGREVISION= 1 CATEGORIES= www perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=HTTP/} @@ -11,7 +10,7 @@ HOMEPAGE= http://search.cpan.org/dist/HTTP-Body/ COMMENT= HTTP Body Parser LICENSE= ${PERL5_LICENSE} -DEPENDS+= p5-libwww>=0:../../www/p5-libwww +DEPENDS+= p5-HTTP-Message>=0:../../www/p5-HTTP-Message BUILD_DEPENDS+= p5-Test-Deep-[0-9]*:../../devel/p5-Test-Deep diff --git a/www/p5-HTTP-Body/distinfo b/www/p5-HTTP-Body/distinfo index 458f4ac8f00..ea720f389b8 100644 --- a/www/p5-HTTP-Body/distinfo +++ b/www/p5-HTTP-Body/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.7 2011/11/16 08:05:53 hiramatsu Exp $ +$NetBSD: distinfo,v 1.8 2012/01/26 14:14:43 rhaen Exp $ -SHA1 (HTTP-Body-1.15.tar.gz) = c78a19386d8b7edfc219a6092192abdf6214621c -RMD160 (HTTP-Body-1.15.tar.gz) = 6d20e2edab0d056394227cb57419adfe360b3f6b -Size (HTTP-Body-1.15.tar.gz) = 24010 bytes +SHA1 (HTTP-Body-1.17.tar.gz) = d692edff44f2318552d81cef5ea870f982e1f3c2 +RMD160 (HTTP-Body-1.17.tar.gz) = ed74d85155e7315761bd038d18b635f7e3bcdd07 +Size (HTTP-Body-1.17.tar.gz) = 24376 bytes diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo index ee8fbe9dff9..e4ae2aff027 100644 --- a/x11/kdelibs4/distinfo +++ b/x11/kdelibs4/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.32 2012/11/11 22:24:01 joerg Exp $ +$NetBSD: distinfo,v 1.33 2013/04/03 10:51:44 markd Exp $ SHA1 (kdelibs-4.10.2.tar.xz) = 2f1f455c39fa33cc133db7ec6b3d2dbbabe03c85 RMD160 (kdelibs-4.10.2.tar.xz) = b1cb62464e146c2f65cf4bb2487be7001ee4fc7b @@ -20,4 +20,7 @@ SHA1 (patch-kdecore_localization_klocale_kde.cpp) = b8a513a0c51e65d7e604a88c1d0e SHA1 (patch-kdecore_network_ConfigureChecks.cmake) = 0ad9352974911ef78ec565f7b2a97c45ead2cf72 SHA1 (patch-kdecore_util_kshareddatacache_p.h) = 6d064fe75fbecd489b0343960333864c717c0805 SHA1 (patch-kjs_JSImmediate.h) = ecc761c7c82f711f41cf47d706c1c22d22c2980a +SHA1 (patch-kjs_interpreter.cpp) = 9d400daf7d96674b8d66e1cde46dcb3615635241 +SHA1 (patch-kjs_wtf_DisallowCType.h) = 6305dd274f1478ba0fe0a6f1717451ab8e3e50d2 +SHA1 (patch-kjs_wtf_HashTable.h) = ec37861cacbe5cf16d40e9895f9245796b7d437b SHA1 (patch-kpty_kpty.cpp) = e8fd2e7c88b8926cf5bf12deea9e6af08e0739d8 diff --git a/x11/kdelibs4/patches/patch-kjs_interpreter.cpp b/x11/kdelibs4/patches/patch-kjs_interpreter.cpp new file mode 100644 index 00000000000..f4465bb95cc --- /dev/null +++ b/x11/kdelibs4/patches/patch-kjs_interpreter.cpp @@ -0,0 +1,12 @@ +$NetBSD$ + +--- kjs/interpreter.cpp.orig 2013-05-03 23:52:06.000000000 +0000 ++++ kjs/interpreter.cpp +@@ -63,6 +63,7 @@ + #include + #include + #include ++#include + #if defined(HAVE_UNISTD_H) + #include + #endif diff --git a/x11/kdelibs4/patches/patch-kjs_wtf_DisallowCType.h b/x11/kdelibs4/patches/patch-kjs_wtf_DisallowCType.h new file mode 100644 index 00000000000..ca776c39db1 --- /dev/null +++ b/x11/kdelibs4/patches/patch-kjs_wtf_DisallowCType.h @@ -0,0 +1,19 @@ +$NetBSD$ + +--- kjs/wtf/DisallowCType.h.orig 2013-05-03 23:51:02.000000000 +0000 ++++ kjs/wtf/DisallowCType.h +@@ -54,6 +54,7 @@ + #undef tolower + #undef toupper + ++#ifndef _LIBCPP_VERSION + #define isalnum WTF_Please_use_ASCIICType_instead_of_ctype_see_comment_in_ASCIICType_h + #define isalpha WTF_Please_use_ASCIICType_instead_of_ctype_see_comment_in_ASCIICType_h + #define isascii WTF_Please_use_ASCIICType_instead_of_ctype_see_comment_in_ASCIICType_h +@@ -70,5 +71,6 @@ + #define toascii WTF_Please_use_ASCIICType_instead_of_ctype_see_comment_in_ASCIICType_h + #define tolower WTF_Please_use_ASCIICType_instead_of_ctype_see_comment_in_ASCIICType_h + #define toupper WTF_Please_use_ASCIICType_instead_of_ctype_see_comment_in_ASCIICType_h ++#endif + + #endif diff --git a/x11/kdelibs4/patches/patch-kjs_wtf_HashTable.h b/x11/kdelibs4/patches/patch-kjs_wtf_HashTable.h new file mode 100644 index 00000000000..37dd873e381 --- /dev/null +++ b/x11/kdelibs4/patches/patch-kjs_wtf_HashTable.h @@ -0,0 +1,13 @@ +$NetBSD$ + +--- kjs/wtf/HashTable.h.orig 2013-05-03 23:46:27.000000000 +0000 ++++ kjs/wtf/HashTable.h +@@ -245,7 +245,7 @@ namespace WTF { + + using std::swap; + +-#if !COMPILER(MSVC) ++#if !COMPILER(MSVC) && !defined(_LIBCPP_VERSION) + // Visual C++ has a swap for pairs defined. + + // swap pairs by component, in case of pair members that specialize swap -- 2.11.4.GIT