Date: Mon, 20 Jun 2016 16:23:29 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r417166 - in head: astro/wmsolar astro/wmsolar/files audio/sphinx audio/sphinx/files benchmarks/himenobench benchmarks/himenobench/files benchmarks/netio benchmarks/netio/files comms/ml... Message-ID: <201606201623.u5KGNTgu000966@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Mon Jun 20 16:23:28 2016 New Revision: 417166 URL: https://svnweb.freebsd.org/changeset/ports/417166 Log: With the power of USES=dos2unix, get rid of most patches and files with CRLF. While there, run make makepatch, rename patches to use the new scheme, and various fixes. With hat: portmgr Sponsored by: Absolight Added: head/audio/sphinx/files/patch-src_examples_clicore.c - copied, changed from r417165, head/audio/sphinx/files/patch-src-examples_clicore.c head/audio/sphinx/files/patch-src_examples_srvcore.c - copied, changed from r417165, head/audio/sphinx/files/patch-src-examples_srvcore.c head/audio/sphinx/files/patch-src_libsphinx2_blk__cdcn__norm.c - copied, changed from r417165, head/audio/sphinx/files/patch-src-libsphinx2_blk_cdcn_norm.c head/audio/sphinx/files/patch-src_libsphinx2_cdcn__norm.c - copied, changed from r417165, head/audio/sphinx/files/patch-src-libsphinx2_cdcn_norm.c head/audio/sphinx/files/patch-src_libsphinx2_cdcn__update.c - copied, changed from r417165, head/audio/sphinx/files/patch-src_libsphinx2_cdcn_update.c head/audio/sphinx/files/patch-src_libsphinx2_eht__quit.c - copied, changed from r417165, head/audio/sphinx/files/patch-src-libsphinx2_eht_quit.c head/audio/sphinx/files/patch-src_libsphinx2_err.c - copied, changed from r417165, head/audio/sphinx/files/patch-src-libsphinx2_err.c head/audio/sphinx/files/patch-src_libsphinx2_include_pconf.h - copied, changed from r417165, head/audio/sphinx/files/patch-src-libsphinx2-include_pconf.h head/audio/sphinx/files/patch-src_libsphinx2_linklist.c - copied, changed from r417165, head/audio/sphinx/files/patch-src-libsphinx2_linklist.c head/audio/sphinx/files/patch-src_libsphinx2_prime.c - copied, changed from r417165, head/audio/sphinx/files/patch-src-libsphinx2_prime.c head/audio/sphinx/files/patch-src_libsphinx2_r__agc__noise.c - copied, changed from r417165, head/audio/sphinx/files/patch-src-libsphinx2_r_agc_noise.c head/audio/sphinx/files/patch-src_libsphinx2_sc__vq.c - copied, changed from r417165, head/audio/sphinx/files/patch-src-libsphinx2_sc_vq.c head/audio/sphinx/files/patch-src_libsphinx2_search.c - copied, changed from r417165, head/audio/sphinx/files/patch-src-libsphinx2_search.c head/audio/sphinx/files/patch-src_libsphinx2ad_ad__oss__bsd.c - copied, changed from r417165, head/audio/sphinx/files/patch-src_libsphinx2ad_ad_oss_bsd.c head/audio/sphinx/files/patch-src_libsphinx2fe_fe__sigproc.c - copied, changed from r417165, head/audio/sphinx/files/patch-src-libsphinx2fe_fe_sigproc.c head/devel/ruby-rbprof/files/patch-aspects_profiler_lib_rbprof.rb - copied, changed from r417165, head/devel/ruby-rbprof/files/patch-aspects__profiler__lib__rbprof.rb head/devel/sabre/files/patch-src_java_de_tu__darmstadt_informatik_rbg_bstickler_udflib_UDFImageBuilderFile.java - copied, changed from r417165, head/devel/sabre/files/patch-src_java_de_tu_darmstadt_informatik_rbg_bstickler_udflib_UDFImageBuilderFile.java head/devel/sdts++/files/patch-sdts++_builder_sb__Accessor.cpp - copied, changed from r417165, head/devel/sdts++/files/patch-sdts++__builder__sb_Accessor.cpp head/devel/sdts++/files/patch-sdts++_io_FormatParser.yy - copied, changed from r417165, head/devel/sdts++/files/patch-sdts++__io__FormatParset.yy head/devel/sdts++/files/patch-sdts++_io_sio__8211Converter.cpp - copied, changed from r417165, head/devel/sdts++/files/patch-sdts++__io__sio_8211Converter.cpp head/devel/sdts++/files/patch-sdts++_io_sio__8211DDRField.cpp - copied, changed from r417165, head/devel/sdts++/files/patch-sdts++__io__sio_8211DDRField.cpp head/devel/sdts++/files/patch-sdts++_io_sio__Utils.cpp - copied, changed from r417165, head/devel/sdts++/files/patch-sdts++__io__sio_Utils.cpp head/devel/sdts++/files/patch-sysutils_t__basename.cpp - copied, changed from r417165, head/devel/sdts++/files/patch-sysutils__t_basename.cpp head/devel/sdts++/files/patch-sysutils_t__dirname.cpp - copied, changed from r417165, head/devel/sdts++/files/patch-sysutils__t_dirname.cpp head/devel/sdts++/files/patch-sysutils_t__stringutils.cpp - copied, changed from r417165, head/devel/sdts++/files/patch-sysutils__t_stringutils.cpp head/games/heretic/files/patch-d__main.c - copied, changed from r417165, head/games/heretic/files/patch-d_main.c head/games/heretic/files/patch-doc_Gamekeys.txt - copied, changed from r417165, head/games/heretic/files/patch-doc-Gamekeys.txt head/games/heretic/files/patch-doc_README.opengl - copied, changed from r417165, head/games/heretic/files/patch-doc-README.opengl head/games/heretic/files/patch-g__game.c - copied, changed from r417165, head/games/heretic/files/patch-g_game.c head/games/heretic/files/patch-graphics_i__sdl.c - copied, changed from r417165, head/games/heretic/files/patch-graphics__i_sdl.c head/games/heretic/files/patch-graphics_i__sdl__gl.c - copied, changed from r417165, head/games/heretic/files/patch-graphics__i_sdl_gl.c head/games/heretic/files/patch-graphics_i__x11__fast.c - copied, changed from r417165, head/games/heretic/files/patch-graphics-i_x11_fast.c head/games/heretic/files/patch-i__udp.c - copied, changed from r417165, head/games/heretic/files/patch-i_udp.c head/games/heretic/files/patch-m__misc.c - copied, changed from r417165, head/games/heretic/files/patch-m_misc.c head/games/heretic/files/patch-opengl_gl__fonts.c - copied, changed from r417165, head/games/heretic/files/patch-opengl_gl_fonts.c head/games/heretic/files/patch-opengl_gl__struct.h - copied, changed from r417165, head/games/heretic/files/patch-opengl_gl_struct.h head/games/heretic/files/patch-p__inter.c - copied, changed from r417165, head/games/heretic/files/patch-p_inter.c head/games/heretic/files/patch-r__things.c - copied, changed from r417165, head/games/heretic/files/patch-r_things.c head/games/heretic/files/patch-w__wad.c - copied, changed from r417165, head/games/heretic/files/patch-w_wad.c head/games/quake2-psychomod/files/patch-src_Makefile - copied, changed from r417165, head/games/quake2-psychomod/files/patch-src__Makefile head/games/quake2-psychomod/files/patch-src_g__items.c - copied, changed from r417165, head/games/quake2-psychomod/files/patch-src__g_items.c head/games/scorched3d/files/patch-src_client_client_LoadPNG.cpp - copied, changed from r417165, head/games/scorched3d/files/patch-src__client__client__LoadPNG.cpp head/games/scorched3d/files/patch-src_client_client_SecureID.cpp - copied, changed from r417165, head/games/scorched3d/files/patch-src-client-client-SecureID.cpp head/games/scorched3d/files/patch-src_common_image_ImagePngFactory.cpp - copied, changed from r417165, head/games/scorched3d/files/patch-src__common__image__ImagePngFactory.cpp head/games/scorched3d/files/patch-src_common_porting_windows.h - copied, changed from r417165, head/games/scorched3d/files/patch-src__common__porting__windows.h head/irc/psybnc/files/patch-src_p__blowfish.c - copied, changed from r417165, head/irc/psybnc/files/patch-src_p_blowfish.c head/irc/psybnc/files/patch-src_p__global.h - copied, changed from r417165, head/irc/psybnc/files/patch-src_p_global.h head/irc/psybnc/files/patch-src_p__idea.c - copied, changed from r417165, head/irc/psybnc/files/patch-src_p_idea.c head/irc/psybnc/files/patch-src_p__memory.c - copied, changed from r417165, head/irc/psybnc/files/patch-src_p_memory.c head/irc/psybnc/files/patch-src_p__string.c - copied, changed from r417165, head/irc/psybnc/files/patch-src_p_string.c head/math/spar/files/patch-calculator_Makefile.in - copied, changed from r417165, head/math/spar/files/patch-calculator__Makefile.in head/math/spar/files/patch-lib_randist_rand.c - copied, changed from r417165, head/math/spar/files/patch-lib__randist__rand.c head/multimedia/w_scan/files/patch-descriptors.c - copied, changed from r417165, head/multimedia/w_scan/files/patch-clang head/net-im/mbpurple/files/patch-microblog_mb__net.c - copied, changed from r417165, head/net-im/mbpurple/files/patch-microblog__mb_net.c head/net-p2p/gnewtellium/files/patch-src_config.c - copied, changed from r417165, head/net-p2p/gnewtellium/files/patch-src__config.c head/net-p2p/torrentsniff/files/patch-BitTorrent_BDecode.pm - copied, changed from r417165, head/net-p2p/torrentsniff/files/patch-BitTorrent-BDecode.pm head/net/hlmaster/files/patch-src_HLServerList.cpp - copied, changed from r417165, head/net/hlmaster/files/patch-HLServerList.cpp head/security/trousers/files/patch-dist_Makefile.am - copied unchanged from r417165, head/security/trousers/files/patch-dist-Makefile.am head/security/trousers/files/patch-dist_tcsd.conf.in - copied unchanged from r417165, head/security/trousers/files/patch-dist-tcsd.conf.in head/security/trousers/files/patch-src_include_biosem.h - copied, changed from r417165, head/security/trousers/files/patch-src-include-biosem.h head/security/trousers/files/patch-src_include_linux_tpm.h - copied, changed from r417165, head/security/trousers/files/patch-src-include-linux-tpm.h head/security/trousers/files/patch-src_include_tcs__tsp.h - copied, changed from r417165, head/security/trousers/files/patch-src-include-tcs_tsp.h head/security/trousers/files/patch-src_include_tcs__utils.h - copied, changed from r417165, head/security/trousers/files/patch-src-include-tcs_utils.h head/security/trousers/files/patch-src_include_tcsd.h - copied, changed from r417165, head/security/trousers/files/patch-src-include-tcsd.h head/security/trousers/files/patch-src_include_tcsd__ops.h - copied, changed from r417165, head/security/trousers/files/patch-src-include-tcsd_ops.h head/security/trousers/files/patch-src_include_threads.h - copied, changed from r417165, head/security/trousers/files/patch-src-include-threads.h head/security/trousers/files/patch-src_include_trousers__types.h - copied, changed from r417165, head/security/trousers/files/patch-src-include-trousers_types.h head/security/trousers/files/patch-src_include_tss_platform.h - copied, changed from r417165, head/security/trousers/files/patch-src-include-tss-platform.h head/security/trousers/files/patch-src_tcs_Makefile.am - copied, changed from r417165, head/security/trousers/files/patch-src-tcs-Makefile.am head/security/trousers/files/patch-src_tcs_ps_ps__utils.c - copied, changed from r417165, head/security/trousers/files/patch-src-tcs-ps-ps_utils.c head/security/trousers/files/patch-src_tcs_ps_tcsps.c - copied, changed from r417165, head/security/trousers/files/patch-src-tcs-ps-tcsps.c head/security/trousers/files/patch-src_tcs_rpc_tcstp_rpc.c - copied, changed from r417165, head/security/trousers/files/patch-src-tcs-rpc-tcstp-rpc.c head/security/trousers/files/patch-src_tcs_tcs__aik.c - copied, changed from r417165, head/security/trousers/files/patch-src-tcs-tcs_aik.c head/security/trousers/files/patch-src_tcs_tcs__auth__mgr.c - copied, changed from r417165, head/security/trousers/files/patch-src-tcs-tcs_auth_mgr.c head/security/trousers/files/patch-src_tcsd_Makefile.am - copied, changed from r417165, head/security/trousers/files/patch-src-tcsd-Makefile.am head/security/trousers/files/patch-src_tcsd_svrside.c - copied, changed from r417165, head/security/trousers/files/patch-src-tcsd-svrside.c head/security/trousers/files/patch-src_tddl_Makefile.am - copied unchanged from r417165, head/security/trousers/files/patch-src-tddl-Makefile.am head/security/trousers/files/patch-src_trspi_Makefile.am - copied, changed from r417165, head/security/trousers/files/patch-src-trspi-Makefile.am head/security/trousers/files/patch-src_tspi_Makefile.am - copied, changed from r417165, head/security/trousers/files/patch-src-tspi-Makefile.am head/security/trousers/files/patch-src_tspi_ps_ps__utils.c - copied, changed from r417165, head/security/trousers/files/patch-src-tspi-ps-ps_utils.c head/security/trousers/files/patch-src_tspi_ps_tspps.c - copied, changed from r417165, head/security/trousers/files/patch-src-tspi-ps-tspps.c head/security/trousers/files/patch-src_tspi_rpc_hosttable.c - copied, changed from r417165, head/security/trousers/files/patch-src-tspi-rpc-hosttable.c head/security/trousers/files/patch-src_tspi_rpc_tcstp_rpc.c - copied, changed from r417165, head/security/trousers/files/patch-src-tspi-rpc-tcstp-rpc.c head/security/trousers/files/patch-src_tspi_tsp__tcsi__param.c - copied, changed from r417165, head/security/trousers/files/patch-src-tspi-tsp_tcsi_param.c head/textproc/p5-XML-AutoWriter/files/patch-lib_XML_Doctype.pm - copied, changed from r417165, head/textproc/p5-XML-AutoWriter/files/patch-Doctype.pm head/www/repos-style/files/patch-open_log_index.php - copied, changed from r417165, head/www/repos-style/files/patch-open-log-index.php head/www/repos-style/files/patch-view_log.xsl - copied, changed from r417165, head/www/repos-style/files/patch-view-log.xsl head/www/repos-style/files/patch-view_repos.xsl - copied, changed from r417165, head/www/repos-style/files/patch-view-repos.xsl head/x11-drivers/xf86-video-openchrome/files/patch-src_via__id.c - copied, changed from r417165, head/x11-drivers/xf86-video-openchrome/files/patch-src_via_id.c head/x11/imwheel/files/patch-getopt_Makefile.in - copied, changed from r417165, head/x11/imwheel/files/patch-getopt__Makefile.in head/x11/imwheel/files/patch-getopt_getopt.c - copied, changed from r417165, head/x11/imwheel/files/patch-getopt__getopt.c Deleted: head/audio/sphinx/files/patch-src-examples_clicore.c head/audio/sphinx/files/patch-src-examples_srvcore.c head/audio/sphinx/files/patch-src-libsphinx2-include_pconf.h head/audio/sphinx/files/patch-src-libsphinx2_blk_cdcn_norm.c head/audio/sphinx/files/patch-src-libsphinx2_cdcn_norm.c head/audio/sphinx/files/patch-src-libsphinx2_eht_quit.c head/audio/sphinx/files/patch-src-libsphinx2_err.c head/audio/sphinx/files/patch-src-libsphinx2_linklist.c head/audio/sphinx/files/patch-src-libsphinx2_prime.c head/audio/sphinx/files/patch-src-libsphinx2_r_agc_noise.c head/audio/sphinx/files/patch-src-libsphinx2_sc_vq.c head/audio/sphinx/files/patch-src-libsphinx2_search.c head/audio/sphinx/files/patch-src-libsphinx2fe_fe_sigproc.c head/audio/sphinx/files/patch-src_libsphinx2_cdcn_update.c head/audio/sphinx/files/patch-src_libsphinx2ad_ad_oss_bsd.c head/devel/ruby-rbprof/files/patch-aspects__profiler__lib__rbprof.rb head/devel/sabre/files/patch-src_java_de_tu_darmstadt_informatik_rbg_bstickler_udflib_UDFImageBuilderFile.java head/devel/sdts++/files/patch-sdts++__builder__sb_Accessor.cpp head/devel/sdts++/files/patch-sdts++__io__FormatParset.yy head/devel/sdts++/files/patch-sdts++__io__sio_8211Converter.cpp head/devel/sdts++/files/patch-sdts++__io__sio_8211DDRField.cpp head/devel/sdts++/files/patch-sdts++__io__sio_Utils.cpp head/devel/sdts++/files/patch-sysutils__t_basename.cpp head/devel/sdts++/files/patch-sysutils__t_dirname.cpp head/devel/sdts++/files/patch-sysutils__t_stringutils.cpp head/games/heretic/files/patch-d_main.c head/games/heretic/files/patch-doc-Gamekeys.txt head/games/heretic/files/patch-doc-README.opengl head/games/heretic/files/patch-g_game.c head/games/heretic/files/patch-graphics-i_x11_fast.c head/games/heretic/files/patch-graphics__i_sdl.c head/games/heretic/files/patch-graphics__i_sdl_gl.c head/games/heretic/files/patch-i_udp.c head/games/heretic/files/patch-m_misc.c head/games/heretic/files/patch-opengl_gl_fonts.c head/games/heretic/files/patch-opengl_gl_struct.h head/games/heretic/files/patch-p_inter.c head/games/heretic/files/patch-r_things.c head/games/heretic/files/patch-w_wad.c head/games/quake2-psychomod/files/patch-src__Makefile head/games/quake2-psychomod/files/patch-src__g_items.c head/games/scorched3d/files/patch-src-client-client-SecureID.cpp head/games/scorched3d/files/patch-src__client__client__LoadPNG.cpp head/games/scorched3d/files/patch-src__common__image__ImagePngFactory.cpp head/games/scorched3d/files/patch-src__common__porting__windows.h head/irc/psybnc/files/patch-src_p_blowfish.c head/irc/psybnc/files/patch-src_p_global.h head/irc/psybnc/files/patch-src_p_idea.c head/irc/psybnc/files/patch-src_p_memory.c head/irc/psybnc/files/patch-src_p_string.c head/math/spar/files/patch-calculator__Makefile.in head/math/spar/files/patch-lib__randist__rand.c head/multimedia/w_scan/files/patch-clang head/multimedia/w_scan/files/patch-z-scan.c head/net-im/mbpurple/files/patch-microblog__mb_net.c head/net-p2p/gnewtellium/files/patch-src__config.c head/net-p2p/torrentsniff/files/patch-BitTorrent-BDecode.pm head/net/hlmaster/files/patch-HLServerList.cpp head/security/trousers/files/patch-dist-Makefile.am head/security/trousers/files/patch-dist-tcsd.conf.in head/security/trousers/files/patch-src-include-biosem.h head/security/trousers/files/patch-src-include-linux-tpm.h head/security/trousers/files/patch-src-include-tcs_tsp.h head/security/trousers/files/patch-src-include-tcs_utils.h head/security/trousers/files/patch-src-include-tcsd.h head/security/trousers/files/patch-src-include-tcsd_ops.h head/security/trousers/files/patch-src-include-threads.h head/security/trousers/files/patch-src-include-trousers_types.h head/security/trousers/files/patch-src-include-tss-platform.h head/security/trousers/files/patch-src-tcs-Makefile.am head/security/trousers/files/patch-src-tcs-ps-ps_utils.c head/security/trousers/files/patch-src-tcs-ps-tcsps.c head/security/trousers/files/patch-src-tcs-rpc-tcstp-rpc.c head/security/trousers/files/patch-src-tcs-tcs_aik.c head/security/trousers/files/patch-src-tcs-tcs_auth_mgr.c head/security/trousers/files/patch-src-tcsd-Makefile.am head/security/trousers/files/patch-src-tcsd-svrside.c head/security/trousers/files/patch-src-tddl-Makefile.am head/security/trousers/files/patch-src-trspi-Makefile.am head/security/trousers/files/patch-src-tspi-Makefile.am head/security/trousers/files/patch-src-tspi-ps-ps_utils.c head/security/trousers/files/patch-src-tspi-ps-tspps.c head/security/trousers/files/patch-src-tspi-rpc-hosttable.c head/security/trousers/files/patch-src-tspi-rpc-tcstp-rpc.c head/security/trousers/files/patch-src-tspi-tsp_tcsi_param.c head/textproc/p5-XML-AutoWriter/files/patch-Doctype.pm head/www/repos-style/files/patch-open-log-index.php head/www/repos-style/files/patch-view-log.xsl head/www/repos-style/files/patch-view-repos.xsl head/x11-drivers/xf86-video-openchrome/files/patch-src_via_id.c head/x11/imwheel/files/patch-getopt__Makefile.in head/x11/imwheel/files/patch-getopt__getopt.c Modified: head/astro/wmsolar/Makefile head/astro/wmsolar/files/patch-Makefile head/astro/wmsolar/files/patch-Vsop.h head/audio/sphinx/Makefile head/audio/sphinx/files/patch-src_examples_tty-continuous.c head/benchmarks/himenobench/Makefile head/benchmarks/himenobench/files/patch-himenobmtxp__l.f head/benchmarks/himenobench/files/patch-himenobmtxp__m.f head/benchmarks/himenobench/files/patch-himenobmtxp__s.f head/benchmarks/himenobench/files/patch-himenobmtxp__xl.f head/benchmarks/himenobench/files/patch-himenobmtxps.c head/benchmarks/netio/Makefile head/benchmarks/netio/files/patch-Makefile head/benchmarks/netio/files/patch-netio.c head/comms/mlan3/Makefile head/comms/mlan3/files/patch-Makefiles head/databases/pgagent/Makefile head/databases/pgagent/files/patch-CMakeLists.txt head/deskutils/everygui/Makefile head/deskutils/everygui/files/patch-setup.py head/devel/charva/Makefile head/devel/charva/files/patch-build.xml head/devel/charva/files/patch-c_src_Makefile.freebsd.txt head/devel/charva/files/patch-c_src_Toolkit.c head/devel/charva/files/patch-java_src_charva_awt_CardLayout.java head/devel/charva/files/patch-java_src_charva_awt_Component.java head/devel/charva/files/patch-java_src_charva_awt_Container.java head/devel/charva/files/patch-java_src_charva_awt_Toolkit.java head/devel/charva/files/patch-java_src_charva_awt_VerticalFlowLayout.java head/devel/charva/files/patch-java_src_charva_awt_Window.java head/devel/charva/files/patch-java_src_charva_awt_event_FocusAdapter.java head/devel/charva/files/patch-java_src_charvax_swing_AbstractButton.java head/devel/charva/files/patch-java_src_charvax_swing_ButtonGroup.java head/devel/charva/files/patch-java_src_charvax_swing_JLabel.java head/devel/charva/files/patch-java_src_charvax_swing_JPasswordField.java head/devel/charva/files/patch-java_src_charvax_swing_JTextArea.java head/devel/charva/files/patch-java_src_charvax_swing_JTextField.java head/devel/charva/files/patch-java_src_charvax_swing_text_JTextComponent.java head/devel/flickrnet/Makefile head/devel/flickrnet/files/patch-AssemblyInfo.cs head/devel/flickrnet/files/patch-flickrnet.pc.in head/devel/itext/Makefile head/devel/itext/files/patch-ant_.ant.properties head/devel/itext/files/patch-ant_compile.xml head/devel/itext/files/patch-ant_site.xml head/devel/itext/files/patch-core_com_lowagie_text_pdf_PRTokeniser.java head/devel/itext/files/patch-core_com_lowagie_text_pdf_PdfReader.java head/devel/itext/files/patch-core_com_lowagie_text_pdf_PdfStamperImp.java head/devel/itext/files/patch-core_com_lowagie_text_xml_xmp_XmpReader.java head/devel/p5-Geo-ShapeFile/Makefile head/devel/p5-Geo-ShapeFile/files/patch-t_main__tests.t head/devel/p5-Sys-Cpu/Makefile head/devel/p5-Sys-Cpu/files/patch-CPU.xs head/devel/ruby-rbprof/Makefile head/devel/sabre/Makefile head/devel/sabre/files/patch-build.xml head/devel/sdts++/Makefile head/devel/sdts++/files/patch-doc__sdts++.texi head/emulators/pcemu/Makefile head/emulators/pcemu/files/patch-ae head/emulators/yabause/Makefile head/emulators/yabause/files/patch-src__core.h head/games/eights/Makefile head/games/eights/files/patch-eights.c head/games/heretic/Makefile head/games/heretic/files/patch-Makefile head/games/heretic/files/patch-doomdef.h head/games/heretic/files/patch-doomtype.h head/games/heretic/files/patch-opengl_sgi-si_libtess_memalloc.h head/games/heretic/files/patch-sndserv_Makefile head/games/heretic/files/patch-sndserv_linux.c head/games/heretic/files/patch-sndserv_soundsrv.c head/games/heretic/files/patch-sndserv_wadread.c head/games/quake2-psychomod/Makefile head/games/scorched3d/Makefile head/games/scorched3d/files/patch-configure-al.m4 head/games/scorched3d/files/patch-src_client_GLEXT_GLFont2dFreeType.h head/games/scorched3d/files/patch-src_launcher_wxdialogs_TrueTypeFont.h head/graphics/c-a-i-r/Makefile head/graphics/c-a-i-r/files/patch-CAIR.cpp head/graphics/picpuz/Makefile head/graphics/picpuz/files/patch-Makefile head/graphics/picpuz/files/patch-zfuncs.cpp head/graphics/picpuz/files/patch-zfuncs.h head/graphics/seam-carving-gui/Makefile head/graphics/seam-carving-gui/files/patch-cair_CAIR.cpp head/irc/psybnc/Makefile head/irc/psybnc/files/patch-Makefile head/irc/psybnc/files/patch-lang_english.lng head/irc/psybnc/files/patch-lang_german.lng head/irc/psybnc/files/patch-lang_italiano.lng head/irc/psybnc/files/patch-src_match.c head/irc/psybnc/files/patch-src_psybnc.c head/irc/psybnc/files/patch-tools_autoconf.c head/java/jakarta-commons-pool/Makefile head/java/jakarta-commons-pool/files/patch-build.xml head/java/jgrapht/Makefile head/java/jgrapht/files/patch-build.xml head/mail/vpopmail/Makefile head/mail/vpopmail/files/patch-README.vpopmaild head/math/spar/Makefile head/math/spar/files/patch-configure head/multimedia/vdr-plugin-wirbelscan/Makefile head/multimedia/vdr-plugin-wirbelscan/files/patch-scanner.c head/multimedia/w_scan/Makefile head/multimedia/w_scan/files/patch-char-coding.c head/multimedia/w_scan/files/patch-scan.c head/net-im/mbpurple/Makefile head/net-mgmt/cdpr/Makefile head/net-mgmt/cdpr/files/patch-cdpr.c head/net-mgmt/cdpr/files/patch-conffile.c head/net-p2p/gnewtellium/Makefile head/net-p2p/torrentsniff/Makefile head/net-p2p/torrentsniff/files/patch-torrentsniff head/net/bittwist/Makefile head/net/bittwist/files/patch-Makefile head/net/hlmaster/Makefile head/net/rtptools/Makefile head/net/rtptools/files/patch-rtp.h head/net/rtptools/files/patch-rtpdump.c head/net/rtptools/files/patch-rtpsend.c head/news/newsfetch/Makefile head/news/newsfetch/files/patch-newsfetch.1 head/news/newsfetch/files/patch-newsfetch.c head/news/newsfetch/files/patch-nntp.c head/news/newsfetch/files/patch-opt.c head/news/newsfetch/files/patch-util.c head/print/panda/Makefile head/print/panda/files/patch-configure.in head/print/panda/files/patch-database.c head/print/panda/files/patch-images.c head/print/panda/files/patch-objects.c head/print/panda/files/patch-utility.c head/security/dcetest/Makefile head/security/dcetest/files/patch-Makefile head/security/dcetest/files/patch-dcetest.c head/security/dcetest/files/patch-tcpstuff.c head/security/dcetest/files/patch-tcpstuff.h head/security/iaikpkcs11wrapper/Makefile head/security/iaikpkcs11wrapper/files/patch-Makefile head/security/iaikpkcs11wrapper/files/patch-native_src_pkcs11wrapper.c head/security/trousers/Makefile head/security/trousers/files/patch-configure.in head/security/xorsearch/Makefile head/security/xorsearch/files/patch-XORSearch.c head/shells/ibsh/Makefile head/shells/ibsh/files/patch-Makefile head/sysutils/rfstool/Makefile head/sysutils/rfstool/files/patch-reiserfs.h head/textproc/expat2/Makefile head/textproc/expat2/files/patch-cve-2012-6702-plus-cve-2016-5300-v1 head/textproc/p5-XML-AutoWriter/Makefile head/textproc/p5-XML-AutoWriter/files/patch-Makefile.PL head/www/repos-style/Makefile head/x11-drivers/xf86-video-openchrome/files/patch-configure head/x11-themes/kde-icons-noia/Makefile head/x11-toolkits/hs-wxcore/Makefile head/x11-toolkits/hs-wxcore/files/patch-Setup.hs head/x11-wm/afterstep/files/AFstep.xpm (contents, props changed) head/x11-wm/afterstep/files/penguin.xpm (contents, props changed) head/x11/aterm/Makefile head/x11/aterm/files/patch-cutToBeginningOfLine head/x11/aterm/files/patch-eterm_transparency head/x11/imwheel/Makefile head/x11/imwheel/files/patch-Makefile.in head/x11/imwheel/files/patch-imwheel.1 head/x11/imwheel/files/patch-imwheelrc head/x11/imwheel/files/patch-util.c Directory Properties: head/x11-wm/afterstep/files/monitor_bsd.xpm (props changed) Modified: head/astro/wmsolar/Makefile ============================================================================== --- head/astro/wmsolar/Makefile Mon Jun 20 16:05:17 2016 (r417165) +++ head/astro/wmsolar/Makefile Mon Jun 20 16:23:28 2016 (r417166) @@ -15,7 +15,7 @@ GH_ACCOUNT= engerim42 PLIST_FILES= bin/wmSolar USE_XORG= x11 xext xpm -USES= gmake +USES= dos2unix gmake pre-patch: @${REINPLACE_CMD} -e 's|values.h|float.h|; s|MAXDOUBLE|DBL_MAX|g' \ Modified: head/astro/wmsolar/files/patch-Makefile ============================================================================== --- head/astro/wmsolar/files/patch-Makefile Mon Jun 20 16:05:17 2016 (r417165) +++ head/astro/wmsolar/files/patch-Makefile Mon Jun 20 16:23:28 2016 (r417166) @@ -1,5 +1,5 @@ ---- Makefile.orig Tue Jan 15 17:54:38 2002 -+++ Makefile Tue Jan 15 17:56:37 2002 +--- Makefile.orig 2016-06-20 12:40:27 UTC ++++ Makefile @@ -1,8 +1,6 @@ -CC = g++ -CFLAGS = -O2 -Wall @@ -11,7 +11,7 @@ # for linux LIBS = -lXpm -lX11 -lXext -lm # for Solaris -@@ -19,14 +17,14 @@ +@@ -19,14 +17,14 @@ OBJS = wmSolar.o \ RiseSet.o \ Vsop.o .c.o: Modified: head/astro/wmsolar/files/patch-Vsop.h ============================================================================== --- head/astro/wmsolar/files/patch-Vsop.h Mon Jun 20 16:05:17 2016 (r417165) +++ head/astro/wmsolar/files/patch-Vsop.h Mon Jun 20 16:23:28 2016 (r417166) @@ -1,10 +1,10 @@ ---- Vsop.h.orig Tue Nov 26 15:41:59 2002 -+++ Vsop.h Tue Nov 26 15:42:13 2002 +--- Vsop.h.orig 2016-06-20 12:40:27 UTC ++++ Vsop.h @@ -12,6 +12,7 @@ - #define VSOP__H - - #include "PlanetData.h" // for enum Planet + #define VSOP__H + + #include "PlanetData.h" // for enum Planet +#include <math.h> - - // * * * * * simple support structs * * * * * - + + // * * * * * simple support structs * * * * * + Modified: head/audio/sphinx/Makefile ============================================================================== --- head/audio/sphinx/Makefile Mon Jun 20 16:05:17 2016 (r417165) +++ head/audio/sphinx/Makefile Mon Jun 20 16:23:28 2016 (r417166) @@ -14,7 +14,8 @@ COMMENT= Speech recognition system GNU_CONFIGURE= yes USE_LDCONFIG= yes PKGMESSAGE= ${WRKDIR}/pkg-message -USES= gmake libtool shebangfix +USES= dos2unix gmake libtool shebangfix +DOS2UNIX_FILES= src/libsphinx2fe/fe_sigproc.c SHEBANG_FILES= scripts/sphinx2-demo.in perl_OLD_CMD= "@PERL@ -w" Copied and modified: head/audio/sphinx/files/patch-src_examples_clicore.c (from r417165, head/audio/sphinx/files/patch-src-examples_clicore.c) ============================================================================== --- head/audio/sphinx/files/patch-src-examples_clicore.c Mon Jun 20 16:05:17 2016 (r417165, copy source) +++ head/audio/sphinx/files/patch-src_examples_clicore.c Mon Jun 20 16:23:28 2016 (r417166) @@ -1,6 +1,6 @@ ---- src/examples/clicore.c.orig 2007-12-06 18:36:24.000000000 +0100 -+++ src/examples/clicore.c 2007-12-06 18:36:39.000000000 +0100 -@@ -323,7 +323,7 @@ +--- src/examples/clicore.c.orig 2001-12-13 21:11:13 UTC ++++ src/examples/clicore.c +@@ -323,7 +323,7 @@ SOCKET cli_open (char *hostname, int32 p memcpy (&addr.sin_addr, hp->h_addr, hp->h_length); addr.sin_port = htons((u_short) port); Copied and modified: head/audio/sphinx/files/patch-src_examples_srvcore.c (from r417165, head/audio/sphinx/files/patch-src-examples_srvcore.c) ============================================================================== --- head/audio/sphinx/files/patch-src-examples_srvcore.c Mon Jun 20 16:05:17 2016 (r417165, copy source) +++ head/audio/sphinx/files/patch-src_examples_srvcore.c Mon Jun 20 16:23:28 2016 (r417166) @@ -1,6 +1,6 @@ ---- src/examples/srvcore.c.orig 2007-12-06 18:35:25.000000000 +0100 -+++ src/examples/srvcore.c 2007-12-06 18:35:56.000000000 +0100 -@@ -381,7 +381,7 @@ +--- src/examples/srvcore.c.orig 2001-12-13 21:11:15 UTC ++++ src/examples/srvcore.c +@@ -381,7 +381,7 @@ SOCKET server_await_conn ( void ) ERRLOG((stderr, "%s(%d): Listening at port %d\n", __FILE__, __LINE__, bindport)); Modified: head/audio/sphinx/files/patch-src_examples_tty-continuous.c ============================================================================== --- head/audio/sphinx/files/patch-src_examples_tty-continuous.c Mon Jun 20 16:05:17 2016 (r417165) +++ head/audio/sphinx/files/patch-src_examples_tty-continuous.c Mon Jun 20 16:23:28 2016 (r417166) @@ -1,7 +1,7 @@ author: Andriy Gapon ---- src/examples/tty-continuous.c.orig Thu Dec 13 21:11:15 2001 -+++ src/examples/tty-continuous.c Mon Oct 20 12:12:58 2003 +--- src/examples/tty-continuous.c.orig 2001-12-13 21:11:15 UTC ++++ src/examples/tty-continuous.c @@ -175,7 +175,6 @@ static void utterance_loop() * listening until current utterance completely decoded */ Copied and modified: head/audio/sphinx/files/patch-src_libsphinx2_blk__cdcn__norm.c (from r417165, head/audio/sphinx/files/patch-src-libsphinx2_blk_cdcn_norm.c) ============================================================================== --- head/audio/sphinx/files/patch-src-libsphinx2_blk_cdcn_norm.c Mon Jun 20 16:05:17 2016 (r417165, copy source) +++ head/audio/sphinx/files/patch-src_libsphinx2_blk__cdcn__norm.c Mon Jun 20 16:23:28 2016 (r417166) @@ -1,5 +1,5 @@ ---- src/libsphinx2/blk_cdcn_norm.c.orig 2007-12-06 19:23:43.000000000 +0100 -+++ src/libsphinx2/blk_cdcn_norm.c 2007-12-06 19:23:25.000000000 +0100 +--- src/libsphinx2/blk_cdcn_norm.c.orig 2001-12-13 21:11:20 UTC ++++ src/libsphinx2/blk_cdcn_norm.c @@ -36,6 +36,18 @@ #include <math.h> #include "cdcn.h" @@ -19,7 +19,7 @@ /************************************************************************ * Dummy routine to convert from suitcase to sane varibles ***************************************************************************/ -@@ -46,7 +58,6 @@ +@@ -46,7 +58,6 @@ void block_cdcn_norm (float z[][NUM_COEF { /* Multidimensional arrays in C suck, so we have to forward-declare-hack this. */ @@ -27,7 +27,7 @@ float *variance, *prob, *tilt, *noise, *codebook, *corrbook; int num_codes; -@@ -88,7 +99,6 @@ +@@ -88,7 +99,6 @@ void block_cdcn_norm (float z[][NUM_COEF * Coded by Alex Acero (acero@s), November 1989 * *************************************************************************/ Copied and modified: head/audio/sphinx/files/patch-src_libsphinx2_cdcn__norm.c (from r417165, head/audio/sphinx/files/patch-src-libsphinx2_cdcn_norm.c) ============================================================================== --- head/audio/sphinx/files/patch-src-libsphinx2_cdcn_norm.c Mon Jun 20 16:05:17 2016 (r417165, copy source) +++ head/audio/sphinx/files/patch-src_libsphinx2_cdcn__norm.c Mon Jun 20 16:23:28 2016 (r417166) @@ -1,5 +1,5 @@ ---- src/libsphinx2/cdcn_norm.c.orig 2007-12-06 19:24:33.000000000 +0100 -+++ src/libsphinx2/cdcn_norm.c 2007-12-06 19:26:24.000000000 +0100 +--- src/libsphinx2/cdcn_norm.c.orig 2001-12-13 21:11:20 UTC ++++ src/libsphinx2/cdcn_norm.c @@ -35,6 +35,15 @@ */ #include <math.h> Copied and modified: head/audio/sphinx/files/patch-src_libsphinx2_cdcn__update.c (from r417165, head/audio/sphinx/files/patch-src_libsphinx2_cdcn_update.c) ============================================================================== --- head/audio/sphinx/files/patch-src_libsphinx2_cdcn_update.c Mon Jun 20 16:05:17 2016 (r417165, copy source) +++ head/audio/sphinx/files/patch-src_libsphinx2_cdcn__update.c Mon Jun 20 16:23:28 2016 (r417166) @@ -1,5 +1,5 @@ ---- src/libsphinx2/cdcn_update.c.orig 2001-12-13 22:11:20.000000000 +0100 -+++ src/libsphinx2/cdcn_update.c 2007-12-06 19:40:02.000000000 +0100 +--- src/libsphinx2/cdcn_update.c.orig 2001-12-13 21:11:20 UTC ++++ src/libsphinx2/cdcn_update.c @@ -47,6 +47,11 @@ * Modified by Uday Jain, June 95 * @@ -12,7 +12,7 @@ float cdcn_update (float *z, /* The observed cepstrum vectors */ -@@ -56,13 +61,7 @@ +@@ -56,13 +61,7 @@ cdcn_update (float *z, /* The observed float distortion; float *noise, *tilt, *codebook, *prob, *variance, *corrbook; int num_codes; Copied and modified: head/audio/sphinx/files/patch-src_libsphinx2_eht__quit.c (from r417165, head/audio/sphinx/files/patch-src-libsphinx2_eht_quit.c) ============================================================================== --- head/audio/sphinx/files/patch-src-libsphinx2_eht_quit.c Mon Jun 20 16:05:17 2016 (r417165, copy source) +++ head/audio/sphinx/files/patch-src_libsphinx2_eht__quit.c Mon Jun 20 16:23:28 2016 (r417166) @@ -1,5 +1,5 @@ ---- src/libsphinx2/eht_quit.c.orig 2007-12-06 18:21:53.000000000 +0100 -+++ src/libsphinx2/eht_quit.c 2007-12-06 18:22:13.000000000 +0100 +--- src/libsphinx2/eht_quit.c.orig 2001-12-13 21:11:20 UTC ++++ src/libsphinx2/eht_quit.c @@ -85,6 +85,7 @@ */ Copied and modified: head/audio/sphinx/files/patch-src_libsphinx2_err.c (from r417165, head/audio/sphinx/files/patch-src-libsphinx2_err.c) ============================================================================== --- head/audio/sphinx/files/patch-src-libsphinx2_err.c Mon Jun 20 16:05:17 2016 (r417165, copy source) +++ head/audio/sphinx/files/patch-src_libsphinx2_err.c Mon Jun 20 16:23:28 2016 (r417166) @@ -1,5 +1,5 @@ ---- src/libsphinx2/err.c.orig 2007-12-06 18:22:49.000000000 +0100 -+++ src/libsphinx2/err.c 2007-12-06 18:23:27.000000000 +0100 +--- src/libsphinx2/err.c.orig 2001-12-13 21:11:20 UTC ++++ src/libsphinx2/err.c @@ -49,6 +49,7 @@ */ Copied and modified: head/audio/sphinx/files/patch-src_libsphinx2_include_pconf.h (from r417165, head/audio/sphinx/files/patch-src-libsphinx2-include_pconf.h) ============================================================================== --- head/audio/sphinx/files/patch-src-libsphinx2-include_pconf.h Mon Jun 20 16:05:17 2016 (r417165, copy source) +++ head/audio/sphinx/files/patch-src_libsphinx2_include_pconf.h Mon Jun 20 16:23:28 2016 (r417166) @@ -1,6 +1,6 @@ ---- src/libsphinx2/include/pconf.h.orig 2007-12-06 18:24:09.000000000 +0100 -+++ src/libsphinx2/include/pconf.h 2007-12-06 18:24:20.000000000 +0100 -@@ -124,4 +124,4 @@ +--- src/libsphinx2/include/pconf.h.orig 2001-12-13 21:11:27 UTC ++++ src/libsphinx2/include/pconf.h +@@ -124,4 +124,4 @@ int ppconf(int argc, char *argv[], char * (*GetDefault)(char const *, char const *), char last); void pusage(char *prog, Config_t *cp); Copied and modified: head/audio/sphinx/files/patch-src_libsphinx2_linklist.c (from r417165, head/audio/sphinx/files/patch-src-libsphinx2_linklist.c) ============================================================================== --- head/audio/sphinx/files/patch-src-libsphinx2_linklist.c Mon Jun 20 16:05:17 2016 (r417165, copy source) +++ head/audio/sphinx/files/patch-src_libsphinx2_linklist.c Mon Jun 20 16:23:28 2016 (r417166) @@ -1,5 +1,5 @@ ---- src/libsphinx2/linklist.c.orig 2007-12-06 18:25:48.000000000 +0100 -+++ src/libsphinx2/linklist.c 2007-12-06 18:27:00.000000000 +0100 +--- src/libsphinx2/linklist.c.orig 2001-12-13 21:11:22 UTC ++++ src/libsphinx2/linklist.c @@ -81,7 +81,6 @@ #include <stdio.h> @@ -8,7 +8,7 @@ #include "s2types.h" -@@ -132,7 +131,7 @@ +@@ -132,7 +131,7 @@ void *listelem_alloc (int32 elem_size) cpp = list[i].freelist = (void **) malloc (list[i].n_malloc * elem_size); cp = (void *) cpp; for (j = list[i].n_malloc-1; j > 0; --j) { Copied and modified: head/audio/sphinx/files/patch-src_libsphinx2_prime.c (from r417165, head/audio/sphinx/files/patch-src-libsphinx2_prime.c) ============================================================================== --- head/audio/sphinx/files/patch-src-libsphinx2_prime.c Mon Jun 20 16:05:17 2016 (r417165, copy source) +++ head/audio/sphinx/files/patch-src_libsphinx2_prime.c Mon Jun 20 16:23:28 2016 (r417166) @@ -1,6 +1,6 @@ ---- src/libsphinx2/prime.c.orig 2007-12-06 18:27:41.000000000 +0100 -+++ src/libsphinx2/prime.c 2007-12-06 18:27:51.000000000 +0100 -@@ -75,5 +75,4 @@ +--- src/libsphinx2/prime.c.orig 2001-12-13 21:11:23 UTC ++++ src/libsphinx2/prime.c +@@ -75,5 +75,4 @@ main () } } Copied and modified: head/audio/sphinx/files/patch-src_libsphinx2_r__agc__noise.c (from r417165, head/audio/sphinx/files/patch-src-libsphinx2_r_agc_noise.c) ============================================================================== --- head/audio/sphinx/files/patch-src-libsphinx2_r_agc_noise.c Mon Jun 20 16:05:17 2016 (r417165, copy source) +++ head/audio/sphinx/files/patch-src_libsphinx2_r__agc__noise.c Mon Jun 20 16:23:28 2016 (r417166) @@ -1,5 +1,5 @@ ---- src/libsphinx2/r_agc_noise.c.orig 2007-12-06 18:28:21.000000000 +0100 -+++ src/libsphinx2/r_agc_noise.c 2007-12-06 18:28:49.000000000 +0100 +--- src/libsphinx2/r_agc_noise.c.orig 2001-12-13 21:11:23 UTC ++++ src/libsphinx2/r_agc_noise.c @@ -34,6 +34,7 @@ * */ Copied and modified: head/audio/sphinx/files/patch-src_libsphinx2_sc__vq.c (from r417165, head/audio/sphinx/files/patch-src-libsphinx2_sc_vq.c) ============================================================================== --- head/audio/sphinx/files/patch-src-libsphinx2_sc_vq.c Mon Jun 20 16:05:17 2016 (r417165, copy source) +++ head/audio/sphinx/files/patch-src_libsphinx2_sc__vq.c Mon Jun 20 16:23:28 2016 (r417166) @@ -1,5 +1,5 @@ ---- src/libsphinx2/sc_vq.c.orig 2007-12-06 18:38:16.000000000 +0100 -+++ src/libsphinx2/sc_vq.c 2007-12-06 18:38:36.000000000 +0100 +--- src/libsphinx2/sc_vq.c.orig 2001-12-13 21:11:23 UTC ++++ src/libsphinx2/sc_vq.c @@ -64,6 +64,7 @@ #include <stdio.h> Copied and modified: head/audio/sphinx/files/patch-src_libsphinx2_search.c (from r417165, head/audio/sphinx/files/patch-src-libsphinx2_search.c) ============================================================================== --- head/audio/sphinx/files/patch-src-libsphinx2_search.c Mon Jun 20 16:05:17 2016 (r417165, copy source) +++ head/audio/sphinx/files/patch-src_libsphinx2_search.c Mon Jun 20 16:23:28 2016 (r417166) @@ -1,6 +1,6 @@ ---- src/libsphinx2/search.c.orig 2007-12-06 18:29:23.000000000 +0100 -+++ src/libsphinx2/search.c 2007-12-06 18:33:21.000000000 +0100 -@@ -2236,6 +2236,9 @@ +--- src/libsphinx2/search.c.orig 2001-12-13 21:11:24 UTC ++++ src/libsphinx2/search.c +@@ -2236,6 +2236,9 @@ search_one_ply_fwd (void) lm_next_frame (); } @@ -10,7 +10,7 @@ void search_finish_fwd (void) { -@@ -2245,7 +2248,6 @@ +@@ -2245,7 +2248,6 @@ search_finish_fwd (void) CHAN_T *hmm, /* *thmm,*/ **acl; /* int32 bp, bestbp, bestscore; */ /* int32 l_scr; */ @@ -18,7 +18,7 @@ if ((CurrentFrame > 0) && (topsen_window > 1)) { /* Wind up remaining frames */ -@@ -2306,7 +2308,6 @@ +@@ -2306,7 +2308,6 @@ search_finish_fwd (void) /* Get pscr-score for fwdtree recognition */ { search_hyp_t *pscrpath; Copied and modified: head/audio/sphinx/files/patch-src_libsphinx2ad_ad__oss__bsd.c (from r417165, head/audio/sphinx/files/patch-src_libsphinx2ad_ad_oss_bsd.c) ============================================================================== --- head/audio/sphinx/files/patch-src_libsphinx2ad_ad_oss_bsd.c Mon Jun 20 16:05:17 2016 (r417165, copy source) +++ head/audio/sphinx/files/patch-src_libsphinx2ad_ad__oss__bsd.c Mon Jun 20 16:23:28 2016 (r417166) @@ -1,7 +1,7 @@ author: Andriy Gapon ---- src/libsphinx2ad/ad_oss_bsd.c.orig Thu Dec 13 21:11:27 2001 -+++ src/libsphinx2ad/ad_oss_bsd.c Fri Oct 24 04:11:22 2003 +--- src/libsphinx2ad/ad_oss_bsd.c.orig 2001-12-13 21:11:27 UTC ++++ src/libsphinx2ad/ad_oss_bsd.c @@ -61,7 +61,7 @@ #include <stdio.h> #include <stdlib.h> @@ -27,7 +27,7 @@ author: Andriy Gapon int32 audioFormat=AUDIO_FORMAT; int32 dspCaps=0; int32 sampleRate; -@@ -96,7 +93,6 @@ +@@ -96,7 +93,6 @@ ad_rec_t *ad_open_sps (int32 sps) { } sampleRate = sps; @@ -35,7 +35,7 @@ author: Andriy Gapon if((dspFD = open ("/dev/dsp", O_RDONLY))<0){ if (errno == EBUSY) fprintf(stderr, "Audio device busy\n"); -@@ -105,18 +101,6 @@ +@@ -105,18 +101,6 @@ ad_rec_t *ad_open_sps (int32 sps) { return NULL; } @@ -54,7 +54,7 @@ author: Andriy Gapon if (ioctl (dspFD, SNDCTL_DSP_SETFMT, &audioFormat) < 0){ fprintf(stderr, "Audio ioctl(SETFMT 0x%x) failed: %s\n", audioFormat, strerror(errno)); close (dspFD); -@@ -139,12 +123,6 @@ +@@ -139,12 +123,6 @@ ad_rec_t *ad_open_sps (int32 sps) { return NULL; } @@ -67,7 +67,7 @@ author: Andriy Gapon if (ioctl (dspFD, SNDCTL_DSP_GETCAPS, &dspCaps) < 0) { fprintf(stderr, "ioctl(GETCAPS) failed: %s\n", strerror(errno)); close (dspFD); -@@ -161,8 +139,6 @@ +@@ -161,8 +139,6 @@ ad_rec_t *ad_open_sps (int32 sps) { printf("DSP %s memory map capability.\n", (dspCaps&DSP_CAP_MMAP)?"has":"does not have"); #endif @@ -76,7 +76,7 @@ author: Andriy Gapon /* Patched by N. Roy (nickr@ri.cmu.edu), 99/7/23. Previously, mixer was set through dspFD. This is incorrect. Should -@@ -210,10 +186,10 @@ +@@ -210,10 +186,10 @@ ad_rec_t *ad_open_sps (int32 sps) { } handle->dspFD = dspFD; @@ -89,7 +89,7 @@ author: Andriy Gapon return(handle); } -@@ -224,15 +200,10 @@ +@@ -224,15 +200,10 @@ ad_rec_t *ad_open ( void ) int32 ad_close (ad_rec_t *handle) { @@ -106,7 +106,7 @@ author: Andriy Gapon free(handle); return(0); -@@ -240,48 +211,62 @@ +@@ -240,48 +211,62 @@ int32 ad_close (ad_rec_t *handle) int32 ad_start_rec (ad_rec_t *handle) { @@ -198,7 +198,7 @@ author: Andriy Gapon if ((length = read (handle->dspFD, buf, length)) > 0) { #if 0 -@@ -292,7 +277,7 @@ +@@ -292,7 +277,7 @@ int32 ad_read (ad_rec_t *handle, int16 * } if (length < 0) { Copied and modified: head/audio/sphinx/files/patch-src_libsphinx2fe_fe__sigproc.c (from r417165, head/audio/sphinx/files/patch-src-libsphinx2fe_fe_sigproc.c) ============================================================================== --- head/audio/sphinx/files/patch-src-libsphinx2fe_fe_sigproc.c Mon Jun 20 16:05:17 2016 (r417165, copy source) +++ head/audio/sphinx/files/patch-src_libsphinx2fe_fe__sigproc.c Mon Jun 20 16:23:28 2016 (r417166) @@ -1,11 +1,11 @@ ---- src/libsphinx2fe/fe_sigproc.c.orig 2007-12-06 18:34:10.000000000 +0100 -+++ src/libsphinx2fe/fe_sigproc.c 2007-12-06 18:34:25.000000000 +0100 +--- src/libsphinx2fe/fe_sigproc.c.orig 2016-06-20 13:31:26 UTC ++++ src/libsphinx2fe/fe_sigproc.c @@ -43,7 +43,7 @@ - - #ifndef M_PI - #define M_PI (3.14159265358979323846) --#endif M_PI -+#endif - - #define FORWARD_FFT 1 - #define INVERSE_FFT -1 + + #ifndef M_PI + #define M_PI (3.14159265358979323846) +-#endif M_PI ++#endif + + #define FORWARD_FFT 1 + #define INVERSE_FFT -1 Modified: head/benchmarks/himenobench/Makefile ============================================================================== --- head/benchmarks/himenobench/Makefile Mon Jun 20 16:05:17 2016 (r417165) +++ head/benchmarks/himenobench/Makefile Mon Jun 20 16:23:28 2016 (r417166) @@ -19,7 +19,8 @@ LICENSE= LGPL20 # (or later) EXTRACT_DEPENDS= lha:archivers/lha -USES= fortran zip +USES= dos2unix fortran zip +DOS2UNIX_GLOB= *.c *.f NO_WRKSUBDIR= yes Modified: head/benchmarks/himenobench/files/patch-himenobmtxp__l.f ============================================================================== --- head/benchmarks/himenobench/files/patch-himenobmtxp__l.f Mon Jun 20 16:05:17 2016 (r417165) +++ head/benchmarks/himenobench/files/patch-himenobmtxp__l.f Mon Jun 20 16:23:28 2016 (r417166) @@ -1,10 +1,10 @@ ---- himenobmtxp_l.f.orig 2002-01-07 04:54:46 UTC +--- himenobmtxp_l.f.orig 2016-06-20 13:01:22 UTC +++ himenobmtxp_l.f -@@ -39,7 +39,6 @@ C ------------------- - C "use portlib" statement on the next line is for Visual fortran - C to use UNIX libraries. Please remove it if your system is UNIX. - C ------------------- -- use portlib - IMPLICIT REAL*4(a-h,o-z) - C - PARAMETER (mimax=513,mjmax=257,mkmax=257) +@@ -39,7 +39,6 @@ C ------------------- + C "use portlib" statement on the next line is for Visual fortran + C to use UNIX libraries. Please remove it if your system is UNIX. + C ------------------- +- use portlib + IMPLICIT REAL*4(a-h,o-z) + C + PARAMETER (mimax=513,mjmax=257,mkmax=257) Modified: head/benchmarks/himenobench/files/patch-himenobmtxp__m.f ============================================================================== --- head/benchmarks/himenobench/files/patch-himenobmtxp__m.f Mon Jun 20 16:05:17 2016 (r417165) +++ head/benchmarks/himenobench/files/patch-himenobmtxp__m.f Mon Jun 20 16:23:28 2016 (r417166) @@ -1,10 +1,10 @@ ---- himenobmtxp_m.f.orig 2002-01-07 04:54:48 UTC +--- himenobmtxp_m.f.orig 2016-06-20 13:01:22 UTC +++ himenobmtxp_m.f -@@ -39,7 +39,6 @@ C ------------------- - C "use portlib" statement on the next line is for Visual fortran - C to use UNIX libraries. Please remove it if your system is UNIX. - C ------------------- -- use portlib - IMPLICIT REAL*4(a-h,o-z) - C - C PARAMETER (mimax=513,mjmax=257,mkmax=257) +@@ -39,7 +39,6 @@ C ------------------- + C "use portlib" statement on the next line is for Visual fortran + C to use UNIX libraries. Please remove it if your system is UNIX. + C ------------------- +- use portlib + IMPLICIT REAL*4(a-h,o-z) + C + C PARAMETER (mimax=513,mjmax=257,mkmax=257) Modified: head/benchmarks/himenobench/files/patch-himenobmtxp__s.f ============================================================================== --- head/benchmarks/himenobench/files/patch-himenobmtxp__s.f Mon Jun 20 16:05:17 2016 (r417165) +++ head/benchmarks/himenobench/files/patch-himenobmtxp__s.f Mon Jun 20 16:23:28 2016 (r417166) @@ -1,10 +1,10 @@ ---- himenobmtxp_s.f.orig 2001-12-17 07:45:16 UTC +--- himenobmtxp_s.f.orig 2016-06-20 13:01:22 UTC +++ himenobmtxp_s.f -@@ -39,7 +39,6 @@ C ------------------- - C "use portlib" statement on the next line is for Visual fortran - C to use UNIX libraries. Please remove it if your system is UNIX. - C ------------------- -- use portlib - IMPLICIT REAL*4(a-h,o-z) - C - C PARAMETER (mimax=513,mjmax=257,mkmax=257) +@@ -39,7 +39,6 @@ C ------------------- + C "use portlib" statement on the next line is for Visual fortran + C to use UNIX libraries. Please remove it if your system is UNIX. + C ------------------- +- use portlib + IMPLICIT REAL*4(a-h,o-z) + C + C PARAMETER (mimax=513,mjmax=257,mkmax=257) Modified: head/benchmarks/himenobench/files/patch-himenobmtxp__xl.f ============================================================================== --- head/benchmarks/himenobench/files/patch-himenobmtxp__xl.f Mon Jun 20 16:05:17 2016 (r417165) +++ head/benchmarks/himenobench/files/patch-himenobmtxp__xl.f Mon Jun 20 16:23:28 2016 (r417166) @@ -1,10 +1,10 @@ ---- himenobmtxp_xl.f.orig 2002-01-07 04:54:42 UTC +--- himenobmtxp_xl.f.orig 2016-06-20 13:01:22 UTC +++ himenobmtxp_xl.f -@@ -39,7 +39,6 @@ C ------------------- - C "use portlib" statement on the next line is for Visual fortran - C to use UNIX libraries. Please remove it if your system is UNIX. - C ------------------- -- use portlib - IMPLICIT REAL*4(a-h,o-z) - C - PARAMETER (mimax=1025,mjmax=513,mkmax=513) +@@ -39,7 +39,6 @@ C ------------------- + C "use portlib" statement on the next line is for Visual fortran + C to use UNIX libraries. Please remove it if your system is UNIX. + C ------------------- +- use portlib + IMPLICIT REAL*4(a-h,o-z) + C + PARAMETER (mimax=1025,mjmax=513,mkmax=513) Modified: head/benchmarks/himenobench/files/patch-himenobmtxps.c ============================================================================== --- head/benchmarks/himenobench/files/patch-himenobmtxps.c Mon Jun 20 16:05:17 2016 (r417165) +++ head/benchmarks/himenobench/files/patch-himenobmtxps.c Mon Jun 20 16:23:28 2016 (r417166) @@ -1,18 +1,18 @@ ---- himenobmtxps.c.orig 2002-02-21 00:27:48 UTC +--- himenobmtxps.c.orig 2016-06-20 13:01:22 UTC +++ himenobmtxps.c @@ -37,6 +37,7 @@ - ********************************************************************/ - - #include <stdio.h> -+#include <sys/time.h> - - #ifdef SSMALL - #define MIMAX 33 -@@ -245,7 +246,6 @@ mflops(int nn,double cpu,double flop) - double - second() - { --#include <sys/time.h> - - struct timeval tm; - double t ; + ********************************************************************/ + + #include <stdio.h> ++#include <sys/time.h> + + #ifdef SSMALL + #define MIMAX 33 +@@ -245,7 +246,6 @@ mflops(int nn,double cpu,double flop) + double + second() + { +-#include <sys/time.h> + + struct timeval tm; + double t ; Modified: head/benchmarks/netio/Makefile ============================================================================== --- head/benchmarks/netio/Makefile Mon Jun 20 16:05:17 2016 (r417165) +++ head/benchmarks/netio/Makefile Mon Jun 20 16:23:28 2016 (r417166) @@ -11,8 +11,8 @@ MAINTAINER= arved@FreeBSD.org COMMENT= Network benchmark WRKSRC= ${WRKDIR} -USES= gmake zip -PATCH_ARGS= -d ${PATCH_WRKSRC} -N -s -E ${PATCH_STRIP} -l +USES= dos2unix gmake zip +DOS2UNIX_FILES= Makefile netio.c PLIST_FILES= bin/netio CFLAGS+= -DUNIX -DSOCKLEN_T Modified: head/benchmarks/netio/files/patch-Makefile ============================================================================== --- head/benchmarks/netio/files/patch-Makefile Mon Jun 20 16:05:17 2016 (r417165) +++ head/benchmarks/netio/files/patch-Makefile Mon Jun 20 16:23:28 2016 (r417166) @@ -1,11 +1,11 @@ ---- Makefile.orig Sat Sep 2 13:27:40 2006 -+++ Makefile Sat Sep 2 13:29:30 2006 -@@ -96,7 +96,7 @@ - - .SUFFIXES: .c $O - .c$O: -- $(CC) $(CFLAGS) $(INC) -c $*.c -+ $(CC) $(OUT) $@ $(CFLAGS) $(INC) -c $*.c - - netio$O: netio.c netbios.h getopt.h - netbios$O: netbios.c netbios.h +--- Makefile.orig 2016-06-20 13:21:43 UTC ++++ Makefile +@@ -102,7 +102,7 @@ netio$X: netio$O getopt$O + + .SUFFIXES: .c $O + .c$O: +- $(CC) $(CFLAGS) $(INC) -c $*.c ++ $(CC) $(OUT) $@ $(CFLAGS) $(INC) -c $*.c + + netio$O: netio.c getopt.h + getopt$O: getopt.c getopt.h Modified: head/benchmarks/netio/files/patch-netio.c ============================================================================== --- head/benchmarks/netio/files/patch-netio.c Mon Jun 20 16:05:17 2016 (r417165) +++ head/benchmarks/netio/files/patch-netio.c Mon Jun 20 16:23:28 2016 (r417166) @@ -1,335 +1,335 @@ ---- netio.c.orig 2012-11-22 17:47:38.000000000 +0100 -+++ netio.c 2015-03-23 11:52:42.000000000 +0100 -@@ -136,6 +136,7 @@ - #include <ctype.h> - #include <signal.h> - #if defined(UNIX) || defined(DJGPP) +--- netio.c.orig 2016-06-20 13:21:43 UTC ++++ netio.c +@@ -136,6 +136,7 @@ static char *rcsrev = "$Revision: 1.32 $ + #include <ctype.h> + #include <signal.h> + #if defined(UNIX) || defined(DJGPP) +#include <arpa/inet.h> - #include <sys/time.h> - #include <unistd.h> - #include <errno.h> -@@ -546,7 +547,7 @@ - - int recv_data(int socket, void *buffer, size_t size, int flags) - { -- size_t rc = recv(socket, buffer, size, flags); + #include <sys/time.h> + #include <unistd.h> + #include <errno.h> +@@ -546,7 +547,7 @@ int send_data(int socket, void *buffer, + + int recv_data(int socket, void *buffer, size_t size, int flags) + { +- size_t rc = recv(socket, buffer, size, flags); + ssize_t rc = recv(socket, buffer, size, flags); - - if (rc < 0) - { -@@ -563,8 +564,13 @@ - const int sobufsize = 131072; - int nPort = DEFAULTPORT; - int nAuxPort = DEFAULTPORT + 1; + + if (rc < 0) + { +@@ -563,8 +564,13 @@ int recv_data(int socket, void *buffer, + const int sobufsize = 131072; + int nPort = DEFAULTPORT; + int nAuxPort = DEFAULTPORT + 1; +#ifdef USE_IPV6 +struct in6_addr addr_server; +struct in6_addr addr_local; +#else - struct in_addr addr_server; - struct in_addr addr_local; + struct in_addr addr_server; + struct in_addr addr_local; +#endif - - int udpsocket, udpd; - unsigned long nUDPCount; -@@ -577,7 +583,11 @@ - TIMER nTimer; - long nTime; - long long nData; + + int udpsocket, udpd; + unsigned long nUDPCount; +@@ -577,7 +583,11 @@ THREAD TCP_Server(void *arg) + TIMER nTimer; + long nTime; + long long nData; +#ifdef USE_IPV6 + struct sockaddr_in6 sa_server, sa_client; +#else - struct sockaddr_in sa_server, sa_client; + struct sockaddr_in sa_server, sa_client; +#endif - int server, client; - socklen_type length; - struct timeval tv; -@@ -591,7 +601,11 @@ - return THREADRESULT; - } - + int server, client; + socklen_type length; + struct timeval tv; +@@ -591,7 +601,11 @@ THREAD TCP_Server(void *arg) + return THREADRESULT; + } + +#ifdef USE_IPV6 + if ((server = socket(PF_INET6, SOCK_STREAM, 0)) < 0) +#else - if ((server = socket(PF_INET, SOCK_STREAM, 0)) < 0) + if ((server = socket(PF_INET, SOCK_STREAM, 0)) < 0) +#endif - { - psock_errno("socket()"); - free(cBuffer); -@@ -601,9 +615,15 @@ - setsockopt(server, SOL_SOCKET, SO_RCVBUF, (char *) &sobufsize, sizeof(sobufsize)); - setsockopt(server, SOL_SOCKET, SO_SNDBUF, (char *) &sobufsize, sizeof(sobufsize)); - + { + psock_errno("socket()"); + free(cBuffer); +@@ -601,9 +615,15 @@ THREAD TCP_Server(void *arg) + setsockopt(server, SOL_SOCKET, SO_RCVBUF, (char *) &sobufsize, sizeof(sobufsize)); + setsockopt(server, SOL_SOCKET, SO_SNDBUF, (char *) &sobufsize, sizeof(sobufsize)); + +#ifdef USE_IPV6 + sa_server.sin6_family = AF_INET6; + sa_server.sin6_port = htons(nPort); + sa_server.sin6_addr = addr_local; +#else - sa_server.sin_family = AF_INET; - sa_server.sin_port = htons(nPort); - sa_server.sin_addr = addr_local; -+#endif - - if (bind(server, (struct sockaddr *) &sa_server, sizeof(sa_server)) < 0) - { -@@ -753,7 +773,11 @@ - long nTime; - long long nData; - int i; + sa_server.sin_family = AF_INET; + sa_server.sin_port = htons(nPort); + sa_server.sin_addr = addr_local; ++#endif + + if (bind(server, (struct sockaddr *) &sa_server, sizeof(sa_server)) < 0) + { +@@ -753,7 +773,11 @@ void TCP_Bench(void *arg) + long nTime; + long long nData; + int i; +#ifdef USE_IPV6 + struct sockaddr_in6 sa_server, sa_client; +#else - struct sockaddr_in sa_server, sa_client; + struct sockaddr_in sa_server, sa_client; +#endif - int server; - int rc; - int nByte; -@@ -764,7 +788,11 @@ - return; - } - + int server; + int rc; + int nByte; +@@ -764,7 +788,11 @@ void TCP_Bench(void *arg) + return; + } + +#ifdef USE_IPV6 + if ((server = socket(PF_INET6, SOCK_STREAM, 0)) < 0) +#else - if ((server = socket(PF_INET, SOCK_STREAM, 0)) < 0) + if ((server = socket(PF_INET, SOCK_STREAM, 0)) < 0) +#endif - { - psock_errno("socket()"); - free(cBuffer); -@@ -774,21 +802,33 @@ - setsockopt(server, SOL_SOCKET, SO_RCVBUF, (char *) &sobufsize, sizeof(sobufsize)); - setsockopt(server, SOL_SOCKET, SO_SNDBUF, (char *) &sobufsize, sizeof(sobufsize)); - + { + psock_errno("socket()"); + free(cBuffer); +@@ -774,21 +802,33 @@ void TCP_Bench(void *arg) + setsockopt(server, SOL_SOCKET, SO_RCVBUF, (char *) &sobufsize, sizeof(sobufsize)); + setsockopt(server, SOL_SOCKET, SO_SNDBUF, (char *) &sobufsize, sizeof(sobufsize)); + +#ifdef USE_IPV6 + sa_client.sin6_family = AF_INET6; + sa_client.sin6_port = htons(0); + sa_client.sin6_addr = addr_local; +#else - sa_client.sin_family = AF_INET; - sa_client.sin_port = htons(0); - sa_client.sin_addr = addr_local; -+#endif - - if (bind(server, (struct sockaddr *) &sa_client, sizeof(sa_client)) < 0) - { - psock_errno("bind()"); - soclose(server); - free(cBuffer); -- return THREADRESULT; + sa_client.sin_family = AF_INET; + sa_client.sin_port = htons(0); + sa_client.sin_addr = addr_local; ++#endif + + if (bind(server, (struct sockaddr *) &sa_client, sizeof(sa_client)) < 0) + { + psock_errno("bind()"); + soclose(server); + free(cBuffer); +- return THREADRESULT; + return; - } - + } + +#ifdef USE_IPV6 + sa_server.sin6_family = AF_INET6; + sa_server.sin6_port = htons(nPort); + sa_server.sin6_addr = addr_server; +#else - sa_server.sin_family = AF_INET; - sa_server.sin_port = htons(nPort); - sa_server.sin_addr = addr_server; -+#endif - - if (connect(server, (struct sockaddr *) &sa_server, sizeof(sa_server)) < 0) - { -@@ -911,7 +951,11 @@ - THREAD UDP_Receiver(void *arg) - { - char *cBuffer; + sa_server.sin_family = AF_INET; + sa_server.sin_port = htons(nPort); + sa_server.sin_addr = addr_server; ++#endif + + if (connect(server, (struct sockaddr *) &sa_server, sizeof(sa_server)) < 0) + { +@@ -911,7 +951,11 @@ void TCP_Bench(void *arg) + THREAD UDP_Receiver(void *arg) + { + char *cBuffer; +#ifdef USE_IPV6 + struct sockaddr_in6 sa_server, sa_client; +#else - struct sockaddr_in sa_server, sa_client; + struct sockaddr_in sa_server, sa_client; +#endif - int rc; - socklen_type nBytes; - -@@ -921,7 +965,11 @@ - return THREADRESULT; - } - + int rc; + socklen_type nBytes; + +@@ -921,7 +965,11 @@ THREAD UDP_Receiver(void *arg) + return THREADRESULT; + } + +#ifdef USE_IPV6 + if ((udpsocket = socket(PF_INET6, SOCK_DGRAM, 0)) < 0) +#else - if ((udpsocket = socket(PF_INET, SOCK_DGRAM, 0)) < 0) + if ((udpsocket = socket(PF_INET, SOCK_DGRAM, 0)) < 0) +#endif - { - psock_errno("socket(DGRAM)"); - free(cBuffer); -@@ -931,9 +979,15 @@ - setsockopt(udpsocket, SOL_SOCKET, SO_RCVBUF, (char *) &sobufsize, sizeof(sobufsize)); - setsockopt(udpsocket, SOL_SOCKET, SO_SNDBUF, (char *) &sobufsize, sizeof(sobufsize)); - + { + psock_errno("socket(DGRAM)"); + free(cBuffer); +@@ -931,9 +979,15 @@ THREAD UDP_Receiver(void *arg) + setsockopt(udpsocket, SOL_SOCKET, SO_RCVBUF, (char *) &sobufsize, sizeof(sobufsize)); + setsockopt(udpsocket, SOL_SOCKET, SO_SNDBUF, (char *) &sobufsize, sizeof(sobufsize)); + +#ifdef USE_IPV6 + sa_server.sin6_family = AF_INET6; + sa_server.sin6_port = htons(nAuxPort); + sa_server.sin6_addr = addr_local; +#else - sa_server.sin_family = AF_INET; - sa_server.sin_port = htons(nAuxPort); - sa_server.sin_addr = addr_local; -+#endif - - if (bind(udpsocket, (struct sockaddr *) &sa_server, sizeof(sa_server)) < 0) - { -@@ -973,7 +1027,11 @@ - TIMER nTimer; - long nTime; - long long nData; + sa_server.sin_family = AF_INET; + sa_server.sin_port = htons(nAuxPort); + sa_server.sin_addr = addr_local; ++#endif + + if (bind(udpsocket, (struct sockaddr *) &sa_server, sizeof(sa_server)) < 0) + { +@@ -973,7 +1027,11 @@ THREAD UDP_Server(void *arg) + TIMER nTimer; + long nTime; + long long nData; +#ifdef USE_IPV6 + struct sockaddr_in6 sa_server, sa_client; +#else - struct sockaddr_in sa_server, sa_client; + struct sockaddr_in sa_server, sa_client; +#endif - int server, client; - struct timeval tv; - fd_set fds; -@@ -986,7 +1044,11 @@ - return THREADRESULT; - } - + int server, client; + struct timeval tv; + fd_set fds; +@@ -986,7 +1044,11 @@ THREAD UDP_Server(void *arg) + return THREADRESULT; + } + +#ifdef USE_IPV6 + if ((server = socket(PF_INET6, SOCK_STREAM, 0)) < 0) +#else - if ((server = socket(PF_INET, SOCK_STREAM, 0)) < 0) + if ((server = socket(PF_INET, SOCK_STREAM, 0)) < 0) +#endif - { - psock_errno("socket(STREAM)"); - free(cBuffer); -@@ -996,9 +1058,15 @@ - setsockopt(server, SOL_SOCKET, SO_RCVBUF, (char *) &sobufsize, sizeof(sobufsize)); - setsockopt(server, SOL_SOCKET, SO_SNDBUF, (char *) &sobufsize, sizeof(sobufsize)); - + { + psock_errno("socket(STREAM)"); + free(cBuffer); +@@ -996,9 +1058,15 @@ THREAD UDP_Server(void *arg) + setsockopt(server, SOL_SOCKET, SO_RCVBUF, (char *) &sobufsize, sizeof(sobufsize)); + setsockopt(server, SOL_SOCKET, SO_SNDBUF, (char *) &sobufsize, sizeof(sobufsize)); + +#ifdef USE_IPV6 + sa_server.sin6_family = AF_INET6; + sa_server.sin6_port = htons(nAuxPort); + sa_server.sin6_addr = addr_local; +#else - sa_server.sin_family = AF_INET; - sa_server.sin_port = htons(nAuxPort); - sa_server.sin_addr = addr_local; -+#endif - - if (bind(server, (struct sockaddr *) &sa_server, sizeof(sa_server)) < 0) - { -@@ -1044,7 +1112,11 @@ - printf("UDP connection established ... "); - fflush(stdout); - + sa_server.sin_family = AF_INET; + sa_server.sin_port = htons(nAuxPort); + sa_server.sin_addr = addr_local; ++#endif + + if (bind(server, (struct sockaddr *) &sa_server, sizeof(sa_server)) < 0) + { +@@ -1044,7 +1112,11 @@ THREAD UDP_Server(void *arg) + printf("UDP connection established ... "); + fflush(stdout); + +#ifdef USE_IPV6 + sa_client.sin6_port = htons(nAuxPort); +#else - sa_client.sin_port = htons(nAuxPort); + sa_client.sin_port = htons(nAuxPort); +#endif - - for (;;) - { -@@ -1160,7 +1232,11 @@ - long nResult; - long long nData; - int i; + + for (;;) + { +@@ -1160,7 +1232,11 @@ void UDP_Bench(void *arg) + long nResult; + long long nData; + int i; +#ifdef USE_IPV6 + struct sockaddr_in6 sa_server, sa_client; +#else - struct sockaddr_in sa_server, sa_client; + struct sockaddr_in sa_server, sa_client; +#endif - int server; - int rc, nByte; - -@@ -1170,7 +1246,11 @@ - return; - } - + int server; + int rc, nByte; + +@@ -1170,7 +1246,11 @@ void UDP_Bench(void *arg) + return; + } + +#ifdef USE_IPV6 + if ((server = socket(PF_INET6, SOCK_STREAM, 0)) < 0) +#else - if ((server = socket(PF_INET, SOCK_STREAM, 0)) < 0) + if ((server = socket(PF_INET, SOCK_STREAM, 0)) < 0) +#endif - { - psock_errno("socket()"); - free(cBuffer); -@@ -1180,21 +1260,33 @@ - setsockopt(server, SOL_SOCKET, SO_RCVBUF, (char *) &sobufsize, sizeof(sobufsize)); - setsockopt(server, SOL_SOCKET, SO_SNDBUF, (char *) &sobufsize, sizeof(sobufsize)); - + { + psock_errno("socket()"); + free(cBuffer); +@@ -1180,21 +1260,33 @@ void UDP_Bench(void *arg) + setsockopt(server, SOL_SOCKET, SO_RCVBUF, (char *) &sobufsize, sizeof(sobufsize)); + setsockopt(server, SOL_SOCKET, SO_SNDBUF, (char *) &sobufsize, sizeof(sobufsize)); + +#ifdef USE_IPV6 + sa_client.sin6_family = AF_INET6; + sa_client.sin6_port = htons(0); + sa_client.sin6_addr = addr_local; +#else - sa_client.sin_family = AF_INET; - sa_client.sin_port = htons(0); - sa_client.sin_addr = addr_local; -+#endif - - if (bind(server, (struct sockaddr *) &sa_client, sizeof(sa_client)) < 0) - { - psock_errno("bind(STREAM)"); - soclose(server); - free(cBuffer); -- return THREADRESULT; + sa_client.sin_family = AF_INET; + sa_client.sin_port = htons(0); *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201606201623.u5KGNTgu000966>