summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormat <mat@FreeBSD.org>2016-06-20 16:23:28 +0000
committermat <mat@FreeBSD.org>2016-06-20 16:23:28 +0000
commitbc12b6beb26907f267f34c1f8598d120cabecbae (patch)
treee83ee6693050a76e305a95a376451aa583df151e
parent5616a93eb39854a280bacec86824bbec7824d5b3 (diff)
downloadFreeBSD-ports-bc12b6beb26907f267f34c1f8598d120cabecbae.zip
FreeBSD-ports-bc12b6beb26907f267f34c1f8598d120cabecbae.tar.gz
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
-rw-r--r--astro/wmsolar/Makefile2
-rw-r--r--astro/wmsolar/files/patch-Makefile6
-rw-r--r--astro/wmsolar/files/patch-Vsop.h16
-rw-r--r--audio/sphinx/Makefile3
-rw-r--r--audio/sphinx/files/patch-src-libsphinx2-include_pconf.h8
-rw-r--r--audio/sphinx/files/patch-src-libsphinx2_eht_quit.c10
-rw-r--r--audio/sphinx/files/patch-src-libsphinx2_prime.c9
-rw-r--r--audio/sphinx/files/patch-src-libsphinx2_r_agc_noise.c10
-rw-r--r--audio/sphinx/files/patch-src-libsphinx2_sc_vq.c10
-rw-r--r--audio/sphinx/files/patch-src-libsphinx2fe_fe_sigproc.c11
-rw-r--r--audio/sphinx/files/patch-src_examples_clicore.c (renamed from audio/sphinx/files/patch-src-examples_clicore.c)6
-rw-r--r--audio/sphinx/files/patch-src_examples_srvcore.c (renamed from audio/sphinx/files/patch-src-examples_srvcore.c)6
-rw-r--r--audio/sphinx/files/patch-src_examples_tty-continuous.c4
-rw-r--r--audio/sphinx/files/patch-src_libsphinx2_blk__cdcn__norm.c (renamed from audio/sphinx/files/patch-src-libsphinx2_blk_cdcn_norm.c)8
-rw-r--r--audio/sphinx/files/patch-src_libsphinx2_cdcn__norm.c (renamed from audio/sphinx/files/patch-src-libsphinx2_cdcn_norm.c)4
-rw-r--r--audio/sphinx/files/patch-src_libsphinx2_cdcn__update.c (renamed from audio/sphinx/files/patch-src_libsphinx2_cdcn_update.c)6
-rw-r--r--audio/sphinx/files/patch-src_libsphinx2_eht__quit.c10
-rw-r--r--audio/sphinx/files/patch-src_libsphinx2_err.c (renamed from audio/sphinx/files/patch-src-libsphinx2_err.c)4
-rw-r--r--audio/sphinx/files/patch-src_libsphinx2_include_pconf.h8
-rw-r--r--audio/sphinx/files/patch-src_libsphinx2_linklist.c (renamed from audio/sphinx/files/patch-src-libsphinx2_linklist.c)6
-rw-r--r--audio/sphinx/files/patch-src_libsphinx2_prime.c9
-rw-r--r--audio/sphinx/files/patch-src_libsphinx2_r__agc__noise.c10
-rw-r--r--audio/sphinx/files/patch-src_libsphinx2_sc__vq.c10
-rw-r--r--audio/sphinx/files/patch-src_libsphinx2_search.c (renamed from audio/sphinx/files/patch-src-libsphinx2_search.c)10
-rw-r--r--audio/sphinx/files/patch-src_libsphinx2ad_ad__oss__bsd.c (renamed from audio/sphinx/files/patch-src_libsphinx2ad_ad_oss_bsd.c)20
-rw-r--r--audio/sphinx/files/patch-src_libsphinx2fe_fe__sigproc.c11
-rw-r--r--benchmarks/himenobench/Makefile3
-rw-r--r--benchmarks/himenobench/files/patch-himenobmtxp__l.f18
-rw-r--r--benchmarks/himenobench/files/patch-himenobmtxp__m.f18
-rw-r--r--benchmarks/himenobench/files/patch-himenobmtxp__s.f18
-rw-r--r--benchmarks/himenobench/files/patch-himenobmtxp__xl.f18
-rw-r--r--benchmarks/himenobench/files/patch-himenobmtxps.c32
-rw-r--r--benchmarks/netio/Makefile4
-rw-r--r--benchmarks/netio/files/patch-Makefile22
-rw-r--r--benchmarks/netio/files/patch-netio.c440
-rw-r--r--comms/mlan3/Makefile3
-rw-r--r--comms/mlan3/files/patch-Makefiles100
-rw-r--r--databases/pgagent/Makefile4
-rw-r--r--databases/pgagent/files/patch-CMakeLists.txt38
-rw-r--r--deskutils/everygui/Makefile3
-rw-r--r--deskutils/everygui/files/patch-setup.py20
-rw-r--r--devel/charva/Makefile17
-rw-r--r--devel/charva/files/patch-build.xml48
-rw-r--r--devel/charva/files/patch-c_src_Makefile.freebsd.txt6
-rw-r--r--devel/charva/files/patch-c_src_Toolkit.c36
-rw-r--r--devel/charva/files/patch-java_src_charva_awt_CardLayout.java4
-rw-r--r--devel/charva/files/patch-java_src_charva_awt_Component.java58
-rw-r--r--devel/charva/files/patch-java_src_charva_awt_Container.java200
-rw-r--r--devel/charva/files/patch-java_src_charva_awt_Toolkit.java226
-rw-r--r--devel/charva/files/patch-java_src_charva_awt_VerticalFlowLayout.java462
-rw-r--r--devel/charva/files/patch-java_src_charva_awt_Window.java112
-rw-r--r--devel/charva/files/patch-java_src_charva_awt_event_FocusAdapter.java4
-rw-r--r--devel/charva/files/patch-java_src_charvax_swing_AbstractButton.java178
-rw-r--r--devel/charva/files/patch-java_src_charvax_swing_ButtonGroup.java52
-rw-r--r--devel/charva/files/patch-java_src_charvax_swing_JLabel.java92
-rw-r--r--devel/charva/files/patch-java_src_charvax_swing_JPasswordField.java28
-rw-r--r--devel/charva/files/patch-java_src_charvax_swing_JTextArea.java80
-rw-r--r--devel/charva/files/patch-java_src_charvax_swing_JTextField.java86
-rw-r--r--devel/charva/files/patch-java_src_charvax_swing_text_JTextComponent.java54
-rw-r--r--devel/flickrnet/Makefile3
-rw-r--r--devel/flickrnet/files/patch-AssemblyInfo.cs25
-rw-r--r--devel/flickrnet/files/patch-flickrnet.pc.in2
-rw-r--r--devel/itext/Makefile3
-rw-r--r--devel/itext/files/patch-ant_.ant.properties6
-rw-r--r--devel/itext/files/patch-ant_compile.xml4
-rw-r--r--devel/itext/files/patch-ant_site.xml4
-rw-r--r--devel/itext/files/patch-core_com_lowagie_text_pdf_PRTokeniser.java6
-rw-r--r--devel/itext/files/patch-core_com_lowagie_text_pdf_PdfReader.java6
-rw-r--r--devel/itext/files/patch-core_com_lowagie_text_pdf_PdfStamperImp.java6
-rw-r--r--devel/itext/files/patch-core_com_lowagie_text_xml_xmp_XmpReader.java46
-rw-r--r--devel/p5-Geo-ShapeFile/Makefile3
-rw-r--r--devel/p5-Geo-ShapeFile/files/patch-t_main__tests.t26
-rw-r--r--devel/p5-Sys-Cpu/Makefile2
-rw-r--r--devel/p5-Sys-Cpu/files/patch-CPU.xs72
-rw-r--r--devel/ruby-rbprof/Makefile2
-rw-r--r--devel/ruby-rbprof/files/patch-aspects_profiler_lib_rbprof.rb (renamed from devel/ruby-rbprof/files/patch-aspects__profiler__lib__rbprof.rb)16
-rw-r--r--devel/sabre/Makefile5
-rw-r--r--devel/sabre/files/patch-build.xml27
-rw-r--r--devel/sabre/files/patch-src_java_de_tu__darmstadt_informatik_rbg_bstickler_udflib_UDFImageBuilderFile.java (renamed from devel/sabre/files/patch-src_java_de_tu_darmstadt_informatik_rbg_bstickler_udflib_UDFImageBuilderFile.java)34
-rw-r--r--devel/sdts++/Makefile2
-rw-r--r--devel/sdts++/files/patch-doc__sdts++.texi4
-rw-r--r--devel/sdts++/files/patch-sdts++__io__sio_8211Converter.cpp10
-rw-r--r--devel/sdts++/files/patch-sdts++__io__sio_8211DDRField.cpp10
-rw-r--r--devel/sdts++/files/patch-sdts++__io__sio_Utils.cpp10
-rw-r--r--devel/sdts++/files/patch-sdts++_builder_sb__Accessor.cpp (renamed from devel/sdts++/files/patch-sdts++__builder__sb_Accessor.cpp)74
-rw-r--r--devel/sdts++/files/patch-sdts++_io_FormatParser.yy (renamed from devel/sdts++/files/patch-sdts++__io__FormatParset.yy)4
-rw-r--r--devel/sdts++/files/patch-sdts++_io_sio__8211Converter.cpp10
-rw-r--r--devel/sdts++/files/patch-sdts++_io_sio__8211DDRField.cpp10
-rw-r--r--devel/sdts++/files/patch-sdts++_io_sio__Utils.cpp10
-rw-r--r--devel/sdts++/files/patch-sysutils__t_basename.cpp10
-rw-r--r--devel/sdts++/files/patch-sysutils__t_dirname.cpp10
-rw-r--r--devel/sdts++/files/patch-sysutils__t_stringutils.cpp9
-rw-r--r--devel/sdts++/files/patch-sysutils_t__basename.cpp10
-rw-r--r--devel/sdts++/files/patch-sysutils_t__dirname.cpp10
-rw-r--r--devel/sdts++/files/patch-sysutils_t__stringutils.cpp10
-rw-r--r--emulators/pcemu/Makefile2
-rw-r--r--emulators/pcemu/files/patch-ae17
-rw-r--r--emulators/yabause/Makefile2
-rw-r--r--emulators/yabause/files/patch-src__core.h2
-rw-r--r--games/eights/Makefile2
-rw-r--r--games/eights/files/patch-eights.c20
-rw-r--r--games/heretic/Makefile3
-rw-r--r--games/heretic/files/patch-Makefile14
-rw-r--r--games/heretic/files/patch-d__main.c (renamed from games/heretic/files/patch-d_main.c)8
-rw-r--r--games/heretic/files/patch-doc_Gamekeys.txt (renamed from games/heretic/files/patch-doc-Gamekeys.txt)6
-rw-r--r--games/heretic/files/patch-doc_README.opengl (renamed from games/heretic/files/patch-doc-README.opengl)6
-rw-r--r--games/heretic/files/patch-doomdef.h14
-rw-r--r--games/heretic/files/patch-doomtype.h6
-rw-r--r--games/heretic/files/patch-g__game.c (renamed from games/heretic/files/patch-g_game.c)10
-rw-r--r--games/heretic/files/patch-graphics_i__sdl.c (renamed from games/heretic/files/patch-graphics__i_sdl.c)4
-rw-r--r--games/heretic/files/patch-graphics_i__sdl__gl.c (renamed from games/heretic/files/patch-graphics__i_sdl_gl.c)4
-rw-r--r--games/heretic/files/patch-graphics_i__x11__fast.c (renamed from games/heretic/files/patch-graphics-i_x11_fast.c)6
-rw-r--r--games/heretic/files/patch-i__udp.c (renamed from games/heretic/files/patch-i_udp.c)4
-rw-r--r--games/heretic/files/patch-m__misc.c (renamed from games/heretic/files/patch-m_misc.c)8
-rw-r--r--games/heretic/files/patch-opengl_gl__fonts.c (renamed from games/heretic/files/patch-opengl_gl_fonts.c)4
-rw-r--r--games/heretic/files/patch-opengl_gl__struct.h (renamed from games/heretic/files/patch-opengl_gl_struct.h)20
-rw-r--r--games/heretic/files/patch-opengl_sgi-si_libtess_memalloc.h4
-rw-r--r--games/heretic/files/patch-p__inter.c (renamed from games/heretic/files/patch-p_inter.c)6
-rw-r--r--games/heretic/files/patch-r__things.c (renamed from games/heretic/files/patch-r_things.c)6
-rw-r--r--games/heretic/files/patch-sndserv_Makefile4
-rw-r--r--games/heretic/files/patch-sndserv_linux.c8
-rw-r--r--games/heretic/files/patch-sndserv_soundsrv.c4
-rw-r--r--games/heretic/files/patch-sndserv_wadread.c4
-rw-r--r--games/heretic/files/patch-w__wad.c (renamed from games/heretic/files/patch-w_wad.c)14
-rw-r--r--games/quake2-psychomod/Makefile3
-rw-r--r--games/quake2-psychomod/files/patch-src_Makefile (renamed from games/quake2-psychomod/files/patch-src__Makefile)14
-rw-r--r--games/quake2-psychomod/files/patch-src_g__items.c (renamed from games/quake2-psychomod/files/patch-src__g_items.c)8
-rw-r--r--games/scorched3d/Makefile4
-rw-r--r--games/scorched3d/files/patch-configure-al.m44
-rw-r--r--games/scorched3d/files/patch-src_client_GLEXT_GLFont2dFreeType.h4
-rw-r--r--games/scorched3d/files/patch-src_client_client_LoadPNG.cpp (renamed from games/scorched3d/files/patch-src__client__client__LoadPNG.cpp)14
-rw-r--r--games/scorched3d/files/patch-src_client_client_SecureID.cpp (renamed from games/scorched3d/files/patch-src-client-client-SecureID.cpp)18
-rw-r--r--games/scorched3d/files/patch-src_common_image_ImagePngFactory.cpp (renamed from games/scorched3d/files/patch-src__common__image__ImagePngFactory.cpp)22
-rw-r--r--games/scorched3d/files/patch-src_common_porting_windows.h (renamed from games/scorched3d/files/patch-src__common__porting__windows.h)34
-rw-r--r--games/scorched3d/files/patch-src_launcher_wxdialogs_TrueTypeFont.h4
-rw-r--r--graphics/c-a-i-r/Makefile3
-rw-r--r--graphics/c-a-i-r/files/patch-CAIR.cpp76
-rw-r--r--graphics/picpuz/Makefile3
-rw-r--r--graphics/picpuz/files/patch-Makefile10
-rw-r--r--graphics/picpuz/files/patch-zfuncs.cpp10
-rw-r--r--graphics/picpuz/files/patch-zfuncs.h18
-rw-r--r--graphics/seam-carving-gui/Makefile3
-rw-r--r--graphics/seam-carving-gui/files/patch-cair_CAIR.cpp76
-rw-r--r--irc/psybnc/Makefile2
-rw-r--r--irc/psybnc/files/patch-Makefile10
-rw-r--r--irc/psybnc/files/patch-lang_english.lng6
-rw-r--r--irc/psybnc/files/patch-lang_german.lng6
-rw-r--r--irc/psybnc/files/patch-lang_italiano.lng6
-rw-r--r--irc/psybnc/files/patch-src_match.c5
-rw-r--r--irc/psybnc/files/patch-src_p__blowfish.c (renamed from irc/psybnc/files/patch-src_p_blowfish.c)6
-rw-r--r--irc/psybnc/files/patch-src_p__global.h (renamed from irc/psybnc/files/patch-src_p_global.h)22
-rw-r--r--irc/psybnc/files/patch-src_p__idea.c (renamed from irc/psybnc/files/patch-src_p_idea.c)9
-rw-r--r--irc/psybnc/files/patch-src_p__memory.c (renamed from irc/psybnc/files/patch-src_p_memory.c)12
-rw-r--r--irc/psybnc/files/patch-src_p__string.c (renamed from irc/psybnc/files/patch-src_p_string.c)7
-rw-r--r--irc/psybnc/files/patch-src_psybnc.c12
-rw-r--r--irc/psybnc/files/patch-tools_autoconf.c8
-rw-r--r--java/jakarta-commons-pool/Makefile4
-rw-r--r--java/jakarta-commons-pool/files/patch-build.xml20
-rw-r--r--java/jgrapht/Makefile5
-rw-r--r--java/jgrapht/files/patch-build.xml20
-rw-r--r--mail/vpopmail/Makefile3
-rw-r--r--mail/vpopmail/files/patch-README.vpopmaild66
-rw-r--r--math/spar/Makefile3
-rw-r--r--math/spar/files/patch-calculator_Makefile.in (renamed from math/spar/files/patch-calculator__Makefile.in)6
-rw-r--r--math/spar/files/patch-configure6
-rw-r--r--math/spar/files/patch-lib_randist_rand.c (renamed from math/spar/files/patch-lib__randist__rand.c)16
-rw-r--r--multimedia/vdr-plugin-wirbelscan/Makefile3
-rw-r--r--multimedia/vdr-plugin-wirbelscan/files/patch-scanner.c18
-rw-r--r--multimedia/w_scan/Makefile5
-rw-r--r--multimedia/w_scan/files/patch-char-coding.c68
-rw-r--r--multimedia/w_scan/files/patch-descriptors.c (renamed from multimedia/w_scan/files/patch-clang)10
-rw-r--r--multimedia/w_scan/files/patch-scan.c18
-rw-r--r--multimedia/w_scan/files/patch-z-scan.c14
-rw-r--r--net-im/mbpurple/Makefile3
-rw-r--r--net-im/mbpurple/files/patch-microblog_mb__net.c (renamed from net-im/mbpurple/files/patch-microblog__mb_net.c)34
-rw-r--r--net-mgmt/cdpr/Makefile2
-rw-r--r--net-mgmt/cdpr/files/patch-cdpr.c10
-rw-r--r--net-mgmt/cdpr/files/patch-conffile.c36
-rw-r--r--net-p2p/gnewtellium/Makefile3
-rw-r--r--net-p2p/gnewtellium/files/patch-src_config.c (renamed from net-p2p/gnewtellium/files/patch-src__config.c)110
-rw-r--r--net-p2p/torrentsniff/Makefile2
-rw-r--r--net-p2p/torrentsniff/files/patch-BitTorrent-BDecode.pm10
-rw-r--r--net-p2p/torrentsniff/files/patch-BitTorrent_BDecode.pm10
-rw-r--r--net-p2p/torrentsniff/files/patch-torrentsniff22
-rw-r--r--net/bittwist/Makefile3
-rw-r--r--net/bittwist/files/patch-Makefile56
-rw-r--r--net/hlmaster/Makefile2
-rw-r--r--net/hlmaster/files/patch-src_HLServerList.cpp (renamed from net/hlmaster/files/patch-HLServerList.cpp)40
-rw-r--r--net/rtptools/Makefile2
-rw-r--r--net/rtptools/files/patch-rtp.h6
-rw-r--r--net/rtptools/files/patch-rtpdump.c8
-rw-r--r--net/rtptools/files/patch-rtpsend.c12
-rw-r--r--news/newsfetch/Makefile3
-rw-r--r--news/newsfetch/files/patch-newsfetch.16
-rw-r--r--news/newsfetch/files/patch-newsfetch.c10
-rw-r--r--news/newsfetch/files/patch-nntp.c210
-rw-r--r--news/newsfetch/files/patch-opt.c6
-rw-r--r--news/newsfetch/files/patch-util.c6
-rw-r--r--print/panda/Makefile3
-rw-r--r--print/panda/files/patch-configure.in4
-rw-r--r--print/panda/files/patch-database.c8
-rw-r--r--print/panda/files/patch-images.c12
-rw-r--r--print/panda/files/patch-objects.c6
-rw-r--r--print/panda/files/patch-utility.c6
-rw-r--r--security/dcetest/Makefile3
-rw-r--r--security/dcetest/files/patch-Makefile4
-rw-r--r--security/dcetest/files/patch-dcetest.c22
-rw-r--r--security/dcetest/files/patch-tcpstuff.c10
-rw-r--r--security/dcetest/files/patch-tcpstuff.h6
-rw-r--r--security/iaikpkcs11wrapper/Makefile5
-rw-r--r--security/iaikpkcs11wrapper/files/patch-Makefile4
-rw-r--r--security/iaikpkcs11wrapper/files/patch-native_src_pkcs11wrapper.c88
-rw-r--r--security/trousers/Makefile5
-rw-r--r--security/trousers/files/patch-configure.in12
-rw-r--r--security/trousers/files/patch-dist_Makefile.am (renamed from security/trousers/files/patch-dist-Makefile.am)0
-rw-r--r--security/trousers/files/patch-dist_tcsd.conf.in (renamed from security/trousers/files/patch-dist-tcsd.conf.in)0
-rw-r--r--security/trousers/files/patch-src_include_biosem.h (renamed from security/trousers/files/patch-src-include-biosem.h)2
-rw-r--r--security/trousers/files/patch-src_include_linux_tpm.h (renamed from security/trousers/files/patch-src-include-linux-tpm.h)2
-rw-r--r--security/trousers/files/patch-src_include_tcs__tsp.h (renamed from security/trousers/files/patch-src-include-tcs_tsp.h)2
-rw-r--r--security/trousers/files/patch-src_include_tcs__utils.h (renamed from security/trousers/files/patch-src-include-tcs_utils.h)2
-rw-r--r--security/trousers/files/patch-src_include_tcsd.h (renamed from security/trousers/files/patch-src-include-tcsd.h)2
-rw-r--r--security/trousers/files/patch-src_include_tcsd__ops.h (renamed from security/trousers/files/patch-src-include-tcsd_ops.h)2
-rw-r--r--security/trousers/files/patch-src_include_threads.h (renamed from security/trousers/files/patch-src-include-threads.h)2
-rw-r--r--security/trousers/files/patch-src_include_trousers__types.h (renamed from security/trousers/files/patch-src-include-trousers_types.h)2
-rw-r--r--security/trousers/files/patch-src_include_tss_platform.h (renamed from security/trousers/files/patch-src-include-tss-platform.h)18
-rw-r--r--security/trousers/files/patch-src_tcs_Makefile.am (renamed from security/trousers/files/patch-src-tcs-Makefile.am)8
-rw-r--r--security/trousers/files/patch-src_tcs_ps_ps__utils.c (renamed from security/trousers/files/patch-src-tcs-ps-ps_utils.c)2
-rw-r--r--security/trousers/files/patch-src_tcs_ps_tcsps.c (renamed from security/trousers/files/patch-src-tcs-ps-tcsps.c)2
-rw-r--r--security/trousers/files/patch-src_tcs_rpc_tcstp_rpc.c (renamed from security/trousers/files/patch-src-tcs-rpc-tcstp-rpc.c)2
-rw-r--r--security/trousers/files/patch-src_tcs_tcs__aik.c (renamed from security/trousers/files/patch-src-tcs-tcs_aik.c)2
-rw-r--r--security/trousers/files/patch-src_tcs_tcs__auth__mgr.c (renamed from security/trousers/files/patch-src-tcs-tcs_auth_mgr.c)2
-rw-r--r--security/trousers/files/patch-src_tcsd_Makefile.am (renamed from security/trousers/files/patch-src-tcsd-Makefile.am)4
-rw-r--r--security/trousers/files/patch-src_tcsd_svrside.c (renamed from security/trousers/files/patch-src-tcsd-svrside.c)2
-rw-r--r--security/trousers/files/patch-src_tddl_Makefile.am (renamed from security/trousers/files/patch-src-tddl-Makefile.am)0
-rw-r--r--security/trousers/files/patch-src_trspi_Makefile.am (renamed from security/trousers/files/patch-src-trspi-Makefile.am)4
-rw-r--r--security/trousers/files/patch-src_tspi_Makefile.am (renamed from security/trousers/files/patch-src-tspi-Makefile.am)6
-rw-r--r--security/trousers/files/patch-src_tspi_ps_ps__utils.c (renamed from security/trousers/files/patch-src-tspi-ps-ps_utils.c)2
-rw-r--r--security/trousers/files/patch-src_tspi_ps_tspps.c (renamed from security/trousers/files/patch-src-tspi-ps-tspps.c)2
-rw-r--r--security/trousers/files/patch-src_tspi_rpc_hosttable.c (renamed from security/trousers/files/patch-src-tspi-rpc-hosttable.c)2
-rw-r--r--security/trousers/files/patch-src_tspi_rpc_tcstp_rpc.c (renamed from security/trousers/files/patch-src-tspi-rpc-tcstp-rpc.c)2
-rw-r--r--security/trousers/files/patch-src_tspi_tsp__tcsi__param.c (renamed from security/trousers/files/patch-src-tspi-tsp_tcsi_param.c)2
-rw-r--r--security/xorsearch/Makefile9
-rw-r--r--security/xorsearch/files/patch-XORSearch.c18
-rw-r--r--shells/ibsh/Makefile2
-rw-r--r--shells/ibsh/files/patch-Makefile40
-rw-r--r--sysutils/rfstool/Makefile3
-rw-r--r--sysutils/rfstool/files/patch-reiserfs.h22
-rw-r--r--textproc/expat2/Makefile3
-rw-r--r--textproc/expat2/files/patch-cve-2012-6702-plus-cve-2016-5300-v118
-rw-r--r--textproc/p5-XML-AutoWriter/Makefile3
-rw-r--r--textproc/p5-XML-AutoWriter/files/patch-Makefile.PL6
-rw-r--r--textproc/p5-XML-AutoWriter/files/patch-lib_XML_Doctype.pm (renamed from textproc/p5-XML-AutoWriter/files/patch-Doctype.pm)20
-rw-r--r--www/repos-style/Makefile3
-rw-r--r--www/repos-style/files/patch-open_log_index.php (renamed from www/repos-style/files/patch-open-log-index.php)20
-rw-r--r--www/repos-style/files/patch-view_log.xsl (renamed from www/repos-style/files/patch-view-log.xsl)20
-rw-r--r--www/repos-style/files/patch-view_repos.xsl (renamed from www/repos-style/files/patch-view-repos.xsl)22
-rw-r--r--x11-drivers/xf86-video-openchrome/files/patch-configure8
-rw-r--r--x11-drivers/xf86-video-openchrome/files/patch-src_via__id.c (renamed from x11-drivers/xf86-video-openchrome/files/patch-src_via_id.c)10
-rw-r--r--x11-themes/kde-icons-noia/Makefile2
-rw-r--r--x11-toolkits/hs-wxcore/Makefile4
-rw-r--r--x11-toolkits/hs-wxcore/files/patch-Setup.hs20
-rw-r--r--x11-wm/afterstep/files/AFstep.xpm144
-rw-r--r--x11-wm/afterstep/files/penguin.xpm146
-rw-r--r--x11/aterm/Makefile3
-rw-r--r--x11/aterm/files/patch-cutToBeginningOfLine14
-rw-r--r--x11/aterm/files/patch-eterm_transparency14
-rw-r--r--x11/imwheel/Makefile3
-rw-r--r--x11/imwheel/files/patch-Makefile.in4
-rw-r--r--x11/imwheel/files/patch-getopt_Makefile.in (renamed from x11/imwheel/files/patch-getopt__Makefile.in)7
-rw-r--r--x11/imwheel/files/patch-getopt_getopt.c (renamed from x11/imwheel/files/patch-getopt__getopt.c)32
-rw-r--r--x11/imwheel/files/patch-imwheel.119
-rw-r--r--x11/imwheel/files/patch-imwheelrc10
-rw-r--r--x11/imwheel/files/patch-util.c15
273 files changed, 2844 insertions, 2846 deletions
diff --git a/astro/wmsolar/Makefile b/astro/wmsolar/Makefile
index 4460d1c..51be13a 100644
--- a/astro/wmsolar/Makefile
+++ b/astro/wmsolar/Makefile
@@ -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' \
diff --git a/astro/wmsolar/files/patch-Makefile b/astro/wmsolar/files/patch-Makefile
index 504e257..4e76bbd 100644
--- a/astro/wmsolar/files/patch-Makefile
+++ b/astro/wmsolar/files/patch-Makefile
@@ -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:
diff --git a/astro/wmsolar/files/patch-Vsop.h b/astro/wmsolar/files/patch-Vsop.h
index 517afb9..b43c3e2 100644
--- a/astro/wmsolar/files/patch-Vsop.h
+++ b/astro/wmsolar/files/patch-Vsop.h
@@ -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 * * * * *
+
diff --git a/audio/sphinx/Makefile b/audio/sphinx/Makefile
index 4247c73..f9eafd7 100644
--- a/audio/sphinx/Makefile
+++ b/audio/sphinx/Makefile
@@ -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"
diff --git a/audio/sphinx/files/patch-src-libsphinx2-include_pconf.h b/audio/sphinx/files/patch-src-libsphinx2-include_pconf.h
deleted file mode 100644
index d7646e0..0000000
--- a/audio/sphinx/files/patch-src-libsphinx2-include_pconf.h
+++ /dev/null
@@ -1,8 +0,0 @@
---- 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 @@
- char * (*GetDefault)(char const *, char const *), char last);
- void pusage(char *prog, Config_t *cp);
-
--#endif _PCONF_
-+#endif
diff --git a/audio/sphinx/files/patch-src-libsphinx2_eht_quit.c b/audio/sphinx/files/patch-src-libsphinx2_eht_quit.c
deleted file mode 100644
index c3c26501..0000000
--- a/audio/sphinx/files/patch-src-libsphinx2_eht_quit.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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
-@@ -85,6 +85,7 @@
- */
-
- #include <stdio.h>
-+#include <stdlib.h>
- #include <stdarg.h>
-
- void
diff --git a/audio/sphinx/files/patch-src-libsphinx2_prime.c b/audio/sphinx/files/patch-src-libsphinx2_prime.c
deleted file mode 100644
index 824091b..0000000
--- a/audio/sphinx/files/patch-src-libsphinx2_prime.c
+++ /dev/null
@@ -1,9 +0,0 @@
---- 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 @@
- }
- }
-
--#endif MAIN
--
-+#endif
diff --git a/audio/sphinx/files/patch-src-libsphinx2_r_agc_noise.c b/audio/sphinx/files/patch-src-libsphinx2_r_agc_noise.c
deleted file mode 100644
index e046567..0000000
--- a/audio/sphinx/files/patch-src-libsphinx2_r_agc_noise.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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
-@@ -34,6 +34,7 @@
- *
- */
- #include <stdio.h>
-+#include <string.h>
-
- #include "s2types.h"
- #include "c.h"
diff --git a/audio/sphinx/files/patch-src-libsphinx2_sc_vq.c b/audio/sphinx/files/patch-src-libsphinx2_sc_vq.c
deleted file mode 100644
index 07d5965..0000000
--- a/audio/sphinx/files/patch-src-libsphinx2_sc_vq.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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
-@@ -64,6 +64,7 @@
-
- #include <stdio.h>
- #include <stdlib.h>
-+#include <string.h>
- #include <assert.h>
- #include <limits.h>
-
diff --git a/audio/sphinx/files/patch-src-libsphinx2fe_fe_sigproc.c b/audio/sphinx/files/patch-src-libsphinx2fe_fe_sigproc.c
deleted file mode 100644
index 20c1685..0000000
--- a/audio/sphinx/files/patch-src-libsphinx2fe_fe_sigproc.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
-@@ -43,7 +43,7 @@
-
- #ifndef M_PI
- #define M_PI (3.14159265358979323846)
--#endif M_PI
-+#endif
-
- #define FORWARD_FFT 1
- #define INVERSE_FFT -1
diff --git a/audio/sphinx/files/patch-src-examples_clicore.c b/audio/sphinx/files/patch-src_examples_clicore.c
index 1013ddc..e842c15 100644
--- a/audio/sphinx/files/patch-src-examples_clicore.c
+++ b/audio/sphinx/files/patch-src_examples_clicore.c
@@ -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);
diff --git a/audio/sphinx/files/patch-src-examples_srvcore.c b/audio/sphinx/files/patch-src_examples_srvcore.c
index 56fc351..6419446 100644
--- a/audio/sphinx/files/patch-src-examples_srvcore.c
+++ b/audio/sphinx/files/patch-src_examples_srvcore.c
@@ -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));
diff --git a/audio/sphinx/files/patch-src_examples_tty-continuous.c b/audio/sphinx/files/patch-src_examples_tty-continuous.c
index d3d33a5..78652fc 100644
--- a/audio/sphinx/files/patch-src_examples_tty-continuous.c
+++ b/audio/sphinx/files/patch-src_examples_tty-continuous.c
@@ -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
*/
diff --git a/audio/sphinx/files/patch-src-libsphinx2_blk_cdcn_norm.c b/audio/sphinx/files/patch-src_libsphinx2_blk__cdcn__norm.c
index 90a67a6..21f15e5 100644
--- a/audio/sphinx/files/patch-src-libsphinx2_blk_cdcn_norm.c
+++ b/audio/sphinx/files/patch-src_libsphinx2_blk__cdcn__norm.c
@@ -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
*
*************************************************************************/
diff --git a/audio/sphinx/files/patch-src-libsphinx2_cdcn_norm.c b/audio/sphinx/files/patch-src_libsphinx2_cdcn__norm.c
index df6ab30..bb94530 100644
--- a/audio/sphinx/files/patch-src-libsphinx2_cdcn_norm.c
+++ b/audio/sphinx/files/patch-src_libsphinx2_cdcn__norm.c
@@ -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>
diff --git a/audio/sphinx/files/patch-src_libsphinx2_cdcn_update.c b/audio/sphinx/files/patch-src_libsphinx2_cdcn__update.c
index 5d11684..b457815 100644
--- a/audio/sphinx/files/patch-src_libsphinx2_cdcn_update.c
+++ b/audio/sphinx/files/patch-src_libsphinx2_cdcn__update.c
@@ -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;
diff --git a/audio/sphinx/files/patch-src_libsphinx2_eht__quit.c b/audio/sphinx/files/patch-src_libsphinx2_eht__quit.c
new file mode 100644
index 0000000..f545fff
--- /dev/null
+++ b/audio/sphinx/files/patch-src_libsphinx2_eht__quit.c
@@ -0,0 +1,10 @@
+--- src/libsphinx2/eht_quit.c.orig 2001-12-13 21:11:20 UTC
++++ src/libsphinx2/eht_quit.c
+@@ -85,6 +85,7 @@
+ */
+
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <stdarg.h>
+
+ void
diff --git a/audio/sphinx/files/patch-src-libsphinx2_err.c b/audio/sphinx/files/patch-src_libsphinx2_err.c
index 84d9d2f..5c654b5 100644
--- a/audio/sphinx/files/patch-src-libsphinx2_err.c
+++ b/audio/sphinx/files/patch-src_libsphinx2_err.c
@@ -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 @@
*/
diff --git a/audio/sphinx/files/patch-src_libsphinx2_include_pconf.h b/audio/sphinx/files/patch-src_libsphinx2_include_pconf.h
new file mode 100644
index 0000000..1a89cbe
--- /dev/null
+++ b/audio/sphinx/files/patch-src_libsphinx2_include_pconf.h
@@ -0,0 +1,8 @@
+--- 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);
+
+-#endif _PCONF_
++#endif
diff --git a/audio/sphinx/files/patch-src-libsphinx2_linklist.c b/audio/sphinx/files/patch-src_libsphinx2_linklist.c
index c6f3eb4..d8816d0 100644
--- a/audio/sphinx/files/patch-src-libsphinx2_linklist.c
+++ b/audio/sphinx/files/patch-src_libsphinx2_linklist.c
@@ -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) {
diff --git a/audio/sphinx/files/patch-src_libsphinx2_prime.c b/audio/sphinx/files/patch-src_libsphinx2_prime.c
new file mode 100644
index 0000000..10bb7ff
--- /dev/null
+++ b/audio/sphinx/files/patch-src_libsphinx2_prime.c
@@ -0,0 +1,9 @@
+--- src/libsphinx2/prime.c.orig 2001-12-13 21:11:23 UTC
++++ src/libsphinx2/prime.c
+@@ -75,5 +75,4 @@ main ()
+ }
+ }
+
+-#endif MAIN
+-
++#endif
diff --git a/audio/sphinx/files/patch-src_libsphinx2_r__agc__noise.c b/audio/sphinx/files/patch-src_libsphinx2_r__agc__noise.c
new file mode 100644
index 0000000..4050c77
--- /dev/null
+++ b/audio/sphinx/files/patch-src_libsphinx2_r__agc__noise.c
@@ -0,0 +1,10 @@
+--- src/libsphinx2/r_agc_noise.c.orig 2001-12-13 21:11:23 UTC
++++ src/libsphinx2/r_agc_noise.c
+@@ -34,6 +34,7 @@
+ *
+ */
+ #include <stdio.h>
++#include <string.h>
+
+ #include "s2types.h"
+ #include "c.h"
diff --git a/audio/sphinx/files/patch-src_libsphinx2_sc__vq.c b/audio/sphinx/files/patch-src_libsphinx2_sc__vq.c
new file mode 100644
index 0000000..a687843
--- /dev/null
+++ b/audio/sphinx/files/patch-src_libsphinx2_sc__vq.c
@@ -0,0 +1,10 @@
+--- 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>
+ #include <stdlib.h>
++#include <string.h>
+ #include <assert.h>
+ #include <limits.h>
+
diff --git a/audio/sphinx/files/patch-src-libsphinx2_search.c b/audio/sphinx/files/patch-src_libsphinx2_search.c
index 1d6f423..69e5c73 100644
--- a/audio/sphinx/files/patch-src-libsphinx2_search.c
+++ b/audio/sphinx/files/patch-src_libsphinx2_search.c
@@ -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;
diff --git a/audio/sphinx/files/patch-src_libsphinx2ad_ad_oss_bsd.c b/audio/sphinx/files/patch-src_libsphinx2ad_ad__oss__bsd.c
index 959b25d..90f9eb7 100644
--- a/audio/sphinx/files/patch-src_libsphinx2ad_ad_oss_bsd.c
+++ b/audio/sphinx/files/patch-src_libsphinx2ad_ad__oss__bsd.c
@@ -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) {
diff --git a/audio/sphinx/files/patch-src_libsphinx2fe_fe__sigproc.c b/audio/sphinx/files/patch-src_libsphinx2fe_fe__sigproc.c
new file mode 100644
index 0000000..07f62d2
--- /dev/null
+++ b/audio/sphinx/files/patch-src_libsphinx2fe_fe__sigproc.c
@@ -0,0 +1,11 @@
+--- 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
diff --git a/benchmarks/himenobench/Makefile b/benchmarks/himenobench/Makefile
index fbe39de..a639be3 100644
--- a/benchmarks/himenobench/Makefile
+++ b/benchmarks/himenobench/Makefile
@@ -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
diff --git a/benchmarks/himenobench/files/patch-himenobmtxp__l.f b/benchmarks/himenobench/files/patch-himenobmtxp__l.f
index 6605b98..855e8bf 100644
--- a/benchmarks/himenobench/files/patch-himenobmtxp__l.f
+++ b/benchmarks/himenobench/files/patch-himenobmtxp__l.f
@@ -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)
diff --git a/benchmarks/himenobench/files/patch-himenobmtxp__m.f b/benchmarks/himenobench/files/patch-himenobmtxp__m.f
index 7aaf759..97ddd3f 100644
--- a/benchmarks/himenobench/files/patch-himenobmtxp__m.f
+++ b/benchmarks/himenobench/files/patch-himenobmtxp__m.f
@@ -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)
diff --git a/benchmarks/himenobench/files/patch-himenobmtxp__s.f b/benchmarks/himenobench/files/patch-himenobmtxp__s.f
index 60ffa15..cea8df87 100644
--- a/benchmarks/himenobench/files/patch-himenobmtxp__s.f
+++ b/benchmarks/himenobench/files/patch-himenobmtxp__s.f
@@ -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)
diff --git a/benchmarks/himenobench/files/patch-himenobmtxp__xl.f b/benchmarks/himenobench/files/patch-himenobmtxp__xl.f
index 3125952..f71a582 100644
--- a/benchmarks/himenobench/files/patch-himenobmtxp__xl.f
+++ b/benchmarks/himenobench/files/patch-himenobmtxp__xl.f
@@ -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)
diff --git a/benchmarks/himenobench/files/patch-himenobmtxps.c b/benchmarks/himenobench/files/patch-himenobmtxps.c
index 175cf05..b00ab893 100644
--- a/benchmarks/himenobench/files/patch-himenobmtxps.c
+++ b/benchmarks/himenobench/files/patch-himenobmtxps.c
@@ -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 ;
diff --git a/benchmarks/netio/Makefile b/benchmarks/netio/Makefile
index 9f31a80..02848c9 100644
--- a/benchmarks/netio/Makefile
+++ b/benchmarks/netio/Makefile
@@ -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
diff --git a/benchmarks/netio/files/patch-Makefile b/benchmarks/netio/files/patch-Makefile
index 364e94f..5341e76 100644
--- a/benchmarks/netio/files/patch-Makefile
+++ b/benchmarks/netio/files/patch-Makefile
@@ -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
diff --git a/benchmarks/netio/files/patch-netio.c b/benchmarks/netio/files/patch-netio.c
index 2648f12..bf3c2e7 100644
--- a/benchmarks/netio/files/patch-netio.c
+++ b/benchmarks/netio/files/patch-netio.c
@@ -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;
+ 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;
+
+ 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;
+ 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;
+
+ 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;
+ 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;
+
+ 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;
+ 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;
+
+ 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;
+ 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);
-
+
+ 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;
+ 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;
+
+ if (bind(server, (struct sockaddr *) &sa_client, sizeof(sa_client)) < 0)
+ {
+ psock_errno("bind(STREAM)");
+ soclose(server);
+ free(cBuffer);
+- return THREADRESULT;
+ return;
- }
-
+ }
+
+#ifdef USE_IPV6
+ sa_server.sin6_family = AF_INET6;
+ sa_server.sin6_port = htons(nAuxPort);
+ sa_server.sin6_addr = addr_server;
+#else
- sa_server.sin_family = AF_INET;
- sa_server.sin_port = htons(nAuxPort);
- sa_server.sin_addr = addr_server;
+ sa_server.sin_family = AF_INET;
+ sa_server.sin_port = htons(nAuxPort);
+ sa_server.sin_addr = addr_server;
+#endif
-
- if (connect(server, (struct sockaddr *) &sa_server, sizeof(sa_server)) < 0)
- {
-@@ -1425,17 +1517,29 @@
- return psock_errno("sock_init()"), 1;
-
- if (szLocal == 0)
+
+ if (connect(server, (struct sockaddr *) &sa_server, sizeof(sa_server)) < 0)
+ {
+@@ -1425,17 +1517,29 @@ int main(int argc, char **argv)
+ return psock_errno("sock_init()"), 1;
+
+ if (szLocal == 0)
+#ifdef USE_IPV6
+ addr_local = in6addr_any;
+#else
- addr_local.s_addr = INADDR_ANY;
+ addr_local.s_addr = INADDR_ANY;
+#endif
- else
- {
- if (isdigit(*szLocal))
+ else
+ {
+ if (isdigit(*szLocal))
+#ifdef USE_IPV6
+ inet_pton(AF_INET6, szLocal, &addr_local);
+#else
- addr_local.s_addr = inet_addr(szLocal);
+ addr_local.s_addr = inet_addr(szLocal);
+#endif
- else
- {
- if ((host = gethostbyname(szLocal)) == NULL)
- return psock_errno("gethostbyname()"), 1;
-
+ else
+ {
+ if ((host = gethostbyname(szLocal)) == NULL)
+ return psock_errno("gethostbyname()"), 1;
+
+#ifdef USE_IPV6
+ addr_local = * (struct in6_addr *) (host->h_addr);
+#else
- addr_local = * (struct in_addr *) (host->h_addr);
+ addr_local = * (struct in_addr *) (host->h_addr);
+#endif
- }
- }
-
-@@ -1445,13 +1549,21 @@
- usage();
-
- if (isdigit(*argv[optind]))
+ }
+ }
+
+@@ -1445,13 +1549,21 @@ int main(int argc, char **argv)
+ usage();
+
+ if (isdigit(*argv[optind]))
+#ifdef USE_IPV6
+ inet_pton(AF_INET6, argv[optind], &addr_server);
+#else
- addr_server.s_addr = inet_addr(argv[optind]);
+ addr_server.s_addr = inet_addr(argv[optind]);
+#endif
- else
- {
- if ((host = gethostbyname(argv[optind])) == NULL)
- return psock_errno("gethostbyname()"), 1;
-
+ else
+ {
+ if ((host = gethostbyname(argv[optind])) == NULL)
+ return psock_errno("gethostbyname()"), 1;
+
+#ifdef USE_IPV6
+ addr_server = * (struct in6_addr *) (host->h_addr);
+#else
- addr_server = * (struct in_addr *) (host->h_addr);
+ addr_server = * (struct in_addr *) (host->h_addr);
+#endif
- }
- }
- }
+ }
+ }
+ }
diff --git a/comms/mlan3/Makefile b/comms/mlan3/Makefile
index e06457f..3cb86ec 100644
--- a/comms/mlan3/Makefile
+++ b/comms/mlan3/Makefile
@@ -14,7 +14,8 @@ LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/license.txt
NO_WRKSUBDIR= yes
-USES= uidfix zip
+USES= dos2unix uidfix zip
+DOS2UNIX_GLOB= *.c *.h
post-patch:
@${REINPLACE_CMD} -e '/int main/s/short argc/int argc/' \
diff --git a/comms/mlan3/files/patch-Makefiles b/comms/mlan3/files/patch-Makefiles
index e9f0292..b769b5f 100644
--- a/comms/mlan3/files/patch-Makefiles
+++ b/comms/mlan3/files/patch-Makefiles
@@ -1,12 +1,12 @@
---- Makefile Thu Jan 1 01:00:00 1970
-+++ Makefile Wed Oct 27 17:03:17 2004
+--- Makefile.orig 2016-06-20 12:38:29 UTC
++++ Makefile
@@ -0,0 +1,4 @@
+
+SUBDIR= lib apps
+
+.include <bsd.subdir.mk>
---- apps/Makefile Thu Jan 1 01:00:00 1970
-+++ apps/Makefile Wed Oct 27 17:03:17 2004
+--- apps/Makefile.orig 2016-06-20 12:38:29 UTC
++++ apps/Makefile
@@ -0,0 +1,6 @@
+
+SUBDIR= atodtst counter coupler fish gethumd memutil mweather shaapp \
@@ -14,8 +14,8 @@
+
+.include <bsd.subdir.mk>
+
---- apps/atodtst/Makefile Thu Jan 1 01:00:00 1970
-+++ apps/atodtst/Makefile Wed Oct 27 17:03:17 2004
+--- apps/atodtst/Makefile.orig 2016-06-20 12:38:29 UTC
++++ apps/atodtst/Makefile
@@ -0,0 +1,15 @@
+PROG= atodtst
+PREFIX?= /usr/local
@@ -32,8 +32,8 @@
+ ./${PROG} /dev/cuaa0
+
+.include <bsd.prog.mk>
---- apps/counter/Makefile Thu Jan 1 01:00:00 1970
-+++ apps/counter/Makefile Wed Oct 27 17:03:17 2004
+--- apps/counter/Makefile.orig 2016-06-20 12:38:29 UTC
++++ apps/counter/Makefile
@@ -0,0 +1,15 @@
+PROG= counter
+PREFIX?= /usr/local
@@ -50,8 +50,8 @@
+ ./${PROG} /dev/cuaa0
+
+.include <bsd.prog.mk>
---- apps/coupler/Makefile Thu Jan 1 01:00:00 1970
-+++ apps/coupler/Makefile Wed Oct 27 17:03:17 2004
+--- apps/coupler/Makefile.orig 2016-06-20 12:38:29 UTC
++++ apps/coupler/Makefile
@@ -0,0 +1,15 @@
+PROG= coupler
+PREFIX?= /usr/local
@@ -68,8 +68,8 @@
+ ./${PROG} /dev/cuaa0
+
+.include <bsd.prog.mk>
---- apps/fish/Makefile Thu Jan 1 01:00:00 1970
-+++ apps/fish/Makefile Wed Oct 27 17:03:17 2004
+--- apps/fish/Makefile.orig 2016-06-20 12:38:29 UTC
++++ apps/fish/Makefile
@@ -0,0 +1,15 @@
+PROG= fish
+PREFIX?= /usr/local
@@ -86,8 +86,8 @@
+ ./${PROG} /dev/cuaa0
+
+.include <bsd.prog.mk>
---- apps/gethumd/Makefile Thu Jan 1 01:00:00 1970
-+++ apps/gethumd/Makefile Wed Oct 27 17:03:17 2004
+--- apps/gethumd/Makefile.orig 2016-06-20 12:38:29 UTC
++++ apps/gethumd/Makefile
@@ -0,0 +1,15 @@
+PROG= gethumd
+PREFIX?= /usr/local
@@ -104,8 +104,8 @@
+ ./${PROG} /dev/cuaa0
+
+.include <bsd.prog.mk>
---- apps/memutil/Makefile Thu Jan 1 01:00:00 1970
-+++ apps/memutil/Makefile Wed Oct 27 17:03:17 2004
+--- apps/memutil/Makefile.orig 2016-06-20 12:38:29 UTC
++++ apps/memutil/Makefile
@@ -0,0 +1,15 @@
+PROG= memutil
+PREFIX?= /usr/local
@@ -122,8 +122,8 @@
+ ./${PROG} /dev/cuaa0
+
+.include <bsd.prog.mk>
---- apps/mweather/Makefile Thu Jan 1 01:00:00 1970
-+++ apps/mweather/Makefile Wed Oct 27 17:03:17 2004
+--- apps/mweather/Makefile.orig 2016-06-20 12:38:29 UTC
++++ apps/mweather/Makefile
@@ -0,0 +1,15 @@
+PROG= mweather
+PREFIX?= /usr/local
@@ -140,8 +140,8 @@
+ ./${PROG} /dev/cuaa0
+
+.include <bsd.prog.mk>
---- apps/shaapp/Makefile Thu Jan 1 01:00:00 1970
-+++ apps/shaapp/Makefile Wed Oct 27 17:03:17 2004
+--- apps/shaapp/Makefile.orig 2016-06-20 12:38:29 UTC
++++ apps/shaapp/Makefile
@@ -0,0 +1,15 @@
+PROG= shaapp
+PREFIX?= /usr/local
@@ -158,8 +158,8 @@
+ ./${PROG} /dev/cuaa0
+
+.include <bsd.prog.mk>
---- apps/swtloop/Makefile.app Thu Jan 1 01:00:00 1970
-+++ apps/swtloop/Makefile.app Wed Oct 27 17:03:17 2004
+--- apps/swtloop/Makefile.app.orig 2016-06-20 12:38:29 UTC
++++ apps/swtloop/Makefile.app
@@ -0,0 +1,8 @@
+PROG= tstfind
+CFLAGS= -I. -Wall -I ../../common
@@ -169,8 +169,8 @@
+SRCS= tstfind.c
+
+.include <bsd.prog.mk>
---- apps/swtsngl/Makefile Thu Jan 1 01:00:00 1970
-+++ apps/swtsngl/Makefile Wed Oct 27 17:03:17 2004
+--- apps/swtsngl/Makefile.orig 2016-06-20 12:38:29 UTC
++++ apps/swtsngl/Makefile
@@ -0,0 +1,15 @@
+PROG= swtsngl
+PREFIX?= /usr/local
@@ -187,8 +187,8 @@
+ ./${PROG} /dev/cuaa0
+
+.include <bsd.prog.mk>
---- apps/temp/Makefile Thu Jan 1 01:00:00 1970
-+++ apps/temp/Makefile Wed Oct 27 17:03:17 2004
+--- apps/temp/Makefile.orig 2016-06-20 12:38:29 UTC
++++ apps/temp/Makefile
@@ -0,0 +1,15 @@
+PROG= temp
+PREFIX?= /usr/local
@@ -205,8 +205,8 @@
+ ./${PROG} /dev/cuaa0
+
+.include <bsd.prog.mk>
---- apps/thermo/Makefile.app Thu Jan 1 01:00:00 1970
-+++ apps/thermo/Makefile.app Wed Oct 27 17:03:17 2004
+--- apps/thermo/Makefile.app.orig 2016-06-20 12:38:29 UTC
++++ apps/thermo/Makefile.app
@@ -0,0 +1,8 @@
+PROG= tstfind
+CFLAGS= -I. -Wall -I ../../common
@@ -216,8 +216,8 @@
+SRCS= tstfind.c
+
+.include <bsd.prog.mk>
---- apps/tstfind/Makefile Thu Jan 1 01:00:00 1970
-+++ apps/tstfind/Makefile Wed Oct 27 17:03:17 2004
+--- apps/tstfind/Makefile.orig 2016-06-20 12:38:29 UTC
++++ apps/tstfind/Makefile
@@ -0,0 +1,15 @@
+PROG= tstfind
+PREFIX?= /usr/local
@@ -234,37 +234,37 @@
+ ./${PROG} /dev/cuaa0
+
+.include <bsd.prog.mk>
---- common/ownet.h Fri Sep 28 21:42:02 2001
-+++ common/ownet.h Wed Oct 27 17:03:17 2004
+--- common/ownet.h.orig 2016-06-20 12:38:29 UTC
++++ common/ownet.h
@@ -133,6 +133,10 @@
- typedef unsigned short ushort;
- typedef unsigned long ulong;
- #endif
+ typedef unsigned short ushort;
+ typedef unsigned long ulong;
+ #endif
+ #if (__FreeBSD__)
+ #include <sys/types.h>
+ typedef unsigned long ulong;
+ #endif
- #endif
- #ifdef SDCC
- //intent of ushort is 2 bytes unsigned.
---- lib/Makefile Thu Jan 1 01:00:00 1970
-+++ lib/Makefile Wed Oct 27 17:03:17 2004
+ #endif
+ #ifdef SDCC
+ //intent of ushort is 2 bytes unsigned.
+--- lib/Makefile.orig 2016-06-20 12:38:29 UTC
++++ lib/Makefile
@@ -0,0 +1,3 @@
+SUBDIR= userial
+
+.include <bsd.subdir.mk>
---- lib/userial/Link/linuxlnk.c Fri Sep 28 21:42:14 2001
-+++ lib/userial/Link/linuxlnk.c Wed Oct 27 17:03:17 2004
+--- lib/userial/Link/linuxlnk.c.orig 2016-06-20 12:38:29 UTC
++++ lib/userial/Link/linuxlnk.c
@@ -93,6 +93,7 @@
- #include <termios.h>
- #include <errno.h>
- #include <sys/time.h>
+ #include <termios.h>
+ #include <errno.h>
+ #include <sys/time.h>
+#include <string.h>
-
- #include "ds2480.h"
- #include "ownet.h"
---- lib/userial/Makefile Thu Jan 1 01:00:00 1970
-+++ lib/userial/Makefile Wed Oct 27 17:03:56 2004
+
+ #include "ds2480.h"
+ #include "ownet.h"
+--- lib/userial/Makefile.orig 2016-06-20 12:38:29 UTC
++++ lib/userial/Makefile
@@ -0,0 +1,33 @@
+MLANCOM= ${.CURDIR}/../../common
+MLANLNK= ${.CURDIR}/Link
diff --git a/databases/pgagent/Makefile b/databases/pgagent/Makefile
index 05f87c9..91d1228 100644
--- a/databases/pgagent/Makefile
+++ b/databases/pgagent/Makefile
@@ -11,10 +11,10 @@ DISTNAME= pgAgent-${PORTVERSION}-Source
MAINTAINER= fjoe@FreeBSD.org
COMMENT= Job scheduler for PostgreSQL
-USES= cmake pgsql
+USES= cmake dos2unix pgsql
+DOS2UNIX_GLOB= *.txt
CMAKE_ARGS= -DSTATIC_BUILD:BOOL=NO -DWX_CONFIG_PATH:FILEPATH="${WX_CONFIG}"
USE_WX= 2.8
-WX_UNICODE= yes
PLIST_FILES= bin/pgagent \
share/postgresql/extension/pgagent--3.4.sql \
diff --git a/databases/pgagent/files/patch-CMakeLists.txt b/databases/pgagent/files/patch-CMakeLists.txt
index b981d3e..fa36abd 100644
--- a/databases/pgagent/files/patch-CMakeLists.txt
+++ b/databases/pgagent/files/patch-CMakeLists.txt
@@ -1,19 +1,19 @@
---- CMakeLists.txt.orig 2014-02-26 04:48:45.000000000 +0700
-+++ CMakeLists.txt 2015-01-28 08:06:29.000000000 +0600
-@@ -134,12 +134,12 @@
- INSTALL(FILES ${pgagent_SOURCE_DIR}/sql/pgagent_upgrade.sql DESTINATION .)
- ELSE(WIN32)
- INSTALL(TARGETS pgagent DESTINATION bin)
-- INSTALL(FILES ${pgagent_SOURCE_DIR}/sql/pgagent.sql DESTINATION share)
-- INSTALL(FILES ${pgagent_SOURCE_DIR}/sql/pgagent_upgrade.sql DESTINATION share)
-+ INSTALL(FILES ${pgagent_SOURCE_DIR}/sql/pgagent.sql DESTINATION share/pgagent)
-+ INSTALL(FILES ${pgagent_SOURCE_DIR}/sql/pgagent_upgrade.sql DESTINATION share/pgagent)
- ENDIF(WIN32)
-
--INSTALL(FILES ${pgagent_SOURCE_DIR}/README DESTINATION .)
--INSTALL(FILES ${pgagent_SOURCE_DIR}/LICENSE DESTINATION .)
-+INSTALL(FILES ${pgagent_SOURCE_DIR}/README DESTINATION share/pgagent)
-+INSTALL(FILES ${pgagent_SOURCE_DIR}/LICENSE DESTINATION share/pgagent)
-
- # Extension
- IF(PG_EXTENSION)
+--- CMakeLists.txt.orig 2016-06-20 15:30:20 UTC
++++ CMakeLists.txt
+@@ -134,12 +134,12 @@ IF (WIN32)
+ INSTALL(FILES ${pgagent_SOURCE_DIR}/sql/pgagent_upgrade.sql DESTINATION .)
+ ELSE(WIN32)
+ INSTALL(TARGETS pgagent DESTINATION bin)
+- INSTALL(FILES ${pgagent_SOURCE_DIR}/sql/pgagent.sql DESTINATION share)
+- INSTALL(FILES ${pgagent_SOURCE_DIR}/sql/pgagent_upgrade.sql DESTINATION share)
++ INSTALL(FILES ${pgagent_SOURCE_DIR}/sql/pgagent.sql DESTINATION share/pgagent)
++ INSTALL(FILES ${pgagent_SOURCE_DIR}/sql/pgagent_upgrade.sql DESTINATION share/pgagent)
+ ENDIF(WIN32)
+
+-INSTALL(FILES ${pgagent_SOURCE_DIR}/README DESTINATION .)
+-INSTALL(FILES ${pgagent_SOURCE_DIR}/LICENSE DESTINATION .)
++INSTALL(FILES ${pgagent_SOURCE_DIR}/README DESTINATION share/pgagent)
++INSTALL(FILES ${pgagent_SOURCE_DIR}/LICENSE DESTINATION share/pgagent)
+
+ # Extension
+ IF(PG_EXTENSION)
diff --git a/deskutils/everygui/Makefile b/deskutils/everygui/Makefile
index 0f91f00..61b5ee5 100644
--- a/deskutils/everygui/Makefile
+++ b/deskutils/everygui/Makefile
@@ -10,7 +10,8 @@ MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Dynamic GUI for an OS command
-USES= python
+USES= dos2unix python
+DOS2UNIX_GLOB= *.py
USE_PYTHON= distutils autoplist
USE_GNOME= libglade2 pygnome2
diff --git a/deskutils/everygui/files/patch-setup.py b/deskutils/everygui/files/patch-setup.py
index 9af894d..cc06c8f 100644
--- a/deskutils/everygui/files/patch-setup.py
+++ b/deskutils/everygui/files/patch-setup.py
@@ -1,19 +1,19 @@
---- setup.py.orig Tue Jan 10 09:59:47 2006
-+++ setup.py Sun Jan 15 11:46:49 2006
-@@ -8,11 +8,6 @@
- from distutils.core import setup
- import glob
+--- setup.py.orig 2016-06-20 15:30:48 UTC
++++ setup.py
+@@ -8,11 +8,6 @@ import sys
+ from distutils.core import setup
+ import glob
-try:
- import gtk
-except:
- sys.exit("pyGTK version 2.6 or greater is required to run everygui. http://www.pygtk.org")
-
-
- setup(
- name='everygui',
-@@ -29,4 +24,3 @@
- ("share/everygui/egconfig", glob.glob("egconfig/*.egd"))]
+
+ setup(
+ name='everygui',
+@@ -29,4 +24,3 @@ setup(
+ ("share/everygui/egconfig", glob.glob("egconfig/*.egd"))]
)
-os.chmod("/usr/share/everygui/egconfig", 0777)
diff --git a/devel/charva/Makefile b/devel/charva/Makefile
index 9ae6926..b16566b 100644
--- a/devel/charva/Makefile
+++ b/devel/charva/Makefile
@@ -17,22 +17,17 @@ RUN_DEPENDS= ${JAVAJARDIR}/commons-logging.jar:java/jakarta-commons-logging
OPTIONS_DEFINE= DOCS
USES= dos2unix zip
-DOS2UNIX_FILES= c/src/Makefile.freebsd.txt
+DOS2UNIX_GLOB= build.xml Makefile.freebsd.txt *.c *.java
USE_JAVA= yes
JAVA_VERSION= 1.6+
USE_ANT= yes
ALL_TARGET= clean makeDLL dist
-PLIST_SUB= JAVA_HOME=${JAVA_HOME:S/${PREFIX}\///}
-PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME}.jar \
- %%JAVA_HOME%%/jre/lib/${MACHINE_ARCH}/libTerminal.so
+PLIST_FILES= ${JAVAJARDIR}/${PORTNAME}.jar \
+ ${JAVA_HOME}/jre/lib/${MACHINE_ARCH}/libTerminal.so
PORTDOCS= *
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDOCS}
-ALL_TARGET+= javadoc
-.endif
+DOCS_ALL_TARGET= javadoc
do-install:
@${ECHO_MSG} -n ">> Installing JAR file as ${JAVAJARDIR}/${PORTNAME}.jar..."
@@ -44,12 +39,12 @@ do-install:
@${INSTALL_PROGRAM} ${WRKSRC}/c/lib/libTerminal.so \
${STAGEDIR}${JAVA_HOME}/jre/lib/${MACHINE_ARCH}/libTerminal.so
@${ECHO_MSG} " [DONE]"
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
@${ECHO_MSG} -n ">> Installing documentation..."
@${MKDIR} ${STAGEDIR}${DOCSDIR}
@cd ${WRKSRC}/docs && ${FIND} * \
| ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${DOCSDIR} > /dev/null 2>&1
@${ECHO_MSG} " [DONE]"
-.endif
.include <bsd.port.mk>
diff --git a/devel/charva/files/patch-build.xml b/devel/charva/files/patch-build.xml
index 3400968..886a38e 100644
--- a/devel/charva/files/patch-build.xml
+++ b/devel/charva/files/patch-build.xml
@@ -1,26 +1,26 @@
---- build.xml.orig Sun Sep 10 22:10:16 2006
-+++ build.xml Tue Dec 12 08:37:44 2006
+--- build.xml.orig 2016-06-20 12:40:44 UTC
++++ build.xml
@@ -90,6 +90,7 @@
- <property name="src.home" value="${basedir}/java/src"/>
- <property name="test.home" value="${basedir}/test"/>
- <property name="c.home" value="${basedir}/c"/>
-+ <property name="os.type" value="freebsd"/>
-
-
- <!-- ==================== Compilation Control Options ==================== -->
+ <property name="src.home" value="${basedir}/java/src"/>
+ <property name="test.home" value="${basedir}/test"/>
+ <property name="c.home" value="${basedir}/c"/>
++ <property name="os.type" value="freebsd"/>
+
+
+ <!-- ==================== Compilation Control Options ==================== -->
@@ -189,14 +190,8 @@
- description="Compile the JNI shared library">
-
- <mkdir dir="${c.home}/lib"/>
-- <input
-- message="Enter the operating system type: "
-- validargs="aix,beos,freebsd,gcj,hpux,linux,mac_osx,solaris,win32"
-- addproperty="os.type"
-- />
--
- <echo>Compiling the shared library using "Makefile.${os.type}.txt"</echo>
-- <exec executable="make"
-+ <exec executable="gmake"
- dir="${c.home}/src"
- output="${c.home}/lib/make.out.txt"
- failonerror="true">
+ description="Compile the JNI shared library">
+
+ <mkdir dir="${c.home}/lib"/>
+- <input
+- message="Enter the operating system type: "
+- validargs="aix,beos,freebsd,gcj,hpux,linux,mac_osx,solaris,win32"
+- addproperty="os.type"
+- />
+-
+ <echo>Compiling the shared library using "Makefile.${os.type}.txt"</echo>
+- <exec executable="make"
++ <exec executable="gmake"
+ dir="${c.home}/src"
+ output="${c.home}/lib/make.out.txt"
+ failonerror="true">
diff --git a/devel/charva/files/patch-c_src_Makefile.freebsd.txt b/devel/charva/files/patch-c_src_Makefile.freebsd.txt
index f5cff1b..1bc1311 100644
--- a/devel/charva/files/patch-c_src_Makefile.freebsd.txt
+++ b/devel/charva/files/patch-c_src_Makefile.freebsd.txt
@@ -1,6 +1,6 @@
---- ./c/src/Makefile.freebsd.txt.orig 2013-10-30 08:21:28.829906040 +0000
-+++ ./c/src/Makefile.freebsd.txt 2013-10-30 08:21:37.384905061 +0000
-@@ -6,7 +6,6 @@
+--- c/src/Makefile.freebsd.txt.orig 2016-06-20 12:40:44 UTC
++++ c/src/Makefile.freebsd.txt
+@@ -6,7 +6,6 @@ OS = freebsd
SHARED_OBJECT_EXT = so
TARGET = libTerminal.${SHARED_OBJECT_EXT}
diff --git a/devel/charva/files/patch-c_src_Toolkit.c b/devel/charva/files/patch-c_src_Toolkit.c
index ab2c57c..1a1fb85 100644
--- a/devel/charva/files/patch-c_src_Toolkit.c
+++ b/devel/charva/files/patch-c_src_Toolkit.c
@@ -1,18 +1,18 @@
---- c/src/Toolkit.c.orig Wed Dec 13 12:29:03 2006
-+++ c/src/Toolkit.c Wed Dec 13 12:35:30 2006
-@@ -372,6 +372,7 @@
- if (colors_started)
- attr = COLOR_PAIR(colorpair_);
-
-+ attron(attr);
- // If the top of the box is outside the clipping rectangle, don't bother
- // to draw the top.
- if (top_ >= top && top_ <= bottom) {
-@@ -414,6 +415,7 @@
- my_addch_with_clip(ACS_VLINE); // right vertical line
- }
- }
-+ attroff(attr);
- }
-
- JNIEXPORT void JNICALL Java_charva_awt_Toolkit_blankBoxNative
+--- c/src/Toolkit.c.orig 2016-06-20 12:40:44 UTC
++++ c/src/Toolkit.c
+@@ -372,6 +372,7 @@ JNIEXPORT void JNICALL Java_charva_awt_T
+ if (colors_started)
+ attr = COLOR_PAIR(colorpair_);
+
++ attron(attr);
+ // If the top of the box is outside the clipping rectangle, don't bother
+ // to draw the top.
+ if (top_ >= top && top_ <= bottom) {
+@@ -414,6 +415,7 @@ JNIEXPORT void JNICALL Java_charva_awt_T
+ my_addch_with_clip(ACS_VLINE); // right vertical line
+ }
+ }
++ attroff(attr);
+ }
+
+ JNIEXPORT void JNICALL Java_charva_awt_Toolkit_blankBoxNative
diff --git a/devel/charva/files/patch-java_src_charva_awt_CardLayout.java b/devel/charva/files/patch-java_src_charva_awt_CardLayout.java
index f6099f0..107a3a8 100644
--- a/devel/charva/files/patch-java_src_charva_awt_CardLayout.java
+++ b/devel/charva/files/patch-java_src_charva_awt_CardLayout.java
@@ -1,5 +1,5 @@
---- java/src/charva/awt/CardLayout.java.orig Mon Jan 29 09:39:30 2007
-+++ java/src/charva/awt/CardLayout.java Mon Jan 29 09:39:30 2007
+--- java/src/charva/awt/CardLayout.java.orig 2016-06-20 12:40:44 UTC
++++ java/src/charva/awt/CardLayout.java
@@ -0,0 +1,115 @@
+package charva.awt;
+
diff --git a/devel/charva/files/patch-java_src_charva_awt_Component.java b/devel/charva/files/patch-java_src_charva_awt_Component.java
index 241cc07..9e28008 100644
--- a/devel/charva/files/patch-java_src_charva_awt_Component.java
+++ b/devel/charva/files/patch-java_src_charva_awt_Component.java
@@ -1,29 +1,29 @@
---- java/src/charva/awt/Component.java.orig Mon Aug 14 18:03:14 2006
-+++ java/src/charva/awt/Component.java Mon Jan 29 09:39:30 2007
-@@ -118,6 +118,17 @@ public abstract class Component {
- }
-
- /**
-+ * Determines whether this component will be displayed on the screen
-+ * if it's displayable.
-+ * @return <code>true</code> if the component and all of its ancestors
-+ * are visible, <code>false</code> otherwise
-+ */
-+ public boolean isRecursivelyVisible() {
-+ Container parent = getParent();
-+ return _visible && (parent == null || parent.isRecursivelyVisible());
-+ }
-+
-+ /**
- * To be implemented by concrete subclasses.
- */
- public abstract void draw();
-@@ -449,7 +460,7 @@ public abstract class Component {
- * traversal.
- */
- public boolean isFocusTraversable() {
-- return (_enabled && _visible);
-+ return (_enabled && isRecursivelyVisible());
- }
-
- /**
+--- java/src/charva/awt/Component.java.orig 2016-06-20 12:40:44 UTC
++++ java/src/charva/awt/Component.java
+@@ -118,6 +118,17 @@ public abstract class Component {
+ }
+
+ /**
++ * Determines whether this component will be displayed on the screen
++ * if it's displayable.
++ * @return <code>true</code> if the component and all of its ancestors
++ * are visible, <code>false</code> otherwise
++ */
++ public boolean isRecursivelyVisible() {
++ Container parent = getParent();
++ return _visible && (parent == null || parent.isRecursivelyVisible());
++ }
++
++ /**
+ * To be implemented by concrete subclasses.
+ */
+ public abstract void draw();
+@@ -449,7 +460,7 @@ public abstract class Component {
+ * traversal.
+ */
+ public boolean isFocusTraversable() {
+- return (_enabled && _visible);
++ return (_enabled && isRecursivelyVisible());
+ }
+
+ /**
diff --git a/devel/charva/files/patch-java_src_charva_awt_Container.java b/devel/charva/files/patch-java_src_charva_awt_Container.java
index 1c3f2d5..ebec529 100644
--- a/devel/charva/files/patch-java_src_charva_awt_Container.java
+++ b/devel/charva/files/patch-java_src_charva_awt_Container.java
@@ -1,100 +1,100 @@
---- java/src/charva/awt/Container.java.orig Mon Aug 7 12:07:52 2006
-+++ java/src/charva/awt/Container.java Mon Jan 29 09:39:30 2007
-@@ -89,6 +89,23 @@ public abstract class Container
- invalidate();
- }
-
-+ public void setBounds(int top_, int left_, int bottom_, int right_) {
-+ super.setBounds(top_, left_, bottom_, right_);
-+ setSize(right_ - left_ + 1, bottom_ - top_ + 1);
-+ }
-+
-+ public void setBounds(Point topleft_, Dimension size_) {
-+ super.setBounds(topleft_, size_);
-+ setSize(size_);
-+ }
-+
-+ public void setBounds(Rectangle bounds) {
-+ super.setBounds(bounds);
-+ setSize(
-+ bounds.getRight() - bounds.getLeft() + 1,
-+ bounds.getBottom() - bounds.getTop() + 1);
-+ }
-+
- public Dimension minimumSize() {
- if (_layoutMgr == null)
- return _size;
-@@ -105,13 +122,30 @@ public abstract class Container
- return (Component) _components.elementAt(n);
- }
-
-+ protected Component getComponentAt(int x, int y, boolean checkVisibility) {
-+ Enumeration e = _components.elements();
-+ while (e.hasMoreElements()) {
-+ Component c = (Component) e.nextElement();
-+ if ((!checkVisibility || c.isVisible()) && c.contains(x, y)) {
-+ if (c instanceof Container) {
-+ // Calculate the coordinates of the point relative
-+ // to the origin of the container
-+ Point origin = c.getLocation();
-+ return ((Container) c).getComponentAt(x - origin.x, y - origin.y, checkVisibility);
-+ } else
-+ return c;
-+ }
-+ }
-+ return null;
-+ }
-+
- /**
- * Returns the component that contains the specified point, or null
- * if no component contains the point. The x and y coordinates of
- * the point are relative to the origin of this container.
- */
- public Component getComponentAt(Point p) {
-- return getComponentAt(p.x, p.y);
-+ return getComponentAt(p.x, p.y, false);
- }
-
- /**
-@@ -120,20 +154,27 @@ public abstract class Container
- * the point are relative to the origin of this container.
- */
- public Component getComponentAt(int x, int y) {
-- Enumeration e = _components.elements();
-- while (e.hasMoreElements()) {
-- Component c = (Component) e.nextElement();
-- if (c.contains(x, y)) {
-- if (c instanceof Container) {
-- // Calculate the coordinates of the point relative
-- // to the origin of the container
-- Point origin = c.getLocation();
-- return ((Container) c).getComponentAt(x - origin.x, y - origin.y);
-- } else
-- return c;
-- }
-- }
-- return null;
-+ return getComponentAt(x, y, false);
-+ }
-+
-+ /**
-+ * Returns the visible component that contains the specified point,
-+ * or null if no visible component contains the point. The x and y
-+ * coordinates of the point are relative to the origin of this container.
-+ */
-+ public final Component findComponentAt(Point p) {
-+ return findComponentAt(p.x, p.y);
-+ }
-+
-+ /**
-+ * Returns the visible component that contains the specified point,
-+ * or null if no visible component contains the point. The x and y
-+ * coordinates of the point are relative to the origin of this container.
-+ */
-+ public final Component findComponentAt(int x, int y) {
-+ if (!isRecursivelyVisible())
-+ return null;
-+ return(getComponentAt(x, y, true));
- }
-
- /**
+--- java/src/charva/awt/Container.java.orig 2016-06-20 12:40:44 UTC
++++ java/src/charva/awt/Container.java
+@@ -89,6 +89,23 @@ public abstract class Container
+ invalidate();
+ }
+
++ public void setBounds(int top_, int left_, int bottom_, int right_) {
++ super.setBounds(top_, left_, bottom_, right_);
++ setSize(right_ - left_ + 1, bottom_ - top_ + 1);
++ }
++
++ public void setBounds(Point topleft_, Dimension size_) {
++ super.setBounds(topleft_, size_);
++ setSize(size_);
++ }
++
++ public void setBounds(Rectangle bounds) {
++ super.setBounds(bounds);
++ setSize(
++ bounds.getRight() - bounds.getLeft() + 1,
++ bounds.getBottom() - bounds.getTop() + 1);
++ }
++
+ public Dimension minimumSize() {
+ if (_layoutMgr == null)
+ return _size;
+@@ -105,13 +122,30 @@ public abstract class Container
+ return (Component) _components.elementAt(n);
+ }
+
++ protected Component getComponentAt(int x, int y, boolean checkVisibility) {
++ Enumeration e = _components.elements();
++ while (e.hasMoreElements()) {
++ Component c = (Component) e.nextElement();
++ if ((!checkVisibility || c.isVisible()) && c.contains(x, y)) {
++ if (c instanceof Container) {
++ // Calculate the coordinates of the point relative
++ // to the origin of the container
++ Point origin = c.getLocation();
++ return ((Container) c).getComponentAt(x - origin.x, y - origin.y, checkVisibility);
++ } else
++ return c;
++ }
++ }
++ return null;
++ }
++
+ /**
+ * Returns the component that contains the specified point, or null
+ * if no component contains the point. The x and y coordinates of
+ * the point are relative to the origin of this container.
+ */
+ public Component getComponentAt(Point p) {
+- return getComponentAt(p.x, p.y);
++ return getComponentAt(p.x, p.y, false);
+ }
+
+ /**
+@@ -120,20 +154,27 @@ public abstract class Container
+ * the point are relative to the origin of this container.
+ */
+ public Component getComponentAt(int x, int y) {
+- Enumeration e = _components.elements();
+- while (e.hasMoreElements()) {
+- Component c = (Component) e.nextElement();
+- if (c.contains(x, y)) {
+- if (c instanceof Container) {
+- // Calculate the coordinates of the point relative
+- // to the origin of the container
+- Point origin = c.getLocation();
+- return ((Container) c).getComponentAt(x - origin.x, y - origin.y);
+- } else
+- return c;
+- }
+- }
+- return null;
++ return getComponentAt(x, y, false);
++ }
++
++ /**
++ * Returns the visible component that contains the specified point,
++ * or null if no visible component contains the point. The x and y
++ * coordinates of the point are relative to the origin of this container.
++ */
++ public final Component findComponentAt(Point p) {
++ return findComponentAt(p.x, p.y);
++ }
++
++ /**
++ * Returns the visible component that contains the specified point,
++ * or null if no visible component contains the point. The x and y
++ * coordinates of the point are relative to the origin of this container.
++ */
++ public final Component findComponentAt(int x, int y) {
++ if (!isRecursivelyVisible())
++ return null;
++ return(getComponentAt(x, y, true));
+ }
+
+ /**
diff --git a/devel/charva/files/patch-java_src_charva_awt_Toolkit.java b/devel/charva/files/patch-java_src_charva_awt_Toolkit.java
index 99317c2..31e2304 100644
--- a/devel/charva/files/patch-java_src_charva_awt_Toolkit.java
+++ b/devel/charva/files/patch-java_src_charva_awt_Toolkit.java
@@ -1,113 +1,113 @@
---- java/src/charva/awt/Toolkit.java.orig Mon Aug 14 20:59:42 2006
-+++ java/src/charva/awt/Toolkit.java Mon Jan 29 09:39:30 2007
-@@ -157,13 +157,9 @@ public class Toolkit {
- * key as defined in the "VK_*" values.
- */
- public void fireKeystroke(int key_, Component source_) {
-- int id;
-- if (Toolkit.isActionKey(key_))
-- id = AWTEvent.KEY_TYPED;
-- else
-- id = AWTEvent.KEY_PRESSED;
--
-- _evtQueue.postEvent(new KeyEvent(key_, id, source_));
-+ _evtQueue.postEvent(new KeyEvent(key_, AWTEvent.KEY_PRESSED, source_));
-+ if (!Toolkit.isActionKey(key_))
-+ _evtQueue.postEvent(new KeyEvent(key_, AWTEvent.KEY_TYPED, source_));
- }
-
- public FocusEvent getLastFocusEvent() {
-@@ -225,7 +221,7 @@ public class Toolkit {
- _lastMousePressTime = System.currentTimeMillis();
-
- Component component =
-- top_window.getComponentAt(x - origin.x, y - origin.y);
-+ top_window.findComponentAt(x - origin.x, y - origin.y);
-
- if (component != null) {
- _evtQueue.postEvent(new MouseEvent(component, modifiers, x, y, 0, button));
-@@ -796,43 +792,47 @@ public class Toolkit {
- //public boolean isActionKey() { return (_key >= 256); }
- public static boolean isActionKey( int _key )
- {
-- boolean value = false;
-- if ( _key == charva.awt.event.KeyEvent.VK_ESCAPE ) value=true;
-- if ( _key == charva.awt.event.KeyEvent.VK_DOWN ) value=true;
-- if ( _key == charva.awt.event.KeyEvent.VK_UP ) value=true;
-- if ( _key == charva.awt.event.KeyEvent.VK_LEFT ) value=true;
-- if ( _key == charva.awt.event.KeyEvent.VK_RIGHT ) value=true;
-- if ( _key == charva.awt.event.KeyEvent.VK_HOME ) value=true;
-- if ( _key == charva.awt.event.KeyEvent.VK_BACK_SPACE ) value=true;
-- if ( _key == charva.awt.event.KeyEvent.VK_F1 ) value=true;
-- if ( _key == charva.awt.event.KeyEvent.VK_F2 ) value=true;
-- if ( _key == charva.awt.event.KeyEvent.VK_F3 ) value=true;
-- if ( _key == charva.awt.event.KeyEvent.VK_F4 ) value=true;
-- if ( _key == charva.awt.event.KeyEvent.VK_F5 ) value=true;
-- if ( _key == charva.awt.event.KeyEvent.VK_F6 ) value=true;
-- if ( _key == charva.awt.event.KeyEvent.VK_F7 ) value=true;
-- if ( _key == charva.awt.event.KeyEvent.VK_F8 ) value=true;
-- if ( _key == charva.awt.event.KeyEvent.VK_F9 ) value=true;
-- if ( _key == charva.awt.event.KeyEvent.VK_F10 ) value=true;
-- if ( _key == charva.awt.event.KeyEvent.VK_F11 ) value=true;
-- if ( _key == charva.awt.event.KeyEvent.VK_F12 ) value=true;
-- if ( _key == charva.awt.event.KeyEvent.VK_F13 ) value=true;
-- if ( _key == charva.awt.event.KeyEvent.VK_F14 ) value=true;
-- if ( _key == charva.awt.event.KeyEvent.VK_F15 ) value=true;
-- if ( _key == charva.awt.event.KeyEvent.VK_F16 ) value=true;
-- if ( _key == charva.awt.event.KeyEvent.VK_F17 ) value=true;
-- if ( _key == charva.awt.event.KeyEvent.VK_F18 ) value=true;
-- if ( _key == charva.awt.event.KeyEvent.VK_F19 ) value=true;
-- if ( _key == charva.awt.event.KeyEvent.VK_F20 ) value=true;
-- if ( _key == charva.awt.event.KeyEvent.VK_DELETE ) value=true;
-- if ( _key == charva.awt.event.KeyEvent.VK_INSERT ) value=true;
-- if ( _key == charva.awt.event.KeyEvent.VK_PAGE_DOWN ) value=true;
-- if ( _key == charva.awt.event.KeyEvent.VK_PAGE_UP ) value=true;
-- if ( _key == charva.awt.event.KeyEvent.VK_ENTER ) value=true;
-- if ( _key == charva.awt.event.KeyEvent.VK_BACK_TAB ) value=true;
-- if ( _key == charva.awt.event.KeyEvent.VK_END ) value=true;
--
-- return (value);
-+ switch (_key) {
-+ case charva.awt.event.KeyEvent.VK_ESCAPE:
-+ case charva.awt.event.KeyEvent.VK_DOWN:
-+ case charva.awt.event.KeyEvent.VK_UP:
-+ case charva.awt.event.KeyEvent.VK_LEFT:
-+ case charva.awt.event.KeyEvent.VK_RIGHT:
-+ case charva.awt.event.KeyEvent.VK_HOME:
-+ case charva.awt.event.KeyEvent.VK_BACK_SPACE:
-+ case charva.awt.event.KeyEvent.VK_F1:
-+ case charva.awt.event.KeyEvent.VK_F2:
-+ case charva.awt.event.KeyEvent.VK_F3:
-+ case charva.awt.event.KeyEvent.VK_F4:
-+ case charva.awt.event.KeyEvent.VK_F5:
-+ case charva.awt.event.KeyEvent.VK_F6:
-+ case charva.awt.event.KeyEvent.VK_F7:
-+ case charva.awt.event.KeyEvent.VK_F8:
-+ case charva.awt.event.KeyEvent.VK_F9:
-+ case charva.awt.event.KeyEvent.VK_F10:
-+ case charva.awt.event.KeyEvent.VK_F11:
-+ case charva.awt.event.KeyEvent.VK_F12:
-+ case charva.awt.event.KeyEvent.VK_F13:
-+ case charva.awt.event.KeyEvent.VK_F14:
-+ case charva.awt.event.KeyEvent.VK_F15:
-+ case charva.awt.event.KeyEvent.VK_F16:
-+ case charva.awt.event.KeyEvent.VK_F17:
-+ case charva.awt.event.KeyEvent.VK_F18:
-+ case charva.awt.event.KeyEvent.VK_F19:
-+ case charva.awt.event.KeyEvent.VK_F20:
-+ case charva.awt.event.KeyEvent.VK_DELETE:
-+ case charva.awt.event.KeyEvent.VK_INSERT:
-+ case charva.awt.event.KeyEvent.VK_PAGE_DOWN:
-+ case charva.awt.event.KeyEvent.VK_PAGE_UP:
-+ case charva.awt.event.KeyEvent.VK_ENTER:
-+ case charva.awt.event.KeyEvent.VK_BACK_TAB:
-+ case charva.awt.event.KeyEvent.VK_END:
-+ return true;
-+ default:
-+ if ( _key < 32 )
-+ return true;
-+ return false;
-+ }
- }
-
- //====================================================================
+--- java/src/charva/awt/Toolkit.java.orig 2016-06-20 12:40:44 UTC
++++ java/src/charva/awt/Toolkit.java
+@@ -157,13 +157,9 @@ public class Toolkit {
+ * key as defined in the "VK_*" values.
+ */
+ public void fireKeystroke(int key_, Component source_) {
+- int id;
+- if (Toolkit.isActionKey(key_))
+- id = AWTEvent.KEY_TYPED;
+- else
+- id = AWTEvent.KEY_PRESSED;
+-
+- _evtQueue.postEvent(new KeyEvent(key_, id, source_));
++ _evtQueue.postEvent(new KeyEvent(key_, AWTEvent.KEY_PRESSED, source_));
++ if (!Toolkit.isActionKey(key_))
++ _evtQueue.postEvent(new KeyEvent(key_, AWTEvent.KEY_TYPED, source_));
+ }
+
+ public FocusEvent getLastFocusEvent() {
+@@ -225,7 +221,7 @@ public class Toolkit {
+ _lastMousePressTime = System.currentTimeMillis();
+
+ Component component =
+- top_window.getComponentAt(x - origin.x, y - origin.y);
++ top_window.findComponentAt(x - origin.x, y - origin.y);
+
+ if (component != null) {
+ _evtQueue.postEvent(new MouseEvent(component, modifiers, x, y, 0, button));
+@@ -796,43 +792,47 @@ public class Toolkit {
+ //public boolean isActionKey() { return (_key >= 256); }
+ public static boolean isActionKey( int _key )
+ {
+- boolean value = false;
+- if ( _key == charva.awt.event.KeyEvent.VK_ESCAPE ) value=true;
+- if ( _key == charva.awt.event.KeyEvent.VK_DOWN ) value=true;
+- if ( _key == charva.awt.event.KeyEvent.VK_UP ) value=true;
+- if ( _key == charva.awt.event.KeyEvent.VK_LEFT ) value=true;
+- if ( _key == charva.awt.event.KeyEvent.VK_RIGHT ) value=true;
+- if ( _key == charva.awt.event.KeyEvent.VK_HOME ) value=true;
+- if ( _key == charva.awt.event.KeyEvent.VK_BACK_SPACE ) value=true;
+- if ( _key == charva.awt.event.KeyEvent.VK_F1 ) value=true;
+- if ( _key == charva.awt.event.KeyEvent.VK_F2 ) value=true;
+- if ( _key == charva.awt.event.KeyEvent.VK_F3 ) value=true;
+- if ( _key == charva.awt.event.KeyEvent.VK_F4 ) value=true;
+- if ( _key == charva.awt.event.KeyEvent.VK_F5 ) value=true;
+- if ( _key == charva.awt.event.KeyEvent.VK_F6 ) value=true;
+- if ( _key == charva.awt.event.KeyEvent.VK_F7 ) value=true;
+- if ( _key == charva.awt.event.KeyEvent.VK_F8 ) value=true;
+- if ( _key == charva.awt.event.KeyEvent.VK_F9 ) value=true;
+- if ( _key == charva.awt.event.KeyEvent.VK_F10 ) value=true;
+- if ( _key == charva.awt.event.KeyEvent.VK_F11 ) value=true;
+- if ( _key == charva.awt.event.KeyEvent.VK_F12 ) value=true;
+- if ( _key == charva.awt.event.KeyEvent.VK_F13 ) value=true;
+- if ( _key == charva.awt.event.KeyEvent.VK_F14 ) value=true;
+- if ( _key == charva.awt.event.KeyEvent.VK_F15 ) value=true;
+- if ( _key == charva.awt.event.KeyEvent.VK_F16 ) value=true;
+- if ( _key == charva.awt.event.KeyEvent.VK_F17 ) value=true;
+- if ( _key == charva.awt.event.KeyEvent.VK_F18 ) value=true;
+- if ( _key == charva.awt.event.KeyEvent.VK_F19 ) value=true;
+- if ( _key == charva.awt.event.KeyEvent.VK_F20 ) value=true;
+- if ( _key == charva.awt.event.KeyEvent.VK_DELETE ) value=true;
+- if ( _key == charva.awt.event.KeyEvent.VK_INSERT ) value=true;
+- if ( _key == charva.awt.event.KeyEvent.VK_PAGE_DOWN ) value=true;
+- if ( _key == charva.awt.event.KeyEvent.VK_PAGE_UP ) value=true;
+- if ( _key == charva.awt.event.KeyEvent.VK_ENTER ) value=true;
+- if ( _key == charva.awt.event.KeyEvent.VK_BACK_TAB ) value=true;
+- if ( _key == charva.awt.event.KeyEvent.VK_END ) value=true;
+-
+- return (value);
++ switch (_key) {
++ case charva.awt.event.KeyEvent.VK_ESCAPE:
++ case charva.awt.event.KeyEvent.VK_DOWN:
++ case charva.awt.event.KeyEvent.VK_UP:
++ case charva.awt.event.KeyEvent.VK_LEFT:
++ case charva.awt.event.KeyEvent.VK_RIGHT:
++ case charva.awt.event.KeyEvent.VK_HOME:
++ case charva.awt.event.KeyEvent.VK_BACK_SPACE:
++ case charva.awt.event.KeyEvent.VK_F1:
++ case charva.awt.event.KeyEvent.VK_F2:
++ case charva.awt.event.KeyEvent.VK_F3:
++ case charva.awt.event.KeyEvent.VK_F4:
++ case charva.awt.event.KeyEvent.VK_F5:
++ case charva.awt.event.KeyEvent.VK_F6:
++ case charva.awt.event.KeyEvent.VK_F7:
++ case charva.awt.event.KeyEvent.VK_F8:
++ case charva.awt.event.KeyEvent.VK_F9:
++ case charva.awt.event.KeyEvent.VK_F10:
++ case charva.awt.event.KeyEvent.VK_F11:
++ case charva.awt.event.KeyEvent.VK_F12:
++ case charva.awt.event.KeyEvent.VK_F13:
++ case charva.awt.event.KeyEvent.VK_F14:
++ case charva.awt.event.KeyEvent.VK_F15:
++ case charva.awt.event.KeyEvent.VK_F16:
++ case charva.awt.event.KeyEvent.VK_F17:
++ case charva.awt.event.KeyEvent.VK_F18:
++ case charva.awt.event.KeyEvent.VK_F19:
++ case charva.awt.event.KeyEvent.VK_F20:
++ case charva.awt.event.KeyEvent.VK_DELETE:
++ case charva.awt.event.KeyEvent.VK_INSERT:
++ case charva.awt.event.KeyEvent.VK_PAGE_DOWN:
++ case charva.awt.event.KeyEvent.VK_PAGE_UP:
++ case charva.awt.event.KeyEvent.VK_ENTER:
++ case charva.awt.event.KeyEvent.VK_BACK_TAB:
++ case charva.awt.event.KeyEvent.VK_END:
++ return true;
++ default:
++ if ( _key < 32 )
++ return true;
++ return false;
++ }
+ }
+
+ //====================================================================
diff --git a/devel/charva/files/patch-java_src_charva_awt_VerticalFlowLayout.java b/devel/charva/files/patch-java_src_charva_awt_VerticalFlowLayout.java
index 46dddb4..d6c6559 100644
--- a/devel/charva/files/patch-java_src_charva_awt_VerticalFlowLayout.java
+++ b/devel/charva/files/patch-java_src_charva_awt_VerticalFlowLayout.java
@@ -1,232 +1,232 @@
---- java/src/charva/awt/VerticalFlowLayout.java.orig Mon Jan 29 09:39:30 2007
-+++ java/src/charva/awt/VerticalFlowLayout.java Mon Jan 29 09:39:30 2007
+--- java/src/charva/awt/VerticalFlowLayout.java.orig 2016-06-20 12:40:44 UTC
++++ java/src/charva/awt/VerticalFlowLayout.java
@@ -0,0 +1,229 @@
-+/* class FlowLayout
-+ *
-+ * Copyright (C) 2001 R M Pitman
-+ * Copyright (C) 2007 Lapo Luchini
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-+ */
-+
-+package charva.awt;
-+
-+import java.util.Enumeration;
-+import java.util.Vector;
-+
-+/**
-+ * A concrete implementation of LayoutManager that lays out its
-+ * components top-to-bottom.
-+ */
-+public class VerticalFlowLayout
-+ implements LayoutManager {
-+ /**
-+ * Default constructor. Sets alignment to MIDDLE, hgap to 1,
-+ * and vgap to 0.
-+ */
-+ public VerticalFlowLayout() {
-+ this(MIDDLE, 1, 0);
-+ }
-+
-+ /**
-+ * Use this constructor when you want to set the alignment and the
-+ * horizontal and vertical gaps.
-+ */
-+ public VerticalFlowLayout(int align_, int hgap_, int vgap_) {
-+ _align = align_;
-+ _hgap = hgap_;
-+ _vgap = vgap_;
-+ }
-+
-+ /**
-+ * Sets the alignment for this layout. Allowable values are
-+ * VerticalFlowLayout.TOP, VerticalFlowLayout.MIDDLE and
-+ * VerticalFlowLayout.BOTTOM.
-+ */
-+ public void setAlignment(int align_) {
-+ _align = align_;
-+ }
-+
-+ /**
-+ * Gets the alignment for this layout.
-+ */
-+ public int getAlignment() {
-+ return _align;
-+ }
-+
-+ /**
-+ * Calculate the minimum-size rectangle that can enclose all the
-+ * components in the given container.
-+ */
-+ public Dimension minimumSize(Container container_) {
-+
-+ int width = 0;
-+ int height = 0;
-+
-+ Component[] components = container_.getComponents();
-+ for (int i = 0; i < components.length; i++) {
-+ Dimension d = components[i].minimumSize();
-+
-+ /* Make allowance for the gap between this component and the
-+ * previous component.
-+ */
-+ if (i != 0)
-+ height += _vgap;
-+
-+ height += d.height;
-+ if (d.width > width)
-+ width = d.width;
-+ }
-+
-+ /* Take into account the border frame (if any).
-+ */
-+ Insets insets = container_.getInsets();
-+ height += insets.top + insets.bottom;
-+ width += insets.left + insets.right;
-+
-+ return new Dimension(width, height);
-+ }
-+
-+ /**
-+ * Lay out the components according to the specified alignment, hgap
-+ * and vgap.
-+ * This is called when the size of the container has already been
-+ * calculated.
-+ * It lays out the components in a column, one at a time, until it
-+ * determines that there is not enough space left in the column.
-+ * Then it moves to the next row. If there is not enough horizontal
-+ * space in the container to lay out all of the components, it
-+ * removes the remaining components from the container; they don't
-+ * appear at all.
-+ */
-+ public void doLayout(Container container_) {
-+
-+ Insets insets = container_.getInsets();
-+ int availableHeight = container_.getSize().height -
-+ insets.top - insets.bottom;
-+ int heightLeft = availableHeight;
-+ int widthLeft = container_.getSize().width -
-+ insets.left - insets.right;
-+
-+ int hoffset = insets.left;
-+
-+ Component[] components = container_.getComponents();
-+ Vector localvector = new Vector();
-+ for (int i = 0; i < components.length; i++) {
-+ Component c = components[i];
-+
-+ /* Get the contained container to lay itself out at its
-+ * preferred size, if it is not already laid out.
-+ */
-+ if (c instanceof Container) {
-+ Container cont = (Container) c;
-+ if (cont.isValid() == false) {
-+ cont.setSize(cont.minimumSize());
-+ cont.doLayout();
-+ }
-+ }
-+
-+ /* Determine the width required to lay out the current
-+ * component (including the gap between this component and
-+ * the previous component).
-+ */
-+ int requiredHeight = c.getSize().height;
-+ if (i != 0)
-+ requiredHeight += _vgap;
-+
-+ if (requiredHeight > heightLeft) {
-+ int columnWidth = 0;
-+ if (localvector.size() != 0) {
-+ columnWidth = layoutColumn(container_, localvector,
-+ widthLeft, heightLeft, hoffset);
-+ localvector.removeAllElements();
-+ }
-+ hoffset += columnWidth + _hgap;
-+ heightLeft = availableHeight;
-+ widthLeft -= columnWidth + _hgap;
-+ }
-+ heightLeft -= requiredHeight;
-+
-+ // Build up a temporary list of components for this row.
-+ localvector.add(c);
-+ }
-+ layoutColumn(container_, localvector, widthLeft, heightLeft, hoffset);
-+
-+ }
-+
-+ /**
-+ * private function to layout a single column of components.
-+ *
-+ * @return The height of the laid-out column.
-+ */
-+ private int layoutColumn(Container container_, Vector components_,
-+ int widthleft_, int heightleft_, int hoffset_) {
-+
-+ int voffset = 0;
-+ int columnWidth = 0;
-+ Insets insets = container_.getInsets();
-+
-+ switch (_align) {
-+ case TOP:
-+ voffset = insets.top;
-+ break;
-+ case MIDDLE:
-+ voffset = insets.top + heightleft_ / 2;
-+ break;
-+ case BOTTOM:
-+ voffset = insets.top + heightleft_;
-+ break;
-+ }
-+
-+ Enumeration e = components_.elements();
-+ while (e.hasMoreElements()) {
-+ Component c = (Component) e.nextElement();
-+ if (c.getSize().width > columnWidth)
-+ columnWidth = c.getSize().width;
-+
-+ if (columnWidth > widthleft_) {
-+ container_.remove(c); // we have run out of space
-+ continue;
-+ }
-+
-+ c.setLocation(hoffset_, voffset);
-+ voffset += c.getSize().height + _vgap;
-+ }
-+ return columnWidth;
-+ }
-+
-+ //====================================================================
-+ // INSTANCE VARIABLES
-+
-+ /**
-+ * Alignment of components (TOP, BOTTOM or MIDDLE)
-+ */
-+ private int _align = MIDDLE;
-+
-+ /**
-+ * Horizontal gap between components
-+ */
-+ private int _hgap = 1;
-+
-+ /**
-+ * Vertical gap between components
-+ */
-+ private int _vgap = 0;
-+
-+ public static final int TOP = 1;
-+ public static final int MIDDLE = 2;
-+ public static final int BOTTOM = 3;
-+
-+}
++/* class FlowLayout
++ *
++ * Copyright (C) 2001 R M Pitman
++ * Copyright (C) 2007 Lapo Luchini
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2.1 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ */
++
++package charva.awt;
++
++import java.util.Enumeration;
++import java.util.Vector;
++
++/**
++ * A concrete implementation of LayoutManager that lays out its
++ * components top-to-bottom.
++ */
++public class VerticalFlowLayout
++ implements LayoutManager {
++ /**
++ * Default constructor. Sets alignment to MIDDLE, hgap to 1,
++ * and vgap to 0.
++ */
++ public VerticalFlowLayout() {
++ this(MIDDLE, 1, 0);
++ }
++
++ /**
++ * Use this constructor when you want to set the alignment and the
++ * horizontal and vertical gaps.
++ */
++ public VerticalFlowLayout(int align_, int hgap_, int vgap_) {
++ _align = align_;
++ _hgap = hgap_;
++ _vgap = vgap_;
++ }
++
++ /**
++ * Sets the alignment for this layout. Allowable values are
++ * VerticalFlowLayout.TOP, VerticalFlowLayout.MIDDLE and
++ * VerticalFlowLayout.BOTTOM.
++ */
++ public void setAlignment(int align_) {
++ _align = align_;
++ }
++
++ /**
++ * Gets the alignment for this layout.
++ */
++ public int getAlignment() {
++ return _align;
++ }
++
++ /**
++ * Calculate the minimum-size rectangle that can enclose all the
++ * components in the given container.
++ */
++ public Dimension minimumSize(Container container_) {
++
++ int width = 0;
++ int height = 0;
++
++ Component[] components = container_.getComponents();
++ for (int i = 0; i < components.length; i++) {
++ Dimension d = components[i].minimumSize();
++
++ /* Make allowance for the gap between this component and the
++ * previous component.
++ */
++ if (i != 0)
++ height += _vgap;
++
++ height += d.height;
++ if (d.width > width)
++ width = d.width;
++ }
++
++ /* Take into account the border frame (if any).
++ */
++ Insets insets = container_.getInsets();
++ height += insets.top + insets.bottom;
++ width += insets.left + insets.right;
++
++ return new Dimension(width, height);
++ }
++
++ /**
++ * Lay out the components according to the specified alignment, hgap
++ * and vgap.
++ * This is called when the size of the container has already been
++ * calculated.
++ * It lays out the components in a column, one at a time, until it
++ * determines that there is not enough space left in the column.
++ * Then it moves to the next row. If there is not enough horizontal
++ * space in the container to lay out all of the components, it
++ * removes the remaining components from the container; they don't
++ * appear at all.
++ */
++ public void doLayout(Container container_) {
++
++ Insets insets = container_.getInsets();
++ int availableHeight = container_.getSize().height -
++ insets.top - insets.bottom;
++ int heightLeft = availableHeight;
++ int widthLeft = container_.getSize().width -
++ insets.left - insets.right;
++
++ int hoffset = insets.left;
++
++ Component[] components = container_.getComponents();
++ Vector localvector = new Vector();
++ for (int i = 0; i < components.length; i++) {
++ Component c = components[i];
++
++ /* Get the contained container to lay itself out at its
++ * preferred size, if it is not already laid out.
++ */
++ if (c instanceof Container) {
++ Container cont = (Container) c;
++ if (cont.isValid() == false) {
++ cont.setSize(cont.minimumSize());
++ cont.doLayout();
++ }
++ }
++
++ /* Determine the width required to lay out the current
++ * component (including the gap between this component and
++ * the previous component).
++ */
++ int requiredHeight = c.getSize().height;
++ if (i != 0)
++ requiredHeight += _vgap;
++
++ if (requiredHeight > heightLeft) {
++ int columnWidth = 0;
++ if (localvector.size() != 0) {
++ columnWidth = layoutColumn(container_, localvector,
++ widthLeft, heightLeft, hoffset);
++ localvector.removeAllElements();
++ }
++ hoffset += columnWidth + _hgap;
++ heightLeft = availableHeight;
++ widthLeft -= columnWidth + _hgap;
++ }
++ heightLeft -= requiredHeight;
++
++ // Build up a temporary list of components for this row.
++ localvector.add(c);
++ }
++ layoutColumn(container_, localvector, widthLeft, heightLeft, hoffset);
++
++ }
++
++ /**
++ * private function to layout a single column of components.
++ *
++ * @return The height of the laid-out column.
++ */
++ private int layoutColumn(Container container_, Vector components_,
++ int widthleft_, int heightleft_, int hoffset_) {
++
++ int voffset = 0;
++ int columnWidth = 0;
++ Insets insets = container_.getInsets();
++
++ switch (_align) {
++ case TOP:
++ voffset = insets.top;
++ break;
++ case MIDDLE:
++ voffset = insets.top + heightleft_ / 2;
++ break;
++ case BOTTOM:
++ voffset = insets.top + heightleft_;
++ break;
++ }
++
++ Enumeration e = components_.elements();
++ while (e.hasMoreElements()) {
++ Component c = (Component) e.nextElement();
++ if (c.getSize().width > columnWidth)
++ columnWidth = c.getSize().width;
++
++ if (columnWidth > widthleft_) {
++ container_.remove(c); // we have run out of space
++ continue;
++ }
++
++ c.setLocation(hoffset_, voffset);
++ voffset += c.getSize().height + _vgap;
++ }
++ return columnWidth;
++ }
++
++ //====================================================================
++ // INSTANCE VARIABLES
++
++ /**
++ * Alignment of components (TOP, BOTTOM or MIDDLE)
++ */
++ private int _align = MIDDLE;
++
++ /**
++ * Horizontal gap between components
++ */
++ private int _hgap = 1;
++
++ /**
++ * Vertical gap between components
++ */
++ private int _vgap = 0;
++
++ public static final int TOP = 1;
++ public static final int MIDDLE = 2;
++ public static final int BOTTOM = 3;
++
++}
diff --git a/devel/charva/files/patch-java_src_charva_awt_Window.java b/devel/charva/files/patch-java_src_charva_awt_Window.java
index 41f18aa..84178c3 100644
--- a/devel/charva/files/patch-java_src_charva_awt_Window.java
+++ b/devel/charva/files/patch-java_src_charva_awt_Window.java
@@ -1,56 +1,56 @@
---- java/src/charva/awt/Window.java.orig Mon Aug 14 17:38:56 2006
-+++ java/src/charva/awt/Window.java Mon Jan 29 09:39:30 2007
-@@ -156,13 +156,21 @@ public class Window
- */
- SyncQueue.getInstance().postEvent(new SyncEvent(this));
-
-- if (_dispatchThreadRunning)
-- run();
-- else {
-- _dispatchThreadRunning = true;
-- Thread dispatchThread = new Thread(this);
-- dispatchThread.setName("event dispatcher");
-- dispatchThread.start();
-+ if (_dispatchThread != null) {
-+ if (Thread.currentThread() == _dispatchThread) {
-+ // we are in the EDT, we must manage events
-+ run();
-+ } else {
-+ // we are not the EDT, let's wait for him to ask us to close
-+ synchronized (this) {
-+ while (!_windowClosed)
-+ try { wait(); } catch (InterruptedException e) { }
-+ }
-+ }
-+ } else {
-+ _dispatchThread = new Thread(this);
-+ _dispatchThread.setName("event dispatcher");
-+ _dispatchThread.start();
-
- /* If "charva.script.playback" is defined, we start up
- * a thread for playing back the script. Keys from both the
-@@ -270,7 +278,10 @@ public class Window
- */
- if (we.getID() == AWTEvent.WINDOW_CLOSING) {
-
-- we.getWindow()._windowClosed = true;
-+ synchronized (we.getWindow()) {
-+ we.getWindow()._windowClosed = true;
-+ we.getWindow().notify();
-+ }
-
- /* Remove this window from the list of those displayed,
- * and blank out the screen area where the window was
-@@ -407,10 +418,10 @@ public class Window
-
- private Window _owner;
- protected Toolkit _term;
-- private boolean _windowClosed = false;
-+ private volatile boolean _windowClosed = false;
-
- private Vector _windowListeners = null;
-
-- private static boolean _dispatchThreadRunning = false;
-+ private static Thread _dispatchThread = null;
-
- }
+--- java/src/charva/awt/Window.java.orig 2016-06-20 12:40:44 UTC
++++ java/src/charva/awt/Window.java
+@@ -156,13 +156,21 @@ public class Window
+ */
+ SyncQueue.getInstance().postEvent(new SyncEvent(this));
+
+- if (_dispatchThreadRunning)
+- run();
+- else {
+- _dispatchThreadRunning = true;
+- Thread dispatchThread = new Thread(this);
+- dispatchThread.setName("event dispatcher");
+- dispatchThread.start();
++ if (_dispatchThread != null) {
++ if (Thread.currentThread() == _dispatchThread) {
++ // we are in the EDT, we must manage events
++ run();
++ } else {
++ // we are not the EDT, let's wait for him to ask us to close
++ synchronized (this) {
++ while (!_windowClosed)
++ try { wait(); } catch (InterruptedException e) { }
++ }
++ }
++ } else {
++ _dispatchThread = new Thread(this);
++ _dispatchThread.setName("event dispatcher");
++ _dispatchThread.start();
+
+ /* If "charva.script.playback" is defined, we start up
+ * a thread for playing back the script. Keys from both the
+@@ -270,7 +278,10 @@ public class Window
+ */
+ if (we.getID() == AWTEvent.WINDOW_CLOSING) {
+
+- we.getWindow()._windowClosed = true;
++ synchronized (we.getWindow()) {
++ we.getWindow()._windowClosed = true;
++ we.getWindow().notify();
++ }
+
+ /* Remove this window from the list of those displayed,
+ * and blank out the screen area where the window was
+@@ -407,10 +418,10 @@ public class Window
+
+ private Window _owner;
+ protected Toolkit _term;
+- private boolean _windowClosed = false;
++ private volatile boolean _windowClosed = false;
+
+ private Vector _windowListeners = null;
+
+- private static boolean _dispatchThreadRunning = false;
++ private static Thread _dispatchThread = null;
+
+ }
diff --git a/devel/charva/files/patch-java_src_charva_awt_event_FocusAdapter.java b/devel/charva/files/patch-java_src_charva_awt_event_FocusAdapter.java
index 5635c2e..8369831 100644
--- a/devel/charva/files/patch-java_src_charva_awt_event_FocusAdapter.java
+++ b/devel/charva/files/patch-java_src_charva_awt_event_FocusAdapter.java
@@ -1,5 +1,5 @@
---- java/src/charva/awt/event/FocusAdapter.java.orig Mon Jan 29 09:39:30 2007
-+++ java/src/charva/awt/event/FocusAdapter.java Mon Jan 29 09:39:30 2007
+--- java/src/charva/awt/event/FocusAdapter.java.orig 2016-06-20 12:40:44 UTC
++++ java/src/charva/awt/event/FocusAdapter.java
@@ -0,0 +1,17 @@
+package charva.awt.event;
+
diff --git a/devel/charva/files/patch-java_src_charvax_swing_AbstractButton.java b/devel/charva/files/patch-java_src_charvax_swing_AbstractButton.java
index ecc8db0..434d96c 100644
--- a/devel/charva/files/patch-java_src_charvax_swing_AbstractButton.java
+++ b/devel/charva/files/patch-java_src_charvax_swing_AbstractButton.java
@@ -1,90 +1,90 @@
---- java/src/charvax/swing/AbstractButton.java.orig Sat Dec 17 15:27:30 2005
-+++ java/src/charvax/swing/AbstractButton.java Mon Jan 29 09:39:30 2007
+--- java/src/charvax/swing/AbstractButton.java.orig 2016-06-20 12:40:44 UTC
++++ java/src/charvax/swing/AbstractButton.java
@@ -19,15 +19,16 @@
-
- package charvax.swing;
-
-+import java.util.Enumeration;
-+import java.util.Vector;
-+
-+import charva.awt.Container;
- import charva.awt.EventQueue;
- import charva.awt.ItemSelectable;
- import charva.awt.Toolkit;
- import charva.awt.Window;
- import charva.awt.event.*;
-
--import java.util.Enumeration;
--import java.util.Vector;
--
- /**
- * This forms the base class for components that exhibit button-like
- * behavior.
-@@ -50,6 +51,12 @@ public abstract class AbstractButton
- _label = label_;
- }
-
-+ protected void addKeyListenerToAncestor() {
-+ Window ancestor = super.getAncestorWindow();
-+ if (ancestor != null)
-+ ancestor.addKeyListener(this);
-+ }
-+
- /**
- * Set the button's mnemonic character.
- * The mnemonic is the key which will activate this button if focus
-@@ -76,10 +83,16 @@ public abstract class AbstractButton
- */
- public void setMnemonic(int mnemonic_) {
- _mnemonic = mnemonic_;
-- Window ancestor = super.getAncestorWindow();
-- if (ancestor != null) {
-- ancestor.addKeyListener(this);
-- }
-+ addKeyListenerToAncestor();
-+ }
-+
-+ public void setParent(Container container_) {
-+ if ((_mnemonic != 0) && (_parent != null) && (_parent.get() != null))
-+ throw new RuntimeException("Removal from previous parent currently not implemented");
-+ //removeKeyListenerFromAncestor();
-+ super.setParent(container_);
-+ if (_mnemonic != 0)
-+ addKeyListenerToAncestor();
- }
-
- /**
-@@ -237,24 +250,23 @@ public abstract class AbstractButton
- * character or a function key or cursor key was typed.
- */
- public void keyPressed(KeyEvent ke_) {
-- if (ke_.getKeyCode() == getMnemonic()) {
-+ int code = ke_.getKeyCode();
-+ int mnem = getMnemonic();
-+ if (!ke_.isActionKey()) {
-+ code = Character.toLowerCase(code);
-+ mnem = Character.toLowerCase(mnem);
-+ }
-+ if (code == mnem) {
- doClick();
- ke_.consume();
- }
- }
-
- /**
-- * Implements the KeyListener interface; this is called if a printable
-- * (ASCII or ISO8859-1) character was typed.
-+ * Implements the KeyListener interface; this is called only if a
-+ * printable (ASCII or ISO8859-1) character was typed.
- */
- public void keyTyped(KeyEvent ke_) {
-- // We must accept either uppercase or lowercase mnemonic characters.
-- char keyLower = Character.toLowerCase((char) ke_.getKeyChar());
-- char mnemonicLower = Character.toLowerCase((char) getMnemonic());
-- if (keyLower == mnemonicLower) {
-- doClick();
-- ke_.consume();
-- }
- }
-
- /**
+
+ package charvax.swing;
+
++import java.util.Enumeration;
++import java.util.Vector;
++
++import charva.awt.Container;
+ import charva.awt.EventQueue;
+ import charva.awt.ItemSelectable;
+ import charva.awt.Toolkit;
+ import charva.awt.Window;
+ import charva.awt.event.*;
+
+-import java.util.Enumeration;
+-import java.util.Vector;
+-
+ /**
+ * This forms the base class for components that exhibit button-like
+ * behavior.
+@@ -50,6 +51,12 @@ public abstract class AbstractButton
+ _label = label_;
+ }
+
++ protected void addKeyListenerToAncestor() {
++ Window ancestor = super.getAncestorWindow();
++ if (ancestor != null)
++ ancestor.addKeyListener(this);
++ }
++
+ /**
+ * Set the button's mnemonic character.
+ * The mnemonic is the key which will activate this button if focus
+@@ -76,10 +83,16 @@ public abstract class AbstractButton
+ */
+ public void setMnemonic(int mnemonic_) {
+ _mnemonic = mnemonic_;
+- Window ancestor = super.getAncestorWindow();
+- if (ancestor != null) {
+- ancestor.addKeyListener(this);
+- }
++ addKeyListenerToAncestor();
++ }
++
++ public void setParent(Container container_) {
++ if ((_mnemonic != 0) && (_parent != null) && (_parent.get() != null))
++ throw new RuntimeException("Removal from previous parent currently not implemented");
++ //removeKeyListenerFromAncestor();
++ super.setParent(container_);
++ if (_mnemonic != 0)
++ addKeyListenerToAncestor();
+ }
+
+ /**
+@@ -237,24 +250,23 @@ public abstract class AbstractButton
+ * character or a function key or cursor key was typed.
+ */
+ public void keyPressed(KeyEvent ke_) {
+- if (ke_.getKeyCode() == getMnemonic()) {
++ int code = ke_.getKeyCode();
++ int mnem = getMnemonic();
++ if (!ke_.isActionKey()) {
++ code = Character.toLowerCase(code);
++ mnem = Character.toLowerCase(mnem);
++ }
++ if (code == mnem) {
+ doClick();
+ ke_.consume();
+ }
+ }
+
+ /**
+- * Implements the KeyListener interface; this is called if a printable
+- * (ASCII or ISO8859-1) character was typed.
++ * Implements the KeyListener interface; this is called only if a
++ * printable (ASCII or ISO8859-1) character was typed.
+ */
+ public void keyTyped(KeyEvent ke_) {
+- // We must accept either uppercase or lowercase mnemonic characters.
+- char keyLower = Character.toLowerCase((char) ke_.getKeyChar());
+- char mnemonicLower = Character.toLowerCase((char) getMnemonic());
+- if (keyLower == mnemonicLower) {
+- doClick();
+- ke_.consume();
+- }
+ }
+
+ /**
diff --git a/devel/charva/files/patch-java_src_charvax_swing_ButtonGroup.java b/devel/charva/files/patch-java_src_charvax_swing_ButtonGroup.java
index a64a92d..b1dbcc7 100644
--- a/devel/charva/files/patch-java_src_charvax_swing_ButtonGroup.java
+++ b/devel/charva/files/patch-java_src_charvax_swing_ButtonGroup.java
@@ -1,26 +1,26 @@
---- java/src/charvax/swing/ButtonGroup.java.orig 2005-12-17 15:27:30.000000000 +0100
-+++ java/src/charvax/swing/ButtonGroup.java 2009-11-16 10:26:42.000000000 +0100
-@@ -63,9 +63,10 @@
- * Adds the specified button to the group.
- */
- public void add(AbstractButton button_) {
-+ if (getSelection() != null)
-+ button_.setSelected(false);
- _buttons.add(button_);
- button_.addItemListener(this);
-- button_.setSelected(false);
- }
-
- /**
-@@ -133,10 +134,9 @@
- for (Enumeration e = _buttons.elements(); e.hasMoreElements();) {
-
- AbstractButton b = (AbstractButton) e.nextElement();
-- if (source != b || statechange != ItemEvent.SELECTED) {
-+ if (source != b && statechange == ItemEvent.SELECTED) {
- if (b.isSelected()) {
- b._selected = false;
-- b.setEnabled(true);
- }
- }
- }
+--- java/src/charvax/swing/ButtonGroup.java.orig 2016-06-20 12:40:44 UTC
++++ java/src/charvax/swing/ButtonGroup.java
+@@ -63,9 +63,10 @@ public class ButtonGroup
+ * Adds the specified button to the group.
+ */
+ public void add(AbstractButton button_) {
++ if (getSelection() != null)
++ button_.setSelected(false);
+ _buttons.add(button_);
+ button_.addItemListener(this);
+- button_.setSelected(false);
+ }
+
+ /**
+@@ -133,10 +134,9 @@ public class ButtonGroup
+ for (Enumeration e = _buttons.elements(); e.hasMoreElements();) {
+
+ AbstractButton b = (AbstractButton) e.nextElement();
+- if (source != b || statechange != ItemEvent.SELECTED) {
++ if (source != b && statechange == ItemEvent.SELECTED) {
+ if (b.isSelected()) {
+ b._selected = false;
+- b.setEnabled(true);
+ }
+ }
+ }
diff --git a/devel/charva/files/patch-java_src_charvax_swing_JLabel.java b/devel/charva/files/patch-java_src_charvax_swing_JLabel.java
index 8abd344b..65704b0 100644
--- a/devel/charva/files/patch-java_src_charvax_swing_JLabel.java
+++ b/devel/charva/files/patch-java_src_charvax_swing_JLabel.java
@@ -1,47 +1,47 @@
---- java/src/charvax/swing/JLabel.java.orig Sat Dec 17 15:27:30 2005
-+++ java/src/charvax/swing/JLabel.java Mon Jan 29 09:39:30 2007
+--- java/src/charvax/swing/JLabel.java.orig 2016-06-20 12:40:44 UTC
++++ java/src/charvax/swing/JLabel.java
@@ -20,6 +20,7 @@
- package charvax.swing;
-
- import charva.awt.Dimension;
-+import charva.awt.Font;
- import charva.awt.Insets;
- import charva.awt.Point;
- import charva.awt.Toolkit;
-@@ -79,6 +80,10 @@ public class JLabel
- // Draw the border if it exists
- super.draw();
-
-+ int attrib = 0;
-+ if (_bold)
-+ attrib |= Toolkit.A_BOLD;
-+
- /* Get the absolute origin of this component.
- */
- Point origin = getLocationOnScreen();
-@@ -98,7 +103,7 @@ public class JLabel
- buf.setLength(_width); // truncate
-
- int colorpair = getCursesColor();
-- term.addString(buf.toString(), 0, colorpair);
-+ term.addString(buf.toString(), attrib, colorpair);
- }
-
- /**
-@@ -169,10 +174,16 @@ public class JLabel
- return "JLabel: [" + getText() + "]";
- }
-
-+ public void setFont(Font font_) {
-+ _bold = ((font_.getStyle() & Font.BOLD) != 0);
-+ }
-+
- //====================================================================
- // INSTANCE VARIABLES
-
- private String _labeltext;
- private int _width;
-+
-+ protected boolean _bold = false;
-
- }
+ package charvax.swing;
+
+ import charva.awt.Dimension;
++import charva.awt.Font;
+ import charva.awt.Insets;
+ import charva.awt.Point;
+ import charva.awt.Toolkit;
+@@ -79,6 +80,10 @@ public class JLabel
+ // Draw the border if it exists
+ super.draw();
+
++ int attrib = 0;
++ if (_bold)
++ attrib |= Toolkit.A_BOLD;
++
+ /* Get the absolute origin of this component.
+ */
+ Point origin = getLocationOnScreen();
+@@ -98,7 +103,7 @@ public class JLabel
+ buf.setLength(_width); // truncate
+
+ int colorpair = getCursesColor();
+- term.addString(buf.toString(), 0, colorpair);
++ term.addString(buf.toString(), attrib, colorpair);
+ }
+
+ /**
+@@ -169,10 +174,16 @@ public class JLabel
+ return "JLabel: [" + getText() + "]";
+ }
+
++ public void setFont(Font font_) {
++ _bold = ((font_.getStyle() & Font.BOLD) != 0);
++ }
++
+ //====================================================================
+ // INSTANCE VARIABLES
+
+ private String _labeltext;
+ private int _width;
+
++ protected boolean _bold = false;
++
+ }
diff --git a/devel/charva/files/patch-java_src_charvax_swing_JPasswordField.java b/devel/charva/files/patch-java_src_charvax_swing_JPasswordField.java
index 5da15a4..67a52ec 100644
--- a/devel/charva/files/patch-java_src_charvax_swing_JPasswordField.java
+++ b/devel/charva/files/patch-java_src_charvax_swing_JPasswordField.java
@@ -1,14 +1,14 @@
---- java/src/charvax/swing/JPasswordField.java.orig Sat Dec 17 15:27:30 2005
-+++ java/src/charvax/swing/JPasswordField.java Mon Jan 29 09:39:30 2007
-@@ -133,8 +133,10 @@ public class JPasswordField
- * UNDERLINE attribute.
- */
- int attrib = 0;
-- if (super._enabled)
-+ if (_enabled)
- attrib |= Toolkit.A_UNDERLINE;
-+ if (_bold)
-+ attrib |= Toolkit.A_BOLD;
-
- term.setCursor(origin);
- term.addString(_padding, attrib, colorpair);
+--- java/src/charvax/swing/JPasswordField.java.orig 2016-06-20 12:40:44 UTC
++++ java/src/charvax/swing/JPasswordField.java
+@@ -133,8 +133,10 @@ public class JPasswordField
+ * UNDERLINE attribute.
+ */
+ int attrib = 0;
+- if (super._enabled)
++ if (_enabled)
+ attrib |= Toolkit.A_UNDERLINE;
++ if (_bold)
++ attrib |= Toolkit.A_BOLD;
+
+ term.setCursor(origin);
+ term.addString(_padding, attrib, colorpair);
diff --git a/devel/charva/files/patch-java_src_charvax_swing_JTextArea.java b/devel/charva/files/patch-java_src_charvax_swing_JTextArea.java
index e81f770..cfff470 100644
--- a/devel/charva/files/patch-java_src_charvax_swing_JTextArea.java
+++ b/devel/charva/files/patch-java_src_charvax_swing_JTextArea.java
@@ -1,40 +1,40 @@
---- java/src/charvax/swing/JTextArea.java.orig Fri Dec 30 16:14:22 2005
-+++ java/src/charvax/swing/JTextArea.java Mon Jan 29 09:39:30 2007
-@@ -412,6 +412,10 @@ public class JTextArea
- Point tempCaret = null;
- Point caret = _caret;
-
-+ int attrib = 0;
-+ if (_bold)
-+ attrib |= Toolkit.A_BOLD;
-+
- /* Get the absolute origin of this component.
- */
- Point origin = getLocationOnScreen();
-@@ -458,7 +462,7 @@ public class JTextArea
- _rows++;
- term.setCursor(origin.addOffset(col, row));
- } else {
-- term.addChar(chr, 0, colorpair);
-+ term.addChar(chr, attrib, colorpair);
- col++;
- }
- } else { // We have reached the right-hand column.
-@@ -470,7 +474,7 @@ public class JTextArea
- _rows++;
- term.setCursor(origin.addOffset(col, row));
- } else {
-- term.addChar(chr, 0, colorpair);
-+ term.addChar(chr, attrib, colorpair);
- col++;
- _columns++;
- }
-@@ -482,7 +486,7 @@ public class JTextArea
- _rows++;
- term.setCursor(origin.addOffset(col, row));
- if (chr != '\n') // thanks to Chris Rogers for this
-- term.addChar(chr, 0, colorpair);
-+ term.addChar(chr, attrib, colorpair);
- } else {
- /* We must back-track until we get to whitespace, so
- * that we can move the word to the next line.
+--- java/src/charvax/swing/JTextArea.java.orig 2016-06-20 12:40:44 UTC
++++ java/src/charvax/swing/JTextArea.java
+@@ -412,6 +412,10 @@ public class JTextArea
+ Point tempCaret = null;
+ Point caret = _caret;
+
++ int attrib = 0;
++ if (_bold)
++ attrib |= Toolkit.A_BOLD;
++
+ /* Get the absolute origin of this component.
+ */
+ Point origin = getLocationOnScreen();
+@@ -458,7 +462,7 @@ public class JTextArea
+ _rows++;
+ term.setCursor(origin.addOffset(col, row));
+ } else {
+- term.addChar(chr, 0, colorpair);
++ term.addChar(chr, attrib, colorpair);
+ col++;
+ }
+ } else { // We have reached the right-hand column.
+@@ -470,7 +474,7 @@ public class JTextArea
+ _rows++;
+ term.setCursor(origin.addOffset(col, row));
+ } else {
+- term.addChar(chr, 0, colorpair);
++ term.addChar(chr, attrib, colorpair);
+ col++;
+ _columns++;
+ }
+@@ -482,7 +486,7 @@ public class JTextArea
+ _rows++;
+ term.setCursor(origin.addOffset(col, row));
+ if (chr != '\n') // thanks to Chris Rogers for this
+- term.addChar(chr, 0, colorpair);
++ term.addChar(chr, attrib, colorpair);
+ } else {
+ /* We must back-track until we get to whitespace, so
+ * that we can move the word to the next line.
diff --git a/devel/charva/files/patch-java_src_charvax_swing_JTextField.java b/devel/charva/files/patch-java_src_charvax_swing_JTextField.java
index f687815..1b1c9f4 100644
--- a/devel/charva/files/patch-java_src_charvax_swing_JTextField.java
+++ b/devel/charva/files/patch-java_src_charvax_swing_JTextField.java
@@ -1,43 +1,43 @@
---- java/src/charvax/swing/JTextField.java.orig Fri Dec 30 16:15:12 2005
-+++ java/src/charvax/swing/JTextField.java Mon Jan 29 09:39:30 2007
-@@ -118,11 +118,6 @@ public class JTextField
- return _columns;
- }
-
-- public void setFont(Font font_) {
-- _bold = ((font_.getStyle() & Font.BOLD) != 0);
-- }
--
--
- /**
- * Set the action command
- */
-@@ -189,9 +184,8 @@ public class JTextField
- * UNDERLINE attribute.
- */
- int attrib = 0;
-- if (super._enabled)
-+ if (_enabled)
- attrib |= Toolkit.A_UNDERLINE;
--
- if (_bold)
- attrib |= Toolkit.A_BOLD;
-
-@@ -247,7 +241,7 @@ public class JTextField
-
- /*
- */
-- if (ke_.isActionKey() == false) {
-+ if (!ke_.isActionKey() && (ke_.getID() == KeyEvent.KEY_TYPED)) {
-
- /* If it is a control character, ignore it.
- * @todo Do something more useful with control chars.
-@@ -414,8 +408,6 @@ public class JTextField
-
- //====================================================================
- // INSTANCE VARIABLES
--
-- protected boolean _bold = false;
-
- protected int _columns;
-
+--- java/src/charvax/swing/JTextField.java.orig 2016-06-20 12:40:44 UTC
++++ java/src/charvax/swing/JTextField.java
+@@ -118,11 +118,6 @@ public class JTextField
+ return _columns;
+ }
+
+- public void setFont(Font font_) {
+- _bold = ((font_.getStyle() & Font.BOLD) != 0);
+- }
+-
+-
+ /**
+ * Set the action command
+ */
+@@ -189,9 +184,8 @@ public class JTextField
+ * UNDERLINE attribute.
+ */
+ int attrib = 0;
+- if (super._enabled)
++ if (_enabled)
+ attrib |= Toolkit.A_UNDERLINE;
+-
+ if (_bold)
+ attrib |= Toolkit.A_BOLD;
+
+@@ -247,7 +241,7 @@ public class JTextField
+
+ /*
+ */
+- if (ke_.isActionKey() == false) {
++ if (!ke_.isActionKey() && (ke_.getID() == KeyEvent.KEY_TYPED)) {
+
+ /* If it is a control character, ignore it.
+ * @todo Do something more useful with control chars.
+@@ -415,8 +409,6 @@ public class JTextField
+ //====================================================================
+ // INSTANCE VARIABLES
+
+- protected boolean _bold = false;
+-
+ protected int _columns;
+
+ /**
diff --git a/devel/charva/files/patch-java_src_charvax_swing_text_JTextComponent.java b/devel/charva/files/patch-java_src_charvax_swing_text_JTextComponent.java
index eadcdd1..c4ad44f 100644
--- a/devel/charva/files/patch-java_src_charvax_swing_text_JTextComponent.java
+++ b/devel/charva/files/patch-java_src_charvax_swing_text_JTextComponent.java
@@ -1,28 +1,28 @@
---- java/src/charvax/swing/text/JTextComponent.java.orig Sat Dec 17 15:27:30 2005
-+++ java/src/charvax/swing/text/JTextComponent.java Mon Jan 29 09:39:30 2007
+--- java/src/charvax/swing/text/JTextComponent.java.orig 2016-06-20 12:40:44 UTC
++++ java/src/charvax/swing/text/JTextComponent.java
@@ -19,6 +19,7 @@
-
- package charvax.swing.text;
-
-+import charva.awt.Font;
- import charvax.swing.JComponent;
-
- /**
-@@ -72,6 +73,10 @@ public abstract class JTextComponent
- _editable = editable_;
- }
-
-+ public void setFont(Font font_) {
-+ _bold = ((font_.getStyle() & Font.BOLD) != 0);
-+ }
-+
- //====================================================================
- // INSTANCE VARIABLES
-
-@@ -84,4 +89,6 @@ public abstract class JTextComponent
- protected StringBuffer _document;
-
- protected boolean _editable = true;
-+
-+ protected boolean _bold = false;
- }
+
+ package charvax.swing.text;
+
++import charva.awt.Font;
+ import charvax.swing.JComponent;
+
+ /**
+@@ -72,6 +73,10 @@ public abstract class JTextComponent
+ _editable = editable_;
+ }
+
++ public void setFont(Font font_) {
++ _bold = ((font_.getStyle() & Font.BOLD) != 0);
++ }
++
+ //====================================================================
+ // INSTANCE VARIABLES
+
+@@ -84,4 +89,6 @@ public abstract class JTextComponent
+ protected StringBuffer _document;
+
+ protected boolean _editable = true;
++
++ protected boolean _bold = false;
+ }
diff --git a/devel/flickrnet/Makefile b/devel/flickrnet/Makefile
index 038906df..f1a5f8c 100644
--- a/devel/flickrnet/Makefile
+++ b/devel/flickrnet/Makefile
@@ -11,7 +11,8 @@ DISTNAME= FlickrNet${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}-Src-48055
MAINTAINER= ports@FreeBSD.org
COMMENT= Flickr .Net API Library
-USES= mono zip
+USES= dos2unix mono zip
+DOS2UNIX_GLOB= *.cs
WRKSRC= ${WRKDIR}/FlickrNet
do-build:
diff --git a/devel/flickrnet/files/patch-AssemblyInfo.cs b/devel/flickrnet/files/patch-AssemblyInfo.cs
index 539b0e0..d01cf90 100644
--- a/devel/flickrnet/files/patch-AssemblyInfo.cs
+++ b/devel/flickrnet/files/patch-AssemblyInfo.cs
@@ -1,16 +1,11 @@
---- AssemblyInfo.cs.orig
+--- AssemblyInfo.cs.orig 2016-06-20 14:46:51 UTC
+++ AssemblyInfo.cs
-@@ -61,10 +61,10 @@
- [assembly: AssemblyKeyName("")]
-
- #if !WindowsCE
--[assembly: AssemblyKeyFile("..\\..\\FlickrNet.snk")]
-+[assembly: AssemblyKeyFile("FlickrNet.snk")]
- [assembly: AllowPartiallyTrustedCallers()]
- [assembly: SecurityPermission(SecurityAction.RequestMinimum, Execution = true)]
- #endif
-
- [assembly: CLSCompliantAttribute(true)]
--[assembly: ComVisible(false)]
-\ No newline at end of file
-+[assembly: ComVisible(false)]
+@@ -61,7 +61,7 @@ using System.Runtime.InteropServices;
+ [assembly: AssemblyKeyName("")]
+
+ #if !WindowsCE
+-[assembly: AssemblyKeyFile("..\\..\\FlickrNet.snk")]
++[assembly: AssemblyKeyFile("FlickrNet.snk")]
+ [assembly: AllowPartiallyTrustedCallers()]
+ [assembly: SecurityPermission(SecurityAction.RequestMinimum, Execution = true)]
+ #endif
diff --git a/devel/flickrnet/files/patch-flickrnet.pc.in b/devel/flickrnet/files/patch-flickrnet.pc.in
index 231a427..e080169 100644
--- a/devel/flickrnet/files/patch-flickrnet.pc.in
+++ b/devel/flickrnet/files/patch-flickrnet.pc.in
@@ -1,4 +1,4 @@
---- /dev/null
+--- flickrnet.pc.in.orig 2016-06-20 14:46:51 UTC
+++ flickrnet.pc.in
@@ -0,0 +1,8 @@
+prefix=@prefix@
diff --git a/devel/itext/Makefile b/devel/itext/Makefile
index f1a1ef6..e2d06ca 100644
--- a/devel/itext/Makefile
+++ b/devel/itext/Makefile
@@ -23,7 +23,8 @@ RUN_DEPENDS= ${JAVAJARDIR}/bcmail.jar:java/bouncycastle \
OPTIONS_DEFINE= DOCS
-USES= tar:bzip2
+USES= dos2unix tar:bzip2
+DOS2UNIX_GLOB= *.java
USE_JAVA= yes
JAVA_VERSION= 1.6+
USE_ANT= yes
diff --git a/devel/itext/files/patch-ant_.ant.properties b/devel/itext/files/patch-ant_.ant.properties
index 485a242..b4a724d 100644
--- a/devel/itext/files/patch-ant_.ant.properties
+++ b/devel/itext/files/patch-ant_.ant.properties
@@ -1,6 +1,6 @@
---- ant/.ant.properties.orig 2010-01-12 10:03:11.000000000 +0100
-+++ ant/.ant.properties 2010-01-12 10:05:47.000000000 +0100
-@@ -3,7 +3,7 @@
+--- ant/.ant.properties.orig 2009-11-27 12:59:39 UTC
++++ ant/.ant.properties
+@@ -3,7 +3,7 @@ releasedate=2009-11-27
itext.home=../..
diff --git a/devel/itext/files/patch-ant_compile.xml b/devel/itext/files/patch-ant_compile.xml
index a2e382d..66c2e58 100644
--- a/devel/itext/files/patch-ant_compile.xml
+++ b/devel/itext/files/patch-ant_compile.xml
@@ -1,5 +1,5 @@
---- ant/compile.xml.orig 2009-06-08 02:50:15.000000000 +0200
-+++ ant/compile.xml 2011-11-24 20:55:01.000000000 +0100
+--- ant/compile.xml.orig 2009-06-08 00:50:15 UTC
++++ ant/compile.xml
@@ -92,11 +92,17 @@
<include name="**/*.html"/>
</fileset>
diff --git a/devel/itext/files/patch-ant_site.xml b/devel/itext/files/patch-ant_site.xml
index 74941b6..feaa678 100644
--- a/devel/itext/files/patch-ant_site.xml
+++ b/devel/itext/files/patch-ant_site.xml
@@ -1,5 +1,5 @@
---- ant/site.xml.orig 2014-06-05 07:50:18.377016755 +0000
-+++ ant/site.xml 2014-06-05 07:49:27.026098152 +0000
+--- ant/site.xml.orig 2009-06-08 00:50:15 UTC
++++ ant/site.xml
@@ -65,7 +65,7 @@
<javadoc
destdir="${itext.docs}"
diff --git a/devel/itext/files/patch-core_com_lowagie_text_pdf_PRTokeniser.java b/devel/itext/files/patch-core_com_lowagie_text_pdf_PRTokeniser.java
index b9d3044..15ae507 100644
--- a/devel/itext/files/patch-core_com_lowagie_text_pdf_PRTokeniser.java
+++ b/devel/itext/files/patch-core_com_lowagie_text_pdf_PRTokeniser.java
@@ -1,6 +1,6 @@
---- core/com/lowagie/text/pdf/PRTokeniser.java.orig 2012-07-03 16:02:24.000000000 +0200
-+++ core/com/lowagie/text/pdf/PRTokeniser.java 2012-07-03 16:03:30.000000000 +0200
-@@ -281,6 +281,12 @@
+--- core/com/lowagie/text/pdf/PRTokeniser.java.orig 2016-06-20 15:02:42 UTC
++++ core/com/lowagie/text/pdf/PRTokeniser.java
+@@ -281,6 +281,12 @@ public class PRTokeniser {
}
}
}
diff --git a/devel/itext/files/patch-core_com_lowagie_text_pdf_PdfReader.java b/devel/itext/files/patch-core_com_lowagie_text_pdf_PdfReader.java
index 270aa60..3ea8d60 100644
--- a/devel/itext/files/patch-core_com_lowagie_text_pdf_PdfReader.java
+++ b/devel/itext/files/patch-core_com_lowagie_text_pdf_PdfReader.java
@@ -1,6 +1,6 @@
---- core/com/lowagie/text/pdf/PdfReader.java.orig 2012-01-27 11:27:08.000000000 +0100
-+++ core/com/lowagie/text/pdf/PdfReader.java 2012-01-27 11:27:41.000000000 +0100
-@@ -1464,7 +1464,7 @@
+--- core/com/lowagie/text/pdf/PdfReader.java.orig 2016-06-20 15:02:42 UTC
++++ core/com/lowagie/text/pdf/PdfReader.java
+@@ -1464,7 +1464,7 @@ public class PdfReader implements PdfVie
}
}
thisStream *= 2;
diff --git a/devel/itext/files/patch-core_com_lowagie_text_pdf_PdfStamperImp.java b/devel/itext/files/patch-core_com_lowagie_text_pdf_PdfStamperImp.java
index 611d512..4a83174 100644
--- a/devel/itext/files/patch-core_com_lowagie_text_pdf_PdfStamperImp.java
+++ b/devel/itext/files/patch-core_com_lowagie_text_pdf_PdfStamperImp.java
@@ -1,6 +1,6 @@
---- core/com/lowagie/text/pdf/PdfStamperImp.java.orig 2009-11-16 13:48:42.000000000 +0100
-+++ core/com/lowagie/text/pdf/PdfStamperImp.java 2012-07-12 10:27:01.000000000 +0200
-@@ -208,8 +208,17 @@
+--- core/com/lowagie/text/pdf/PdfStamperImp.java.orig 2016-06-20 15:02:42 UTC
++++ core/com/lowagie/text/pdf/PdfStamperImp.java
+@@ -208,8 +208,17 @@ class PdfStamperImp extends PdfWriter {
}
// metadata
int skipInfo = -1;
diff --git a/devel/itext/files/patch-core_com_lowagie_text_xml_xmp_XmpReader.java b/devel/itext/files/patch-core_com_lowagie_text_xml_xmp_XmpReader.java
index f4fee55..865385e 100644
--- a/devel/itext/files/patch-core_com_lowagie_text_xml_xmp_XmpReader.java
+++ b/devel/itext/files/patch-core_com_lowagie_text_xml_xmp_XmpReader.java
@@ -1,23 +1,23 @@
---- core/com/lowagie/text/xml/xmp/XmpReader.java.orig 2011-11-24 16:34:23.000000000 +0100
-+++ core/com/lowagie/text/xml/xmp/XmpReader.java 2011-11-24 16:41:54.000000000 +0100
-@@ -103,8 +103,19 @@
- public boolean replace(String namespaceURI, String localName, String value) {
- NodeList nodes = domDocument.getElementsByTagNameNS(namespaceURI, localName);
- Node node;
-- if (nodes.getLength() == 0)
-+ if (nodes.getLength() == 0) {
-+ nodes = domDocument.getElementsByTagNameNS("http://www.w3.org/1999/02/22-rdf-syntax-ns#", "Description");
-+ if (nodes.getLength() == 0) return false;
-+ for (int i = 0; i < nodes.getLength(); i++) {
-+ node = nodes.item(i);
-+ Node attribute = node.getAttributes().getNamedItemNS(namespaceURI, localName);
-+ if (attribute != null) {
-+ attribute.setNodeValue(value);
-+ return true;
-+ }
-+ }
- return false;
-+ }
- for (int i = 0; i < nodes.getLength(); i++) {
- node = nodes.item(i);
- setNodeText(domDocument, node, value);
+--- core/com/lowagie/text/xml/xmp/XmpReader.java.orig 2016-06-20 15:02:42 UTC
++++ core/com/lowagie/text/xml/xmp/XmpReader.java
+@@ -103,8 +103,19 @@ public class XmpReader {
+ public boolean replace(String namespaceURI, String localName, String value) {
+ NodeList nodes = domDocument.getElementsByTagNameNS(namespaceURI, localName);
+ Node node;
+- if (nodes.getLength() == 0)
++ if (nodes.getLength() == 0) {
++ nodes = domDocument.getElementsByTagNameNS("http://www.w3.org/1999/02/22-rdf-syntax-ns#", "Description");
++ if (nodes.getLength() == 0) return false;
++ for (int i = 0; i < nodes.getLength(); i++) {
++ node = nodes.item(i);
++ Node attribute = node.getAttributes().getNamedItemNS(namespaceURI, localName);
++ if (attribute != null) {
++ attribute.setNodeValue(value);
++ return true;
++ }
++ }
+ return false;
++ }
+ for (int i = 0; i < nodes.getLength(); i++) {
+ node = nodes.item(i);
+ setNodeText(domDocument, node, value);
diff --git a/devel/p5-Geo-ShapeFile/Makefile b/devel/p5-Geo-ShapeFile/Makefile
index 060d04c..a3dccb7 100644
--- a/devel/p5-Geo-ShapeFile/Makefile
+++ b/devel/p5-Geo-ShapeFile/Makefile
@@ -18,7 +18,8 @@ BUILD_DEPENDS= p5-Tree-R>0:devel/p5-Tree-R \
RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
-USES= perl5
+USES= dos2unix perl5
+DOS2UNIX_GLOB= *.pm *.pl *.t
USE_PERL5= configure
.include <bsd.port.mk>
diff --git a/devel/p5-Geo-ShapeFile/files/patch-t_main__tests.t b/devel/p5-Geo-ShapeFile/files/patch-t_main__tests.t
index cc100bf..5e6b323 100644
--- a/devel/p5-Geo-ShapeFile/files/patch-t_main__tests.t
+++ b/devel/p5-Geo-ShapeFile/files/patch-t_main__tests.t
@@ -1,14 +1,14 @@
---- t/main_tests.t.orig 2015-10-16 16:34:06.906634577 +0200
-+++ t/main_tests.t 2015-10-16 16:34:56.598631573 +0200
+--- t/main_tests.t.orig 2016-06-20 14:43:13 UTC
++++ t/main_tests.t
@@ -3,7 +3,10 @@
- use Test::More;
- use strict;
- use warnings;
--use rlib '../lib', './lib';
-+#use rlib '../lib', './lib';
-+use FindBin;
-+use lib "$FindBin::Bin/lib";
-+use lib "$FindBin::Bin/../lib";
-
- use Geo::ShapeFile;
- use Geo::ShapeFile::Shape;
+ use Test::More;
+ use strict;
+ use warnings;
+-use rlib '../lib', './lib';
++#use rlib '../lib', './lib';
++use FindBin;
++use lib "$FindBin::Bin/lib";
++use lib "$FindBin::Bin/../lib";
+
+ use Geo::ShapeFile;
+ use Geo::ShapeFile::Shape;
diff --git a/devel/p5-Sys-Cpu/Makefile b/devel/p5-Sys-Cpu/Makefile
index f792414..60c666b 100644
--- a/devel/p5-Sys-Cpu/Makefile
+++ b/devel/p5-Sys-Cpu/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= terry@sucked-in.com
COMMENT= Sys::CPU - Perl extension for getting CPU information
-USES= perl5
+USES= dos2unix perl5
USE_PERL5= configure
.include <bsd.port.mk>
diff --git a/devel/p5-Sys-Cpu/files/patch-CPU.xs b/devel/p5-Sys-Cpu/files/patch-CPU.xs
index ba4ae3c..839bdb2 100644
--- a/devel/p5-Sys-Cpu/files/patch-CPU.xs
+++ b/devel/p5-Sys-Cpu/files/patch-CPU.xs
@@ -1,36 +1,36 @@
---- CPU.xs.orig 2010-09-03 23:30:18.000000000 +0100
-+++ CPU.xs 2010-09-03 23:57:31.000000000 +0100
-@@ -40,6 +40,11 @@
- #define _have_cpu_clock
- #define _have_cpu_type
- #endif
-+#ifdef __FreeBSD__
-+ #include <sys/sysctl.h>
-+ #define _have_cpu_type
-+ #define _have_cpu_clock
-+#endif
- #ifdef WINDOWS
- /* Registry Functions */
-
-@@ -317,6 +322,10 @@
- int value = proc_cpuinfo_clock();
- if (value) clock = value;
- #endif
-+#ifdef __FreeBSD__
-+ size_t len = sizeof(clock);
-+ sysctlbyname("hw.clockrate", &clock, &len, NULL, 0);
-+#endif
- #ifdef WINDOWS
- char *clock_str = malloc(MAX_IDENT_SIZE);
- /*!! untested !!*/
-@@ -356,6 +365,10 @@
- {
- char *value = malloc(MAX_IDENT_SIZE);
- int retcode = 0;
-+#ifdef __FreeBSD__
-+ size_t len = MAX_IDENT_SIZE;
-+ sysctlbyname("hw.model", value, &len, NULL, 0);
-+#endif
- #ifdef __linux__
- value = proc_cpuinfo_field ("model name");
- if (!value) value = proc_cpuinfo_field ("machine");
+--- CPU.xs.orig 2016-06-20 15:01:16 UTC
++++ CPU.xs
+@@ -40,6 +40,11 @@
+ #define _have_cpu_clock
+ #define _have_cpu_type
+ #endif
++#ifdef __FreeBSD__
++ #include <sys/sysctl.h>
++ #define _have_cpu_type
++ #define _have_cpu_clock
++#endif
+ #ifdef WINDOWS
+ /* Registry Functions */
+
+@@ -317,6 +322,10 @@ CODE:
+ int value = proc_cpuinfo_clock();
+ if (value) clock = value;
+ #endif
++#ifdef __FreeBSD__
++ size_t len = sizeof(clock);
++ sysctlbyname("hw.clockrate", &clock, &len, NULL, 0);
++#endif
+ #ifdef WINDOWS
+ char *clock_str = malloc(MAX_IDENT_SIZE);
+ /*!! untested !!*/
+@@ -356,6 +365,10 @@ CODE:
+ {
+ char *value = malloc(MAX_IDENT_SIZE);
+ int retcode = 0;
++#ifdef __FreeBSD__
++ size_t len = MAX_IDENT_SIZE;
++ sysctlbyname("hw.model", value, &len, NULL, 0);
++#endif
+ #ifdef __linux__
+ value = proc_cpuinfo_field ("model name");
+ if (!value) value = proc_cpuinfo_field ("machine");
diff --git a/devel/ruby-rbprof/Makefile b/devel/ruby-rbprof/Makefile
index 71a05e2..222fb1e 100644
--- a/devel/ruby-rbprof/Makefile
+++ b/devel/ruby-rbprof/Makefile
@@ -16,6 +16,8 @@ OPTIONS_DEFINE= DOCS
#RUN_DEPENDS= ${RUBY_SITELIBDIR}/runit/error.rb:devel/ruby-unit \
# ${RUBY_SITELIBDIR}/aspectr.rb:devel/ruby-aspectr
+USES= dos2unix
+
USE_RUBY= yes
NO_BUILD= yes
diff --git a/devel/ruby-rbprof/files/patch-aspects__profiler__lib__rbprof.rb b/devel/ruby-rbprof/files/patch-aspects_profiler_lib_rbprof.rb
index d442ebd..36d730a 100644
--- a/devel/ruby-rbprof/files/patch-aspects__profiler__lib__rbprof.rb
+++ b/devel/ruby-rbprof/files/patch-aspects_profiler_lib_rbprof.rb
@@ -1,9 +1,9 @@
---- aspects/profiler/lib/rbprof.rb.orig Tue Jan 29 07:45:45 2002
-+++ aspects/profiler/lib/rbprof.rb Fri Oct 3 18:02:23 2003
+--- aspects/profiler/lib/rbprof.rb.orig 2016-06-20 14:57:12 UTC
++++ aspects/profiler/lib/rbprof.rb
@@ -1,5 +1,5 @@
- require 'aspectr'
--require 'trap_method_definitions'
-+require 'rbprof/trap_method_definitions'
-
- class Profiler < AspectR::Aspect
- def initialize
+ require 'aspectr'
+-require 'trap_method_definitions'
++require 'rbprof/trap_method_definitions'
+
+ class Profiler < AspectR::Aspect
+ def initialize
diff --git a/devel/sabre/Makefile b/devel/sabre/Makefile
index 019a9b3..c1aaa85 100644
--- a/devel/sabre/Makefile
+++ b/devel/sabre/Makefile
@@ -13,13 +13,14 @@ COMMENT= Simple API for Binary REpresentations and an UDF Library
LICENSE= LGPL21
WRKSRC= ${WRKDIR}/Simple\ API\ for\ Binary\ REpresentations\ \(SABRE\)
-USES= zip
+USES= dos2unix zip
+DOS2UNIX_GLOB= *.xml *.java
USE_JAVA= yes
JAVA_VERSION= 1.6+
USE_ANT= yes
ALL_TARGET= dist
-PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME}.jar %%JAVAJARDIR%%/udflib.jar
+PLIST_FILES= ${JAVAJARDIR}/${PORTNAME}.jar ${JAVAJARDIR}/udflib.jar
do-install:
@${MKDIR} ${STAGEDIR}${JAVAJARDIR}
diff --git a/devel/sabre/files/patch-build.xml b/devel/sabre/files/patch-build.xml
index 6ac8333..43466ba 100644
--- a/devel/sabre/files/patch-build.xml
+++ b/devel/sabre/files/patch-build.xml
@@ -1,18 +1,11 @@
---- build.xml.orig 2012-01-10 16:24:58.000000000 +0100
-+++ build.xml 2012-01-10 16:25:09.000000000 +0100
+--- build.xml.orig 2016-06-20 14:54:06 UTC
++++ build.xml
@@ -32,7 +32,7 @@
- </target>
-
- <target name="compile" depends="prepare">
-- <javac destdir="${build}/classes" classpathref="classpath.libs" debug="on">
-+ <javac destdir="${build}/classes" source="1.5" target="1.5" classpathref="classpath.libs" debug="on">
- <src path="${src}"/>
- </javac>
- </target>
-@@ -77,4 +77,4 @@
- <filelocation location="${build}/image" childfilesonly="true" />
- </udfimage>
- </target>
--</project>
-\ No newline at end of file
-+</project>
+ </target>
+
+ <target name="compile" depends="prepare">
+- <javac destdir="${build}/classes" classpathref="classpath.libs" debug="on">
++ <javac destdir="${build}/classes" source="1.5" target="1.5" classpathref="classpath.libs" debug="on">
+ <src path="${src}"/>
+ </javac>
+ </target>
diff --git a/devel/sabre/files/patch-src_java_de_tu_darmstadt_informatik_rbg_bstickler_udflib_UDFImageBuilderFile.java b/devel/sabre/files/patch-src_java_de_tu__darmstadt_informatik_rbg_bstickler_udflib_UDFImageBuilderFile.java
index cef9ccd..d263ee5 100644
--- a/devel/sabre/files/patch-src_java_de_tu_darmstadt_informatik_rbg_bstickler_udflib_UDFImageBuilderFile.java
+++ b/devel/sabre/files/patch-src_java_de_tu__darmstadt_informatik_rbg_bstickler_udflib_UDFImageBuilderFile.java
@@ -1,17 +1,17 @@
---- src/java/de/tu_darmstadt/informatik/rbg/bstickler/udflib/UDFImageBuilderFile.java.orig 2010-06-28 11:44:55.000000000 +0200
-+++ src/java/de/tu_darmstadt/informatik/rbg/bstickler/udflib/UDFImageBuilderFile.java 2010-06-28 11:46:18.000000000 +0200
-@@ -32,6 +32,14 @@
- // Symlink // TODO: maybe support symlinks
- }
-
-+ public UDFImageBuilderFile( String fileIdentifier, File sourceFile )
-+ throws Exception
-+ {
-+ this(sourceFile);
-+
-+ identifier = fileIdentifier;
-+ }
-+
- public UDFImageBuilderFile( File sourceFile )
- throws Exception
- {
+--- src/java/de/tu_darmstadt/informatik/rbg/bstickler/udflib/UDFImageBuilderFile.java.orig 2016-06-20 14:54:06 UTC
++++ src/java/de/tu_darmstadt/informatik/rbg/bstickler/udflib/UDFImageBuilderFile.java
+@@ -32,6 +32,14 @@ public class UDFImageBuilderFile impleme
+ // Symlink // TODO: maybe support symlinks
+ }
+
++ public UDFImageBuilderFile( String fileIdentifier, File sourceFile )
++ throws Exception
++ {
++ this(sourceFile);
++
++ identifier = fileIdentifier;
++ }
++
+ public UDFImageBuilderFile( File sourceFile )
+ throws Exception
+ {
diff --git a/devel/sdts++/Makefile b/devel/sdts++/Makefile
index a1787dd..9fe59c3 100644
--- a/devel/sdts++/Makefile
+++ b/devel/sdts++/Makefile
@@ -13,7 +13,7 @@ COMMENT= C++ library for SDTS related development
LIB_DEPENDS= libboost_thread.so:devel/boost-libs
-DOS2UNIX_FILES= sdts++/io/sio_Utils.cpp
+DOS2UNIX_GLOB= *.cpp
USES= autoreconf bison dos2unix gmake libtool makeinfo
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-boost=${LOCALBASE}/include
diff --git a/devel/sdts++/files/patch-doc__sdts++.texi b/devel/sdts++/files/patch-doc__sdts++.texi
index 102b48b..2cdd3f1 100644
--- a/devel/sdts++/files/patch-doc__sdts++.texi
+++ b/devel/sdts++/files/patch-doc__sdts++.texi
@@ -1,5 +1,5 @@
---- doc/sdts++.texi.orig Wed Jan 12 00:48:47 2000
-+++ doc/sdts++.texi Fri Jul 28 09:12:44 2000
+--- doc/sdts++.texi.orig 2003-06-10 18:15:51 UTC
++++ doc/sdts++.texi
@@ -7,6 +7,10 @@
@setfilename sdts++.info
@settitle @code{sdts++} Library
diff --git a/devel/sdts++/files/patch-sdts++__io__sio_8211Converter.cpp b/devel/sdts++/files/patch-sdts++__io__sio_8211Converter.cpp
deleted file mode 100644
index 01e85d3..0000000
--- a/devel/sdts++/files/patch-sdts++__io__sio_8211Converter.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- sdts++/io/sio_8211Converter.cpp.orig 2002-11-25 07:07:43.000000000 +0900
-+++ sdts++/io/sio_8211Converter.cpp 2012-09-12 16:47:10.000000000 +0900
-@@ -16,6 +16,7 @@
-
- #include <strstream>
- #include <iomanip>
-+#include <cstring>
-
- #include <algorithm>
-
diff --git a/devel/sdts++/files/patch-sdts++__io__sio_8211DDRField.cpp b/devel/sdts++/files/patch-sdts++__io__sio_8211DDRField.cpp
deleted file mode 100644
index 32988f5..0000000
--- a/devel/sdts++/files/patch-sdts++__io__sio_8211DDRField.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- sdts++/io/sio_8211DDRField.cpp.orig 2002-11-25 07:07:43.000000000 +0900
-+++ sdts++/io/sio_8211DDRField.cpp 2012-09-12 16:48:13.000000000 +0900
-@@ -18,6 +18,7 @@
- #endif
-
- #include <strstream>
-+#include <cstring>
-
-
-
diff --git a/devel/sdts++/files/patch-sdts++__io__sio_Utils.cpp b/devel/sdts++/files/patch-sdts++__io__sio_Utils.cpp
deleted file mode 100644
index a2622c1..0000000
--- a/devel/sdts++/files/patch-sdts++__io__sio_Utils.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- sdts++/io/sio_Utils.cpp.orig 2002-10-08 05:44:24.000000000 +0900
-+++ sdts++/io/sio_Utils.cpp 2012-09-12 16:50:32.000000000 +0900
-@@ -15,6 +15,7 @@
- #endif
-
- #include <cstdlib>
-+#include <cstring>
-
-
-
diff --git a/devel/sdts++/files/patch-sdts++__builder__sb_Accessor.cpp b/devel/sdts++/files/patch-sdts++_builder_sb__Accessor.cpp
index 6af1acd..4806a83 100644
--- a/devel/sdts++/files/patch-sdts++__builder__sb_Accessor.cpp
+++ b/devel/sdts++/files/patch-sdts++_builder_sb__Accessor.cpp
@@ -1,46 +1,41 @@
---- sdts++/builder/sb_Accessor.cpp.orig 2003-06-11 00:51:40.000000000 +0400
-+++ sdts++/builder/sb_Accessor.cpp 2012-03-11 20:18:18.000000000 +0300
+--- sdts++/builder/sb_Accessor.cpp.orig 2016-06-20 14:59:02 UTC
++++ sdts++/builder/sb_Accessor.cpp
@@ -26,6 +26,13 @@
- #include <cctype>
- #include <cstring>
-
+ #include <cctype>
+ #include <cstring>
+
+#ifdef __FreeBSD__
+# include <osreldate.h>
+# if __FreeBSD_version < 500035
+# include <stlport/iosfwd>
+# endif
+#endif
-+namespace std { using ::mbstate_t; }
- #include <boost/smart_ptr.hpp>
- #include <boost/filesystem/path.hpp>
- #include <boost/filesystem/operations.hpp>
-@@ -155,27 +162,27 @@
-
-
-
--static const char* module_mnemonics_[] =
--{
-- {"CATS"},
-- {"CATD"},
-- {"DDOM"},
-- {"DDSH"},
-- {"MDOM"},
-- {"MDEF"},
-- {"DQHL"},
-- {"DQPA"},
-- {"DQAA"},
-- {"DQLC"},
-- {"DQCG"},
-- {"IDEN"},
-- {"IREF"},
-- {"LDEF"},
-- {"RSDF"},
-- {"STAT"},
-- {"XREF"},
-- {""}
--}; // module_mnemonics
-+static const char* module_mnemonics_[] =
-+{
++namespace std { using ::mbstate_t; }
+ #include <boost/smart_ptr.hpp>
+ #include <boost/filesystem/path.hpp>
+ #include <boost/filesystem/operations.hpp>
+@@ -157,24 +164,24 @@ sb_Accessor::~sb_Accessor( )
+
+ static const char* module_mnemonics_[] =
+ {
+- {"CATS"},
+- {"CATD"},
+- {"DDOM"},
+- {"DDSH"},
+- {"MDOM"},
+- {"MDEF"},
+- {"DQHL"},
+- {"DQPA"},
+- {"DQAA"},
+- {"DQLC"},
+- {"DQCG"},
+- {"IDEN"},
+- {"IREF"},
+- {"LDEF"},
+- {"RSDF"},
+- {"STAT"},
+- {"XREF"},
+- {""}
+ "CATS",
+ "CATD",
+ "DDOM",
@@ -59,7 +54,6 @@
+ "STAT",
+ "XREF",
+ ""
-+}; // module_mnemonics
-
-
-
+ }; // module_mnemonics
+
+
diff --git a/devel/sdts++/files/patch-sdts++__io__FormatParset.yy b/devel/sdts++/files/patch-sdts++_io_FormatParser.yy
index ea268ef..edada988 100644
--- a/devel/sdts++/files/patch-sdts++__io__FormatParset.yy
+++ b/devel/sdts++/files/patch-sdts++_io_FormatParser.yy
@@ -1,5 +1,5 @@
---- sdts++/io/FormatParser.yy.orig 2002-10-08 05:44:24.000000000 +0900
-+++ sdts++/io/FormatParser.yy 2012-09-12 16:53:19.000000000 +0900
+--- sdts++/io/FormatParser.yy.orig 2002-10-07 20:44:24 UTC
++++ sdts++/io/FormatParser.yy
@@ -71,6 +71,10 @@
#include <iostream>
diff --git a/devel/sdts++/files/patch-sdts++_io_sio__8211Converter.cpp b/devel/sdts++/files/patch-sdts++_io_sio__8211Converter.cpp
new file mode 100644
index 0000000..8d6b7cc
--- /dev/null
+++ b/devel/sdts++/files/patch-sdts++_io_sio__8211Converter.cpp
@@ -0,0 +1,10 @@
+--- sdts++/io/sio_8211Converter.cpp.orig 2016-06-20 14:59:02 UTC
++++ sdts++/io/sio_8211Converter.cpp
+@@ -16,6 +16,7 @@
+
+ #include <strstream>
+ #include <iomanip>
++#include <cstring>
+
+ #include <algorithm>
+
diff --git a/devel/sdts++/files/patch-sdts++_io_sio__8211DDRField.cpp b/devel/sdts++/files/patch-sdts++_io_sio__8211DDRField.cpp
new file mode 100644
index 0000000..3e8412d
--- /dev/null
+++ b/devel/sdts++/files/patch-sdts++_io_sio__8211DDRField.cpp
@@ -0,0 +1,10 @@
+--- sdts++/io/sio_8211DDRField.cpp.orig 2016-06-20 14:59:02 UTC
++++ sdts++/io/sio_8211DDRField.cpp
+@@ -18,6 +18,7 @@
+ #endif
+
+ #include <strstream>
++#include <cstring>
+
+
+
diff --git a/devel/sdts++/files/patch-sdts++_io_sio__Utils.cpp b/devel/sdts++/files/patch-sdts++_io_sio__Utils.cpp
new file mode 100644
index 0000000..e3b5baa
--- /dev/null
+++ b/devel/sdts++/files/patch-sdts++_io_sio__Utils.cpp
@@ -0,0 +1,10 @@
+--- sdts++/io/sio_Utils.cpp.orig 2016-06-20 14:59:02 UTC
++++ sdts++/io/sio_Utils.cpp
+@@ -15,6 +15,7 @@
+ #endif
+
+ #include <cstdlib>
++#include <cstring>
+
+
+
diff --git a/devel/sdts++/files/patch-sysutils__t_basename.cpp b/devel/sdts++/files/patch-sysutils__t_basename.cpp
deleted file mode 100644
index 71aef16..0000000
--- a/devel/sdts++/files/patch-sysutils__t_basename.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- sysutils/t_basename.cpp.orig 2002-11-27 09:21:34.000000000 +0900
-+++ sysutils/t_basename.cpp 2012-09-12 16:55:05.000000000 +0900
-@@ -3,6 +3,7 @@
- //
-
- #include <iostream>
-+#include <cstdlib>
-
- #include "fileutils.h"
-
diff --git a/devel/sdts++/files/patch-sysutils__t_dirname.cpp b/devel/sdts++/files/patch-sysutils__t_dirname.cpp
deleted file mode 100644
index 0616cfb..0000000
--- a/devel/sdts++/files/patch-sysutils__t_dirname.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- sysutils/t_dirname.cpp.orig 2002-11-27 09:21:34.000000000 +0900
-+++ sysutils/t_dirname.cpp 2012-09-12 16:54:58.000000000 +0900
-@@ -3,6 +3,7 @@
- //
-
- #include <iostream>
-+#include <cstdlib>
-
- #include "fileutils.h"
-
diff --git a/devel/sdts++/files/patch-sysutils__t_stringutils.cpp b/devel/sdts++/files/patch-sysutils__t_stringutils.cpp
deleted file mode 100644
index d6c1025..0000000
--- a/devel/sdts++/files/patch-sysutils__t_stringutils.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
---- sysutils/t_stringutils.cpp.orig 2001-07-18 05:50:15.000000000 +0900
-+++ sysutils/t_stringutils.cpp 2012-09-12 16:44:29.000000000 +0900
-@@ -5,6 +5,7 @@
- #include <iostream>
- #include <string>
- #include <cassert>
-+#include <cstdlib>
-
- using namespace std;
diff --git a/devel/sdts++/files/patch-sysutils_t__basename.cpp b/devel/sdts++/files/patch-sysutils_t__basename.cpp
new file mode 100644
index 0000000..a2842ea
--- /dev/null
+++ b/devel/sdts++/files/patch-sysutils_t__basename.cpp
@@ -0,0 +1,10 @@
+--- sysutils/t_basename.cpp.orig 2016-06-20 14:59:02 UTC
++++ sysutils/t_basename.cpp
+@@ -3,6 +3,7 @@
+ //
+
+ #include <iostream>
++#include <cstdlib>
+
+ #include "fileutils.h"
+
diff --git a/devel/sdts++/files/patch-sysutils_t__dirname.cpp b/devel/sdts++/files/patch-sysutils_t__dirname.cpp
new file mode 100644
index 0000000..9f7a7eb
--- /dev/null
+++ b/devel/sdts++/files/patch-sysutils_t__dirname.cpp
@@ -0,0 +1,10 @@
+--- sysutils/t_dirname.cpp.orig 2016-06-20 14:59:02 UTC
++++ sysutils/t_dirname.cpp
+@@ -3,6 +3,7 @@
+ //
+
+ #include <iostream>
++#include <cstdlib>
+
+ #include "fileutils.h"
+
diff --git a/devel/sdts++/files/patch-sysutils_t__stringutils.cpp b/devel/sdts++/files/patch-sysutils_t__stringutils.cpp
new file mode 100644
index 0000000..5c52815
--- /dev/null
+++ b/devel/sdts++/files/patch-sysutils_t__stringutils.cpp
@@ -0,0 +1,10 @@
+--- sysutils/t_stringutils.cpp.orig 2016-06-20 14:59:02 UTC
++++ sysutils/t_stringutils.cpp
+@@ -5,6 +5,7 @@
+ #include <iostream>
+ #include <string>
+ #include <cassert>
++#include <cstdlib>
+
+ using namespace std;
+
diff --git a/emulators/pcemu/Makefile b/emulators/pcemu/Makefile
index a16b974..00512d0 100644
--- a/emulators/pcemu/Makefile
+++ b/emulators/pcemu/Makefile
@@ -16,6 +16,8 @@ RUN_DEPENDS= mkfontdir:x11-fonts/mkfontdir \
mkfontscale:x11-fonts/mkfontscale
USE_XORG= x11 xext
+USES= dos2unix
+DOS2UNIX_FILES= programs/config.sys
MAKE_ENV= FILESDIR=${FILESDIR} STAGEDIR=${STAGEDIR}
MAKE_ARGS= CC="${CC}"
diff --git a/emulators/pcemu/files/patch-ae b/emulators/pcemu/files/patch-ae
index 6ff371a..5c745cc 100644
--- a/emulators/pcemu/files/patch-ae
+++ b/emulators/pcemu/files/patch-ae
@@ -1,10 +1,7 @@
-*** programs/config.sys.orig Mon Mar 27 21:27:23 1995
---- programs/config.sys Mon Mar 27 22:19:26 1995
-***************
-*** 1,2 ****
-! device=emufs.sys /
-! stacks 9,512
---- 1,3 ----
-! device=\emufs.sys /usr/local/lib/pcemu/C
-! stacks 9,512
-!
+--- programs/config.sys.orig 2016-06-20 15:48:12 UTC
++++ programs/config.sys
+@@ -1,2 +1,3 @@
+-device=emufs.sys /
++device=\emufs.sys /usr/local/lib/pcemu/C
+ stacks 9,512
++
diff --git a/emulators/yabause/Makefile b/emulators/yabause/Makefile
index 6d71b51..7c5eb8b 100644
--- a/emulators/yabause/Makefile
+++ b/emulators/yabause/Makefile
@@ -12,7 +12,7 @@ COMMENT= Sega Saturn system emulator
LICENSE= GPLv2+
USES= cmake dos2unix openal:soft pkgconfig
-DOS2UNIX_FILES= src/qt/YabauseThread.cpp
+DOS2UNIX_FILES= src/qt/YabauseThread.cpp src/core.h
USE_XORG= xmu xrandr
USE_GL= gl glu glut
diff --git a/emulators/yabause/files/patch-src__core.h b/emulators/yabause/files/patch-src__core.h
index 30820f6..fd63e91 100644
--- a/emulators/yabause/files/patch-src__core.h
+++ b/emulators/yabause/files/patch-src__core.h
@@ -9,5 +9,5 @@
#endif
+#endif
- #ifdef _MSC_VER
+ #ifdef _MSC_VER
# define BSWAP16(x) ((_byteswap_ushort((x) >> 16) << 16) | _byteswap_ushort((x)))
diff --git a/games/eights/Makefile b/games/eights/Makefile
index 2946a76..79eb82d 100644
--- a/games/eights/Makefile
+++ b/games/eights/Makefile
@@ -10,6 +10,8 @@ DISTNAME= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= Text based card game, the objective is to get rid of all your cards
+USES= dos2unix
+DOS2UNIX_FILES= eights.c
NO_WRKSUBDIR= yes
PLIST_FILES= bin/eights
diff --git a/games/eights/files/patch-eights.c b/games/eights/files/patch-eights.c
index 51aac5e..2155d1e 100644
--- a/games/eights/files/patch-eights.c
+++ b/games/eights/files/patch-eights.c
@@ -1,11 +1,11 @@
---- eights.c Sun Nov 10 08:50:52 2002
-+++ eights.c Sat May 20 12:36:22 2000
+--- eights.c.orig 2016-06-20 14:33:50 UTC
++++ eights.c
@@ -5,6 +5,8 @@
- #include <unistd.h>
- #include <time.h>
-
-+#define debug
-+
- #ifdef DEBUG
- #undef debug
- #define debug printf
+ #include <unistd.h>
+ #include <time.h>
+
++#define debug
++
+ #ifdef DEBUG
+ #undef debug
+ #define debug printf
diff --git a/games/heretic/Makefile b/games/heretic/Makefile
index 92daad9..036b78a 100644
--- a/games/heretic/Makefile
+++ b/games/heretic/Makefile
@@ -12,7 +12,8 @@ DISTNAME= gl${PORTNAME}-${PORTVERSION}
MAINTAINER= oliver@FreeBSD.org
COMMENT= Unix source-port of the famous Heretic game by id Software
-USES= gmake
+USES= dos2unix gmake
+DOS2UNIX_FILES= opengl/gl_struct.h
USE_XORG= x11 xi xpm xau
OPTIONS_DEFINE= WAD DOCS
diff --git a/games/heretic/files/patch-Makefile b/games/heretic/files/patch-Makefile
index a7deddb..bc3f8bb 100644
--- a/games/heretic/files/patch-Makefile
+++ b/games/heretic/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig Mon May 1 22:56:45 2000
-+++ Makefile Fri Aug 30 01:43:32 2002
+--- Makefile.orig 2000-05-02 01:57:07 UTC
++++ Makefile
@@ -1,19 +1,19 @@
# Makefile for Linux Heretic/GLHeretic
@@ -23,7 +23,7 @@
#
# For old SVGALIB, comment out -D__NEWVGALIB__
-@@ -21,7 +21,7 @@
+@@ -21,7 +21,7 @@ CC = gcc -pipe
CDEFS.ipx = -DUNIX -DHAVE_USLEEP -DHAVE_MATH_H -DHAVE_VALUES_H -DLINUX_MOUSE \
-DIPX_PROTOCOL -DI_GGI_HERETIC -DNEED_SHMGETEVENTBASE \
-D__NEWVGALIB__ # -DIPX_DEBUG -DEXTRA_WADS
@@ -32,7 +32,7 @@
-DUDP_PROTOCOL -DI_GGI_HERETIC -DNEED_SHMGETEVENTBASE \
-D__NEWVGALIB__ # -DEXTRA_WADS
-@@ -38,7 +38,7 @@
+@@ -38,7 +38,7 @@ COPT.m68k = -m68020-60 -O2 -fomit-frame-
COPT.alpha = -O2 -D__64BIT__ -DHAVE_ALLOCA_H
@@ -41,7 +41,7 @@
COPT.arm = -O2 -D__32BIT__ -fsigned-char -fomit-frame-pointer \
-DHAVE_ALLOCA_H -D__PACKED__=__attribute__\ \(\(packed\)\)
-@@ -57,12 +57,12 @@
+@@ -57,12 +57,12 @@ endif
endif
# Change this to change the platform
@@ -57,7 +57,7 @@
# Uncomment the line below if you want to use original "[" and "]" keys
# for inventory access, instead of "k" and "l".
-@@ -85,18 +85,18 @@
+@@ -85,18 +85,18 @@ SOUND_REFS = soundclient/i_sound.c sound
COPT.sound = -D__DOSOUND__ -DSNDSERV -Isoundclient -D__DOMUSIC__ -DMUSSERV # -D_DEBUGSOUND
X11LIBS = -lXext -lX11
@@ -80,7 +80,7 @@
OBJS = am_map.o ct_chat.o d_main.o d_net.o f_finale.o g_game.o \
p_ceilng.o p_doors.o p_enemy.o p_floor.o p_inter.o p_lights.o \
-@@ -104,7 +104,7 @@
+@@ -104,7 +104,7 @@ OBJS = am_map.o ct_chat.o d_main.o d_net
p_spec.o p_switch.o p_telept.o p_tick.o p_user.o r_bsp.o r_data.o \
r_draw.o r_plane.o r_segs.o r_things.o r_main.o mn_menu.o sb_bar.o \
tables.o v_video.o w_wad.o z_zone.o in_lude.o \
diff --git a/games/heretic/files/patch-d_main.c b/games/heretic/files/patch-d__main.c
index 298ac1c..54687d3 100644
--- a/games/heretic/files/patch-d_main.c
+++ b/games/heretic/files/patch-d__main.c
@@ -1,6 +1,6 @@
---- d_main.c.ori Sun Mar 11 16:31:49 2007
-+++ d_main.c Sun Mar 11 16:33:46 2007
-@@ -690,6 +690,7 @@
+--- d_main.c.orig 2003-12-08 23:21:25 UTC
++++ d_main.c
+@@ -690,6 +690,7 @@ void D_DoomMain(void)
setbuf(stdout, NULL);
nomonsters = M_CheckParm("-nomonsters");
respawnparm = M_CheckParm("-respawn");
@@ -8,7 +8,7 @@
ravpic = M_CheckParm("-ravpic");
noartiskip = M_CheckParm("-noartiskip");
debugmode = M_CheckParm("-debug");
-@@ -778,7 +779,13 @@
+@@ -778,7 +779,13 @@ void D_DoomMain(void)
{
deathmatch = true;
}
diff --git a/games/heretic/files/patch-doc-Gamekeys.txt b/games/heretic/files/patch-doc_Gamekeys.txt
index d32c547..ff4dced 100644
--- a/games/heretic/files/patch-doc-Gamekeys.txt
+++ b/games/heretic/files/patch-doc_Gamekeys.txt
@@ -1,6 +1,6 @@
---- doc/Gamekeys.txt.orig 1999-04-06 14:58:18.000000000 +0200
-+++ doc/Gamekeys.txt 2011-04-21 01:30:38.000000000 +0200
-@@ -9,6 +9,10 @@
+--- doc/Gamekeys.txt.orig 1999-04-06 12:58:18 UTC
++++ doc/Gamekeys.txt
+@@ -9,6 +9,10 @@ key-strafe-right: '.'
key_fire: Control-key
key_use: Space-key
diff --git a/games/heretic/files/patch-doc-README.opengl b/games/heretic/files/patch-doc_README.opengl
index f8ec2e3..ff84485 100644
--- a/games/heretic/files/patch-doc-README.opengl
+++ b/games/heretic/files/patch-doc_README.opengl
@@ -1,6 +1,6 @@
---- doc/README.opengl.orig 2000-05-15 22:46:24.000000000 +0200
-+++ doc/README.opengl 2011-04-21 01:36:33.000000000 +0200
-@@ -71,6 +71,9 @@
+--- doc/README.opengl.orig 2000-05-15 20:46:24 UTC
++++ doc/README.opengl
+@@ -71,6 +71,9 @@ To start the game in windowed mode, use
7. -mlook
With this switch you enable free mouse look in the game. Normaly it makes sense to use this switch together with the -grabmouse switch. Mouselook is enabled by default, but it can be switched inside the game.
diff --git a/games/heretic/files/patch-doomdef.h b/games/heretic/files/patch-doomdef.h
index 7a6d168..143b72d 100644
--- a/games/heretic/files/patch-doomdef.h
+++ b/games/heretic/files/patch-doomdef.h
@@ -1,6 +1,6 @@
---- doomdef.h.ori Sun Mar 4 15:43:44 2007
-+++ doomdef.h Sun Mar 4 15:57:04 2007
-@@ -681,6 +681,7 @@
+--- doomdef.h.orig 2000-05-01 23:42:01 UTC
++++ doomdef.h
+@@ -681,6 +681,7 @@ typedef struct
short ticdup __PACKED__ ; /* 1 = no duplication, 2-5 = dup for slow nets */
short extratics __PACKED__ ; /* 1 = send a backup tic in every packet */
short deathmatch __PACKED__ ; /* 1 = deathmatch */
@@ -8,12 +8,12 @@
short savegame __PACKED__ ; /* -1 = new game, 0-5 = load savegame */
short episode __PACKED__ ; /* 1-3 */
short map __PACKED__ ; /* 1-9 */
-@@ -753,6 +754,8 @@
- extern boolean cdrom; /* true if cd-rom mode active ("-cdrom") */
+@@ -754,6 +755,8 @@ extern boolean cdrom; /* true if c
extern boolean deathmatch; /* only if started as net death */
-+
-+extern boolean respawnartifacts; /* respawn the artifacts */
++extern boolean respawnartifacts; /* respawn the artifacts */
++
extern boolean netgame; /* only true if >1 player */
+ extern boolean playeringame[MAXPLAYERS];
diff --git a/games/heretic/files/patch-doomtype.h b/games/heretic/files/patch-doomtype.h
index f2eca02..7ab8414 100644
--- a/games/heretic/files/patch-doomtype.h
+++ b/games/heretic/files/patch-doomtype.h
@@ -1,6 +1,6 @@
---- doomtype.h.orig Wed Oct 5 07:40:18 2005
-+++ doomtype.h Wed Oct 5 07:40:41 2005
-@@ -59,9 +59,7 @@
+--- doomtype.h.orig 2000-01-07 20:42:41 UTC
++++ doomtype.h
+@@ -59,9 +59,7 @@ typedef unsigned char byte;
#define MININT ((int)0x80000000)
#define MINLONG ((long)0x8000000000000000)
diff --git a/games/heretic/files/patch-g_game.c b/games/heretic/files/patch-g__game.c
index b4349c5..0f6c980 100644
--- a/games/heretic/files/patch-g_game.c
+++ b/games/heretic/files/patch-g__game.c
@@ -1,6 +1,6 @@
---- g_game.c.ori Sun Mar 4 15:44:07 2007
-+++ g_game.c Sun Mar 4 15:50:29 2007
-@@ -91,6 +91,7 @@
+--- g_game.c.orig 2000-05-01 23:54:51 UTC
++++ g_game.c
+@@ -91,6 +91,7 @@ int starttime;
boolean viewactive;
boolean deathmatch; /* only if started as net death */
@@ -8,7 +8,7 @@
boolean netgame; /* only true if packets are broadcast */
boolean playeringame[MAXPLAYERS];
player_t players[MAXPLAYERS];
-@@ -122,6 +123,7 @@
+@@ -122,6 +123,7 @@ extern char* homedir;
long key_right, key_left, key_up, key_down;
long key_strafeleft, key_straferight;
long key_fire, key_use, key_strafe, key_speed;
@@ -16,7 +16,7 @@
long key_flyup, key_flydown, key_flycenter;
long key_lookup, key_lookdown, key_lookcenter;
long key_invleft, key_invright, key_useartifact;
-@@ -361,13 +363,34 @@
+@@ -361,13 +363,34 @@ void G_BuildTiccmd (ticcmd_t *cmd)
}
}
}
diff --git a/games/heretic/files/patch-graphics__i_sdl.c b/games/heretic/files/patch-graphics_i__sdl.c
index 928a8bc..a963f21 100644
--- a/games/heretic/files/patch-graphics__i_sdl.c
+++ b/games/heretic/files/patch-graphics_i__sdl.c
@@ -1,5 +1,5 @@
---- graphics/i_sdl.c 2002/04/17 17:57:00 1.1
-+++ graphics/i_sdl.c 2002/04/17 17:57:08
+--- graphics/i_sdl.c.orig 2000-05-01 23:49:49 UTC
++++ graphics/i_sdl.c
@@ -7,7 +7,7 @@
#include <sys/time.h>
#include "doomdef.h"
diff --git a/games/heretic/files/patch-graphics__i_sdl_gl.c b/games/heretic/files/patch-graphics_i__sdl__gl.c
index 032fde5..796b1c8 100644
--- a/games/heretic/files/patch-graphics__i_sdl_gl.c
+++ b/games/heretic/files/patch-graphics_i__sdl__gl.c
@@ -1,5 +1,5 @@
---- graphics/i_sdl_gl.c 2002/04/17 17:57:00 1.1
-+++ graphics/i_sdl_gl.c 2002/04/17 17:57:14
+--- graphics/i_sdl_gl.c.orig 2000-05-01 23:49:05 UTC
++++ graphics/i_sdl_gl.c
@@ -4,7 +4,7 @@
#include <sys/time.h>
#include "doomdef.h"
diff --git a/games/heretic/files/patch-graphics-i_x11_fast.c b/games/heretic/files/patch-graphics_i__x11__fast.c
index 4d4fcc7..7825c50 100644
--- a/games/heretic/files/patch-graphics-i_x11_fast.c
+++ b/games/heretic/files/patch-graphics_i__x11__fast.c
@@ -1,6 +1,6 @@
---- graphics/i_x11_fast.c.orig Fri Dec 29 20:03:37 2006
-+++ graphics/i_x11_fast.c Fri Dec 29 20:03:59 2006
-@@ -201,13 +201,9 @@
+--- graphics/i_x11_fast.c.orig 2003-12-08 22:48:58 UTC
++++ graphics/i_x11_fast.c
+@@ -201,13 +201,9 @@ int xlatekey(void)
/* This is an ugly PC-ism. Better switch to XLookupKeysym() ? */
case XK_KP_Insert: rc = '0'; break;
case XK_KP_End: rc = '1'; break;
diff --git a/games/heretic/files/patch-i_udp.c b/games/heretic/files/patch-i__udp.c
index e7e198b..e0ee0bc 100644
--- a/games/heretic/files/patch-i_udp.c
+++ b/games/heretic/files/patch-i__udp.c
@@ -1,5 +1,5 @@
---- i_udp.c.old Sun Oct 20 22:21:11 2002
-+++ i_udp.c Sun Oct 20 22:21:26 2002
+--- i_udp.c.orig 2000-05-01 10:24:52 UTC
++++ i_udp.c
@@ -31,7 +31,7 @@
boolean server = 0;
diff --git a/games/heretic/files/patch-m_misc.c b/games/heretic/files/patch-m__misc.c
index 8a4d803..b8d376d 100644
--- a/games/heretic/files/patch-m_misc.c
+++ b/games/heretic/files/patch-m__misc.c
@@ -1,6 +1,6 @@
---- m_misc.c.ori Sun Mar 4 15:50:54 2007
-+++ m_misc.c Sun Mar 4 15:52:40 2007
-@@ -365,6 +365,7 @@
+--- m_misc.c.orig 2000-05-02 00:01:29 UTC
++++ m_misc.c
+@@ -365,6 +365,7 @@ long usejoystick;
extern long key_right, key_left, key_up, key_down;
extern long key_strafeleft, key_straferight;
extern long key_fire, key_use, key_strafe, key_speed;
@@ -8,7 +8,7 @@
extern long key_flyup, key_flydown, key_flycenter;
extern long key_lookup, key_lookdown, key_lookcenter;
extern long key_invleft, key_invright, key_useartifact;
-@@ -447,6 +448,10 @@
+@@ -447,6 +448,10 @@ default_t defaults[] =
{ "key_fire", &key_fire, KEY_RCTRL, 1 },
{ "key_use", &key_use, ' ', 1 },
diff --git a/games/heretic/files/patch-opengl_gl_fonts.c b/games/heretic/files/patch-opengl_gl__fonts.c
index 26a1436..f6a61eb 100644
--- a/games/heretic/files/patch-opengl_gl_fonts.c
+++ b/games/heretic/files/patch-opengl_gl__fonts.c
@@ -1,5 +1,5 @@
---- opengl/gl_fonts.c Sun Jan 30 05:58:21 2000
-+++ opengl/gl_fonts.c.new Sun Feb 13 03:54:46 2000
+--- opengl/gl_fonts.c.orig 2000-05-01 19:17:31 UTC
++++ opengl/gl_fonts.c
@@ -1,5 +1,5 @@
#include <stdio.h>
-#include <malloc.h>
diff --git a/games/heretic/files/patch-opengl_gl_struct.h b/games/heretic/files/patch-opengl_gl__struct.h
index 009be36..6030b13 100644
--- a/games/heretic/files/patch-opengl_gl_struct.h
+++ b/games/heretic/files/patch-opengl_gl__struct.h
@@ -1,11 +1,11 @@
---- opengl/gl_struct.h.orig Wed Jan 26 14:38:19 2000
-+++ opengl/gl_struct.h Sun Apr 2 16:43:51 2000
+--- opengl/gl_struct.h.orig 2016-06-20 13:32:45 UTC
++++ opengl/gl_struct.h
@@ -2,7 +2,7 @@
- #define __GL_STRUCT_H__
-
- #include <stdio.h>
--#include <malloc.h>
-+#include <stdlib.h>
- #include <string.h>
- #include <GL/gl.h>
- #include <GL/glu.h>
+ #define __GL_STRUCT_H__
+
+ #include <stdio.h>
+-#include <malloc.h>
++#include <stdlib.h>
+ #include <string.h>
+ #include <GL/gl.h>
+ #include <GL/glu.h>
diff --git a/games/heretic/files/patch-opengl_sgi-si_libtess_memalloc.h b/games/heretic/files/patch-opengl_sgi-si_libtess_memalloc.h
index 1e6ec40..67d61f3 100644
--- a/games/heretic/files/patch-opengl_sgi-si_libtess_memalloc.h
+++ b/games/heretic/files/patch-opengl_sgi-si_libtess_memalloc.h
@@ -1,5 +1,5 @@
---- opengl/sgi-si/libtess/memalloc.h Wed Jan 26 05:30:44 2000
-+++ opengl/sgi-si/libtess/memalloc.h.new Sun Feb 13 03:54:46 2000
+--- opengl/sgi-si/libtess/memalloc.h.orig 2000-01-26 10:30:44 UTC
++++ opengl/sgi-si/libtess/memalloc.h
@@ -42,7 +42,7 @@
#ifndef __memalloc_simple_h_
#define __memalloc_simple_h_
diff --git a/games/heretic/files/patch-p_inter.c b/games/heretic/files/patch-p__inter.c
index 7e82b12..a954ea2 100644
--- a/games/heretic/files/patch-p_inter.c
+++ b/games/heretic/files/patch-p__inter.c
@@ -1,6 +1,6 @@
---- p_inter.c.ori Sun Mar 4 15:38:51 2007
-+++ p_inter.c Sun Mar 4 15:41:50 2007
-@@ -477,8 +477,10 @@
+--- p_inter.c.orig 2000-01-07 17:58:53 UTC
++++ p_inter.c
+@@ -477,8 +477,10 @@ boolean P_GiveArtifact(player_t *player,
void P_SetDormantArtifact(mobj_t *arti)
{
arti->flags &= ~MF_SPECIAL;
diff --git a/games/heretic/files/patch-r_things.c b/games/heretic/files/patch-r__things.c
index 32d15a2..954319b1 100644
--- a/games/heretic/files/patch-r_things.c
+++ b/games/heretic/files/patch-r__things.c
@@ -1,6 +1,6 @@
---- r_things.c.orig Thu Jan 27 00:49:35 2000
-+++ r_things.c Fri Dec 29 20:57:02 2006
-@@ -144,7 +144,7 @@
+--- r_things.c.orig 2000-01-26 23:49:35 UTC
++++ r_things.c
+@@ -144,7 +144,7 @@ void R_InitSpriteDefs (char **namelist)
while (*check != NULL)
check++;
diff --git a/games/heretic/files/patch-sndserv_Makefile b/games/heretic/files/patch-sndserv_Makefile
index 9293acc..03dbd90 100644
--- a/games/heretic/files/patch-sndserv_Makefile
+++ b/games/heretic/files/patch-sndserv_Makefile
@@ -1,5 +1,5 @@
---- sndserv/Makefile.orig Sat Oct 23 11:02:21 1999
-+++ sndserv/Makefile Thu Jan 10 19:34:23 2002
+--- sndserv/Makefile.orig 1999-10-23 09:02:21 UTC
++++ sndserv/Makefile
@@ -1,6 +1,6 @@
-CC = gcc
+#CC = gcc
diff --git a/games/heretic/files/patch-sndserv_linux.c b/games/heretic/files/patch-sndserv_linux.c
index 5aac936..97b1a8b 100644
--- a/games/heretic/files/patch-sndserv_linux.c
+++ b/games/heretic/files/patch-sndserv_linux.c
@@ -1,8 +1,8 @@
---- sndserv/linux.c.orig Thu Jan 10 19:06:58 2002
-+++ sndserv/linux.c Thu Jan 10 19:07:06 2002
-@@ -32,7 +32,7 @@
- #include <unistd.h>
+--- sndserv/linux.c.orig 2003-12-08 22:44:54 UTC
++++ sndserv/linux.c
+@@ -33,7 +33,7 @@
#include <sys/ioctl.h>
+ #include <errno.h>
-#include <linux/soundcard.h>
+#include <soundcard.h>
diff --git a/games/heretic/files/patch-sndserv_soundsrv.c b/games/heretic/files/patch-sndserv_soundsrv.c
index e744690..002ce73 100644
--- a/games/heretic/files/patch-sndserv_soundsrv.c
+++ b/games/heretic/files/patch-sndserv_soundsrv.c
@@ -1,5 +1,5 @@
---- sndserv/soundsrv.c Mon Mar 22 20:06:59 1999
-+++ sndserv/soundsrv.c.new Sun Feb 13 03:54:46 2000
+--- sndserv/soundsrv.c.orig 1999-03-23 01:06:59 UTC
++++ sndserv/soundsrv.c
@@ -43,7 +43,7 @@
#include <sys/ioctl.h>
#include <unistd.h>
diff --git a/games/heretic/files/patch-sndserv_wadread.c b/games/heretic/files/patch-sndserv_wadread.c
index d878db7..a533889 100644
--- a/games/heretic/files/patch-sndserv_wadread.c
+++ b/games/heretic/files/patch-sndserv_wadread.c
@@ -1,5 +1,5 @@
---- sndserv/wadread.c Thu Nov 25 05:24:49 1999
-+++ sndserv/wadread.c.new Sun Feb 13 03:54:46 2000
+--- sndserv/wadread.c.orig 1999-11-25 10:24:49 UTC
++++ sndserv/wadread.c
@@ -39,7 +39,7 @@
*/
diff --git a/games/heretic/files/patch-w_wad.c b/games/heretic/files/patch-w__wad.c
index 74df663..bad6d45 100644
--- a/games/heretic/files/patch-w_wad.c
+++ b/games/heretic/files/patch-w__wad.c
@@ -1,5 +1,5 @@
---- w_wad.c Sat Oct 23 05:02:21 1999
-+++ w_wad.c.new Sun Feb 13 03:52:25 2000
+--- w_wad.c.orig 2003-12-08 23:10:35 UTC
++++ w_wad.c
@@ -15,7 +15,6 @@
#include <string.h>
#include <unistd.h>
@@ -8,12 +8,12 @@
#include <assert.h>
#include <fcntl.h>
#include <sys/stat.h>
-@@ -26,8 +25,6 @@
-
+@@ -27,8 +26,6 @@
#define O_BINARY 0
#endif /* UNIX */
--
--#include <malloc.h>
+-#include <malloc.h>
+-
#ifdef __GLIBC__
- #include <sys/io.h>
+ /* kludge for broken asm-sparc/io.h on linux 2.2.14.? */
+ #ifdef __sparc__
diff --git a/games/quake2-psychomod/Makefile b/games/quake2-psychomod/Makefile
index 15fed79..c82664e 100644
--- a/games/quake2-psychomod/Makefile
+++ b/games/quake2-psychomod/Makefile
@@ -10,7 +10,8 @@ PKGNAMEPREFIX= ${Q2PKGNAMEPREFIX}
MAINTAINER= danfe@FreeBSD.org
COMMENT= Psychomod modification for Quake II
-USES= gmake tar:bzip2
+USES= dos2unix gmake tar:bzip2
+DOS2UNIX_GLOB= *.c *.h
WRKSRC= ${WRKDIR}/${PORTNAME}
BUILD_WRKSRC= ${WRKSRC}/src
ALL_TARGET= release
diff --git a/games/quake2-psychomod/files/patch-src__Makefile b/games/quake2-psychomod/files/patch-src_Makefile
index db762dd..94b5638 100644
--- a/games/quake2-psychomod/files/patch-src__Makefile
+++ b/games/quake2-psychomod/files/patch-src_Makefile
@@ -1,6 +1,6 @@
---- ./src/Makefile.orig Wed Feb 1 20:46:55 2006
-+++ ./src/Makefile Wed Jan 10 19:11:16 2007
-@@ -16,20 +16,10 @@
+--- src/Makefile.orig 2006-02-01 23:46:55 UTC
++++ src/Makefile
+@@ -16,20 +16,10 @@ OSTYPE := $(shell uname -s)
# this nice line comes from the linux kernel makefile
ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc/ -e s/sparc64/sparc/ -e s/arm.*/arm/ -e s/sa110/arm/ -e s/alpha/axp/)
@@ -24,7 +24,7 @@
BASE_CFLAGS=-Dstricmp=strcasecmp
RELEASE_CFLAGS=$(BASE_CFLAGS) -ffast-math -funroll-loops \
-@@ -53,7 +43,7 @@
+@@ -53,7 +43,7 @@ SHLIBLDFLAGS=-shared
DO_CC=$(CC) $(CFLAGS) -o $@ -c $<
DO_SHLIB_CC=$(CC) $(CFLAGS) $(SHLIBCFLAGS) -o $@ -c $<
@@ -33,7 +33,7 @@
all:
@echo
-@@ -64,11 +54,11 @@
+@@ -64,11 +54,11 @@ all:
@echo
debug:
@-mkdir -p $(BUILD_DEBUG_DIR)/psychomod
@@ -47,7 +47,7 @@
targets: $(TARGETS)
-@@ -124,7 +114,7 @@
+@@ -124,7 +114,7 @@ GAME_OBJS = \
$(BUILDDIR)/p_weapon.o \
$(BUILDDIR)/q_shared.o
@@ -56,7 +56,7 @@
$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(GAME_OBJS)
$(BUILDDIR)/g_ai.o : g_ai.c
-@@ -282,10 +272,10 @@
+@@ -282,10 +272,10 @@ $(BUILDDIR)/q_shared.o : q_shared.c
clean: clean-debug clean-release
clean-debug:
diff --git a/games/quake2-psychomod/files/patch-src__g_items.c b/games/quake2-psychomod/files/patch-src_g__items.c
index db547b7..acb7843 100644
--- a/games/quake2-psychomod/files/patch-src__g_items.c
+++ b/games/quake2-psychomod/files/patch-src_g__items.c
@@ -1,6 +1,6 @@
---- ./src/g_items.c.orig Wed Oct 10 12:53:12 2001
-+++ ./src/g_items.c Wed Jan 10 19:11:41 2007
-@@ -21,9 +21,9 @@
+--- src/g_items.c.orig 2016-06-20 14:35:21 UTC
++++ src/g_items.c
+@@ -21,9 +21,9 @@ gitem_armor_t jacketarmor_info = { 25,
gitem_armor_t combatarmor_info = { 50, 100, .60, .30, ARMOR_COMBAT};
gitem_armor_t bodyarmor_info = {100, 200, .80, .60, ARMOR_BODY};
@@ -12,4 +12,4 @@
+int body_armor_index;
static int power_screen_index;
static int power_shield_index;
-
+
diff --git a/games/scorched3d/Makefile b/games/scorched3d/Makefile
index 3dd9ad7..3a7fa52 100644
--- a/games/scorched3d/Makefile
+++ b/games/scorched3d/Makefile
@@ -27,13 +27,11 @@ USE_GL= glew glu
USE_SDL= mixer net sdl
USE_WX= 2.8
WX_CONF_ARGS= absolute
-WX_UNICODE= yes
USES= autoreconf dos2unix gmake iconv jpeg openal:al,alut perl5 pkgconfig
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --datadir=${DATADIR}
-DOS2UNIX_FILES= src/client/GLEXT/GLFont2dFreeType.h \
- src/launcher/wxdialogs/TrueTypeFont.h
+DOS2UNIX_GLOB= *.h *.cpp
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/games/scorched3d/files/patch-configure-al.m4 b/games/scorched3d/files/patch-configure-al.m4
index 73c5ca6..76adaf5 100644
--- a/games/scorched3d/files/patch-configure-al.m4
+++ b/games/scorched3d/files/patch-configure-al.m4
@@ -1,5 +1,5 @@
---- configure-al.m4.orig 2011-12-31 23:51:36.000000000 +0900
-+++ configure-al.m4 2012-03-08 02:09:57.000000000 +0900
+--- configure-al.m4.orig 2011-12-31 14:51:36 UTC
++++ configure-al.m4
@@ -1,118 +1,8 @@
dnl Checking for OpenAL
-AC_ARG_WITH([openal-static],
diff --git a/games/scorched3d/files/patch-src_client_GLEXT_GLFont2dFreeType.h b/games/scorched3d/files/patch-src_client_GLEXT_GLFont2dFreeType.h
index 5bcad3c..b8fe143 100644
--- a/games/scorched3d/files/patch-src_client_GLEXT_GLFont2dFreeType.h
+++ b/games/scorched3d/files/patch-src_client_GLEXT_GLFont2dFreeType.h
@@ -1,5 +1,5 @@
---- src/client/GLEXT/GLFont2dFreeType.h.orig 2013-12-17 09:58:11.000000000 +0100
-+++ src/client/GLEXT/GLFont2dFreeType.h 2013-12-17 09:59:18.000000000 +0100
+--- src/client/GLEXT/GLFont2dFreeType.h.orig 2016-06-20 14:16:37 UTC
++++ src/client/GLEXT/GLFont2dFreeType.h
@@ -23,10 +23,10 @@
#include <GLEXT/GLFont2dStorage.h>
diff --git a/games/scorched3d/files/patch-src__client__client__LoadPNG.cpp b/games/scorched3d/files/patch-src_client_client_LoadPNG.cpp
index 8db4ee8..138a50ae 100644
--- a/games/scorched3d/files/patch-src__client__client__LoadPNG.cpp
+++ b/games/scorched3d/files/patch-src_client_client_LoadPNG.cpp
@@ -1,6 +1,6 @@
---- src/client/client/LoadPNG.cpp.orig 2010-08-16 08:26:36.000000000 +0900
-+++ src/client/client/LoadPNG.cpp 2012-03-07 19:25:24.000000000 +0900
-@@ -28,6 +28,8 @@
+--- src/client/client/LoadPNG.cpp.orig 2016-06-20 14:16:37 UTC
++++ src/client/client/LoadPNG.cpp
+@@ -28,6 +28,8 @@ SDL_Surface *EXT_LoadPNG_RW(SDL_RWops *s
int row, i;
volatile int ckey = -1;
png_color_16 *transv;
@@ -9,7 +9,7 @@
if ( !src ) {
/* The error message has been set in SDL_RWFromFile */
-@@ -58,7 +60,7 @@
+@@ -58,7 +60,7 @@ SDL_Surface *EXT_LoadPNG_RW(SDL_RWops *s
* the normal method of doing things with libpng). REQUIRED unless you
* set up your own error handlers in png_create_read_struct() earlier.
*/
@@ -18,7 +18,7 @@
error = "Error reading the PNG file.";
goto done;
}
-@@ -127,9 +129,9 @@
+@@ -127,9 +129,9 @@ SDL_Surface *EXT_LoadPNG_RW(SDL_RWops *s
Rmask = 0x000000FF;
Gmask = 0x0000FF00;
Bmask = 0x00FF0000;
@@ -30,7 +30,7 @@
Rmask = 0xFF000000 >> s;
Gmask = 0x00FF0000 >> s;
Bmask = 0x0000FF00 >> s;
-@@ -137,7 +139,7 @@
+@@ -137,7 +139,7 @@ SDL_Surface *EXT_LoadPNG_RW(SDL_RWops *s
}
}
surface = SDL_AllocSurface(SDL_SWSURFACE, width, height,
@@ -39,7 +39,7 @@
if ( surface == NULL ) {
error = "Out of memory";
goto done;
-@@ -185,12 +187,15 @@
+@@ -185,12 +187,15 @@ SDL_Surface *EXT_LoadPNG_RW(SDL_RWops *s
palette->colors[i].g = i;
palette->colors[i].b = i;
}
diff --git a/games/scorched3d/files/patch-src-client-client-SecureID.cpp b/games/scorched3d/files/patch-src_client_client_SecureID.cpp
index 5701b71b..b1549c6 100644
--- a/games/scorched3d/files/patch-src-client-client-SecureID.cpp
+++ b/games/scorched3d/files/patch-src_client_client_SecureID.cpp
@@ -1,9 +1,9 @@
---- src/client/client/SecureID.cpp.orig 2008-03-03 00:47:36.000000000 +0600
-+++ src/client/client/SecureID.cpp 2009-09-29 14:13:58.000000000 +0700
-@@ -34,6 +34,47 @@
- return "0:0:0:0:0:0";
- }
-
+--- src/client/client/SecureID.cpp.orig 2016-06-20 14:16:37 UTC
++++ src/client/client/SecureID.cpp
+@@ -71,6 +71,47 @@ std::string SecureID::GetPrivateKey(void
+ return result;
+ }
+
+#elif defined(__FreeBSD__)
+
+#include <sys/types.h>
@@ -45,6 +45,6 @@
+ return Key;
+}
+
- #else
-
- #include <sys/ioctl.h>
+ #else
+
+ #include <sys/ioctl.h>
diff --git a/games/scorched3d/files/patch-src__common__image__ImagePngFactory.cpp b/games/scorched3d/files/patch-src_common_image_ImagePngFactory.cpp
index 43ad7a9..1afd54f 100644
--- a/games/scorched3d/files/patch-src__common__image__ImagePngFactory.cpp
+++ b/games/scorched3d/files/patch-src_common_image_ImagePngFactory.cpp
@@ -1,11 +1,11 @@
---- src/common/image/ImagePngFactory.cpp.orig 2012-01-10 09:52:15.000000000 +0900
-+++ src/common/image/ImagePngFactory.cpp 2012-03-07 18:31:12.000000000 +0900
-@@ -62,7 +62,7 @@
-
- static void user_png_error(png_structp png_ptr, png_const_charp msg)
- {
-- longjmp(png_ptr->jmpbuf,1);
-+ longjmp(png_jmpbuf(png_ptr),1);
- }
-
- static void user_png_warning(png_structp png_ptr, png_const_charp msg)
+--- src/common/image/ImagePngFactory.cpp.orig 2016-06-20 14:16:37 UTC
++++ src/common/image/ImagePngFactory.cpp
+@@ -62,7 +62,7 @@ struct user_read_struct
+
+ static void user_png_error(png_structp png_ptr, png_const_charp msg)
+ {
+- longjmp(png_ptr->jmpbuf,1);
++ longjmp(png_jmpbuf(png_ptr),1);
+ }
+
+ static void user_png_warning(png_structp png_ptr, png_const_charp msg)
diff --git a/games/scorched3d/files/patch-src__common__porting__windows.h b/games/scorched3d/files/patch-src_common_porting_windows.h
index 7c591c9..35521a2 100644
--- a/games/scorched3d/files/patch-src__common__porting__windows.h
+++ b/games/scorched3d/files/patch-src_common_porting_windows.h
@@ -1,18 +1,18 @@
---- src/common/porting/windows.h.orig 2008-03-03 03:47:36.000000000 +0900
-+++ src/common/porting/windows.h 2012-03-07 18:29:31.000000000 +0900
+--- src/common/porting/windows.h.orig 2016-06-20 14:16:37 UTC
++++ src/common/porting/windows.h
@@ -9,6 +9,7 @@
- #include <ctype.h>
- #include <common/Defines.h>
-
-+#if defined(_WIN32)
- typedef char * LPSTR;
- typedef const char * LPCTSTR;
- typedef unsigned int DWORD;
-@@ -27,6 +28,7 @@
- typedef int LRESULT;
- typedef void * HDC;
- typedef void * HGLRC;
-+#endif
-
- #define _strnicmp(a,b,c) strncasecmp(a,b,c)
- #define stricmp(a,b) strcasecmp(a,b)
+ #include <ctype.h>
+ #include <common/Defines.h>
+
++#if defined(_WIN32)
+ typedef char * LPSTR;
+ typedef const char * LPCTSTR;
+ typedef unsigned int DWORD;
+@@ -27,6 +28,7 @@ typedef int LPARAM;
+ typedef int LRESULT;
+ typedef void * HDC;
+ typedef void * HGLRC;
++#endif
+
+ #define _strnicmp(a,b,c) strncasecmp(a,b,c)
+ #define stricmp(a,b) strcasecmp(a,b)
diff --git a/games/scorched3d/files/patch-src_launcher_wxdialogs_TrueTypeFont.h b/games/scorched3d/files/patch-src_launcher_wxdialogs_TrueTypeFont.h
index d3f2123..1c6f5fa 100644
--- a/games/scorched3d/files/patch-src_launcher_wxdialogs_TrueTypeFont.h
+++ b/games/scorched3d/files/patch-src_launcher_wxdialogs_TrueTypeFont.h
@@ -1,5 +1,5 @@
---- src/launcher/wxdialogs/TrueTypeFont.h.orig 2013-12-17 10:01:02.000000000 +0100
-+++ src/launcher/wxdialogs/TrueTypeFont.h 2013-12-17 10:01:16.000000000 +0100
+--- src/launcher/wxdialogs/TrueTypeFont.h.orig 2016-06-20 14:16:37 UTC
++++ src/launcher/wxdialogs/TrueTypeFont.h
@@ -25,10 +25,10 @@
#include <wx/image.h>
#include <ft2build.h>
diff --git a/graphics/c-a-i-r/Makefile b/graphics/c-a-i-r/Makefile
index 7817ee3..a4db05a 100644
--- a/graphics/c-a-i-r/Makefile
+++ b/graphics/c-a-i-r/Makefile
@@ -10,7 +10,8 @@ DISTNAME= CAIR_v${PORTVERSION}
MAINTAINER= buganini@gmail.com
COMMENT= Content Aware Image Resizer is an implementation of seam carving
-USES= gmake zip
+USES= dos2unix gmake zip
+DOS2UNIX_GLOB= *.cpp
MAKE_ARGS+= CC="${CXX}"
diff --git a/graphics/c-a-i-r/files/patch-CAIR.cpp b/graphics/c-a-i-r/files/patch-CAIR.cpp
index 9292b9d..ea099db 100644
--- a/graphics/c-a-i-r/files/patch-CAIR.cpp
+++ b/graphics/c-a-i-r/files/patch-CAIR.cpp
@@ -1,38 +1,38 @@
---- CAIR.cpp.orig 2010-03-16 08:51:06.000000000 +0800
-+++ CAIR.cpp 2010-03-16 08:55:11.000000000 +0800
-@@ -276,7 +276,7 @@
- //Our thread function for the Grayscale
- void * Gray_Quadrant( void * id )
- {
-- int num = *((int *)id);
-+ long int num = *((long int *)id);
-
- while( true )
- {
-@@ -437,7 +437,7 @@
- //The thread function, splitting the image into strips
- void * Edge_Quadrant( void * id )
- {
-- int num = *((int *)id);
-+ long int num = *((long int *)id);
-
- while( true )
- {
-@@ -744,7 +744,7 @@
- //This works like Remove_Quadrant, strips across the image.
- void * Add_Quadrant( void * id )
- {
-- int num = *((int *)id);
-+ long int num = *((long int *)id);
- Thread_Params add_area;
-
- while( true )
-@@ -907,7 +907,7 @@
- //the areas are not quadrants, rather, more like strips, but I keep the name convention
- void * Remove_Quadrant( void * id )
- {
-- int num = *((int *)id);
-+ long int num = *((long int *)id);
- Thread_Params remove_area;
-
- while( true )
+--- CAIR.cpp.orig 2016-06-20 15:51:27 UTC
++++ CAIR.cpp
+@@ -276,7 +276,7 @@ inline CML_byte Grayscale_Pixel( CML_RGB
+ //Our thread function for the Grayscale
+ void * Gray_Quadrant( void * id )
+ {
+- int num = *((int *)id);
++ long int num = *((long int *)id);
+
+ while( true )
+ {
+@@ -437,7 +437,7 @@ int Convolve_Pixel( CML_image_ptr * Sour
+ //The thread function, splitting the image into strips
+ void * Edge_Quadrant( void * id )
+ {
+- int num = *((int *)id);
++ long int num = *((long int *)id);
+
+ while( true )
+ {
+@@ -744,7 +744,7 @@ CML_RGBA Average_Pixels( CML_RGBA Pixel1
+ //This works like Remove_Quadrant, strips across the image.
+ void * Add_Quadrant( void * id )
+ {
+- int num = *((int *)id);
++ long int num = *((long int *)id);
+ Thread_Params add_area;
+
+ while( true )
+@@ -907,7 +907,7 @@ bool CAIR_Add( CML_image * Source, CML_i
+ //the areas are not quadrants, rather, more like strips, but I keep the name convention
+ void * Remove_Quadrant( void * id )
+ {
+- int num = *((int *)id);
++ long int num = *((long int *)id);
+ Thread_Params remove_area;
+
+ while( true )
diff --git a/graphics/picpuz/Makefile b/graphics/picpuz/Makefile
index 3d9277f..ec862e9 100644
--- a/graphics/picpuz/Makefile
+++ b/graphics/picpuz/Makefile
@@ -11,7 +11,8 @@ MASTER_SITES= http://kornelix.squarespace.com/storage/downloads/ \
MAINTAINER= devel@stasyan.com
COMMENT= Jigsaw puzzle program
-USES= execinfo gmake pkgconfig
+USES= dos2unix execinfo gmake pkgconfig
+DOS2UNIX_GLOB= *.h
USE_GNOME= gtk20
ALL_TARGET= #
diff --git a/graphics/picpuz/files/patch-Makefile b/graphics/picpuz/files/patch-Makefile
index c75beed..bdb765e 100644
--- a/graphics/picpuz/files/patch-Makefile
+++ b/graphics/picpuz/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig 2009-10-29 09:38:40.000000000 +0100
-+++ Makefile 2014-02-18 19:19:51.140331100 +0100
-@@ -6,7 +6,7 @@
+--- Makefile.orig 2009-10-29 08:38:40 UTC
++++ Makefile
+@@ -6,7 +6,7 @@ SOURCE = $(PROGRAM)-$(VERSION).cpp
# replace CFLAGS and LFLAGS -O (oh) with -g for GDB debugging
CFLAGS = -O -Wall -c `pkg-config --cflags gtk+-2.0`
@@ -9,7 +9,7 @@
# use $PREFIX if defined, else assume /usr/local
ifeq "$(PREFIX)" ""
-@@ -19,14 +19,14 @@
+@@ -19,14 +19,14 @@ DOCDIR = $(PREFIX)/share/doc/$(PROGRAM)
DESKTOP = $(DATADIR)/kornelix-$(PROGRAM).desktop
$(PROGRAM): $(PROGRAM).o zfuncs.o
@@ -27,7 +27,7 @@
-D "DATADIR=\"$(DATADIR)\"" -D "DOCDIR=\"$(DOCDIR)\"" -D "BINDIR=\"$(BINDIR)\""
install: $(PROGRAM)
-@@ -39,15 +39,15 @@
+@@ -39,15 +39,15 @@ install: $(PROGRAM)
cp $(PROGRAM) $(DESTDIR)$(BINDIR)
cp -R locales/* $(DESTDIR)$(DATADIR)/locales
# install .desktop file (menu entry)
diff --git a/graphics/picpuz/files/patch-zfuncs.cpp b/graphics/picpuz/files/patch-zfuncs.cpp
index f5e5d7f..16f9033 100644
--- a/graphics/picpuz/files/patch-zfuncs.cpp
+++ b/graphics/picpuz/files/patch-zfuncs.cpp
@@ -1,5 +1,5 @@
---- zfuncs.cpp.orig 2009-10-29 08:38:40.000000000 +0000
-+++ zfuncs.cpp 2013-03-30 09:06:21.000000000 +0000
+--- zfuncs.cpp.orig 2009-10-29 08:38:40 UTC
++++ zfuncs.cpp
@@ -23,6 +23,11 @@
// zfuncs.cpp version v.2.28
@@ -12,7 +12,7 @@
/**************************************************************************
system-level utility functions
-@@ -236,7 +241,7 @@
+@@ -236,7 +241,7 @@ void synch_threads(int NT)
// safely access parameters from multiple threads
// limitation: one lock for any number of parameters
@@ -21,7 +21,7 @@
int zget_locked(int &param) // lock and return parameter
{
-@@ -2916,7 +2921,7 @@
+@@ -2916,7 +2921,7 @@ int initz_appfiles(const char *appname,
strcpy(zicondir,zdatadir);
strcat(zicondir,"/icons");
@@ -30,7 +30,7 @@
if (strEqu(pp,"root")) snprintf(zuserdir,199,"/root/.%s",zappname); // get /root/.appname
else snprintf(zuserdir,199,"%s/.%s",getenv("HOME"),zappname); // or /home/user/.appname
-@@ -3415,7 +3420,7 @@
+@@ -3415,7 +3420,7 @@ pthread_t tid_main = 0;
pthread_t tids[tmax];
int tlocks[tmax];
int zinit = 0;
diff --git a/graphics/picpuz/files/patch-zfuncs.h b/graphics/picpuz/files/patch-zfuncs.h
index 64aab99..35cc9f2 100644
--- a/graphics/picpuz/files/patch-zfuncs.h
+++ b/graphics/picpuz/files/patch-zfuncs.h
@@ -1,5 +1,5 @@
---- zfuncs.h.orig 2009-10-29 08:38:40.000000000 +0000
-+++ zfuncs.h 2013-03-30 09:03:57.000000000 +0000
+--- zfuncs.h.orig 2016-06-20 15:52:16 UTC
++++ zfuncs.h
@@ -36,7 +36,201 @@
#include <signal.h>
#include <execinfo.h>
@@ -212,12 +212,12 @@
#define mutex_init pthread_mutex_init
#define mutex_lock pthread_mutex_lock
#define mutex_trylock pthread_mutex_trylock
-@@ -495,7 +689,7 @@
+@@ -495,7 +689,7 @@ class Queue
{
- char wmi[8];
- Vxstring * vd; // vector of xstrings
-- mutex qmutex; // for multi-thread access
-+ mutex_tp qmutex; // for multi-thread access
+ char wmi[8];
+ Vxstring * vd; // vector of xstrings
+- mutex qmutex; // for multi-thread access
++ mutex_tp qmutex; // for multi-thread access
int qcap; // queue capacity
- int qcount; // curr. queue count
- int ent1; // first entry pointer
+ int qcount; // curr. queue count
+ int ent1; // first entry pointer
diff --git a/graphics/seam-carving-gui/Makefile b/graphics/seam-carving-gui/Makefile
index cf6eec8..ac920f9 100644
--- a/graphics/seam-carving-gui/Makefile
+++ b/graphics/seam-carving-gui/Makefile
@@ -11,7 +11,8 @@ DISTNAME= SeamCarvingGui-Src-${PORTVERSION}
MAINTAINER= buganini@gmail.com
COMMENT= The Seam Carving GUI is a GUI front end to CAIR
-USES= gmake qmake
+USES= dos2unix gmake qmake
+DOS2UNIX_GLOB= *.cpp
USE_QT4= gui imageformats_run moc_build uic_build
WRKSRC= ${WRKDIR}/Src\ Seam\ Carving\ GUI\ ${PORTVERSION}
diff --git a/graphics/seam-carving-gui/files/patch-cair_CAIR.cpp b/graphics/seam-carving-gui/files/patch-cair_CAIR.cpp
index 3c66e1a..9d6e31b 100644
--- a/graphics/seam-carving-gui/files/patch-cair_CAIR.cpp
+++ b/graphics/seam-carving-gui/files/patch-cair_CAIR.cpp
@@ -1,38 +1,38 @@
---- cair/CAIR.cpp.orig 2010-02-28 16:44:47.000000000 +0800
-+++ cair/CAIR.cpp 2010-02-28 16:45:32.000000000 +0800
-@@ -276,7 +276,7 @@
- //Our thread function for the Grayscale
- void * Gray_Quadrant( void * id )
- {
-- int num = *((int *)id);
-+ long int num = *((long int *)id);
-
- while( true )
- {
-@@ -437,7 +437,7 @@
- //The thread function, splitting the image into strips
- void * Edge_Quadrant( void * id )
- {
-- int num = *((int *)id);
-+ long int num = *((long int *)id);
-
- while( true )
- {
-@@ -744,7 +744,7 @@
- //This works like Remove_Quadrant, strips across the image.
- void * Add_Quadrant( void * id )
- {
-- int num = *((int *)id);
-+ long int num = *((long int *)id);
- Thread_Params add_area;
-
- while( true )
-@@ -907,7 +907,7 @@
- //the areas are not quadrants, rather, more like strips, but I keep the name convention
- void * Remove_Quadrant( void * id )
- {
-- int num = *((int *)id);
-+ long int num = *((long int *)id);
- Thread_Params remove_area;
-
- while( true )
+--- cair/CAIR.cpp.orig 2016-06-20 15:53:24 UTC
++++ cair/CAIR.cpp
+@@ -276,7 +276,7 @@ inline CML_byte Grayscale_Pixel( CML_RGB
+ //Our thread function for the Grayscale
+ void * Gray_Quadrant( void * id )
+ {
+- int num = *((int *)id);
++ long int num = *((long int *)id);
+
+ while( true )
+ {
+@@ -437,7 +437,7 @@ int Convolve_Pixel( CML_image_ptr * Sour
+ //The thread function, splitting the image into strips
+ void * Edge_Quadrant( void * id )
+ {
+- int num = *((int *)id);
++ long int num = *((long int *)id);
+
+ while( true )
+ {
+@@ -744,7 +744,7 @@ CML_RGBA Average_Pixels( CML_RGBA Pixel1
+ //This works like Remove_Quadrant, strips across the image.
+ void * Add_Quadrant( void * id )
+ {
+- int num = *((int *)id);
++ long int num = *((long int *)id);
+ Thread_Params add_area;
+
+ while( true )
+@@ -907,7 +907,7 @@ bool CAIR_Add( CML_image * Source, CML_i
+ //the areas are not quadrants, rather, more like strips, but I keep the name convention
+ void * Remove_Quadrant( void * id )
+ {
+- int num = *((int *)id);
++ long int num = *((long int *)id);
+ Thread_Params remove_area;
+
+ while( true )
diff --git a/irc/psybnc/Makefile b/irc/psybnc/Makefile
index fb7ca0d..f58d571a6 100644
--- a/irc/psybnc/Makefile
+++ b/irc/psybnc/Makefile
@@ -16,6 +16,8 @@ LICENSE= GPLv1+ # though COPYING is GPLv2
BROKEN_powerpc64= Does not build
USE_OPENSSL= yes
+USES= dos2unix
+DOS2UNIX_GLOB= *.c *.h
WRKSRC= ${WRKDIR}/psybnc
PSYBASE?= ${PREFIX}/psybnc
MAKE_ARGS= PSYBASE=${PSYBASE}
diff --git a/irc/psybnc/files/patch-Makefile b/irc/psybnc/files/patch-Makefile
index 85e3a71..0138444 100644
--- a/irc/psybnc/files/patch-Makefile
+++ b/irc/psybnc/files/patch-Makefile
@@ -1,6 +1,6 @@
---- ./Makefile Sun Jul 7 18:09:25 2002
-+++ ../../psybnc.mina/Makefile Sun Nov 24 19:41:57 2002
-@@ -7,7 +7,7 @@
+--- Makefile.orig 2007-03-20 14:02:50 UTC
++++ Makefile
+@@ -7,7 +7,7 @@ all: $(OBJS)
@$(CC) tools/convconf.c -o tools/convconf
@tools/convconf
@echo [*] Running Autoconfig.
@@ -9,7 +9,7 @@
@tools/autoconf
@echo [*] Compiling MakeSalt for Encryption..
@$(CC) -I. -o makesalt tools/makesalt.c
-@@ -23,7 +23,7 @@
+@@ -23,7 +23,7 @@ menuconfig:
@$(CC) tools/convconf.c -o tools/convconf
@tools/convconf
@echo [*] Running Autoconfig.
@@ -18,7 +18,7 @@
@tools/autoconf
@echo [*] Creating Menu, please wait.
@echo This needs the 'ncurses' library. If it is not available, menuconf wont work. If you are using 'curses', use make menuconfig-curses instead.
-@@ -39,7 +39,7 @@
+@@ -39,7 +39,7 @@ menuconfig-curses:
@$(CC) tools/convconf.c -o tools/convconf
@tools/convconf
@echo [*] Running Autoconfig.
diff --git a/irc/psybnc/files/patch-lang_english.lng b/irc/psybnc/files/patch-lang_english.lng
index 67225e3..48c65f7 100644
--- a/irc/psybnc/files/patch-lang_english.lng
+++ b/irc/psybnc/files/patch-lang_english.lng
@@ -1,6 +1,6 @@
---- ./lang/english.lng Sat Jun 1 18:07:47 2002
-+++ ../../psybnc.mina/lang/english.lng Sun Nov 24 19:14:01 2002
-@@ -1998,7 +1998,7 @@
+--- lang/english.lng.orig 2008-10-22 19:09:46 UTC
++++ lang/english.lng
+@@ -1999,7 +1999,7 @@ msg0994=SYSTEM
; psybnc.c line 201:
msg0995=PORT1
; psybnc.c line 203:
diff --git a/irc/psybnc/files/patch-lang_german.lng b/irc/psybnc/files/patch-lang_german.lng
index 8f19c8c..ef29109 100644
--- a/irc/psybnc/files/patch-lang_german.lng
+++ b/irc/psybnc/files/patch-lang_german.lng
@@ -1,6 +1,6 @@
---- ./lang/german.lng Sat Jun 1 18:08:01 2002
-+++ ../../psybnc.mina/lang/german.lng Sun Nov 24 19:14:22 2002
-@@ -2003,7 +2003,7 @@
+--- lang/german.lng.orig 2008-10-22 19:10:34 UTC
++++ lang/german.lng
+@@ -2004,7 +2004,7 @@ msg0994=SYSTEM
; psybnc.c line 201:
msg0995=PORT1
; psybnc.c line 203:
diff --git a/irc/psybnc/files/patch-lang_italiano.lng b/irc/psybnc/files/patch-lang_italiano.lng
index 8b26de1..e08978a 100644
--- a/irc/psybnc/files/patch-lang_italiano.lng
+++ b/irc/psybnc/files/patch-lang_italiano.lng
@@ -1,6 +1,6 @@
---- ./lang/italiano.lng Sat Jun 1 18:08:25 2002
-+++ ../../psybnc.mina/lang/italiano.lng Sun Nov 24 19:14:44 2002
-@@ -1998,7 +1998,7 @@
+--- lang/italiano.lng.orig 2008-10-22 19:10:54 UTC
++++ lang/italiano.lng
+@@ -1999,7 +1999,7 @@ msg0994=SYSTEM
; psybnc.c line 201:
msg0995=PORT1
; psybnc.c line 203:
diff --git a/irc/psybnc/files/patch-src_match.c b/irc/psybnc/files/patch-src_match.c
index 74e6063..de44076 100644
--- a/irc/psybnc/files/patch-src_match.c
+++ b/irc/psybnc/files/patch-src_match.c
@@ -1,6 +1,5 @@
-diff -Naurp src/match.c src/match.c
---- src/match.c 2007-02-26 12:26:10.000000000 +0000
-+++ src/match.c 2007-02-26 12:26:17.000000000 +0000
+--- src/match.c.orig 2016-06-20 14:41:27 UTC
++++ src/match.c
@@ -36,6 +36,7 @@
/* Remove the next line to use this in IrcII */
#define EGGDROP
diff --git a/irc/psybnc/files/patch-src_p_blowfish.c b/irc/psybnc/files/patch-src_p__blowfish.c
index 1f56e32..610f3a2 100644
--- a/irc/psybnc/files/patch-src_p_blowfish.c
+++ b/irc/psybnc/files/patch-src_p__blowfish.c
@@ -1,5 +1,5 @@
---- src/p_blowfish.c 2005-06-04 22:22:45.000000000 +0400
-+++ src/p_blowfish.c 2008-02-25 23:42:07.000000000 +0300
+--- src/p_blowfish.c.orig 2016-06-20 14:41:27 UTC
++++ src/p_blowfish.c
@@ -27,16 +27,21 @@
static char rcsid[] = "@(#)$Id: p_blowfish.c,v 1.3 2005/06/04 18:00:14 hisi Exp $";
#endif
@@ -22,7 +22,7 @@
unsigned char *hashstring(unsigned char *str,int len);
unsigned char *unhashstring(unsigned char *str);
-@@ -478,10 +483,11 @@
+@@ -478,10 +483,11 @@ char * BLOWencrypt(unsigned char *str)
char *p, *s, *dest, *d, *pt;
char rim[5],ep[5],rep[5];
int i;
diff --git a/irc/psybnc/files/patch-src_p_global.h b/irc/psybnc/files/patch-src_p__global.h
index 67a4f7e..71b50ff 100644
--- a/irc/psybnc/files/patch-src_p_global.h
+++ b/irc/psybnc/files/patch-src_p__global.h
@@ -1,20 +1,6 @@
---- ./src/p_global.h Sun Jul 7 08:07:23 2002
-+++ ../../psybnc.mina/src/p_global.h Sun Nov 24 18:20:55 2002
-@@ -1264,8 +1264,8 @@
- #define pcontext { strmncpy(ctxt,__FILE__,sizeof(ctxt)); strmncpy(cfunc,__FUNCTION__,sizeof(cfunc)); cline=__LINE__; }
- #define pmalloc(n) __pmalloc((n),__FILE__,__FUNCTION__,__LINE__)
-
--#define SSLCERT "key/psybnc.cert.pem"
--#define SSLKEY "key/psybnc.key.pem"
-+#define SSLCERT PSYBASE "/key/psybnc.cert.pem"
-+#define SSLKEY PSYBASE "/key/psybnc.key.pem"
-
- #ifdef HAVE_SSL
- #ifndef SSLSEC
-diff -urN src/p_global.h psybnc.new/src/p_global.h
---- src/p_global.h 2005-06-04 22:22:45.000000000 +0400
-+++ src/p_global.h 2008-02-25 23:36:21.000000000 +0300
-@@ -972,7 +972,7 @@
+--- src/p_global.h.orig 2016-06-20 14:41:27 UTC
++++ src/p_global.h
+@@ -972,7 +972,7 @@ int checklogging(int usern);
#endif
#ifndef P_MEMORY
@@ -23,7 +9,7 @@ diff -urN src/p_global.h psybnc.new/src/p_global.h
void _pfree(void * pointer,char *module, char *function, int line);
struct usert *user(int usern);
struct newpeert *newpeer(int usern);
-@@ -1267,8 +1267,8 @@
+@@ -1267,8 +1267,8 @@ extern char * BLOW_stringdecrypt(unsigne
#endif
diff --git a/irc/psybnc/files/patch-src_p_idea.c b/irc/psybnc/files/patch-src_p__idea.c
index fd271db..4191c9a 100644
--- a/irc/psybnc/files/patch-src_p_idea.c
+++ b/irc/psybnc/files/patch-src_p__idea.c
@@ -1,7 +1,6 @@
-diff -urN src/p_idea.c psybnc.new/src/p_idea.c
---- src/p_idea.c 2005-06-04 22:22:45.000000000 +0400
-+++ src/p_idea.c 2008-02-25 23:44:12.000000000 +0300
-@@ -50,6 +50,9 @@
+--- src/p_idea.c.orig 2016-06-20 14:41:27 UTC
++++ src/p_idea.c
+@@ -50,6 +50,9 @@ static char rcsid[] = "@(#)$Id: p_idea.c
* string encryption by psychoid
*/
@@ -11,7 +10,7 @@ diff -urN src/p_idea.c psybnc.new/src/p_idea.c
#include <time.h>
#include <string.h>
#include <stdlib.h>
-@@ -62,7 +65,7 @@
+@@ -62,7 +65,7 @@ extern int cline;
#define pcontext { strmncpy(ctxt,__FILE__,sizeof(ctxt));strmncpy(cfunc,__FUNCTION__,sizeof(cfunc)); cline=__LINE__; }
#define pmalloc(n) __pmalloc((n),__FILE__,__FUNCTION__,__LINE__)
diff --git a/irc/psybnc/files/patch-src_p_memory.c b/irc/psybnc/files/patch-src_p__memory.c
index 092a5a73..3d29fb6 100644
--- a/irc/psybnc/files/patch-src_p_memory.c
+++ b/irc/psybnc/files/patch-src_p__memory.c
@@ -1,7 +1,6 @@
-diff -urN src/p_memory.c psybnc.new/src/p_memory.c
---- src/p_memory.c 2005-06-04 22:22:45.000000000 +0400
-+++ src/p_memory.c 2008-02-25 23:31:29.000000000 +0300
-@@ -32,10 +32,10 @@
+--- src/p_memory.c.orig 2016-06-20 14:41:27 UTC
++++ src/p_memory.c
+@@ -32,10 +32,10 @@ FILE *logm=NULL;
/* malloc-wrapper. No memory will log an error entry and kill the bouncer */
@@ -15,7 +14,7 @@ diff -urN src/p_memory.c psybnc.new/src/p_memory.c
{
p_log(LOG_ERROR,-1,lngtxt(602),module,function,line);
exit(0x0);
-@@ -53,7 +53,7 @@
+@@ -53,7 +53,7 @@ unsigned long *__pmalloc(unsigned long s
return rc;
}
@@ -24,7 +23,7 @@ diff -urN src/p_memory.c psybnc.new/src/p_memory.c
{
#ifdef LOGALLOC
if(logm==NULL)
-@@ -67,7 +67,7 @@
+@@ -67,7 +67,7 @@ void _pfree(unsigned long *pointer, char
free(pointer);
}
@@ -32,3 +31,4 @@ diff -urN src/p_memory.c psybnc.new/src/p_memory.c
+#define free(a) _pfree((void *)a,__FILE__,(char*)__FUNCTION__,__LINE__)
/* struct wrappers. Those alloc, delete and return the needed structures */
+
diff --git a/irc/psybnc/files/patch-src_p_string.c b/irc/psybnc/files/patch-src_p__string.c
index 94851f4..deaa262 100644
--- a/irc/psybnc/files/patch-src_p_string.c
+++ b/irc/psybnc/files/patch-src_p__string.c
@@ -1,7 +1,6 @@
- #ifndef SSLSEC
---- ./src/p_string.c Fri Jul 19 09:01:52 2002
-+++ ../../psybnc.mina/src/p_string.c Sun Nov 24 17:58:56 2002
-@@ -613,7 +613,7 @@
+--- src/p_string.c.orig 2016-06-20 14:41:27 UTC
++++ src/p_string.c
+@@ -616,7 +616,7 @@ int loadlanguage(char *langf)
int msg;
pcontext;
clearlanguage();
diff --git a/irc/psybnc/files/patch-src_psybnc.c b/irc/psybnc/files/patch-src_psybnc.c
index 07c3209..a4c2ef8 100644
--- a/irc/psybnc/files/patch-src_psybnc.c
+++ b/irc/psybnc/files/patch-src_psybnc.c
@@ -1,6 +1,6 @@
---- ./src/psybnc.c Wed Jul 24 17:19:05 2002
-+++ ../../psybnc.mina/src/psybnc.c Sun Nov 24 19:54:52 2002
-@@ -43,6 +43,8 @@
+--- src/psybnc.c.orig 2016-06-20 14:41:27 UTC
++++ src/psybnc.c
+@@ -44,6 +44,8 @@ int slice=0;
#ifdef HAVE_SSL
@@ -9,7 +9,7 @@
void initSSL()
{
SSL_load_error_strings();
-@@ -170,13 +172,17 @@
+@@ -171,13 +173,17 @@ main (int argc, char **argv)
if(argc==2)
{
strmncpy(configfile,argv[1],sizeof(configfile));
@@ -29,9 +29,9 @@
exit (0x0);
}
fclose(conffile);
-@@ -301,3 +307,15 @@
+@@ -302,3 +308,15 @@ main (int argc, char **argv)
bncmain();
- }
+ }
+int fexists(char *fname)
+{
diff --git a/irc/psybnc/files/patch-tools_autoconf.c b/irc/psybnc/files/patch-tools_autoconf.c
index 9e281d8..bbb25ca 100644
--- a/irc/psybnc/files/patch-tools_autoconf.c
+++ b/irc/psybnc/files/patch-tools_autoconf.c
@@ -1,6 +1,6 @@
---- tools/autoconf.c.orig 2006-11-16 00:27:04.000000000 +0000
-+++ tools/autoconf.c 2013-01-18 13:55:10.102047624 +0000
-@@ -443,9 +443,9 @@
+--- tools/autoconf.c.orig 2016-06-20 14:41:27 UTC
++++ tools/autoconf.c
+@@ -443,9 +443,9 @@ int main()
fprintf(makefile,"INCLUDE = -I./src/ -I.\n");
fprintf(makefile,"OBJS = src/psybnc.o src/match.o src/p_client.o src/p_crypt.o src/p_dcc.o src/p_hash.o src/p_idea.o src/p_inifunc.o src/p_link.o src/p_log.o src/p_memory.o src/p_network.o src/p_parse.o src/p_peer.o src/p_server.o src/p_socket.o src/p_string.o src/p_sysmsg.o src/p_userfile.o src/p_uchannel.o src/p_script.o src/p_topology.o src/p_intnet.o src/p_blowfish.o src/p_translate.o src/p_coredns.o src/snprintf.o %s\n",env);
if(provi==0)
@@ -12,7 +12,7 @@
fprintf(makefile,"TARGET = psybnc\n");
fprintf(makefile,"\n");
fprintf(makefile,"all: $(OBJS)\n");
-@@ -453,7 +453,8 @@
+@@ -453,7 +453,8 @@ int main()
fprintf(makefile," @strip $(TARGET)\n");
if(ssl==0)
{
diff --git a/java/jakarta-commons-pool/Makefile b/java/jakarta-commons-pool/Makefile
index 1dabad7..badb32b 100644
--- a/java/jakarta-commons-pool/Makefile
+++ b/java/jakarta-commons-pool/Makefile
@@ -15,13 +15,15 @@ LICENSE= APACHE20
OPTIONS_DEFINE= DOCS
+USES= dos2unix
+DOS2UNIX_GLOB= *.xml *.java
USE_JAVA= yes
JAVA_VERSION= 1.6+
USE_ANT= yes
ALL_TARGET= build-jar
-PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME}.jar
+PLIST_FILES= ${JAVAJARDIR}/${PORTNAME}.jar
PORTDOCS= *
diff --git a/java/jakarta-commons-pool/files/patch-build.xml b/java/jakarta-commons-pool/files/patch-build.xml
index d82eb5b..bb1ff67 100644
--- a/java/jakarta-commons-pool/files/patch-build.xml
+++ b/java/jakarta-commons-pool/files/patch-build.xml
@@ -1,11 +1,11 @@
---- build.xml.orig 2012-01-10 13:14:30.000000000 +0100
-+++ build.xml 2012-01-10 13:14:40.000000000 +0100
+--- build.xml.orig 2016-06-20 15:05:02 UTC
++++ build.xml
@@ -40,7 +40,7 @@
-
- <property name="name" value="commons-pool"/>
- <property name="title" value="Apache Commons Object Pooling Package"/>
-- <property name="version" value="1.6-SNAPSHOT"/>
-+ <property name="version" value="1.6"/>
- <property name="package" value="org.apache.commons.pool.*"/>
-
- <property name="src.dir" value="${basedir}/src"/>
+
+ <property name="name" value="commons-pool"/>
+ <property name="title" value="Apache Commons Object Pooling Package"/>
+- <property name="version" value="1.6-SNAPSHOT"/>
++ <property name="version" value="1.6"/>
+ <property name="package" value="org.apache.commons.pool.*"/>
+
+ <property name="src.dir" value="${basedir}/src"/>
diff --git a/java/jgrapht/Makefile b/java/jgrapht/Makefile
index 947fc6d..a7f1947 100644
--- a/java/jgrapht/Makefile
+++ b/java/jgrapht/Makefile
@@ -10,7 +10,8 @@ MASTER_SITES= SF/${PORTNAME}/JGraphT/Version%20${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Java package for mathematical graph-theory objects and algorithms
-USES= zip
+USES= dos2unix zip
+DOS2UNIX_GLOB= *.xml *.java
USE_JAVA= yes
JAVA_VERSION= 1.6 1.7
@@ -30,7 +31,7 @@ NO_BUILD= yes
PORTDOCS= *
-PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME}.jar
+PLIST_FILES= ${JAVAJARDIR}/${PORTNAME}.jar
.include <bsd.port.pre.mk>
diff --git a/java/jgrapht/files/patch-build.xml b/java/jgrapht/files/patch-build.xml
index eb39cf5..2870d17 100644
--- a/java/jgrapht/files/patch-build.xml
+++ b/java/jgrapht/files/patch-build.xml
@@ -1,12 +1,12 @@
Patch to allow the JDK API location to be passed to Ant using -Djdk.api
---- build.xml.orig Mon Jul 3 00:53:38 2006
-+++ build.xml Sun Mar 11 12:16:31 2007
-@@ -400,6 +400,7 @@
- <include name="**"/>
- <exclude name="org/jgrapht/experimental/**"/>
- </packageset>
-+ <link offline="true" packagelistLoc="${jdk.api}" href="${jdk.api}"/>
- </javadoc>
- </target>
-
+--- build.xml.orig 2016-06-20 15:06:43 UTC
++++ build.xml
+@@ -355,6 +355,7 @@
+ <include name="**"/>
+ <exclude name="org/jgrapht/experimental/**"/>
+ </packageset>
++ <link offline="true" packagelistLoc="${jdk.api}" href="${jdk.api}"/>
+ </javadoc>
+ </target>
+
diff --git a/mail/vpopmail/Makefile b/mail/vpopmail/Makefile
index 6b9a839..ae3c4cc 100644
--- a/mail/vpopmail/Makefile
+++ b/mail/vpopmail/Makefile
@@ -18,7 +18,8 @@ RUN_DEPENDS= ${LOCALBASE}/bin/tcprules:sysutils/ucspi-tcp
PATCH_STRIP= -p1
-USES= qmail gmake fakeroot
+USES= dos2unix qmail gmake fakeroot
+DOS2UNIX_FILES= doc/README.vpopmaild
CONFLICTS= vpopmail-devel-5.*
diff --git a/mail/vpopmail/files/patch-README.vpopmaild b/mail/vpopmail/files/patch-README.vpopmaild
index 8a31b72..6f2a1379 100644
--- a/mail/vpopmail/files/patch-README.vpopmaild
+++ b/mail/vpopmail/files/patch-README.vpopmaild
@@ -6,39 +6,39 @@ Last-Update: 2009-11-26
--- a/doc/README.vpopmaild
+++ b/doc/README.vpopmaild
@@ -243,7 +243,7 @@
-
- Rights required: Must be a valid email address.
-
--Action: Verify the username and password of the persion desiring to
-+Action: Verify the username and password of the person desiring to
- login, and set their access rights.
-
- For the "login" command, a successful login will return a
+
+ Rights required: Must be a valid email address.
+
+-Action: Verify the username and password of the persion desiring to
++Action: Verify the username and password of the person desiring to
+ login, and set their access rights.
+
+ For the "login" command, a successful login will return a
@@ -386,7 +386,7 @@
-
-
- The following values are returned as the character '1' or '0'. '1'
--says the field is active which, for example an active no_password_change
-+says the field is active - for example, an active no_password_change field
- means the user can not change passwords.
-
- no_password_change, no_pop, no_webmail, no_imap, bounce_mail, no_relay,
+
+
+ The following values are returned as the character '1' or '0'. '1'
+-says the field is active which, for example an active no_password_change
++says the field is active - for example, an active no_password_change field
+ means the user can not change passwords.
+
+ no_password_change, no_pop, no_webmail, no_imap, bounce_mail, no_relay,
@@ -631,7 +631,7 @@
- Rights required: SA_ADMIN
-
- Action: List all domains on the system, and their parent domain.
--If the optional page is given, lines_per_page must be specified also.
-+If the optional page is given, lines_per_page must also be specified.
- When both are given, the data is broken up into pages with lines_per_page
- lines on each. The page returned is specified by page.
-
+ Rights required: SA_ADMIN
+
+ Action: List all domains on the system, and their parent domain.
+-If the optional page is given, lines_per_page must be specified also.
++If the optional page is given, lines_per_page must also be specified.
+ When both are given, the data is broken up into pages with lines_per_page
+ lines on each. The page returned is specified by page.
+
@@ -1088,7 +1088,7 @@
- The actual error messages are stored in the file vpopmaild.msg for easy translation.
- Once there are other language files, I'll create a directory to store the various
- language files, and use a symlink to select a language. Error messages are set
--at comile time.
-+at compile time.
-
--0.X represents a message passed up from fpopmaild primitives, and does not otherwise
-+0.X represents a message passed up from vpopmaild primitives, and does not otherwise
- follow the standard error reporting structure. (yet?)
+ The actual error messages are stored in the file vpopmaild.msg for easy translation.
+ Once there are other language files, I'll create a directory to store the various
+ language files, and use a symlink to select a language. Error messages are set
+-at comile time.
++at compile time.
+
+-0.X represents a message passed up from fpopmaild primitives, and does not otherwise
++0.X represents a message passed up from vpopmaild primitives, and does not otherwise
+ follow the standard error reporting structure. (yet?)
diff --git a/math/spar/Makefile b/math/spar/Makefile
index 85fa785..8045415 100644
--- a/math/spar/Makefile
+++ b/math/spar/Makefile
@@ -10,7 +10,8 @@ MASTER_SITES= SF/${PORTNAME}/Spar/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Modular math parser
-USES= libtool ncurses readline
+USES= dos2unix libtool ncurses readline
+DOS2UNIX_FILES= lib/randist/rand.c
GNU_CONFIGURE= yes
USE_CSTD= gnu89
USE_LDCONFIG= yes
diff --git a/math/spar/files/patch-calculator__Makefile.in b/math/spar/files/patch-calculator_Makefile.in
index 725ba36..e4515e8 100644
--- a/math/spar/files/patch-calculator__Makefile.in
+++ b/math/spar/files/patch-calculator_Makefile.in
@@ -1,6 +1,6 @@
---- calculator/Makefile.in.orig Sun Jul 1 02:55:42 2001
-+++ calculator/Makefile.in Sun Jul 1 02:55:56 2001
-@@ -91,7 +91,7 @@
+--- calculator/Makefile.in.orig 2001-06-26 13:32:25 UTC
++++ calculator/Makefile.in
+@@ -91,7 +91,7 @@ PROGRAMS = $(bin_PROGRAMS)
DEFS = @DEFS@ -I. -I$(srcdir) -I..
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
diff --git a/math/spar/files/patch-configure b/math/spar/files/patch-configure
index ce43259..6e1a2e8 100644
--- a/math/spar/files/patch-configure
+++ b/math/spar/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig Tue Jun 26 05:46:47 2001
-+++ configure Sun Sep 8 15:42:06 2002
-@@ -1580,7 +1563,6 @@
+--- configure.orig 2001-06-26 12:46:47 UTC
++++ configure
+@@ -1580,7 +1580,6 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtoo
exec 5>>./config.log
diff --git a/math/spar/files/patch-lib__randist__rand.c b/math/spar/files/patch-lib_randist_rand.c
index 792b9fa..836d51c 100644
--- a/math/spar/files/patch-lib__randist__rand.c
+++ b/math/spar/files/patch-lib_randist_rand.c
@@ -1,10 +1,10 @@
---- lib/randist/rand.c.orig Sun Jul 1 02:45:44 2001
-+++ lib/randist/rand.c Sun Jul 1 02:46:03 2001
+--- lib/randist/rand.c.orig 2016-06-20 13:16:43 UTC
++++ lib/randist/rand.c
@@ -64,6 +64,7 @@
- * struct timeb to be defined. They can be
- * found in timeb.h.
- */
+ * struct timeb to be defined. They can be
+ * found in timeb.h.
+ */
+#include <sys/types.h>
- #include <sys/timeb.h>
- void
- sl_randomize (void)
+ #include <sys/timeb.h>
+ void
+ sl_randomize (void)
diff --git a/multimedia/vdr-plugin-wirbelscan/Makefile b/multimedia/vdr-plugin-wirbelscan/Makefile
index caedd02..ed26f59 100644
--- a/multimedia/vdr-plugin-wirbelscan/Makefile
+++ b/multimedia/vdr-plugin-wirbelscan/Makefile
@@ -11,7 +11,8 @@ DISTNAME= ${PORTNAME:S/-plugin-/-/}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERS
MAINTAINER= ports@FreeBSD.org
COMMENT= Video Disk Recorder - wirbelscan plugin
-USES= tar:tgz
+USES= dos2unix tar:tgz
+DOS2UNIX_FILES= scanner.c
PATCH_STRIP= -p1
HAVE_CONFIGURE= yes
PORTDOCS= COPYING README HISTORY
diff --git a/multimedia/vdr-plugin-wirbelscan/files/patch-scanner.c b/multimedia/vdr-plugin-wirbelscan/files/patch-scanner.c
index fc4ce34..5c6fa84 100644
--- a/multimedia/vdr-plugin-wirbelscan/files/patch-scanner.c
+++ b/multimedia/vdr-plugin-wirbelscan/files/patch-scanner.c
@@ -1,11 +1,11 @@
--- a/scanner.c
+++ b/scanner.c
-@@ -633,7 +633,7 @@ void cScanner::Action(void) {
- else
- continue;
- cCondWait::SleepMs(2000);
-- vbiSupport = vcap.capabilities & (V4L2_CAP_VBI_CAPTURE || V4L2_CAP_SLICED_VBI_CAPTURE);
-+ vbiSupport = vcap.capabilities & (V4L2_CAP_VBI_CAPTURE | V4L2_CAP_SLICED_VBI_CAPTURE);
- if (vbiSupport)
- dlog(1, "device can capture vbi");
- }
+@@ -633,7 +633,7 @@ void cScanner::Action(void) {
+ else
+ continue;
+ cCondWait::SleepMs(2000);
+- vbiSupport = vcap.capabilities & (V4L2_CAP_VBI_CAPTURE || V4L2_CAP_SLICED_VBI_CAPTURE);
++ vbiSupport = vcap.capabilities & (V4L2_CAP_VBI_CAPTURE | V4L2_CAP_SLICED_VBI_CAPTURE);
+ if (vbiSupport)
+ dlog(1, "device can capture vbi");
+ }
diff --git a/multimedia/w_scan/Makefile b/multimedia/w_scan/Makefile
index 4d12b98..58fdffc 100644
--- a/multimedia/w_scan/Makefile
+++ b/multimedia/w_scan/Makefile
@@ -14,10 +14,9 @@ LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= v4l_compat>=1.0.20120501:multimedia/v4l_compat
-PATCH_STRIP= -lp1
-
GNU_CONFIGURE= yes
-USES= gettext iconv localbase tar:bzip2
+USES= dos2unix gettext iconv localbase tar:bzip2
+DOS2UNIX_GLOB= *.c *.h
LDFLAGS+= ${ICONV_LIB}
NO_WRKSUBDIR= yes
diff --git a/multimedia/w_scan/files/patch-char-coding.c b/multimedia/w_scan/files/patch-char-coding.c
index 2169ee5..fb87b8a 100644
--- a/multimedia/w_scan/files/patch-char-coding.c
+++ b/multimedia/w_scan/files/patch-char-coding.c
@@ -1,35 +1,35 @@
---- a/char-coding.c
-+++ b/char-coding.c
+--- char-coding.c.orig 2016-06-20 13:13:56 UTC
++++ char-coding.c
@@ -250,6 +250,10 @@ void char_coding(char **inbuf, size_t *
- // Fallback method: copy all printable chars from *inbuf to *outbuf.
- size_t i;
- size_t pos = 0;
-+#ifdef __FreeBSD__
-+ int to_utf = user_charset_id < iconv_codes_count() &&
-+ !strncmp(iconv_codes[user_charset_id], "UTF", sizeof "UTF" - 1);
-+#endif
-
- for (i = 0; i < nsrc; i++) {
- switch((uint8_t) *(psrc + i)) {
-@@ -257,7 +259,21 @@ void char_coding(char **inbuf, size_t *
- //case 0xA0 ... 0xFF:
- // printable chars ISO-6937-2
- // Figure A.1: Character code table 00 - Latin alphabet
-+#ifdef __FreeBSD__
-+ case 0x80 ... 0xFF:
-+ // the iconv used on FreeBSD doesn't know about the
-+ // default DVB charset ISO_6937-2 so we'll end up here
-+ // for 8-bit chars in channel names that are (usually
-+ // wrongly) specified as the default charset - and if
-+ // we are converting to utf those will create invalid
-+ // encodings.
-+ if (to_utf)
-+ continue;
-+ // FALLTHRU
-+ case 0x01 ... 0x7F:
-+#else
- case 0x01 ... 0xFF: // 20121202: don't touch anything; leave it as it is.
-+#endif
- *(pdest + pos++) = *(psrc + i);
- default:;
- }
+ // Fallback method: copy all printable chars from *inbuf to *outbuf.
+ size_t i;
+ size_t pos = 0;
++#ifdef __FreeBSD__
++ int to_utf = user_charset_id < iconv_codes_count() &&
++ !strncmp(iconv_codes[user_charset_id], "UTF", sizeof "UTF" - 1);
++#endif
+
+ for (i = 0; i < nsrc; i++) {
+ switch((uint8_t) *(psrc + i)) {
+@@ -257,7 +261,21 @@ void char_coding(char **inbuf, size_t *
+ //case 0xA0 ... 0xFF:
+ // printable chars ISO-6937-2
+ // Figure A.1: Character code table 00 - Latin alphabet
++#ifdef __FreeBSD__
++ case 0x80 ... 0xFF:
++ // the iconv used on FreeBSD doesn't know about the
++ // default DVB charset ISO_6937-2 so we'll end up here
++ // for 8-bit chars in channel names that are (usually
++ // wrongly) specified as the default charset - and if
++ // we are converting to utf those will create invalid
++ // encodings.
++ if (to_utf)
++ continue;
++ // FALLTHRU
++ case 0x01 ... 0x7F:
++#else
+ case 0x01 ... 0xFF: // 20121202: don't touch anything; leave it as it is.
++#endif
+ *(pdest + pos++) = *(psrc + i);
+ default:;
+ }
diff --git a/multimedia/w_scan/files/patch-clang b/multimedia/w_scan/files/patch-descriptors.c
index 77120dd..0bfcf37 100644
--- a/multimedia/w_scan/files/patch-clang
+++ b/multimedia/w_scan/files/patch-descriptors.c
@@ -1,9 +1,9 @@
The code is using gnu C extensions. The following new patchfile under files/ fixes the issue:
# cat files/patch-descriptors.c
---- a/descriptors.c 2012-10-03 12:39:42.000000000 +0200
-+++ b/descriptors.c 2012-10-03 12:39:56.000000000 +0200
-@@ -1000,6 +1000,16 @@
+--- descriptors.c.orig 2016-06-20 13:13:56 UTC
++++ descriptors.c
+@@ -1000,6 +1000,16 @@ void parse_T2_delivery_system_descriptor
}
}
@@ -20,7 +20,7 @@ The code is using gnu C extensions. The following new patchfile under files/ fix
/* 300468 v011101 annex C, Conversion between time and date conventions
* NOTE: These formulas are applicable between the inclusive dates 1900 March 1 to 2100 February 28.
-@@ -1011,16 +1021,6 @@
+@@ -1011,16 +1021,6 @@ struct tm modified_julian_date_to_utc(__
int _M = (int) (MJD - 14956.1 - (int) (_Y * 365.25)) / 30.6001;
int K = (_M == 14) ? 1 : (_M == 15) ? 1 : 0;
@@ -37,5 +37,3 @@ The code is using gnu C extensions. The following new patchfile under files/ fix
memset(&utc, 0, sizeof(struct tm));
utc.tm_mday = MJD - 14956 - (int) (_Y * 365.25) - (int) (_M * 30.6001);
utc.tm_year = _Y + K;
-
-
diff --git a/multimedia/w_scan/files/patch-scan.c b/multimedia/w_scan/files/patch-scan.c
index 5fa9852..88910e5 100644
--- a/multimedia/w_scan/files/patch-scan.c
+++ b/multimedia/w_scan/files/patch-scan.c
@@ -1,6 +1,18 @@
---- a/scan.c
-+++ b/scan.c
-@@ -2936,8 +2936,8 @@ int main (int argc, char **argv)
+--- scan.c.orig 2016-06-20 13:13:56 UTC
++++ scan.c
+@@ -1816,7 +1816,11 @@ static int set_frontend(int frontend_fd,
+ case SCAN_TERRESTRIAL:
+ set_cmd_sequence(DTV_DELIVERY_SYSTEM, t->param.u.terr.delivery_system);
+ if (t->param.u.terr.delivery_system == SYS_DVBT2) {
++#ifndef DTV_DVBT2_PLP_ID
++ set_cmd_sequence(DTV_DVBT2_PLP_ID_LEGACY, t->pids.plp_id);
++#else
+ set_cmd_sequence(DTV_DVBT2_PLP_ID, t->pids.plp_id);
++#endif
+ }
+ set_cmd_sequence(DTV_FREQUENCY, t->param.frequency);
+ set_cmd_sequence(DTV_INVERSION, t->param.inversion);
+@@ -3010,8 +3014,8 @@ int main (int argc, char **argv)
cleanup();
return -1;
}
diff --git a/multimedia/w_scan/files/patch-z-scan.c b/multimedia/w_scan/files/patch-z-scan.c
deleted file mode 100644
index 860de10..0000000
--- a/multimedia/w_scan/files/patch-z-scan.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/scan.c
-+++ b/scan.c
-@@ -1816,7 +1816,11 @@ static int set_frontend(int frontend_fd,
- case SCAN_TERRESTRIAL:
- set_cmd_sequence(DTV_DELIVERY_SYSTEM, t->param.u.terr.delivery_system);
- if (t->param.u.terr.delivery_system == SYS_DVBT2) {
-+#ifndef DTV_DVBT2_PLP_ID
-+ set_cmd_sequence(DTV_DVBT2_PLP_ID_LEGACY, t->pids.plp_id);
-+#else
- set_cmd_sequence(DTV_DVBT2_PLP_ID, t->pids.plp_id);
-+#endif
- }
- set_cmd_sequence(DTV_FREQUENCY, t->param.frequency);
- set_cmd_sequence(DTV_INVERSION, t->param.inversion);
diff --git a/net-im/mbpurple/Makefile b/net-im/mbpurple/Makefile
index ce946fe..6e4fc94 100644
--- a/net-im/mbpurple/Makefile
+++ b/net-im/mbpurple/Makefile
@@ -16,7 +16,8 @@ RUN_DEPENDS= ${LOCALBASE}/bin/pidgin:net-im/pidgin
LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= gmake pkgconfig
+USES= dos2unix gmake pkgconfig
+DOS2UNIX_GLOB= *.c
MAKE_ARGS= PREFIX="${PREFIX}" LIBDIR="${PREFIX}/lib" \
PURPLE_DATAROOT_DIR="${PREFIX}/share"
diff --git a/net-im/mbpurple/files/patch-microblog__mb_net.c b/net-im/mbpurple/files/patch-microblog_mb__net.c
index 818c30c..077b0f2 100644
--- a/net-im/mbpurple/files/patch-microblog__mb_net.c
+++ b/net-im/mbpurple/files/patch-microblog_mb__net.c
@@ -1,19 +1,17 @@
-diff --git a/microblog/mb_net.c b/microblog/mb_net.c
-index 2752aba..962ac1f 100644
---- microblog/mb_net.c
+--- microblog/mb_net.c.orig 2016-06-20 15:55:29 UTC
+++ microblog/mb_net.c
-@@ -160,13 +160,13 @@ void mb_conn_fetch_url_cb(PurpleUtilFetchUrlData * url_data, gpointer user_data,
- conn_data->fetch_url_data = NULL;
-
- if(error_message != NULL) {
-- mb_conn_data_free(conn_data);
- if(conn_data->handler) {
- retval = conn_data->handler(conn_data, conn_data->handler_data, error_message);
- }
- if(ma->gc != NULL) {
- purple_connection_error_reason(ma->gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, error_message);
- }
-+ mb_conn_data_free(conn_data);
- } else {
- mb_http_data_post_read(conn_data->response, url_text, len);
- if(conn_data->handler) {
+@@ -160,13 +160,13 @@ void mb_conn_fetch_url_cb(PurpleUtilFetc
+ conn_data->fetch_url_data = NULL;
+
+ if(error_message != NULL) {
+- mb_conn_data_free(conn_data);
+ if(conn_data->handler) {
+ retval = conn_data->handler(conn_data, conn_data->handler_data, error_message);
+ }
+ if(ma->gc != NULL) {
+ purple_connection_error_reason(ma->gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, error_message);
+ }
++ mb_conn_data_free(conn_data);
+ } else {
+ mb_http_data_post_read(conn_data->response, url_text, len);
+ if(conn_data->handler) {
diff --git a/net-mgmt/cdpr/Makefile b/net-mgmt/cdpr/Makefile
index 077efaa..0596578 100644
--- a/net-mgmt/cdpr/Makefile
+++ b/net-mgmt/cdpr/Makefile
@@ -9,6 +9,8 @@ MASTER_SITES= SF
MAINTAINER= mich@FreeBSD.org
COMMENT= Cisco Discovery Protocol Reporter
+USES= dos2unix
+DOS2UNIX_GLOB= *.c *.h
LDFLAGS+= -L${LOCALBASE}/lib -lpcap
DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
diff --git a/net-mgmt/cdpr/files/patch-cdpr.c b/net-mgmt/cdpr/files/patch-cdpr.c
index 8c591de..3a83c51 100644
--- a/net-mgmt/cdpr/files/patch-cdpr.c
+++ b/net-mgmt/cdpr/files/patch-cdpr.c
@@ -1,6 +1,6 @@
---- cdpr.c.orig Wed Nov 19 17:53:13 2003
-+++ cdpr.c Wed Nov 19 17:54:06 2003
-@@ -639,7 +639,7 @@
+--- cdpr.c.orig 2016-06-20 14:44:21 UTC
++++ cdpr.c
+@@ -641,7 +641,7 @@ main(int argc, char *argv[])
pcap_lookupnet(dev, &net, &mask, errbuf);
/* Open the pcap device */
@@ -9,7 +9,7 @@
{
printf("Error opening device (%s)\n", errbuf);
exit(1);
-@@ -656,11 +656,6 @@
+@@ -658,11 +658,6 @@ main(int argc, char *argv[])
pcap_setfilter(handle, &filter);
pcap_freecode(&filter);
@@ -21,7 +21,7 @@
/* Get the next packet that comes in, we only need one */
printf("Waiting for CDP advertisement:\n");
-@@ -671,11 +666,7 @@
+@@ -673,11 +668,7 @@ main(int argc, char *argv[])
do
{
packet = pcap_next(handle, &header);
diff --git a/net-mgmt/cdpr/files/patch-conffile.c b/net-mgmt/cdpr/files/patch-conffile.c
index 0ca7c053..ef5a7d1 100644
--- a/net-mgmt/cdpr/files/patch-conffile.c
+++ b/net-mgmt/cdpr/files/patch-conffile.c
@@ -1,19 +1,19 @@
---- conffile.c.orig
+--- conffile.c.orig 2016-06-20 14:44:21 UTC
+++ conffile.c
-@@ -57,6 +57,7 @@
- struct hostent *h;
- char *addy;
- int port;
-+ char *tport;
-
- if (ip && url)
- {
-@@ -70,7 +71,7 @@
- else
- {
- strtok(ip,":");
-- char *tport = strtok(NULL,":");
-+ tport = strtok(NULL,":");
- port = atoi(tport);
- }
- /*
+@@ -57,6 +57,7 @@ do_something_with (char *ip, char *url)
+ struct hostent *h;
+ char *addy;
+ int port;
++ char *tport;
+
+ if (ip && url)
+ {
+@@ -70,7 +71,7 @@ do_something_with (char *ip, char *url)
+ else
+ {
+ strtok(ip,":");
+- char *tport = strtok(NULL,":");
++ tport = strtok(NULL,":");
+ port = atoi(tport);
+ }
+ /*
diff --git a/net-p2p/gnewtellium/Makefile b/net-p2p/gnewtellium/Makefile
index d812c31..06a07ce 100644
--- a/net-p2p/gnewtellium/Makefile
+++ b/net-p2p/gnewtellium/Makefile
@@ -13,7 +13,8 @@ COMMENT= Gnutella client
PORTSCOUT= skipv:0.05 # older than current one
USE_GNOME= gtk12
-USES= gmake
+USES= dos2unix gmake
+DOS2UNIX_GLOB= *.c
GNU_CONFIGURE= yes
MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
AUTOHEADER="${TRUE}"
diff --git a/net-p2p/gnewtellium/files/patch-src__config.c b/net-p2p/gnewtellium/files/patch-src_config.c
index 54d3eba..8c2d7e2 100644
--- a/net-p2p/gnewtellium/files/patch-src__config.c
+++ b/net-p2p/gnewtellium/files/patch-src_config.c
@@ -1,55 +1,55 @@
---- src/config.c.orig Tue Feb 5 03:50:18 2002
-+++ src/config.c Tue Mar 9 20:37:00 2004
-@@ -539,8 +539,8 @@
- gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
- gtk_widget_show(hbox);
-
-- label = gtk_label_new("Let Newtella know what speed your Internet Connection is.
--Setting this to an accurate number will help you get the most out of
-+ label = gtk_label_new("Let Newtella know what speed your Internet Connection is.\n\
-+Setting this to an accurate number will help you get the most out of\n\
- Newtella's advanced bandwidth management.");
- gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
- hbox = gtk_hbox_new(FALSE, 0);
-@@ -579,7 +579,7 @@
- gtk_widget_show(button);
-
- hbox = gtk_hbox_new(FALSE, 0);
-- label = gtk_label_new("Select the directory where you want to store your newly
-+ label = gtk_label_new("Select the directory where you want to store your newly\n\
- downloaded files.");
- gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
- gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 10);
-@@ -627,8 +627,8 @@
- gtk_widget_show(hbox);
- gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 5);
-
-- label = gtk_label_new("Add any number of directories here.
--All .mp3 files under any of these directories can then be
-+ label = gtk_label_new("Add any number of directories here.\n\
-+All .mp3 files under any of these directories can then be\n\
- downloaded by other Newtella users.");
- gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
- hbox = gtk_hbox_new(FALSE, 0);
-@@ -686,8 +686,8 @@
- gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 10);
-
- hbox = gtk_hbox_new(FALSE, 0);
-- label = gtk_label_new("Select how much search results Newtella will maximally send to
--other clients. Use this to limit the impact of stupid searches on your
-+ label = gtk_label_new("Select how much search results Newtella will maximally send to\n\
-+other clients. Use this to limit the impact of stupid searches on your\n\
- computer.");
- gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
- gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 10);
-@@ -724,8 +724,8 @@
- gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 10);
-
- hbox = gtk_hbox_new(FALSE, 0);
-- label = gtk_label_new("Returns the entered IP with search results instead of your real one.
--Useful if your're behind a NAT Firewall (like Windows 98 Internet
-+ label = gtk_label_new("Returns the entered IP with search results instead of your real one.\n\
-+Useful if your're behind a NAT Firewall (like Windows 98 Internet\n\
- Connection Sharing)");
- gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
- gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 10);
+--- src/config.c.orig 2016-06-20 14:36:47 UTC
++++ src/config.c
+@@ -539,8 +539,8 @@ void config_draw(void)
+ gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+ gtk_widget_show(hbox);
+
+- label = gtk_label_new("Let Newtella know what speed your Internet Connection is.
+-Setting this to an accurate number will help you get the most out of
++ label = gtk_label_new("Let Newtella know what speed your Internet Connection is.\n\
++Setting this to an accurate number will help you get the most out of\n\
+ Newtella's advanced bandwidth management.");
+ gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
+ hbox = gtk_hbox_new(FALSE, 0);
+@@ -579,7 +579,7 @@ Newtella's advanced bandwidth management
+ gtk_widget_show(button);
+
+ hbox = gtk_hbox_new(FALSE, 0);
+- label = gtk_label_new("Select the directory where you want to store your newly
++ label = gtk_label_new("Select the directory where you want to store your newly\n\
+ downloaded files.");
+ gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
+ gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 10);
+@@ -627,8 +627,8 @@ downloaded files.");
+ gtk_widget_show(hbox);
+ gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 5);
+
+- label = gtk_label_new("Add any number of directories here.
+-All .mp3 files under any of these directories can then be
++ label = gtk_label_new("Add any number of directories here.\n\
++All .mp3 files under any of these directories can then be\n\
+ downloaded by other Newtella users.");
+ gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
+ hbox = gtk_hbox_new(FALSE, 0);
+@@ -686,8 +686,8 @@ downloaded by other Newtella users.");
+ gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 10);
+
+ hbox = gtk_hbox_new(FALSE, 0);
+- label = gtk_label_new("Select how much search results Newtella will maximally send to
+-other clients. Use this to limit the impact of stupid searches on your
++ label = gtk_label_new("Select how much search results Newtella will maximally send to\n\
++other clients. Use this to limit the impact of stupid searches on your\n\
+ computer.");
+ gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
+ gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 10);
+@@ -724,8 +724,8 @@ computer.");
+ gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 10);
+
+ hbox = gtk_hbox_new(FALSE, 0);
+- label = gtk_label_new("Returns the entered IP with search results instead of your real one.
+-Useful if your're behind a NAT Firewall (like Windows 98 Internet
++ label = gtk_label_new("Returns the entered IP with search results instead of your real one.\n\
++Useful if your're behind a NAT Firewall (like Windows 98 Internet\n\
+ Connection Sharing)");
+ gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
+ gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 10);
diff --git a/net-p2p/torrentsniff/Makefile b/net-p2p/torrentsniff/Makefile
index eca0a26..e843760 100644
--- a/net-p2p/torrentsniff/Makefile
+++ b/net-p2p/torrentsniff/Makefile
@@ -14,7 +14,7 @@ RUN_DEPENDS= p5-libwww>=0:www/p5-libwww \
p5-Digest-SHA1>=0:security/p5-Digest-SHA1
NO_BUILD= yes
-USES= shebangfix perl5
+USES= dos2unix shebangfix perl5
SHEBANG_FILES= torrentsniff
do-install:
diff --git a/net-p2p/torrentsniff/files/patch-BitTorrent-BDecode.pm b/net-p2p/torrentsniff/files/patch-BitTorrent-BDecode.pm
deleted file mode 100644
index 9caadb0..0000000
--- a/net-p2p/torrentsniff/files/patch-BitTorrent-BDecode.pm
+++ /dev/null
@@ -1,10 +0,0 @@
---- BitTorrent/BDecode.pm.orig Sun Jun 15 05:47:46 2003
-+++ BitTorrent/BDecode.pm Fri Nov 14 18:42:44 2003
-@@ -5,7 +5,6 @@
- use Carp;
- use base 'Exporter';
- use strict;
--our @EXPORT_OK = qw(bdecode);
-
- sub bdecode {
- my ($dataref) = @_;
diff --git a/net-p2p/torrentsniff/files/patch-BitTorrent_BDecode.pm b/net-p2p/torrentsniff/files/patch-BitTorrent_BDecode.pm
new file mode 100644
index 0000000..43b9a4d
--- /dev/null
+++ b/net-p2p/torrentsniff/files/patch-BitTorrent_BDecode.pm
@@ -0,0 +1,10 @@
+--- BitTorrent/BDecode.pm.orig 2016-06-20 14:38:26 UTC
++++ BitTorrent/BDecode.pm
+@@ -5,7 +5,6 @@ package BitTorrent::BDecode;
+ use Carp;
+ use base 'Exporter';
+ use strict;
+-our @EXPORT_OK = qw(bdecode);
+
+ sub bdecode {
+ my ($dataref) = @_;
diff --git a/net-p2p/torrentsniff/files/patch-torrentsniff b/net-p2p/torrentsniff/files/patch-torrentsniff
index 03062bb..6c14566 100644
--- a/net-p2p/torrentsniff/files/patch-torrentsniff
+++ b/net-p2p/torrentsniff/files/patch-torrentsniff
@@ -1,11 +1,11 @@
---- torrentsniff.orig Fri Nov 14 18:17:20 2003
-+++ torrentsniff Fri Nov 14 18:27:24 2003
-@@ -115,7 +115,7 @@
- my($file, $report_file_info, $report_tracker_info) = @_;
- print "$file\n";
- local *TOR;
-- if( not open(TOR, "<", $file) ) {
-+ if( not open(TOR, "< $file") ) {
- print STDERR "Unable to read $file because of $!\n";
- return 0;
- }
+--- torrentsniff.orig 2016-06-20 14:38:26 UTC
++++ torrentsniff
+@@ -115,7 +115,7 @@ sub process_file {
+ my($file, $report_file_info, $report_tracker_info) = @_;
+ print "$file\n";
+ local *TOR;
+- if( not open(TOR, "<", $file) ) {
++ if( not open(TOR, "< $file") ) {
+ print STDERR "Unable to read $file because of $!\n";
+ return 0;
+ }
diff --git a/net/bittwist/Makefile b/net/bittwist/Makefile
index 7ea14a6..39260ef 100644
--- a/net/bittwist/Makefile
+++ b/net/bittwist/Makefile
@@ -10,7 +10,8 @@ MAINTAINER= wxs@FreeBSD.org
COMMENT= Libpcap-based Ethernet packet generator, with PCAP editor
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USES= gmake
+USES= dos2unix gmake
+DOS2UNIX_FILES= Makefile
PLIST_FILES= bin/bittwist bin/bittwistb bin/bittwiste \
man/man1/bittwist.1.gz \
diff --git a/net/bittwist/files/patch-Makefile b/net/bittwist/files/patch-Makefile
index f58c9cc..346daa8 100644
--- a/net/bittwist/files/patch-Makefile
+++ b/net/bittwist/files/patch-Makefile
@@ -1,29 +1,29 @@
---- Makefile.orig 2011-02-24 23:23:42.000000000 +0800
-+++ Makefile 2014-06-23 10:40:19.186220280 +0800
+--- Makefile.orig 2016-06-20 15:56:31 UTC
++++ Makefile
@@ -1,6 +1,6 @@
- SHELL = /bin/sh
-
--prefix = /usr/local
-+prefix = ${PREFIX}
- exec_prefix = ${prefix}
- bindir = ${exec_prefix}/bin
- mandir = ${prefix}/man/man1
-@@ -31,12 +31,12 @@ clean:
- rm -f $(SRC)/bittwist $(SRC)/bittwistb $(SRC)/bittwiste
-
- install:
-- mkdir -p $(bindir)
-- chmod 755 $(bindir)
-- $(INSTALL_PROGRAM) $(SRC)/bittwist $(SRC)/bittwistb $(SRC)/bittwiste $(bindir)
-- mkdir -p $(mandir)
-- chmod 755 $(mandir)
-- $(INSTALL_DATA) $(DOC)/bittwist.1 $(DOC)/bittwistb.1 $(DOC)/bittwiste.1 $(mandir)
-+ mkdir -p $(DESTDIR)$(bindir)
-+ chmod 755 $(DESTDIR)$(bindir)
-+ $(INSTALL_PROGRAM) $(SRC)/bittwist $(SRC)/bittwistb $(SRC)/bittwiste $(DESTDIR)$(bindir)
-+ mkdir -p $(DESTDIR)$(mandir)
-+ chmod 755 $(DESTDIR)$(mandir)
-+ $(INSTALL_DATA) $(DOC)/bittwist.1 $(DOC)/bittwistb.1 $(DOC)/bittwiste.1 $(DESTDIR)$(mandir)
-
- uninstall:
- rm -f $(bindir)/bittwist $(bindir)/bittwistb $(bindir)/bittwiste
+ SHELL = /bin/sh
+
+-prefix = /usr/local
++prefix = ${PREFIX}
+ exec_prefix = ${prefix}
+ bindir = ${exec_prefix}/bin
+ mandir = ${prefix}/man/man1
+@@ -31,12 +31,12 @@ clean:
+ rm -f $(SRC)/bittwist $(SRC)/bittwistb $(SRC)/bittwiste
+
+ install:
+- mkdir -p $(bindir)
+- chmod 755 $(bindir)
+- $(INSTALL_PROGRAM) $(SRC)/bittwist $(SRC)/bittwistb $(SRC)/bittwiste $(bindir)
+- mkdir -p $(mandir)
+- chmod 755 $(mandir)
+- $(INSTALL_DATA) $(DOC)/bittwist.1 $(DOC)/bittwistb.1 $(DOC)/bittwiste.1 $(mandir)
++ mkdir -p $(DESTDIR)$(bindir)
++ chmod 755 $(DESTDIR)$(bindir)
++ $(INSTALL_PROGRAM) $(SRC)/bittwist $(SRC)/bittwistb $(SRC)/bittwiste $(DESTDIR)$(bindir)
++ mkdir -p $(DESTDIR)$(mandir)
++ chmod 755 $(DESTDIR)$(mandir)
++ $(INSTALL_DATA) $(DOC)/bittwist.1 $(DOC)/bittwistb.1 $(DOC)/bittwiste.1 $(DESTDIR)$(mandir)
+
+ uninstall:
+ rm -f $(bindir)/bittwist $(bindir)/bittwistb $(bindir)/bittwiste
diff --git a/net/hlmaster/Makefile b/net/hlmaster/Makefile
index a6ff532..224448d 100644
--- a/net/hlmaster/Makefile
+++ b/net/hlmaster/Makefile
@@ -9,6 +9,8 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Half-Life game master server daemon
+USES= dos2unix
+DOS2UNIX_GLOB= *.cpp
GNU_CONFIGURE= yes
OPTIONS_DEFINE= DOCS EXAMPLES
diff --git a/net/hlmaster/files/patch-HLServerList.cpp b/net/hlmaster/files/patch-src_HLServerList.cpp
index 2a652cc..5300fb1 100644
--- a/net/hlmaster/files/patch-HLServerList.cpp
+++ b/net/hlmaster/files/patch-src_HLServerList.cpp
@@ -1,20 +1,20 @@
---- src/HLServerList.cpp.orig 2007-08-03 13:52:50.000000000 +0200
-+++ src/HLServerList.cpp 2007-08-03 13:53:27.000000000 +0200
-@@ -73,7 +73,7 @@
- m_nSkipRequests = 0;
-
- // initialize challenge number (should be random)
-- m_nChallengeSeed = (int) &m_pHeadDummyItem;
-+ m_nChallengeSeed = (intptr_t) &m_pHeadDummyItem;
- }
-
-
-@@ -604,7 +604,7 @@
- if(pItem != NULL)
- {
- // get a fresh, random id
-- pItem->m_nChallengeId = GetRandomChallenge((int)&pItem, (int)nTimestamp);
-+ pItem->m_nChallengeId = GetRandomChallenge((intptr_t)&pItem, (int)nTimestamp);
- }
- }
-
+--- src/HLServerList.cpp.orig 2016-06-20 15:57:45 UTC
++++ src/HLServerList.cpp
+@@ -73,7 +73,7 @@ HLServerList::HLServerList(int nMaxItems
+ m_nSkipRequests = 0;
+
+ // initialize challenge number (should be random)
+- m_nChallengeSeed = (int) &m_pHeadDummyItem;
++ m_nChallengeSeed = (intptr_t) &m_pHeadDummyItem;
+ }
+
+
+@@ -604,7 +604,7 @@ HLServerListItem* HLServerList::HeartBea
+ if(pItem != NULL)
+ {
+ // get a fresh, random id
+- pItem->m_nChallengeId = GetRandomChallenge((int)&pItem, (int)nTimestamp);
++ pItem->m_nChallengeId = GetRandomChallenge((intptr_t)&pItem, (int)nTimestamp);
+ }
+ }
+
diff --git a/net/rtptools/Makefile b/net/rtptools/Makefile
index 04c651b..ad129ac 100644
--- a/net/rtptools/Makefile
+++ b/net/rtptools/Makefile
@@ -9,6 +9,8 @@ MASTER_SITES= http://www.cs.columbia.edu/IRT/software/rtptools/download/
MAINTAINER= cpm@fbsd.es
COMMENT= Set of tools to record, playback, and monitor RTPv2 data streams
+USES= dos2unix
+DOS2UNIX_GLOB= *.c
GNU_CONFIGURE= yes
PLIST_FILES= bin/rtpdump bin/rtpplay bin/rtpsend bin/rtptrans
diff --git a/net/rtptools/files/patch-rtp.h b/net/rtptools/files/patch-rtp.h
index c1d142b..456bb3dc 100644
--- a/net/rtptools/files/patch-rtp.h
+++ b/net/rtptools/files/patch-rtp.h
@@ -1,6 +1,6 @@
---- rtp.h.orig Thu Mar 9 07:35:26 2000
-+++ rtp.h Sat Apr 21 21:52:49 2001
-@@ -110,13 +110,18 @@
+--- rtp.h.orig 2001-12-29 12:48:24 UTC
++++ rtp.h
+@@ -112,13 +112,18 @@ typedef struct {
#define RTCP_VALID_MASK (0xc000 | 0x2000 | 0xfe)
#define RTCP_VALID_VALUE ((RTP_VERSION << 14) | RTCP_SR)
diff --git a/net/rtptools/files/patch-rtpdump.c b/net/rtptools/files/patch-rtpdump.c
index 2805695..e353f47 100644
--- a/net/rtptools/files/patch-rtpdump.c
+++ b/net/rtptools/files/patch-rtpdump.c
@@ -1,6 +1,6 @@
---- rtpdump.c.orig Sat Apr 7 08:02:13 2001
-+++ rtpdump.c Sat Apr 21 21:54:10 2001
-@@ -429,8 +429,8 @@
+--- rtpdump.c.orig 2016-06-20 15:59:04 UTC
++++ rtpdump.c
+@@ -441,8 +441,8 @@ static int parse_control(FILE *out, char
for (i = 0; i < r->common.count; i++) {
fprintf(out, " (ssrc=0x%lx fraction=%g lost=%lu last_seq=%lu jit=%lu lsr=%lu dlsr=%lu )\n",
(unsigned long)ntohl(r->r.sr.rr[i].ssrc),
@@ -11,7 +11,7 @@
(unsigned long)ntohl(r->r.sr.rr[i].last_seq),
(unsigned long)ntohl(r->r.sr.rr[i].jitter),
(unsigned long)ntohl(r->r.sr.rr[i].lsr),
-@@ -446,8 +446,8 @@
+@@ -458,8 +458,8 @@ static int parse_control(FILE *out, char
for (i = 0; i < r->common.count; i++) {
fprintf(out, " (ssrc=0x%lx fraction=%g lost=%lu last_seq=%lu jit=%lu lsr=%lu dlsr=%lu )\n",
(unsigned long)ntohl(r->r.rr.rr[i].ssrc),
diff --git a/net/rtptools/files/patch-rtpsend.c b/net/rtptools/files/patch-rtpsend.c
index 2003e89..1153d08 100644
--- a/net/rtptools/files/patch-rtpsend.c
+++ b/net/rtptools/files/patch-rtpsend.c
@@ -1,6 +1,6 @@
---- rtpsend.c.orig Tue Sep 10 13:24:10 2002
-+++ rtpsend.c Sat Aug 16 08:58:12 2003
-@@ -353,9 +353,9 @@
+--- rtpsend.c.orig 2016-06-20 15:59:04 UTC
++++ rtpsend.c
+@@ -354,9 +354,9 @@ static int rtcp_rr(node_t *list, char *p
if (strcmp(n->type, "ssrc") == 0)
rr->ssrc = htonl(n->num);
else if (strcmp(n->type, "fraction") == 0)
@@ -13,9 +13,9 @@
else if (strcmp(n->type, "last_seq") == 0)
rr->last_seq = htonl(n->num);
else if (strcmp(n->type, "jit") == 0)
-@@ -919,6 +919,8 @@
- local = (struct in_addr *)host->h_addr_list[0];
- sin.sin_addr = *local;
+@@ -926,6 +926,8 @@ int main(int argc, char *argv[])
+ local = (struct in_addr *)host->h_addr_list[0];
+ sin.sin_addr = *local;
}
+ } else {
+ usage(argv[0]);
diff --git a/news/newsfetch/Makefile b/news/newsfetch/Makefile
index 56178b3..2d33f2e 100644
--- a/news/newsfetch/Makefile
+++ b/news/newsfetch/Makefile
@@ -12,7 +12,8 @@ COMMENT= Download news articles from NNTP server
MAKE_ENV= BINDIR="${PREFIX}/bin" MANDIR="${PREFIX}/man/man"
-USES= uidfix
+USES= dos2unix uidfix
+DOS2UNIX_GLOB= *.c
CFLAGS+= -Wno-return-type
PLIST_FILES= bin/newsfetch \
man/man1/newsfetch.1.gz
diff --git a/news/newsfetch/files/patch-newsfetch.1 b/news/newsfetch/files/patch-newsfetch.1
index 5f9b06c..57d9634 100644
--- a/news/newsfetch/files/patch-newsfetch.1
+++ b/news/newsfetch/files/patch-newsfetch.1
@@ -1,6 +1,6 @@
---- newsfetch.1.orig Tue Apr 14 20:04:25 1998
-+++ newsfetch.1 Fri Jan 26 23:41:22 2001
-@@ -5,7 +5,7 @@
+--- newsfetch.1.orig 1998-04-14 11:04:25 UTC
++++ newsfetch.1
+@@ -5,7 +5,7 @@ newsfetch - Pull news from an NNTP serve
.SH SYNOPSIS
.B newsfetch
.BI
diff --git a/news/newsfetch/files/patch-newsfetch.c b/news/newsfetch/files/patch-newsfetch.c
index 46a011a..ad82fa1 100644
--- a/news/newsfetch/files/patch-newsfetch.c
+++ b/news/newsfetch/files/patch-newsfetch.c
@@ -1,5 +1,5 @@
---- newsfetch.c.orig Thu Jul 23 18:28:56 1998
-+++ newsfetch.c Fri Jan 26 23:41:22 2001
+--- newsfetch.c.orig 2016-06-20 15:59:53 UTC
++++ newsfetch.c
@@ -7,6 +7,7 @@
@@ -8,7 +8,7 @@
#include <signal.h>
#include <pwd.h>
#include <sys/types.h>
-@@ -28,6 +29,7 @@
+@@ -28,6 +29,7 @@ int terminate = 1;
int wait_after_articles = 0, articles_fetched=0, last_than_current;
int wait_for_time = 0, timeout=READ_TIMEOUT, article_fetching=0;
int cleanup=1, max_article, news_target=0, first_article, only_list=0;
@@ -16,7 +16,7 @@
char group[100], pipe_command[100];
FILE *rcfp, *rctmpfp, *socket_fp[2];
char lockfile[100];
-@@ -59,6 +61,16 @@
+@@ -59,6 +61,16 @@ if(argc < 2)
getHomedir(homedir);
strcpy(hostname,argv[1]);
@@ -33,7 +33,7 @@
get_commandline(argc, argv, dirname, rcfile,
&cleanup, &wait_after_articles, &wait_for_time,
&command_flag, execute_command,
-@@ -75,7 +87,7 @@
+@@ -75,7 +87,7 @@ if(argc < 2)
generateProcmailrc(homedir, rcfile, dirname, pipe_command);
}
diff --git a/news/newsfetch/files/patch-nntp.c b/news/newsfetch/files/patch-nntp.c
index 5505313..7cccade 100644
--- a/news/newsfetch/files/patch-nntp.c
+++ b/news/newsfetch/files/patch-nntp.c
@@ -1,106 +1,106 @@
---- nntp.c.orig Thu Jul 23 12:03:11 1998
-+++ nntp.c Thu Jan 27 17:19:01 2005
-@@ -20,6 +20,7 @@
-
- char *header;
- #define MAXBUFSIZE 500
+--- nntp.c.orig 2016-06-20 15:59:53 UTC
++++ nntp.c
+@@ -20,6 +20,7 @@ extern FILE *rcfp, *rctmpfp, *socket_fp[
+
+ char *header;
+ #define MAXBUFSIZE 500
+#define GROUP_FMT "%99s"
- char command_buf[MAXBUFSIZE+1];
-
- readNNTPdata()
-@@ -33,7 +34,7 @@
- {
- /* dummy read to flush input */
- readNNTPdata();
-- fprintf(socket_fp[0],"MODE READER\n");
-+ fprintf(socket_fp[0],"MODE READER\r\n");
- readNNTPdata();
- return(get_error(command_buf));
- }
-@@ -140,7 +141,8 @@
- else
- fprintf(rctmpfp,"%s",command_buf);
- }
-- items_read=sscanf(command_buf,"%s %d %d", group, &first_article, &max_article);
-+ items_read=sscanf(command_buf,GROUP_FMT "%d %d", group, &first_article, &max_article);
-+ group[sizeof(group)-1] = '\0';
- if(items_read < 2)
- return(0);
- return(items_read);
-@@ -151,7 +153,7 @@
- int first_art, last_art, total_art, tmp ;
-
- fprintf(stderr,"%s: ",group);
-- fprintf(socket_fp[0],"GROUP %s\n",group);
-+ fprintf(socket_fp[0],"GROUP %s\r\n",group);
- readNNTPdata();
-
- #ifdef DEBUG
-@@ -180,7 +182,7 @@
- first_article = last_art - max_article + 1;
- }
-
-- fprintf(socket_fp[0],"STAT %d\n",first_article);
-+ fprintf(socket_fp[0],"STAT %d\r\n",first_article);
- readNNTPdata();
-
- while(!get_error1(command_buf))
-@@ -196,7 +198,7 @@
- return(0);
- }
-
-- fprintf(socket_fp[0],"STAT %d\n",first_article);
-+ fprintf(socket_fp[0],"STAT %d\r\n",first_article);
- readNNTPdata();
- }
- fprintf(stderr,"articles %d to %d\n",first_article,last_art);
-@@ -256,7 +258,7 @@
- fprintf(stderr," %c",0xd);
- }
-
-- fprintf(socket_fp[0],"ARTICLE\n");
-+ fprintf(socket_fp[0],"ARTICLE\r\n");
- readNNTPdata();
- if(!get_error(command_buf))
- return(0);
-@@ -275,7 +277,7 @@
- }
-
- /* Make it little fast */
-- fprintf(socket_fp[0],"NEXT\n");
-+ fprintf(socket_fp[0],"NEXT\r\n");
-
- article_fetching=1;
-
-@@ -329,17 +331,19 @@
- char groupname[100];
-
- fprintf(stderr, "\nList of NewsGroups:\n");
-- fprintf(socket_fp[0],"LIST\n");
-+ fprintf(socket_fp[0],"LIST\r\n");
- readNNTPdata();
- if(!get_error2(command_buf))
- exit(1);
- readNNTPdata();
-- sscanf(command_buf,"%s",groupname);
-+ sscanf(command_buf,GROUP_FMT,groupname);
-+ groupname[sizeof(groupname)-1] = '\0';
- while(command_buf[0] != '.' || command_buf[1] != 13 )/*|| command_buf[1] != 10)*/
- {
- fprintf(stderr,"%s\n",groupname);
- readNNTPdata();
-- sscanf(command_buf,"%s",groupname);
-+ sscanf(command_buf,GROUP_FMT,groupname);
-+ groupname[sizeof(groupname)-1] = '\0';
- }
- exit(1);
-
-@@ -348,7 +352,7 @@
- sendQuit()
- {
-
-- fprintf(socket_fp[0],"QUIT\n");
-+ fprintf(socket_fp[0],"QUIT\r\n");
- readNNTPdata();
- }
-
+ char command_buf[MAXBUFSIZE+1];
+
+ readNNTPdata()
+@@ -33,7 +34,7 @@ setReaderMode()
+ {
+ /* dummy read to flush input */
+ readNNTPdata();
+- fprintf(socket_fp[0],"MODE READER\n");
++ fprintf(socket_fp[0],"MODE READER\r\n");
+ readNNTPdata();
+ return(get_error(command_buf));
+ }
+@@ -140,7 +141,8 @@ while(comment)
+ else
+ fprintf(rctmpfp,"%s",command_buf);
+ }
+- items_read=sscanf(command_buf,"%s %d %d", group, &first_article, &max_article);
++ items_read=sscanf(command_buf,GROUP_FMT "%d %d", group, &first_article, &max_article);
++ group[sizeof(group)-1] = '\0';
+ if(items_read < 2)
+ return(0);
+ return(items_read);
+@@ -151,7 +153,7 @@ checkGroup()
+ int first_art, last_art, total_art, tmp ;
+
+ fprintf(stderr,"%s: ",group);
+- fprintf(socket_fp[0],"GROUP %s\n",group);
++ fprintf(socket_fp[0],"GROUP %s\r\n",group);
+ readNNTPdata();
+
+ #ifdef DEBUG
+@@ -180,7 +182,7 @@ int first_art, last_art, total_art, tmp
+ first_article = last_art - max_article + 1;
+ }
+
+- fprintf(socket_fp[0],"STAT %d\n",first_article);
++ fprintf(socket_fp[0],"STAT %d\r\n",first_article);
+ readNNTPdata();
+
+ while(!get_error1(command_buf))
+@@ -196,7 +198,7 @@ int first_art, last_art, total_art, tmp
+ return(0);
+ }
+
+- fprintf(socket_fp[0],"STAT %d\n",first_article);
++ fprintf(socket_fp[0],"STAT %d\r\n",first_article);
+ readNNTPdata();
+ }
+ fprintf(stderr,"articles %d to %d\n",first_article,last_art);
+@@ -256,7 +258,7 @@ int check_header = 1;
+ fprintf(stderr," %c",0xd);
+ }
+
+- fprintf(socket_fp[0],"ARTICLE\n");
++ fprintf(socket_fp[0],"ARTICLE\r\n");
+ readNNTPdata();
+ if(!get_error(command_buf))
+ return(0);
+@@ -275,7 +277,7 @@ int check_header = 1;
+ }
+
+ /* Make it little fast */
+- fprintf(socket_fp[0],"NEXT\n");
++ fprintf(socket_fp[0],"NEXT\r\n");
+
+ article_fetching=1;
+
+@@ -329,17 +331,19 @@ getGroupList()
+ char groupname[100];
+
+ fprintf(stderr, "\nList of NewsGroups:\n");
+- fprintf(socket_fp[0],"LIST\n");
++ fprintf(socket_fp[0],"LIST\r\n");
+ readNNTPdata();
+ if(!get_error2(command_buf))
+ exit(1);
+ readNNTPdata();
+- sscanf(command_buf,"%s",groupname);
++ sscanf(command_buf,GROUP_FMT,groupname);
++ groupname[sizeof(groupname)-1] = '\0';
+ while(command_buf[0] != '.' || command_buf[1] != 13 )/*|| command_buf[1] != 10)*/
+ {
+ fprintf(stderr,"%s\n",groupname);
+ readNNTPdata();
+- sscanf(command_buf,"%s",groupname);
++ sscanf(command_buf,GROUP_FMT,groupname);
++ groupname[sizeof(groupname)-1] = '\0';
+ }
+ exit(1);
+
+@@ -348,7 +352,7 @@ exit(1);
+ sendQuit()
+ {
+
+- fprintf(socket_fp[0],"QUIT\n");
++ fprintf(socket_fp[0],"QUIT\r\n");
+ readNNTPdata();
+ }
+
diff --git a/news/newsfetch/files/patch-opt.c b/news/newsfetch/files/patch-opt.c
index a07d560..05111da 100644
--- a/news/newsfetch/files/patch-opt.c
+++ b/news/newsfetch/files/patch-opt.c
@@ -1,6 +1,6 @@
---- opt.c.orig Wed Nov 19 19:01:47 2003
-+++ opt.c Wed Nov 19 19:01:47 2003
-@@ -192,8 +192,8 @@
+--- opt.c.orig 2016-06-20 15:59:53 UTC
++++ opt.c
+@@ -192,8 +192,8 @@ opt_help(char *prog_name)
{
char *options=
diff --git a/news/newsfetch/files/patch-util.c b/news/newsfetch/files/patch-util.c
index b90dc04..fc262b6 100644
--- a/news/newsfetch/files/patch-util.c
+++ b/news/newsfetch/files/patch-util.c
@@ -1,6 +1,6 @@
---- util.c.orig Wed Nov 19 19:01:47 2003
-+++ util.c Wed Nov 19 19:01:47 2003
-@@ -61,15 +61,15 @@
+--- util.c.orig 2016-06-20 15:59:53 UTC
++++ util.c
+@@ -61,15 +61,15 @@ generateProcmailrc(char *homedir, char *
FILE *fp, *fp1, *fp2;
char *tmp, buf[200], group[180], filterfile[100], procmailrcfile[100];
int i,j;
diff --git a/print/panda/Makefile b/print/panda/Makefile
index 7dba2a6..574b0b5 100644
--- a/print/panda/Makefile
+++ b/print/panda/Makefile
@@ -23,7 +23,8 @@ CONFIGURE_ARGS= --enable-berkeley-db
CPPFLAGS+= -I${BDB_INCLUDE_DIR} -I${LOCALBASE}/include
LIBS+= -L${BDB_LIB_DIR} -L${LOCALBASE}/lib
INSTALL_TARGET= install-strip
-USES= autoreconf gmake jpeg libtool pathfix pkgconfig tar:bzip2
+USES= autoreconf dos2unix gmake jpeg libtool pathfix pkgconfig tar:bzip2
+DOS2UNIX_GLOB= *.c
PATHFIX_MAKEFILEIN= Makefile.am
USE_BDB= yes
USE_LDCONFIG= yes
diff --git a/print/panda/files/patch-configure.in b/print/panda/files/patch-configure.in
index bf1cae6..a214417 100644
--- a/print/panda/files/patch-configure.in
+++ b/print/panda/files/patch-configure.in
@@ -1,6 +1,6 @@
--- configure.in.orig 2004-04-13 00:46:24 UTC
+++ configure.in
-@@ -28,7 +28,7 @@
+@@ -28,7 +28,7 @@ dnl -ldmalloc:
dnl AC_CHECK_LIB(dmalloc, malloc)
dnl -lpng::
@@ -9,7 +9,7 @@
dnl -ltiff:
AC_CHECK_LIB(tiff, TIFFOpen, CFLAGS="$CFLAGS -DHAVE_LIBTIFF" LDFLAGS="$LDFLAGS -ltiff")
-@@ -52,12 +52,12 @@
+@@ -52,12 +52,12 @@ else
if test "z$DATABASE" = "zedb"; then
AC_CHECK_LIB(edb, e_db_open,
[LDFLAGS="$LDFLAGS -ledb" DATABASE="edb" AC_DEFINE([USE_EDB], [], [Use Edb])],
diff --git a/print/panda/files/patch-database.c b/print/panda/files/patch-database.c
index 6c51db1..ec1f705 100644
--- a/print/panda/files/patch-database.c
+++ b/print/panda/files/patch-database.c
@@ -1,6 +1,6 @@
---- ./database.c.orig 2004-04-13 02:46:24.000000000 +0200
-+++ ./database.c 2014-08-15 19:09:39.000000000 +0200
-@@ -160,6 +160,12 @@
+--- database.c.orig 2016-06-20 16:04:03 UTC
++++ database.c
+@@ -160,6 +160,12 @@ panda_dbwrite (panda_pdf * document, cha
panda_windbwrite (document, key, value);
#else
@@ -13,7 +13,7 @@
#if defined DEBUG
printf ("Storing (%s, %s) in 0x%08x\n", key, value, document->db);
#endif
-@@ -169,13 +175,6 @@
+@@ -169,13 +175,6 @@ panda_dbwrite (panda_pdf * document, cha
if (value == NULL)
panda_error (panda_true, "Cannot store null value\n");
diff --git a/print/panda/files/patch-images.c b/print/panda/files/patch-images.c
index 9091205..ed5cfbb 100644
--- a/print/panda/files/patch-images.c
+++ b/print/panda/files/patch-images.c
@@ -1,6 +1,6 @@
---- ./images.c.orig 2004-04-13 02:46:24.000000000 +0200
-+++ ./images.c 2014-08-15 19:11:07.000000000 +0200
-@@ -835,7 +835,7 @@
+--- images.c.orig 2016-06-20 16:04:03 UTC
++++ images.c
+@@ -835,7 +835,7 @@ panda_insertPNG (panda_pdf * output, pan
panda_object * imageObj, char *filename)
{
FILE *image;
@@ -9,7 +9,7 @@
int bitdepth, colourtype, outColourType;
png_uint_32 i, rowbytes;
png_structp png;
-@@ -854,7 +854,7 @@
+@@ -854,7 +854,7 @@ panda_insertPNG (panda_pdf * output, pan
// Check that it really is a PNG file
fread (sig, 1, 8, image);
@@ -18,7 +18,7 @@
panda_error (panda_true, "PNG file was invalid");
// Start decompressing
-@@ -1399,7 +1399,7 @@
+@@ -1399,7 +1399,7 @@ void
panda_imagesizePNG (int *width, int *height, char *filename)
{
FILE * image;
@@ -27,7 +27,7 @@
int bitdepth, colourtype;
png_structp png;
png_infop info;
-@@ -1411,7 +1411,7 @@
+@@ -1411,7 +1411,7 @@ panda_imagesizePNG (int *width, int *hei
// Check that it really is a PNG file
fread (sig, 1, 8, image);
diff --git a/print/panda/files/patch-objects.c b/print/panda/files/patch-objects.c
index af5273f..8278423 100644
--- a/print/panda/files/patch-objects.c
+++ b/print/panda/files/patch-objects.c
@@ -1,6 +1,6 @@
---- ./objects.c.orig 2004-04-13 02:46:24.000000000 +0200
-+++ ./objects.c 2014-08-15 19:09:39.000000000 +0200
-@@ -99,7 +99,7 @@
+--- objects.c.orig 2016-06-20 16:04:03 UTC
++++ objects.c
+@@ -99,7 +99,7 @@ panda_newobject (panda_pdf * doc, int ty
created->children = (panda_child *) panda_xmalloc (sizeof (panda_child));
((panda_child *) created->children)->next = NULL;
diff --git a/print/panda/files/patch-utility.c b/print/panda/files/patch-utility.c
index c37cb02..12064c9 100644
--- a/print/panda/files/patch-utility.c
+++ b/print/panda/files/patch-utility.c
@@ -6,16 +6,16 @@
length = strlen (input);
- output = panda_xmalloc ((length + 1) * sizeof (char));
+ output = panda_xmalloc ((length*2 + 1) * sizeof (char));
-
+
// todo_mikal: not sure I like the windows version of this code
for (count = 0; count < length; count++)
@@ -518,11 +518,11 @@
sprintf (output[count], "%2x", input[count]);
-
+
#else /* */
- snprintf (output[count], 1, "%2x", input[count]);
+ sprintf (output+count*2, "%2x", input[count]);
-
+
#endif
}
diff --git a/security/dcetest/Makefile b/security/dcetest/Makefile
index aa52beb..46d9cf2 100644
--- a/security/dcetest/Makefile
+++ b/security/dcetest/Makefile
@@ -9,6 +9,9 @@ MASTER_SITES= PACKETSTORM/UNIX/scanners
MAINTAINER= onatan@gmail.com
COMMENT= Utility to dump MSRPC endpoint information from Windows systems
+USES= dos2unix
+DOS2UNIX_GLOB= *.c
+
ALL_TARGET= dcetest
MAKE_ARGS= CC="${CC}"
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/security/dcetest/files/patch-Makefile b/security/dcetest/files/patch-Makefile
index 9a12138..30349d5 100644
--- a/security/dcetest/files/patch-Makefile
+++ b/security/dcetest/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig Sat Jan 11 06:22:46 2003
-+++ Makefile Sat Jan 11 06:23:10 2003
+--- Makefile.orig 2001-08-20 20:40:40 UTC
++++ Makefile
@@ -1,6 +1,6 @@
.SUFFIXES: .a .o .c
CC = gcc
diff --git a/security/dcetest/files/patch-dcetest.c b/security/dcetest/files/patch-dcetest.c
index 23347da..d5bc9b5 100644
--- a/security/dcetest/files/patch-dcetest.c
+++ b/security/dcetest/files/patch-dcetest.c
@@ -1,11 +1,11 @@
---- dcetest.c.orig Tue Feb 15 11:32:36 2005
-+++ dcetest.c Tue Feb 15 11:31:48 2005
-@@ -359,7 +359,7 @@
- int tint;
- char annotation[EPT_MAX_ANNOTATION_SIZE+1];
- int floor, floors;
-- int address_type;
-+ int address_type=0;
-
- char tmp_address[200];
- char tmp_address2[200];
+--- dcetest.c.orig 2016-06-20 15:23:56 UTC
++++ dcetest.c
+@@ -359,7 +359,7 @@ dce_parse_enum_response(const unsigned c
+ int tint;
+ char annotation[EPT_MAX_ANNOTATION_SIZE+1];
+ int floor, floors;
+- int address_type;
++ int address_type=0;
+
+ char tmp_address[200];
+ char tmp_address2[200];
diff --git a/security/dcetest/files/patch-tcpstuff.c b/security/dcetest/files/patch-tcpstuff.c
index d05de6c..4abe4a6 100644
--- a/security/dcetest/files/patch-tcpstuff.c
+++ b/security/dcetest/files/patch-tcpstuff.c
@@ -1,6 +1,6 @@
---- tcpstuff.c.orig Sat Jan 11 06:46:08 2003
-+++ tcpstuff.c Sat Jan 11 06:50:59 2003
-@@ -229,6 +229,7 @@
+--- tcpstuff.c.orig 2016-06-20 15:23:56 UTC
++++ tcpstuff.c
+@@ -229,6 +229,7 @@ make_tcp_listener(unsigned short localpo
/* this function takes in a listenFd and returns an acceptedFd */
@@ -8,7 +8,7 @@
int
tcp_accept(int listenFd)
{
-@@ -242,12 +243,14 @@
+@@ -242,12 +243,14 @@ tcp_accept(int listenFd)
(struct sockaddr *)&clientAddr,
&addrLen)) < 0)
{
@@ -25,7 +25,7 @@
lingerVal.l_onoff = 0;
lingerVal.l_linger = 0;
if (setsockopt(clientFd, SOL_SOCKET, SO_LINGER,
-@@ -260,3 +263,4 @@
+@@ -260,3 +263,4 @@ tcp_accept(int listenFd)
return(clientFd);
}
diff --git a/security/dcetest/files/patch-tcpstuff.h b/security/dcetest/files/patch-tcpstuff.h
index 1657191..152ac0e 100644
--- a/security/dcetest/files/patch-tcpstuff.h
+++ b/security/dcetest/files/patch-tcpstuff.h
@@ -1,6 +1,6 @@
---- tcpstuff.h.orig Sat Jan 11 06:48:15 2003
-+++ tcpstuff.h Sat Jan 11 06:48:54 2003
-@@ -42,5 +42,7 @@
+--- tcpstuff.h.orig 2001-08-20 20:29:56 UTC
++++ tcpstuff.h
+@@ -42,5 +42,7 @@ make_tcp_listener(unsigned short localpo
int
write_uint32(int fd,uint32 data);
diff --git a/security/iaikpkcs11wrapper/Makefile b/security/iaikpkcs11wrapper/Makefile
index 27efc67..ba5a1e7 100644
--- a/security/iaikpkcs11wrapper/Makefile
+++ b/security/iaikpkcs11wrapper/Makefile
@@ -14,12 +14,13 @@ OPTIONS_DEFINE= DOCS EXAMPLES
USES= dos2unix gmake zip
USE_JAVA= yes
-DOS2UNIX_FILES= Makefile
+DOS2UNIX_GLOB= Makefile *.c
+DOS2UNIX_WRKSRC= ${WRKDIR}/src/native
JAVA_VERSION= 1.6+
JAVA_OS= native
ALL_TARGET= release
-PLIST_FILES= lib/libpkcs11wrapper.so %%JAVAJARDIR%%/iaikPkcs11Wrapper.jar
+PLIST_FILES= lib/libpkcs11wrapper.so ${JAVAJARDIR}/iaikPkcs11Wrapper.jar
PORTDOCS= *
PORTEXAMPLES= *
diff --git a/security/iaikpkcs11wrapper/files/patch-Makefile b/security/iaikpkcs11wrapper/files/patch-Makefile
index 1fbed91..83168fe 100644
--- a/security/iaikpkcs11wrapper/files/patch-Makefile
+++ b/security/iaikpkcs11wrapper/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig 2013-10-30 08:34:48.105849638 +0000
-+++ Makefile 2013-10-30 08:35:06.293848426 +0000
+--- Makefile.orig 2016-06-20 15:16:34 UTC
++++ Makefile
@@ -1,4 +1,3 @@
-CC = gcc
SOURCE_DIR = ../../common/
diff --git a/security/iaikpkcs11wrapper/files/patch-native_src_pkcs11wrapper.c b/security/iaikpkcs11wrapper/files/patch-native_src_pkcs11wrapper.c
index bbf6cb1..ae78b05 100644
--- a/security/iaikpkcs11wrapper/files/patch-native_src_pkcs11wrapper.c
+++ b/security/iaikpkcs11wrapper/files/patch-native_src_pkcs11wrapper.c
@@ -1,44 +1,44 @@
---- ../../common/pkcs11wrapper.c.orig 2011-11-03 12:15:18.000000000 +0100
-+++ ../../common/pkcs11wrapper.c 2011-11-13 21:55:57.000000000 +0100
-@@ -1258,6 +1258,7 @@
- jobject jAttribute;
- CK_RV rv;
- CK_ULONG error = 0;
-+ CK_BBOOL array = FALSE;
- ModuleData *moduleData;
- CK_FUNCTION_LIST_PTR ckpFunctions;
-
-@@ -1328,9 +1329,11 @@
- for (j=0; j<length; j++){
- ckAttributeArray[j].pValue = NULL_PTR;
- }
-+ array = TRUE;
- }
- }
-
-+ if (array == TRUE) {
- // get ulValueLen of the attributes of a CKF_ARRAY_ATTRIBUTE if present
- rv = (*ckpFunctions->C_GetAttributeValue)(ckSessionHandle, ckObjectHandle, ckpAttributes, ckAttributesLength);
- if(ckAssertReturnValueOK(env, rv, __FUNCTION__) != CK_ASSERT_OK) {
-@@ -1343,6 +1346,7 @@
- TRACE0(tag_call, __FUNCTION__, "exiting ");
- return ;
- }
-+ }
-
- /* now, the ulValueLength field of each attribute should hold the exact buffer length needed
- * to allocate the needed buffers accordingly
-@@ -4474,11 +4478,12 @@
- jpTemp = (jchar*) malloc((*ckpLength) * sizeof(jchar));
- if (jpTemp == NULL && (*ckpLength)!=0) { *ckpArray = NULL_PTR; throwOutOfMemoryError(env); return 1; }
- (*env)->GetCharArrayRegion(env, jArray, 0, *ckpLength, jpTemp);
-- *ckpArray = (CK_UTF8CHAR_PTR) malloc (*ckpLength * sizeof(CK_UTF8CHAR));
-+ *ckpArray = (CK_UTF8CHAR_PTR) malloc ((*ckpLength + 1) * sizeof(CK_UTF8CHAR));
- if (*ckpArray == NULL && (*ckpLength)!=0) { free(jpTemp); throwOutOfMemoryError(env); return 2; }
- for (i=0; i<(*ckpLength); i++) {
- (*ckpArray)[i] = jCharToCKUTF8Char(jpTemp[i]);
- }
-+ (*ckpArray)[*ckpLength] = NULL_PTR;
- free(jpTemp);
- return 0;
- }
+--- ../../common/pkcs11wrapper.c.orig 2016-06-20 15:16:34 UTC
++++ ../../common/pkcs11wrapper.c
+@@ -1258,6 +1258,7 @@ JNIEXPORT void JNICALL Java_iaik_pkcs_pk
+ jobject jAttribute;
+ CK_RV rv;
+ CK_ULONG error = 0;
++ CK_BBOOL array = FALSE;
+ ModuleData *moduleData;
+ CK_FUNCTION_LIST_PTR ckpFunctions;
+
+@@ -1328,9 +1329,11 @@ JNIEXPORT void JNICALL Java_iaik_pkcs_pk
+ for (j=0; j<length; j++){
+ ckAttributeArray[j].pValue = NULL_PTR;
+ }
++ array = TRUE;
+ }
+ }
+
++ if (array == TRUE) {
+ // get ulValueLen of the attributes of a CKF_ARRAY_ATTRIBUTE if present
+ rv = (*ckpFunctions->C_GetAttributeValue)(ckSessionHandle, ckObjectHandle, ckpAttributes, ckAttributesLength);
+ if(ckAssertReturnValueOK(env, rv, __FUNCTION__) != CK_ASSERT_OK) {
+@@ -1343,6 +1346,7 @@ JNIEXPORT void JNICALL Java_iaik_pkcs_pk
+ TRACE0(tag_call, __FUNCTION__, "exiting ");
+ return ;
+ }
++ }
+
+ /* now, the ulValueLength field of each attribute should hold the exact buffer length needed
+ * to allocate the needed buffers accordingly
+@@ -4474,11 +4478,12 @@ int jCharArrayToCKUTF8CharArray(JNIEnv *
+ jpTemp = (jchar*) malloc((*ckpLength) * sizeof(jchar));
+ if (jpTemp == NULL && (*ckpLength)!=0) { *ckpArray = NULL_PTR; throwOutOfMemoryError(env); return 1; }
+ (*env)->GetCharArrayRegion(env, jArray, 0, *ckpLength, jpTemp);
+- *ckpArray = (CK_UTF8CHAR_PTR) malloc (*ckpLength * sizeof(CK_UTF8CHAR));
++ *ckpArray = (CK_UTF8CHAR_PTR) malloc ((*ckpLength + 1) * sizeof(CK_UTF8CHAR));
+ if (*ckpArray == NULL && (*ckpLength)!=0) { free(jpTemp); throwOutOfMemoryError(env); return 2; }
+ for (i=0; i<(*ckpLength); i++) {
+ (*ckpArray)[i] = jCharToCKUTF8Char(jpTemp[i]);
+ }
++ (*ckpArray)[*ckpLength] = NULL_PTR;
+ free(jpTemp);
+ return 0;
+ }
diff --git a/security/trousers/Makefile b/security/trousers/Makefile
index 3b9849e..40dc05e 100644
--- a/security/trousers/Makefile
+++ b/security/trousers/Makefile
@@ -17,7 +17,8 @@ LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
BUILD_DEPENDS= tpm-emulator>=0.7.4_1:emulators/tpm-emulator
RUN_DEPENDS:= ${BUILD_DEPENDS}
-USES= alias autoreconf gmake iconv libtool pkgconfig
+USES= dos2unix alias autoreconf gmake iconv libtool pkgconfig
+DOS2UNIX_GLOB= *.h *.c
USE_OPENSSL= YES
USE_LDCONFIG= YES
USE_RC_SUBR= tcsd
@@ -40,8 +41,6 @@ GROUPS= _tss
OPTIONS_DEFINE= DEBUG
DEBUG_CONFIGURE_ENABLE= debug
-.include <bsd.port.options.mk>
-
post-install:
${INSTALL_DATA} \
${WRKSRC}/dist/tcsd.conf ${STAGEDIR}${PREFIX}/etc/tcsd.conf.sample
diff --git a/security/trousers/files/patch-configure.in b/security/trousers/files/patch-configure.in
index 489a28f..a121c37 100644
--- a/security/trousers/files/patch-configure.in
+++ b/security/trousers/files/patch-configure.in
@@ -1,6 +1,6 @@
---- configure.in.orig 2014-04-25 03:05:43.000000000 +0900
-+++ configure.in 2016-05-19 02:57:32.524179000 +0900
-@@ -52,7 +52,7 @@
+--- configure.in.orig 2014-04-24 18:05:43 UTC
++++ configure.in
+@@ -52,7 +52,7 @@ AC_ARG_WITH(openssl,
AC_MSG_ERROR([$OPENSSL_INCLUDE_DIR or $OPENSSL_LIB_DIR doen't exist!])
else
AC_MSG_RESULT([yes])
@@ -9,7 +9,7 @@
AC_SUBST([OPENSSL_LIB_DIR])
fi],
[AC_MSG_RESULT([no])
-@@ -72,6 +72,21 @@
+@@ -72,6 +72,21 @@ AC_ARG_ENABLE(gcov,
[CFLAGS="$CFLAGS -ftest-coverage -fprofile-arcs"
AC_MSG_RESULT([*** Enabling gcov at user request ***])],)
@@ -31,7 +31,7 @@
# profiling support
AC_ARG_ENABLE(gprof,
[AC_HELP_STRING([--enable-gprof], [enable profiling with gprof [default=off]])],
-@@ -356,6 +371,8 @@
+@@ -356,6 +371,8 @@ AC_PROG_LIBTOOL
AC_C_BIGENDIAN([AC_DEFINE(_BIG_ENDIAN, 1, [big-endian host])])
AC_CHECK_DECL(htole32, [AC_DEFINE(HTOLE_DEFINED, 1, [htole32 function is available])])
AC_CHECK_HEADER(sys/byteorder.h, [AC_DEFINE(HAVE_BYTEORDER_H, 1, [sys/byteorder.h header])])
@@ -40,7 +40,7 @@
AC_CHECK_FUNC(daemon, [ AC_DEFINE(HAVE_DAEMON, 1, [daemon function is available]) ])
if test "x${GCC}" = "xyes"; then
-@@ -363,6 +380,7 @@
+@@ -363,6 +380,7 @@ if test "x${GCC}" = "xyes"; then
fi
CFLAGS="$CFLAGS -I../include \
diff --git a/security/trousers/files/patch-dist-Makefile.am b/security/trousers/files/patch-dist_Makefile.am
index ba062c7..ba062c7 100644
--- a/security/trousers/files/patch-dist-Makefile.am
+++ b/security/trousers/files/patch-dist_Makefile.am
diff --git a/security/trousers/files/patch-dist-tcsd.conf.in b/security/trousers/files/patch-dist_tcsd.conf.in
index a9e13e8..a9e13e8 100644
--- a/security/trousers/files/patch-dist-tcsd.conf.in
+++ b/security/trousers/files/patch-dist_tcsd.conf.in
diff --git a/security/trousers/files/patch-src-include-biosem.h b/security/trousers/files/patch-src_include_biosem.h
index e19865e..0f8086c 100644
--- a/security/trousers/files/patch-src-include-biosem.h
+++ b/security/trousers/files/patch-src_include_biosem.h
@@ -1,4 +1,4 @@
---- src/include/biosem.h.orig 2014-04-24 18:05:44 UTC
+--- src/include/biosem.h.orig 2016-06-20 15:21:26 UTC
+++ src/include/biosem.h
@@ -26,7 +26,7 @@ typedef struct {
UINT32 eventType;
diff --git a/security/trousers/files/patch-src-include-linux-tpm.h b/security/trousers/files/patch-src_include_linux_tpm.h
index 9ecc4cfa..ae6cd78 100644
--- a/security/trousers/files/patch-src-include-linux-tpm.h
+++ b/security/trousers/files/patch-src_include_linux_tpm.h
@@ -1,4 +1,4 @@
---- src/include/linux/tpm.h.orig 2014-04-24 18:05:44 UTC
+--- src/include/linux/tpm.h.orig 2016-06-20 15:21:26 UTC
+++ src/include/linux/tpm.h
@@ -20,6 +20,8 @@
#include <linux/ioctl.h>
diff --git a/security/trousers/files/patch-src-include-tcs_tsp.h b/security/trousers/files/patch-src_include_tcs__tsp.h
index 4a99f4a..fd8164a 100644
--- a/security/trousers/files/patch-src-include-tcs_tsp.h
+++ b/security/trousers/files/patch-src_include_tcs__tsp.h
@@ -1,4 +1,4 @@
---- src/include/tcs_tsp.h.orig 2014-04-24 18:05:44 UTC
+--- src/include/tcs_tsp.h.orig 2016-06-20 15:21:26 UTC
+++ src/include/tcs_tsp.h
@@ -79,7 +79,13 @@ struct key_disk_cache
/* XXX Get rid of this, there's no reason to set an arbitrary limit */
diff --git a/security/trousers/files/patch-src-include-tcs_utils.h b/security/trousers/files/patch-src_include_tcs__utils.h
index d0aa6c1..4eee71c 100644
--- a/security/trousers/files/patch-src-include-tcs_utils.h
+++ b/security/trousers/files/patch-src_include_tcs__utils.h
@@ -1,4 +1,4 @@
---- src/include/tcs_utils.h.orig 2014-04-24 18:05:44 UTC
+--- src/include/tcs_utils.h.orig 2016-06-20 15:21:26 UTC
+++ src/include/tcs_utils.h
@@ -18,6 +18,20 @@
#include "tcs_tsp.h"
diff --git a/security/trousers/files/patch-src-include-tcsd.h b/security/trousers/files/patch-src_include_tcsd.h
index 86f62b7..6d5943f 100644
--- a/security/trousers/files/patch-src-include-tcsd.h
+++ b/security/trousers/files/patch-src_include_tcsd.h
@@ -1,4 +1,4 @@
---- src/include/tcsd.h.orig 2014-04-24 18:05:44 UTC
+--- src/include/tcsd.h.orig 2016-06-20 15:21:26 UTC
+++ src/include/tcsd.h
@@ -53,14 +53,22 @@ struct tcsd_config
#define TCSD_DEFAULT_CONFIG_FILE ETC_PREFIX "/tcsd.conf"
diff --git a/security/trousers/files/patch-src-include-tcsd_ops.h b/security/trousers/files/patch-src_include_tcsd__ops.h
index 54fdb60..72bc79e 100644
--- a/security/trousers/files/patch-src-include-tcsd_ops.h
+++ b/security/trousers/files/patch-src_include_tcsd__ops.h
@@ -1,4 +1,4 @@
---- src/include/tcsd_ops.h.orig 2014-04-24 18:05:44 UTC
+--- src/include/tcsd_ops.h.orig 2016-06-20 15:21:26 UTC
+++ src/include/tcsd_ops.h
@@ -123,7 +123,7 @@
diff --git a/security/trousers/files/patch-src-include-threads.h b/security/trousers/files/patch-src_include_threads.h
index f094969..feeb1b0 100644
--- a/security/trousers/files/patch-src-include-threads.h
+++ b/security/trousers/files/patch-src_include_threads.h
@@ -1,4 +1,4 @@
---- src/include/threads.h.orig 2014-04-24 18:05:44 UTC
+--- src/include/threads.h.orig 2016-06-20 15:21:26 UTC
+++ src/include/threads.h
@@ -31,7 +31,7 @@
#define COND_SIGNAL(c) pthread_cond_signal(c)
diff --git a/security/trousers/files/patch-src-include-trousers_types.h b/security/trousers/files/patch-src_include_trousers__types.h
index 902bea8..147d709 100644
--- a/security/trousers/files/patch-src-include-trousers_types.h
+++ b/security/trousers/files/patch-src_include_trousers__types.h
@@ -1,4 +1,4 @@
---- src/include/trousers_types.h.orig 2014-04-24 18:05:44 UTC
+--- src/include/trousers_types.h.orig 2016-06-20 15:21:26 UTC
+++ src/include/trousers_types.h
@@ -11,6 +11,14 @@
#ifndef _TROUSERS_TYPES_H_
diff --git a/security/trousers/files/patch-src-include-tss-platform.h b/security/trousers/files/patch-src_include_tss_platform.h
index f9fcd40..67273bc 100644
--- a/security/trousers/files/patch-src-include-tss-platform.h
+++ b/security/trousers/files/patch-src_include_tss_platform.h
@@ -1,11 +1,11 @@
---- src/include/tss/platform.h.orig 2014-04-24 18:05:44 UTC
+--- src/include/tss/platform.h.orig 2016-06-20 15:21:26 UTC
+++ src/include/tss/platform.h
@@ -15,7 +15,7 @@ There are platform dependent and general
- #if !defined(WIN32)
- #include <stdint.h>
- typedef uint8_t BYTE;
-- typedef int8_t TSS_BOOL;
-+ typedef uint8_t TSS_BOOL;
- typedef uint16_t UINT16;
- typedef uint32_t UINT32;
- typedef uint64_t UINT64;
+ #if !defined(WIN32)
+ #include <stdint.h>
+ typedef uint8_t BYTE;
+- typedef int8_t TSS_BOOL;
++ typedef uint8_t TSS_BOOL;
+ typedef uint16_t UINT16;
+ typedef uint32_t UINT32;
+ typedef uint64_t UINT64;
diff --git a/security/trousers/files/patch-src-tcs-Makefile.am b/security/trousers/files/patch-src_tcs_Makefile.am
index c9ff1d9..637037d 100644
--- a/security/trousers/files/patch-src-tcs-Makefile.am
+++ b/security/trousers/files/patch-src_tcs_Makefile.am
@@ -1,5 +1,5 @@
---- src/tcs/Makefile.am.orig 2014-04-25 03:05:44.000000000 +0900
-+++ src/tcs/Makefile.am 2016-05-19 15:26:50.732611000 +0900
+--- src/tcs/Makefile.am.orig 2014-04-24 18:05:44 UTC
++++ src/tcs/Makefile.am
@@ -1,8 +1,7 @@
-noinst_LIBRARIES=libtcs.a
+noinst_LIBRARIES=libtcs.a libtcs_emu.a
@@ -11,7 +11,7 @@
libtcs_a_SOURCES=log.c \
tcs_caps.c \
-@@ -91,7 +90,7 @@
+@@ -91,7 +90,7 @@ endif
if TSS_BUILD_KEY
libtcs_a_SOURCES+=tcsi_key.c tcs_key.c tcs_key_mem_cache.c tcs_context_key.c rpc/@RPC@/rpc_key.c \
crypto/@CRYPTO_PACKAGE@/crypto.c
@@ -20,7 +20,7 @@
endif
if TSS_BUILD_MAINT
libtcs_a_SOURCES+=tcsi_maint.c rpc/@RPC@/rpc_maint.c
-@@ -140,3 +139,143 @@
+@@ -140,3 +139,143 @@ if TSS_BUILD_CMK
libtcs_a_SOURCES+=tcsi_cmk.c rpc/@RPC@/rpc_cmk.c
libtcs_a_CFLAGS+=-DTSS_BUILD_CMK
endif
diff --git a/security/trousers/files/patch-src-tcs-ps-ps_utils.c b/security/trousers/files/patch-src_tcs_ps_ps__utils.c
index cc2dfab..679a2d8 100644
--- a/security/trousers/files/patch-src-tcs-ps-ps_utils.c
+++ b/security/trousers/files/patch-src_tcs_ps_ps__utils.c
@@ -1,4 +1,4 @@
---- src/tcs/ps/ps_utils.c.orig 2014-04-24 18:05:44 UTC
+--- src/tcs/ps/ps_utils.c.orig 2016-06-20 15:21:26 UTC
+++ src/tcs/ps/ps_utils.c
@@ -16,10 +16,18 @@
#if defined(HAVE_BYTEORDER_H)
diff --git a/security/trousers/files/patch-src-tcs-ps-tcsps.c b/security/trousers/files/patch-src_tcs_ps_tcsps.c
index 3f79d1b..3b3e962 100644
--- a/security/trousers/files/patch-src-tcs-ps-tcsps.c
+++ b/security/trousers/files/patch-src_tcs_ps_tcsps.c
@@ -1,4 +1,4 @@
---- src/tcs/ps/tcsps.c.orig 2014-04-24 18:05:44 UTC
+--- src/tcs/ps/tcsps.c.orig 2016-06-20 15:21:26 UTC
+++ src/tcs/ps/tcsps.c
@@ -24,6 +24,11 @@
#define LE_16 htole16
diff --git a/security/trousers/files/patch-src-tcs-rpc-tcstp-rpc.c b/security/trousers/files/patch-src_tcs_rpc_tcstp_rpc.c
index e71911c..d37d36b 100644
--- a/security/trousers/files/patch-src-tcs-rpc-tcstp-rpc.c
+++ b/security/trousers/files/patch-src_tcs_rpc_tcstp_rpc.c
@@ -1,4 +1,4 @@
---- src/tcs/rpc/tcstp/rpc.c.orig 2014-04-24 18:05:44 UTC
+--- src/tcs/rpc/tcstp/rpc.c.orig 2016-06-20 15:21:26 UTC
+++ src/tcs/rpc/tcstp/rpc.c
@@ -16,6 +16,7 @@
#if (defined (__OpenBSD__) || defined (__FreeBSD__))
diff --git a/security/trousers/files/patch-src-tcs-tcs_aik.c b/security/trousers/files/patch-src_tcs_tcs__aik.c
index 53868fd..c4e4113 100644
--- a/security/trousers/files/patch-src-tcs-tcs_aik.c
+++ b/security/trousers/files/patch-src_tcs_tcs__aik.c
@@ -1,4 +1,4 @@
---- src/tcs/tcs_aik.c.orig 2014-04-24 18:05:44 UTC
+--- src/tcs/tcs_aik.c.orig 2016-06-20 15:21:26 UTC
+++ src/tcs/tcs_aik.c
@@ -66,7 +66,7 @@ UnloadBlob_SYMMETRIC_KEY(UINT64 *offset,
UnloadBlob_UINT16(offset, &key->size, blob);
diff --git a/security/trousers/files/patch-src-tcs-tcs_auth_mgr.c b/security/trousers/files/patch-src_tcs_tcs__auth__mgr.c
index 7088a4f..ef5f296 100644
--- a/security/trousers/files/patch-src-tcs-tcs_auth_mgr.c
+++ b/security/trousers/files/patch-src_tcs_tcs__auth__mgr.c
@@ -1,4 +1,4 @@
---- src/tcs/tcs_auth_mgr.c.orig 2014-04-24 18:05:44 UTC
+--- src/tcs/tcs_auth_mgr.c.orig 2016-06-20 15:21:26 UTC
+++ src/tcs/tcs_auth_mgr.c
@@ -108,7 +108,7 @@ void
auth_mgr_swap_in()
diff --git a/security/trousers/files/patch-src-tcsd-Makefile.am b/security/trousers/files/patch-src_tcsd_Makefile.am
index 2a06728..eb41644 100644
--- a/security/trousers/files/patch-src-tcsd-Makefile.am
+++ b/security/trousers/files/patch-src_tcsd_Makefile.am
@@ -1,5 +1,5 @@
---- src/tcsd/Makefile.am.orig 2014-04-25 03:05:44.000000000 +0900
-+++ src/tcsd/Makefile.am 2016-05-19 03:00:08.951991000 +0900
+--- src/tcsd/Makefile.am.orig 2014-04-24 18:05:44 UTC
++++ src/tcsd/Makefile.am
@@ -1,11 +1,17 @@
-sbin_PROGRAMS=tcsd
+sbin_PROGRAMS=tcsd tcsd_emu
diff --git a/security/trousers/files/patch-src-tcsd-svrside.c b/security/trousers/files/patch-src_tcsd_svrside.c
index dfc6eee..e7248c6 100644
--- a/security/trousers/files/patch-src-tcsd-svrside.c
+++ b/security/trousers/files/patch-src_tcsd_svrside.c
@@ -1,4 +1,4 @@
---- src/tcsd/svrside.c.orig 2014-04-24 18:05:44 UTC
+--- src/tcsd/svrside.c.orig 2016-06-20 15:21:26 UTC
+++ src/tcsd/svrside.c
@@ -92,12 +92,19 @@ tcsd_signal_term(int signal)
term = 1;
diff --git a/security/trousers/files/patch-src-tddl-Makefile.am b/security/trousers/files/patch-src_tddl_Makefile.am
index 639175a..639175a 100644
--- a/security/trousers/files/patch-src-tddl-Makefile.am
+++ b/security/trousers/files/patch-src_tddl_Makefile.am
diff --git a/security/trousers/files/patch-src-trspi-Makefile.am b/security/trousers/files/patch-src_trspi_Makefile.am
index e834550..439a229 100644
--- a/security/trousers/files/patch-src-trspi-Makefile.am
+++ b/security/trousers/files/patch-src_trspi_Makefile.am
@@ -1,5 +1,5 @@
---- src/trspi/Makefile.am.orig 2014-04-25 03:05:44.000000000 +0900
-+++ src/trspi/Makefile.am 2016-05-19 03:16:29.786606000 +0900
+--- src/trspi/Makefile.am.orig 2014-04-24 18:05:44 UTC
++++ src/trspi/Makefile.am
@@ -1,7 +1,8 @@
noinst_LTLIBRARIES=libtrousers.la
diff --git a/security/trousers/files/patch-src-tspi-Makefile.am b/security/trousers/files/patch-src_tspi_Makefile.am
index 66be8ad..658a5f6 100644
--- a/security/trousers/files/patch-src-tspi-Makefile.am
+++ b/security/trousers/files/patch-src_tspi_Makefile.am
@@ -1,6 +1,6 @@
---- src/tspi/Makefile.am.orig 2014-04-25 03:05:44.000000000 +0900
-+++ src/tspi/Makefile.am 2016-05-19 03:04:18.883005000 +0900
-@@ -17,9 +17,9 @@
+--- src/tspi/Makefile.am.orig 2014-04-24 18:05:44 UTC
++++ src/tspi/Makefile.am
+@@ -17,9 +17,9 @@ libtspi_la_LIBADD=${top_builddir}/src/tr
# 5. If any interfaces have been added since the last public release, then increment age.
# 6. If any interfaces have been removed since the last public release, then set age to 0.
diff --git a/security/trousers/files/patch-src-tspi-ps-ps_utils.c b/security/trousers/files/patch-src_tspi_ps_ps__utils.c
index 0bb38d1..1c83180 100644
--- a/security/trousers/files/patch-src-tspi-ps-ps_utils.c
+++ b/security/trousers/files/patch-src_tspi_ps_ps__utils.c
@@ -1,4 +1,4 @@
---- src/tspi/ps/ps_utils.c.orig 2014-04-24 18:05:44 UTC
+--- src/tspi/ps/ps_utils.c.orig 2016-06-20 15:21:26 UTC
+++ src/tspi/ps/ps_utils.c
@@ -22,7 +22,7 @@
#include "tspps.h"
diff --git a/security/trousers/files/patch-src-tspi-ps-tspps.c b/security/trousers/files/patch-src_tspi_ps_tspps.c
index d58f17d..48f55a0 100644
--- a/security/trousers/files/patch-src-tspi-ps-tspps.c
+++ b/security/trousers/files/patch-src_tspi_ps_tspps.c
@@ -1,4 +1,4 @@
---- src/tspi/ps/tspps.c.orig 2014-04-24 18:05:44 UTC
+--- src/tspi/ps/tspps.c.orig 2016-06-20 15:21:26 UTC
+++ src/tspi/ps/tspps.c
@@ -29,6 +29,11 @@
#define LE_16 htole16
diff --git a/security/trousers/files/patch-src-tspi-rpc-hosttable.c b/security/trousers/files/patch-src_tspi_rpc_hosttable.c
index 144ec14..0acd9ec 100644
--- a/security/trousers/files/patch-src-tspi-rpc-hosttable.c
+++ b/security/trousers/files/patch-src_tspi_rpc_hosttable.c
@@ -1,4 +1,4 @@
---- src/tspi/rpc/hosttable.c.orig 2014-04-24 18:05:44 UTC
+--- src/tspi/rpc/hosttable.c.orig 2016-06-20 15:21:26 UTC
+++ src/tspi/rpc/hosttable.c
@@ -51,6 +51,8 @@ host_table_final()
{
diff --git a/security/trousers/files/patch-src-tspi-rpc-tcstp-rpc.c b/security/trousers/files/patch-src_tspi_rpc_tcstp_rpc.c
index 5de4c20..b26709a 100644
--- a/security/trousers/files/patch-src-tspi-rpc-tcstp-rpc.c
+++ b/security/trousers/files/patch-src_tspi_rpc_tcstp_rpc.c
@@ -1,4 +1,4 @@
---- src/tspi/rpc/tcstp/rpc.c.orig 2014-04-24 18:05:44 UTC
+--- src/tspi/rpc/tcstp/rpc.c.orig 2016-06-20 15:21:26 UTC
+++ src/tspi/rpc/tcstp/rpc.c
@@ -304,7 +304,7 @@ recv_from_socket(int sock, void *buffer,
errno = 0;
diff --git a/security/trousers/files/patch-src-tspi-tsp_tcsi_param.c b/security/trousers/files/patch-src_tspi_tsp__tcsi__param.c
index 5aae426..aa975ed 100644
--- a/security/trousers/files/patch-src-tspi-tsp_tcsi_param.c
+++ b/security/trousers/files/patch-src_tspi_tsp__tcsi__param.c
@@ -1,4 +1,4 @@
---- src/tspi/tsp_tcsi_param.c.orig 2014-04-24 18:05:44 UTC
+--- src/tspi/tsp_tcsi_param.c.orig 2016-06-20 15:21:26 UTC
+++ src/tspi/tsp_tcsi_param.c
@@ -11,7 +11,12 @@
#include <stdlib.h>
diff --git a/security/xorsearch/Makefile b/security/xorsearch/Makefile
index 2f29097..2f45ce9 100644
--- a/security/xorsearch/Makefile
+++ b/security/xorsearch/Makefile
@@ -10,16 +10,17 @@ DISTNAME= XORSearch_V1_2_0
MAINTAINER= edwin@mavetju.org
COMMENT= Search for a given string in an XOR or ROL encoded binary file
-USES= zip
-WRKSRC= ${WRKDIR}
+USES= dos2unix zip
+DOS2UNIX_GLOB= *.c
+NO_WRKSUBDIR= yes
PLIST_FILES= bin/xorsearch
do-build:
- ${CC} -o ${WRKDIR}/XORSearch ${WRKDIR}/XORSearch.c
+ ${CC} -o ${WRKSRC}/XORSearch ${WRKSRC}/XORSearch.c
do-install:
- ${INSTALL_PROGRAM} ${WRKDIR}/XORSearch \
+ ${INSTALL_PROGRAM} ${WRKSRC}/XORSearch \
${STAGEDIR}${PREFIX}/bin/xorsearch
.include <bsd.port.mk>
diff --git a/security/xorsearch/files/patch-XORSearch.c b/security/xorsearch/files/patch-XORSearch.c
index b42befe..20d6023 100644
--- a/security/xorsearch/files/patch-XORSearch.c
+++ b/security/xorsearch/files/patch-XORSearch.c
@@ -1,10 +1,10 @@
---- XORSearch.c.orig Tue Dec 18 07:27:32 2007
-+++ XORSearch.c Tue Dec 18 07:27:38 2007
+--- XORSearch.c.orig 2016-06-20 15:09:40 UTC
++++ XORSearch.c
@@ -20,7 +20,6 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <sys/stat.h>
--#include <malloc.h>
- #include <string.h>
- #include <ctype.h>
- #include <limits.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <sys/stat.h>
+-#include <malloc.h>
+ #include <string.h>
+ #include <ctype.h>
+ #include <limits.h>
diff --git a/shells/ibsh/Makefile b/shells/ibsh/Makefile
index a2f75fb..fc2ef1d 100644
--- a/shells/ibsh/Makefile
+++ b/shells/ibsh/Makefile
@@ -12,7 +12,7 @@ COMMENT= Restricted unix shell
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= gmake
+USES= dos2unix gmake
ALL_TARGET= ibsh
INSTALL_TARGET= ibsh_install
MAKE_ARGS= CC="${CC}" PREFIX="${STAGEDIR}${PREFIX}"
diff --git a/shells/ibsh/files/patch-Makefile b/shells/ibsh/files/patch-Makefile
index eee4590..311cf90 100644
--- a/shells/ibsh/files/patch-Makefile
+++ b/shells/ibsh/files/patch-Makefile
@@ -1,21 +1,21 @@
---- Makefile.orig 2005-06-03 13:47:32 UTC
+--- Makefile.orig 2016-06-20 15:08:34 UTC
+++ Makefile
-@@ -30,12 +30,12 @@ delbadfiles.o: delbadfiles.c ibsh.h
- ${CC} -c delbadfiles.c
-
- ibsh_install:
-- cp ./ibsh /bin/
-- mkdir /etc/ibsh
-- mkdir /etc/ibsh/cmds
-- mkdir /etc/ibsh/xtns
-- cp ./globals.cmds /etc/ibsh/
-- cp ./globals.xtns /etc/ibsh/
-+ cp ./ibsh ${PREFIX}/bin/
-+ mkdir ${PREFIX}/etc/ibsh
-+ mkdir ${PREFIX}/etc/ibsh/cmds
-+ mkdir ${PREFIX}/etc/ibsh/xtns
-+ cp ./globals.cmds ${PREFIX}/etc/ibsh/
-+ cp ./globals.xtns ${PREFIX}/etc/ibsh/
-
- ibsh_uninstall:
- rm -rf /etc/ibsh/globals.cmds
+@@ -30,12 +30,12 @@ delbadfiles.o: delbadfiles.c ibsh.h
+ ${CC} -c delbadfiles.c
+
+ ibsh_install:
+- cp ./ibsh /bin/
+- mkdir /etc/ibsh
+- mkdir /etc/ibsh/cmds
+- mkdir /etc/ibsh/xtns
+- cp ./globals.cmds /etc/ibsh/
+- cp ./globals.xtns /etc/ibsh/
++ cp ./ibsh ${PREFIX}/bin/
++ mkdir ${PREFIX}/etc/ibsh
++ mkdir ${PREFIX}/etc/ibsh/cmds
++ mkdir ${PREFIX}/etc/ibsh/xtns
++ cp ./globals.cmds ${PREFIX}/etc/ibsh/
++ cp ./globals.xtns ${PREFIX}/etc/ibsh/
+
+ ibsh_uninstall:
+ rm -rf /etc/ibsh/globals.cmds
diff --git a/sysutils/rfstool/Makefile b/sysutils/rfstool/Makefile
index 11f2637..2629827 100644
--- a/sysutils/rfstool/Makefile
+++ b/sysutils/rfstool/Makefile
@@ -11,7 +11,8 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Read from a Reiser file system
PLIST_FILES= bin/rfstool
-USES= zip
+USES= dos2unix zip
+DOS2UNIX_FILES= reiserfs.h
WRKSRC= ${WRKDIR}/rfstool-0.14/RFSTOOL
MAKEFILE= makefile.gcc3x
diff --git a/sysutils/rfstool/files/patch-reiserfs.h b/sysutils/rfstool/files/patch-reiserfs.h
index 21e8ea1..4a59c3b 100644
--- a/sysutils/rfstool/files/patch-reiserfs.h
+++ b/sysutils/rfstool/files/patch-reiserfs.h
@@ -1,11 +1,11 @@
---- reiserfs.h.orig Mon Oct 2 13:58:35 2006
-+++ reiserfs.h Mon Oct 2 13:58:39 2006
-@@ -268,7 +268,7 @@
- {
- }
-
-- ReiserFsBlock::~ReiserFsBlock()
-+ ~ReiserFsBlock()
- {
- delete m_lpbMemory;
- }
+--- reiserfs.h.orig 2016-06-20 13:19:25 UTC
++++ reiserfs.h
+@@ -268,7 +268,7 @@ class ReiserFsBlock : public PNode
+ {
+ }
+
+- ReiserFsBlock::~ReiserFsBlock()
++ ~ReiserFsBlock()
+ {
+ delete m_lpbMemory;
+ }
diff --git a/textproc/expat2/Makefile b/textproc/expat2/Makefile
index 0027302..5a566c5 100644
--- a/textproc/expat2/Makefile
+++ b/textproc/expat2/Makefile
@@ -12,7 +12,8 @@ COMMENT= XML 1.0 parser written in C
GNU_CONFIGURE= yes
ALL_TARGET= default
-USES= libtool pathfix tar:bz2
+USES= dos2unix libtool pathfix tar:bz2
+DOS2UNIX_GLOB= *.txt
USE_LDCONFIG= yes
post-stage:
diff --git a/textproc/expat2/files/patch-cve-2012-6702-plus-cve-2016-5300-v1 b/textproc/expat2/files/patch-cve-2012-6702-plus-cve-2016-5300-v1
index de96294..23a47f4 100644
--- a/textproc/expat2/files/patch-cve-2012-6702-plus-cve-2016-5300-v1
+++ b/textproc/expat2/files/patch-cve-2012-6702-plus-cve-2016-5300-v1
@@ -39,15 +39,15 @@ index 353627e..524d514 100755
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -41,6 +41,9 @@ include_directories(${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/lib)
- if(MSVC)
- add_definitions(-D_CRT_SECURE_NO_WARNINGS -wd4996)
- endif(MSVC)
-+if(WIN32)
-+ add_definitions(-DCOMPILED_FROM_DSP)
-+endif(WIN32)
-
- set(expat_SRCS
- lib/xmlparse.c
+ if(MSVC)
+ add_definitions(-D_CRT_SECURE_NO_WARNINGS -wd4996)
+ endif(MSVC)
++if(WIN32)
++ add_definitions(-DCOMPILED_FROM_DSP)
++endif(WIN32)
+
+ set(expat_SRCS
+ lib/xmlparse.c
diff --git a/expat/lib/xmlparse.c b/expat/lib/xmlparse.c
index e308c79..c5f942f 100644
--- lib/xmlparse.c
diff --git a/textproc/p5-XML-AutoWriter/Makefile b/textproc/p5-XML-AutoWriter/Makefile
index 70c20df..c9e1df7 100644
--- a/textproc/p5-XML-AutoWriter/Makefile
+++ b/textproc/p5-XML-AutoWriter/Makefile
@@ -16,7 +16,8 @@ LICENSE_COMB= dual
TEST_DEPENDS= p5-XML-Parser>=0:textproc/p5-XML-Parser
-USES= perl5
+USES= dos2unix perl5
+DOS2UNIX_GLOB= *.pm
USE_PERL5= configure
post-patch:
diff --git a/textproc/p5-XML-AutoWriter/files/patch-Makefile.PL b/textproc/p5-XML-AutoWriter/files/patch-Makefile.PL
index 4618fef..885901f 100644
--- a/textproc/p5-XML-AutoWriter/files/patch-Makefile.PL
+++ b/textproc/p5-XML-AutoWriter/files/patch-Makefile.PL
@@ -1,6 +1,6 @@
---- Makefile.PL.orig 2012-12-23 11:07:17.511361339 +0900
-+++ Makefile.PL 2012-12-23 11:09:35.165438990 +0900
-@@ -9,7 +9,6 @@
+--- Makefile.PL.orig 2009-06-11 18:26:48 UTC
++++ Makefile.PL
+@@ -9,7 +9,6 @@ requires => 'XML::Parser';
build_requires => 'Test';
build_requires => 'IO::File';
diff --git a/textproc/p5-XML-AutoWriter/files/patch-Doctype.pm b/textproc/p5-XML-AutoWriter/files/patch-lib_XML_Doctype.pm
index d9d905f..be7993d 100644
--- a/textproc/p5-XML-AutoWriter/files/patch-Doctype.pm
+++ b/textproc/p5-XML-AutoWriter/files/patch-lib_XML_Doctype.pm
@@ -1,12 +1,12 @@
---- lib/XML/Doctype.pm.orig Tue Dec 27 23:27:13 2005
-+++ lib/XML/Doctype.pm Mon Jan 30 23:43:38 2006
-@@ -62,7 +62,9 @@
- =cut
-
- use strict ;
+--- lib/XML/Doctype.pm.orig 2016-06-20 16:08:38 UTC
++++ lib/XML/Doctype.pm
+@@ -62,7 +62,9 @@ XML::Doctype::ENITITY
+ =cut
+
+ use strict ;
+use Config;
- use vars qw( $VERSION %_default_dtds ) ;
+ use vars qw( $VERSION %_default_dtds ) ;
+use lib $Config{sitelib};
- use fields (
- 'ELTS', # A hash of declared & undeclared elements, keyed by name
- 'NAME', # The root node (the name from the DOCTYPE decl).
+ use fields (
+ 'ELTS', # A hash of declared & undeclared elements, keyed by name
+ 'NAME', # The root node (the name from the DOCTYPE decl).
diff --git a/www/repos-style/Makefile b/www/repos-style/Makefile
index 30c4ec1..0b2e2ae 100644
--- a/www/repos-style/Makefile
+++ b/www/repos-style/Makefile
@@ -15,7 +15,8 @@ BROKEN_powerpc64= Does not build
RUN_DEPENDS= subversion>=0:devel/subversion
-USES= zip
+USES= dos2unix zip
+DOS2UNIX_GLOB= *.xsl *.php
NO_BUILD= YES
USE_PHP= xml
diff --git a/www/repos-style/files/patch-open-log-index.php b/www/repos-style/files/patch-open_log_index.php
index 63cf7f4..4da027d 100644
--- a/www/repos-style/files/patch-open-log-index.php
+++ b/www/repos-style/files/patch-open_log_index.php
@@ -1,11 +1,11 @@
---- open/log/index.php.orig 2009-03-13 11:39:06.000000000 +0100
-+++ open/log/index.php 2009-08-21 22:36:25.000000000 +0200
+--- open/log/index.php.orig 2016-06-20 16:09:43 UTC
++++ open/log/index.php
@@ -18,7 +18,7 @@
- // === Print svn log --xml to response ===
-
- // Set the URL to the stylesheet, must be same host or absolute path from root
--$xslt = '/repos-web/view/log.xsl';
-+$xslt = '/repos-style/view/log.xsl';
-
- // URL or path to repository, no trailing slash
- // (note that the log viewer may bypass access control)
+ // === Print svn log --xml to response ===
+
+ // Set the URL to the stylesheet, must be same host or absolute path from root
+-$xslt = '/repos-web/view/log.xsl';
++$xslt = '/repos-style/view/log.xsl';
+
+ // URL or path to repository, no trailing slash
+ // (note that the log viewer may bypass access control)
diff --git a/www/repos-style/files/patch-view-log.xsl b/www/repos-style/files/patch-view_log.xsl
index 60da8b5..4e1f734 100644
--- a/www/repos-style/files/patch-view-log.xsl
+++ b/www/repos-style/files/patch-view_log.xsl
@@ -1,11 +1,11 @@
---- view/log.xsl.orig 2009-03-12 22:15:36.000000000 +0100
-+++ view/log.xsl 2009-08-21 22:39:20.000000000 +0200
-@@ -25,7 +25,7 @@
-
- <!-- === repos style configuration === -->
- <!-- static: absolute url to style application -->
-- <xsl:param name="static">/repos-web/</xsl:param>
+--- view/log.xsl.orig 2016-06-20 16:09:43 UTC
++++ view/log.xsl
+@@ -25,7 +25,7 @@ limitations under the License.
+
+ <!-- === repos style configuration === -->
+ <!-- static: absolute url to style application -->
+- <xsl:param name="static">/repos-web/</xsl:param>
+ <xsl:param name="static">/repos-style/</xsl:param>
- <!-- cssUrl: absolute url to css folder -->
- <xsl:param name="cssUrl"><xsl:value-of select="$static"/>style/</xsl:param>
- <!-- log viewer does not know the repository URL -->
+ <!-- cssUrl: absolute url to css folder -->
+ <xsl:param name="cssUrl"><xsl:value-of select="$static"/>style/</xsl:param>
+ <!-- log viewer does not know the repository URL -->
diff --git a/www/repos-style/files/patch-view-repos.xsl b/www/repos-style/files/patch-view_repos.xsl
index b7a9d8d..d790101 100644
--- a/www/repos-style/files/patch-view-repos.xsl
+++ b/www/repos-style/files/patch-view_repos.xsl
@@ -1,11 +1,11 @@
---- view/repos.xsl.orig 2009-03-13 09:34:04.000000000 +0100
-+++ view/repos.xsl 2009-08-21 22:42:04.000000000 +0200
-@@ -31,7 +31,7 @@
-
- <!-- === repos style configuration === -->
- <!-- static: absolute url to style application -->
-- <xsl:param name="static">/repos-web/</xsl:param>
-+ <xsl:param name="static">/repos-style/</xsl:param>
- <!-- cssUrl: absolute url to css folder -->
- <xsl:param name="cssUrl"><xsl:value-of select="$static"/>style/</xsl:param>
- <!-- logUrl: empty -> no log tool, absolute url -> enable 'history' link. Must allow appended query param -->
+--- view/repos.xsl.orig 2016-06-20 16:09:43 UTC
++++ view/repos.xsl
+@@ -31,7 +31,7 @@ limitations under the License.
+
+ <!-- === repos style configuration === -->
+ <!-- static: absolute url to style application -->
+- <xsl:param name="static">/repos-web/</xsl:param>
++ <xsl:param name="static">/repos-style/</xsl:param>
+ <!-- cssUrl: absolute url to css folder -->
+ <xsl:param name="cssUrl"><xsl:value-of select="$static"/>style/</xsl:param>
+ <!-- logUrl: empty -> no log tool, absolute url -> enable 'history' link. Must allow appended query param -->
diff --git a/x11-drivers/xf86-video-openchrome/files/patch-configure b/x11-drivers/xf86-video-openchrome/files/patch-configure
index 42654fc..d32348a 100644
--- a/x11-drivers/xf86-video-openchrome/files/patch-configure
+++ b/x11-drivers/xf86-video-openchrome/files/patch-configure
@@ -1,7 +1,7 @@
---- configure.orig 2008-01-02 15:05:04.000000000 -0500
-+++ configure 2008-01-10 20:48:21.000000000 -0500
-@@ -21484,7 +21484,7 @@
- _ACEOF
+--- configure.orig 2013-05-23 15:11:54 UTC
++++ configure
+@@ -12742,7 +12742,7 @@ $as_echo "#define X_HAVE_XAAGETROP 1" >>
+ $as_echo "#define X_NEED_I2CSTART 1" >>confdefs.h
-DRIVER_MAN_SUFFIX="4"
diff --git a/x11-drivers/xf86-video-openchrome/files/patch-src_via_id.c b/x11-drivers/xf86-video-openchrome/files/patch-src_via__id.c
index 130e2ba..35ba5e3 100644
--- a/x11-drivers/xf86-video-openchrome/files/patch-src_via_id.c
+++ b/x11-drivers/xf86-video-openchrome/files/patch-src_via__id.c
@@ -1,10 +1,10 @@
---- src/via_id.c.orig 2008-08-18 18:25:16.000000000 -0400
-+++ src/via_id.c 2008-11-11 21:20:14.000000000 -0500
-@@ -207,6 +207,7 @@
+--- src/via_id.c.orig 2013-05-23 15:11:28 UTC
++++ src/via_id.c
+@@ -231,6 +231,7 @@ static struct ViaCardIdStruct ViaCardId[
{"VIA VT3343 (P4M890)", VIA_P4M890, 0x1106, 0x3343, VIA_DEVICE_CRT},
{"MSI P4M890M-L/IL (MS-7255)", VIA_P4M890, 0x1462, 0x7255, VIA_DEVICE_CRT},
{"Biostar P4M890-M7 TE", VIA_P4M890, 0x1565, 0x1207, VIA_DEVICE_CRT},
-+ {"Mitac 8624 (Joybook R41E)", VIA_P4M890, 0x1071, 0x8624, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
++ {"Mitac 8624 (Joybook R41E)", VIA_P4M890, 0x1071, 0x8624, VIA_DEVICE_CRT | VIA_DEVICE_LCD},
{"ASRock P4VM890", VIA_P4M890, 0x1849, 0x3343, VIA_DEVICE_CRT},
- /* keep this */
+ /*** VX800 ***/
diff --git a/x11-themes/kde-icons-noia/Makefile b/x11-themes/kde-icons-noia/Makefile
index c7d3993..e94aa3e 100644
--- a/x11-themes/kde-icons-noia/Makefile
+++ b/x11-themes/kde-icons-noia/Makefile
@@ -9,7 +9,7 @@ DISTNAME= noia-kde-icons-${PORTVERSION}
COMMENT= KDE Noia complete iconset
USES= tar:tgz
-WRKSRC= "${WRKDIR}/noia_kde_${PORTVERSION:C/\.//}"
+WRKSRC= ${WRKDIR}/noia_kde_${PORTVERSION:C/\.//}
PORT_SHAREDIR= ${PORTNAME}
.include "${.CURDIR}/Makefile.icons"
diff --git a/x11-toolkits/hs-wxcore/Makefile b/x11-toolkits/hs-wxcore/Makefile
index 3732f0d..8fcec49 100644
--- a/x11-toolkits/hs-wxcore/Makefile
+++ b/x11-toolkits/hs-wxcore/Makefile
@@ -9,9 +9,11 @@ COMMENT= wxHaskell core
USE_CABAL= parsec stm wxc>=0.91 wxdirect>=0.91
+USES= dos2unix
+DOS2UNIX_GLOB= *.hs
+
USE_WX= 3.0
WX_COMPS= wx
-WX_UNICODE= yes
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
diff --git a/x11-toolkits/hs-wxcore/files/patch-Setup.hs b/x11-toolkits/hs-wxcore/files/patch-Setup.hs
index a319b4b..612c881 100644
--- a/x11-toolkits/hs-wxcore/files/patch-Setup.hs
+++ b/x11-toolkits/hs-wxcore/files/patch-Setup.hs
@@ -1,10 +1,10 @@
---- ./Setup.hs.orig 2012-04-13 14:40:36.000000000 +0200
-+++ ./Setup.hs 2012-05-13 20:41:08.000000000 +0200
-@@ -66,7 +66,6 @@
-
- let libbi' = libbi
- { extraLibDirs = extraLibDirs libbi ++ [wxcDirectory]
-- , extraLibs = extraLibs libbi ++ ["wxc"]
- , ldOptions = ldOptions libbi ++ ["-Wl,-rpath," ++ wxcDirectory] }
-
- let lib' = lib { libBuildInfo = libbi' }
+--- Setup.hs.orig 2016-06-20 16:11:53 UTC
++++ Setup.hs
+@@ -78,7 +78,6 @@ myConfHook (pkg0, pbi) flags = do
+
+ let libbi' = libbi
+ { extraLibDirs = extraLibDirs libbi ++ [wxcDirectory]
+- , extraLibs = extraLibs libbi ++ ["wxc"]
+ , ldOptions = ldOptions libbi ++ ["-Wl,-rpath," ++ wxcDirectory] }
+
+ let lib' = lib { libBuildInfo = libbi' }
diff --git a/x11-wm/afterstep/files/AFstep.xpm b/x11-wm/afterstep/files/AFstep.xpm
index 2f07b6b..fd96ea6 100644
--- a/x11-wm/afterstep/files/AFstep.xpm
+++ b/x11-wm/afterstep/files/AFstep.xpm
@@ -1,72 +1,72 @@
-/* XPM */
-static char *noname[] = {
-/* width height ncolors chars_per_pixel */
-"48 47 18 1",
-/* colors */
-"` c #858678",
-"a c #B2C0DC",
-"b c #3D4C41",
-"c c #14E314",
-"d c #E3DF2A",
-"e c #4E5151",
-"f c #3F3D3F",
-"g c #101214",
-"h c #686560",
-"i c #020102",
-"j c #2F3538",
-"k c #A30E1C",
-"l c #7D6F73",
-"m c #00018D",
-"n c #545851",
-"o c #A19685",
-"p c #356E3B",
-"q c #242134",
-/* pixels */
-"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
-"aaaaaaaaaaaaaaaaaaaaaaaaa`aaaaaaaaaaaaaaaaaaaaaa",
-"aaaaaaaaaaaaaaaaaaaaaaaa``aaaaaaaaaaaaaaaaaaaaaa",
-"aaaaaaaaaaaaaaaaaaaaakkkkig``aaaaaaaaaaaaaaaaaaa",
-"aaaaaaaaaaaaaaaaaaa`kkggqfqiqo`aaaaaaaaaaaaaaaaa",
-"aaaaaaaaaaaaaaaaaooqgkkgkkbfgifo`aaaaaaaaaaaaaaa",
-"aaaaaaaaaaaaaaa``qggikkkkkjbffqgbaaaaaaaaaaaaaaa",
-"aaaaaaaaaaaaaaoqiqfgikkkkkfjbnejqqn`aaaaaaaaaaaa",
-"aaaaaaaaaao`lggqeeebkkkkkkkkqjgjbfiboaaaaaaaaaaa",
-"aaaaaaaaaahdpbqgqqjebbpbkkkkkkkkbegoaaaaaaaaaaaa",
-"aaaaaaaaagiddddddbqqqjfbpfkkkkkkpeg`aaaaaaaaaaaa",
-"aaaaaoafiiidbjhdddddpbqqqqgkkknpefq`aaaaaaaaaaaa",
-"aaaoofiqfqgddqjgjdddddddhdpkkppeeqn`aaaaaaaaaaaa",
-"`ooeggjebqgpdggpdddjppddddhfpbeebqoaaaaaaaaaaaaa",
-"abgqjbbfbqgqdpddd`ejjjdddhebnneeejeaaaaaaaaaaaaa",
-"oibeefefefggddddnjjegpd`ejeenefenfjfl`aaaaaaaaaa",
-"aiqnebbfneqgbdhmjjbhenhjeneeeenbgqa`eqaaaaaaaaaa",
-"`gijebffnnqqjdegbeeeenneeeebfnejlhooejqhaaaaaaaa",
-"o`iijnefenqqgddddefnenhnefeenhifa`afjnngqaaaaaaa",
-"aoiiijhnfnbggddddfnenneeebnehqioaa`afjnhegn`aaaa",
-"a`iigiqnefggpdd`jeheennenhebcccphla```qjffqfaoaa",
-"a`figiiqnnjqpdhjehnnneenhjpccccccoooa`aehleege`a",
-"aaoigggijhhbeejnhnnenenhjgcgigccphn`oa``alnhgh`a",
-"aa`iigggiqenehnnhnneehhnqccqgccchjccolaahehbg`aa",
-"aa`giggggifhhnehejmpnnnbqpcpccphljccjhaenhnih`aa",
-"aa`higgggiqlneenbmmnjmmhqgcccblleqccfllnhbgiaaaa",
-"aaaoiigggiqhnnnejimmmmm`fipcccccccccehh`fgin`aaa",
-"aaaoeigggighebnejimmmmn`lfggcccccccph`ljgiioaaaa",
-"aaaaofiggginnnhegmmqmmmhhhnpggpcpgghllqgiioaaaaa",
-"aaaaa`jigginnnnqgmmimmmmhh`hpppppghohqgigaaaaaaa",
-"aaaaaa`qigiflhhhbmejqmmmmhpfm`nnh``hqgiq`aaaaaaa",
-"aaaaaaa`giiijhhhhhhbqgmmmmjmmhhl`lfqgij`aaaaaaaa",
-"aaaaaaaaaiiiifhhhnhhnqgmmmmmm`lhleqgif`aaaaaaaaa",
-"aaaaaaaaaaiiiijl`hhlhnjgmmmmh`lhbqginoaaaaaaaaaa",
-"aaaaaaaaaaoiiiiflhnhh`hfqmgjh`hfqgih`aaaaaaaaaaa",
-"aaaaaaaaaaaoiiiiflhhhlhhhhnh`hqqgilaaaaaaaaaaaaa",
-"aaaaaaaaaaaaoiigieohnhnhhhllnqggi`aaaaaaaaaaaaaa",
-"aaaaaaaaaaaaa`iiiiflhnnhll`ngqgi`aaaaaaaaaaaaaaa",
-"aaaaaaaaaaaaaaliigieohnnh`ngqgioaaaaaaaaaaaaaaaa",
-"aaaaaaaaaaaaaaahiiiinoh``ngqigoaaaaaaaaaaaaaaaaa",
-"aaaaaaaaaaaaaaaonigiib`hfggig`aaaaaaaaaaaaaaaaaa",
-"aaaaaaaaaaaaaaaaobigiiffqgij`aaaaaaaaaaaaaaaaaaa",
-"aaaaaaaaaaaaaaaaa`jigigjgif`aaaaaaaaaaaaaaaaaaaa",
-"aaaaaaaaaaaaaaaaaa`gigqqin`aaaaaaaaaaaaaaaaaaaaa",
-"aaaaaaaaaaaaaaaaaaa`iiiin`aaaaaaaaaaaaaaaaaaaaaa",
-"aaaaaaaaaaaaaaaaaaaa`iihaaaaaaaaaaaaaaaaaaaaaaaa",
-"aaaaaaaaaaaaaaaaaaaa`oo`aaaaaaaaaaaaaaaaaaaaaaaa"
-};
+/* XPM */
+static char *noname[] = {
+/* width height ncolors chars_per_pixel */
+"48 47 18 1",
+/* colors */
+"` c #858678",
+"a c #B2C0DC",
+"b c #3D4C41",
+"c c #14E314",
+"d c #E3DF2A",
+"e c #4E5151",
+"f c #3F3D3F",
+"g c #101214",
+"h c #686560",
+"i c #020102",
+"j c #2F3538",
+"k c #A30E1C",
+"l c #7D6F73",
+"m c #00018D",
+"n c #545851",
+"o c #A19685",
+"p c #356E3B",
+"q c #242134",
+/* pixels */
+"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+"aaaaaaaaaaaaaaaaaaaaaaaaa`aaaaaaaaaaaaaaaaaaaaaa",
+"aaaaaaaaaaaaaaaaaaaaaaaa``aaaaaaaaaaaaaaaaaaaaaa",
+"aaaaaaaaaaaaaaaaaaaaakkkkig``aaaaaaaaaaaaaaaaaaa",
+"aaaaaaaaaaaaaaaaaaa`kkggqfqiqo`aaaaaaaaaaaaaaaaa",
+"aaaaaaaaaaaaaaaaaooqgkkgkkbfgifo`aaaaaaaaaaaaaaa",
+"aaaaaaaaaaaaaaa``qggikkkkkjbffqgbaaaaaaaaaaaaaaa",
+"aaaaaaaaaaaaaaoqiqfgikkkkkfjbnejqqn`aaaaaaaaaaaa",
+"aaaaaaaaaao`lggqeeebkkkkkkkkqjgjbfiboaaaaaaaaaaa",
+"aaaaaaaaaahdpbqgqqjebbpbkkkkkkkkbegoaaaaaaaaaaaa",
+"aaaaaaaaagiddddddbqqqjfbpfkkkkkkpeg`aaaaaaaaaaaa",
+"aaaaaoafiiidbjhdddddpbqqqqgkkknpefq`aaaaaaaaaaaa",
+"aaaoofiqfqgddqjgjdddddddhdpkkppeeqn`aaaaaaaaaaaa",
+"`ooeggjebqgpdggpdddjppddddhfpbeebqoaaaaaaaaaaaaa",
+"abgqjbbfbqgqdpddd`ejjjdddhebnneeejeaaaaaaaaaaaaa",
+"oibeefefefggddddnjjegpd`ejeenefenfjfl`aaaaaaaaaa",
+"aiqnebbfneqgbdhmjjbhenhjeneeeenbgqa`eqaaaaaaaaaa",
+"`gijebffnnqqjdegbeeeenneeeebfnejlhooejqhaaaaaaaa",
+"o`iijnefenqqgddddefnenhnefeenhifa`afjnngqaaaaaaa",
+"aoiiijhnfnbggddddfnenneeebnehqioaa`afjnhegn`aaaa",
+"a`iigiqnefggpdd`jeheennenhebcccphla```qjffqfaoaa",
+"a`figiiqnnjqpdhjehnnneenhjpccccccoooa`aehleege`a",
+"aaoigggijhhbeejnhnnenenhjgcgigccphn`oa``alnhgh`a",
+"aa`iigggiqenehnnhnneehhnqccqgccchjccolaahehbg`aa",
+"aa`giggggifhhnehejmpnnnbqpcpccphljccjhaenhnih`aa",
+"aa`higgggiqlneenbmmnjmmhqgcccblleqccfllnhbgiaaaa",
+"aaaoiigggiqhnnnejimmmmm`fipcccccccccehh`fgin`aaa",
+"aaaoeigggighebnejimmmmn`lfggcccccccph`ljgiioaaaa",
+"aaaaofiggginnnhegmmqmmmhhhnpggpcpgghllqgiioaaaaa",
+"aaaaa`jigginnnnqgmmimmmmhh`hpppppghohqgigaaaaaaa",
+"aaaaaa`qigiflhhhbmejqmmmmhpfm`nnh``hqgiq`aaaaaaa",
+"aaaaaaa`giiijhhhhhhbqgmmmmjmmhhl`lfqgij`aaaaaaaa",
+"aaaaaaaaaiiiifhhhnhhnqgmmmmmm`lhleqgif`aaaaaaaaa",
+"aaaaaaaaaaiiiijl`hhlhnjgmmmmh`lhbqginoaaaaaaaaaa",
+"aaaaaaaaaaoiiiiflhnhh`hfqmgjh`hfqgih`aaaaaaaaaaa",
+"aaaaaaaaaaaoiiiiflhhhlhhhhnh`hqqgilaaaaaaaaaaaaa",
+"aaaaaaaaaaaaoiigieohnhnhhhllnqggi`aaaaaaaaaaaaaa",
+"aaaaaaaaaaaaa`iiiiflhnnhll`ngqgi`aaaaaaaaaaaaaaa",
+"aaaaaaaaaaaaaaliigieohnnh`ngqgioaaaaaaaaaaaaaaaa",
+"aaaaaaaaaaaaaaahiiiinoh``ngqigoaaaaaaaaaaaaaaaaa",
+"aaaaaaaaaaaaaaaonigiib`hfggig`aaaaaaaaaaaaaaaaaa",
+"aaaaaaaaaaaaaaaaobigiiffqgij`aaaaaaaaaaaaaaaaaaa",
+"aaaaaaaaaaaaaaaaa`jigigjgif`aaaaaaaaaaaaaaaaaaaa",
+"aaaaaaaaaaaaaaaaaa`gigqqin`aaaaaaaaaaaaaaaaaaaaa",
+"aaaaaaaaaaaaaaaaaaa`iiiin`aaaaaaaaaaaaaaaaaaaaaa",
+"aaaaaaaaaaaaaaaaaaaa`iihaaaaaaaaaaaaaaaaaaaaaaaa",
+"aaaaaaaaaaaaaaaaaaaa`oo`aaaaaaaaaaaaaaaaaaaaaaaa"
+};
diff --git a/x11-wm/afterstep/files/penguin.xpm b/x11-wm/afterstep/files/penguin.xpm
index 13401bd..c7282cf 100644
--- a/x11-wm/afterstep/files/penguin.xpm
+++ b/x11-wm/afterstep/files/penguin.xpm
@@ -1,73 +1,73 @@
-/* XPM */
-static char *noname[] = {
-/* width height ncolors chars_per_pixel */
-"48 48 18 1",
-/* colors */
-"` c #000000",
-"a c #F3BD14",
-"b c #828796",
-"c c #B2C0DC",
-"d c #221C1D",
-"e c #160011",
-"f c #685A5E",
-"g c #A0A3AC",
-"h c #F6F6F3",
-"i c #6E727E",
-"j c #040304",
-"k c #FCFCF7",
-"l c #A28359",
-"m c #DFCF80",
-"n c #E3EDF1",
-"o c #FFFFFF",
-"p c #E1B11E",
-"q c #EEEEED",
-/* pixels */
-"cccccccccccccccccccccccjjjjjjjjccccccccccccccccc",
-"ccnooooooooooooooooooojjjjjjjffjoooooooooooooodc",
-"cnqqqnqqqnqqqnqqqnqqqjjjjjjjjjfdjqqqqqnqhhhhhidc",
-"conqnhnqnhnqnhnqnhnqjjjjjejjjjjjjjnnqnhnhhhhhidc",
-"coqnqqqnqqqnqqqnqqqnjjjjjjjjjjjjjjqqnqqqhhhhgidc",
-"conhnqnhnqnhnqnhnqnhjjjdjjjjjjjjjjjnhnqnnhhggidc",
-"coqqqn``````````````jdgidjjigcfdjjj``````fgggidc",
-"conqnh`iiiiiiiibibbbjhnhhjdqhhgjjjjbbbbbiobggidc",
-"coqnqq`iiiiiiibbbbbbjcjdhddhjbhdjjjff`diioggcidc",
-"conhnq`iiiibbbbbgbggjcjdfdehjbnfjjjf`dffiogcgidc",
-"coqqqn`iiibbbbbbggggjdflaaaajihjjjjeeddfiocggidc",
-"conqnh`iibbbggggggggjjpaaaaaappjjjj`ddffiogcgidc",
-"coqnqq`ibbbbbgggggggjlpaaaaaappejjjddfffiocggidc",
-"conhnq`ibbbgggbggbggjdpaaaaalppjjdjffffiiogggidc",
-"coqqqn`ibbbgggbggbggdifpaalpppmdjjfjffiiiogggidc",
-"conqnh`bbbggggggggggdbclpppgmcncjjjjdiiiiogggidc",
-"coqnqq`ibbbgggbggbggjbncllgcchhhdjjjjiiiiogggidc",
-"conhnq`bbbgggggggggdjqhccccnhhhhqjjejjiiiogggiec",
-"coqqqn`ibbbbggbbgbdjghkhcchhhhhhkjjjjjiiiogggfdc",
-"conqnh`ibbgbgggbgbjdhhhhhhhhkhhhhgjjjjjiiogggiec",
-"coqnqq`ibbbbbgbgcjjbhhhkkhkkhhhhhqjjjjjjiogggfdc",
-"conhnq`iibbbbbggjjjgcqhhnnhhhccccndjjjjjdogggiec",
-"coqqqn`iiibbbbbbjjdckhhhqhhhkhhncchjdjjjjogggfec",
-"conqnh`iiibbbbbjjjghhkqhhhhhhhhhkncjjjjjjjggbfec",
-"coqnqq`iiiiibbbjdjhhhkkkhhhhkhhkhknnjjjjjjgggfec",
-"conhnq`iiiiiibijjbhhhhkhhhkkhhhhhkhhdjjjjjbgbfjc",
-"coqqqn`iiiiiiijdjhhhhkhqhkhhhkhhkhkhdjjjjjjbbfec",
-"conqnn`iiiiiiijjfhhhhhhnkhkhhhhhhhhhfjjjjjjgbfjc",
-"coqnqn`iiiiiijjjchhkhkhnhhhhhhkhhhhhbjjjjjjbbfec",
-"connnn`iiiiiijdjqhhhkhhnhhhhhhkkhhhhgjjjjjjjbf`c",
-"coqnnn`iiiiijjdjqhhhhkhnhhhhkhhkhhkhcjjjjjjjbfec",
-"connnn`iiiiijjdjnhhkhhhnkhhhhhhhhhhhnjjjjjjjbf`c",
-"connnngooooojpfdhkhhhkhnhhhhhhhhhhhhbdjjjjjjbf`c",
-"connnnncncccpaalfhkhkhhnhhhhhhhhhhmpljjjjjjbbf`c",
-"connncnccccmpaaafdhhhhknhhhhhhhhhhpapjjjjjpabf`c",
-"connncccccmppaaaaejqhhhhhhhkhhhhhhpapejjjfaaif`c",
-"cogiiiiilpppaaaaapjjnhkhkhhhhhkhhcpaplddlpaaff`c",
-"ci`````ppaaaaaaaaadjjfqhhhhhkhhhhclppppppaaaa``c",
-"cccccccaaaaaaaaaaapejjqhhhhhhhhhkclpppppaaaaaacc",
-"cccccccpaaaaaaaaaaaljjqkhhhhhhkhhglpaaaaaaaaaapc",
-"cccccccpaaaaaaaaaaaamhhhhkhhhhhhgjlpaaaaaaaaaaaa",
-"cccccccpaaaaaaaaaaaapqhhkkhhhhhdjelpaaaaaaaaaaac",
-"cccccccpaaaaaaaaaaaapfhhhkhhhbjjjelpaaaaaaaaaacc",
-"cccccccpppaaaaaaaaaapljjjjjjjjjjjdppaaaaaaapcccc",
-"ccccccclpppppppaaaappfejjjjjjjjjjdlpaaaapplccccc",
-"ccccccci```lllpppppplfejj```````jdfppppplccccccc",
-"ccccccccccccccffllllffccccccccccccdlplplcccccccc",
-"cccccccccccccccccdfdfccccccccccccccdffdccccccccc"
-};
+/* XPM */
+static char *noname[] = {
+/* width height ncolors chars_per_pixel */
+"48 48 18 1",
+/* colors */
+"` c #000000",
+"a c #F3BD14",
+"b c #828796",
+"c c #B2C0DC",
+"d c #221C1D",
+"e c #160011",
+"f c #685A5E",
+"g c #A0A3AC",
+"h c #F6F6F3",
+"i c #6E727E",
+"j c #040304",
+"k c #FCFCF7",
+"l c #A28359",
+"m c #DFCF80",
+"n c #E3EDF1",
+"o c #FFFFFF",
+"p c #E1B11E",
+"q c #EEEEED",
+/* pixels */
+"cccccccccccccccccccccccjjjjjjjjccccccccccccccccc",
+"ccnooooooooooooooooooojjjjjjjffjoooooooooooooodc",
+"cnqqqnqqqnqqqnqqqnqqqjjjjjjjjjfdjqqqqqnqhhhhhidc",
+"conqnhnqnhnqnhnqnhnqjjjjjejjjjjjjjnnqnhnhhhhhidc",
+"coqnqqqnqqqnqqqnqqqnjjjjjjjjjjjjjjqqnqqqhhhhgidc",
+"conhnqnhnqnhnqnhnqnhjjjdjjjjjjjjjjjnhnqnnhhggidc",
+"coqqqn``````````````jdgidjjigcfdjjj``````fgggidc",
+"conqnh`iiiiiiiibibbbjhnhhjdqhhgjjjjbbbbbiobggidc",
+"coqnqq`iiiiiiibbbbbbjcjdhddhjbhdjjjff`diioggcidc",
+"conhnq`iiiibbbbbgbggjcjdfdehjbnfjjjf`dffiogcgidc",
+"coqqqn`iiibbbbbbggggjdflaaaajihjjjjeeddfiocggidc",
+"conqnh`iibbbggggggggjjpaaaaaappjjjj`ddffiogcgidc",
+"coqnqq`ibbbbbgggggggjlpaaaaaappejjjddfffiocggidc",
+"conhnq`ibbbgggbggbggjdpaaaaalppjjdjffffiiogggidc",
+"coqqqn`ibbbgggbggbggdifpaalpppmdjjfjffiiiogggidc",
+"conqnh`bbbggggggggggdbclpppgmcncjjjjdiiiiogggidc",
+"coqnqq`ibbbgggbggbggjbncllgcchhhdjjjjiiiiogggidc",
+"conhnq`bbbgggggggggdjqhccccnhhhhqjjejjiiiogggiec",
+"coqqqn`ibbbbggbbgbdjghkhcchhhhhhkjjjjjiiiogggfdc",
+"conqnh`ibbgbgggbgbjdhhhhhhhhkhhhhgjjjjjiiogggiec",
+"coqnqq`ibbbbbgbgcjjbhhhkkhkkhhhhhqjjjjjjiogggfdc",
+"conhnq`iibbbbbggjjjgcqhhnnhhhccccndjjjjjdogggiec",
+"coqqqn`iiibbbbbbjjdckhhhqhhhkhhncchjdjjjjogggfec",
+"conqnh`iiibbbbbjjjghhkqhhhhhhhhhkncjjjjjjjggbfec",
+"coqnqq`iiiiibbbjdjhhhkkkhhhhkhhkhknnjjjjjjgggfec",
+"conhnq`iiiiiibijjbhhhhkhhhkkhhhhhkhhdjjjjjbgbfjc",
+"coqqqn`iiiiiiijdjhhhhkhqhkhhhkhhkhkhdjjjjjjbbfec",
+"conqnn`iiiiiiijjfhhhhhhnkhkhhhhhhhhhfjjjjjjgbfjc",
+"coqnqn`iiiiiijjjchhkhkhnhhhhhhkhhhhhbjjjjjjbbfec",
+"connnn`iiiiiijdjqhhhkhhnhhhhhhkkhhhhgjjjjjjjbf`c",
+"coqnnn`iiiiijjdjqhhhhkhnhhhhkhhkhhkhcjjjjjjjbfec",
+"connnn`iiiiijjdjnhhkhhhnkhhhhhhhhhhhnjjjjjjjbf`c",
+"connnngooooojpfdhkhhhkhnhhhhhhhhhhhhbdjjjjjjbf`c",
+"connnnncncccpaalfhkhkhhnhhhhhhhhhhmpljjjjjjbbf`c",
+"connncnccccmpaaafdhhhhknhhhhhhhhhhpapjjjjjpabf`c",
+"connncccccmppaaaaejqhhhhhhhkhhhhhhpapejjjfaaif`c",
+"cogiiiiilpppaaaaapjjnhkhkhhhhhkhhcpaplddlpaaff`c",
+"ci`````ppaaaaaaaaadjjfqhhhhhkhhhhclppppppaaaa``c",
+"cccccccaaaaaaaaaaapejjqhhhhhhhhhkclpppppaaaaaacc",
+"cccccccpaaaaaaaaaaaljjqkhhhhhhkhhglpaaaaaaaaaapc",
+"cccccccpaaaaaaaaaaaamhhhhkhhhhhhgjlpaaaaaaaaaaaa",
+"cccccccpaaaaaaaaaaaapqhhkkhhhhhdjelpaaaaaaaaaaac",
+"cccccccpaaaaaaaaaaaapfhhhkhhhbjjjelpaaaaaaaaaacc",
+"cccccccpppaaaaaaaaaapljjjjjjjjjjjdppaaaaaaapcccc",
+"ccccccclpppppppaaaappfejjjjjjjjjjdlpaaaapplccccc",
+"ccccccci```lllpppppplfejj```````jdfppppplccccccc",
+"ccccccccccccccffllllffccccccccccccdlplplcccccccc",
+"cccccccccccccccccdfdfccccccccccccccdffdccccccccc"
+};
diff --git a/x11/aterm/Makefile b/x11/aterm/Makefile
index 42a6ff5..af04a62 100644
--- a/x11/aterm/Makefile
+++ b/x11/aterm/Makefile
@@ -12,6 +12,9 @@ COMMENT= Color vt102 terminal emulator with transparency support
MAKE_JOBS_UNSAFE= yes
+USES= dos2unix
+DOS2UNIX_FILES= src/rxvt.h
+
USE_XORG= xpm
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-wtmp \
diff --git a/x11/aterm/files/patch-cutToBeginningOfLine b/x11/aterm/files/patch-cutToBeginningOfLine
index 2be191d..4f70287 100644
--- a/x11/aterm/files/patch-cutToBeginningOfLine
+++ b/x11/aterm/files/patch-cutToBeginningOfLine
@@ -2,13 +2,13 @@ diff -urNad aterm-1.0.1~/src/rxvt.h src/rxvt.h
--- src/rxvt.h 2007-08-03 23:55:28.000000000 +0200
+++ src/rxvt.h 2007-08-03 23:56:36.000000000 +0200
@@ -784,6 +784,7 @@
- #define Opt_scrollKeypress (1LU<<12)
- #define Opt_transparent (1LU<<13)
- #define Opt_transparent_sb (1LU<<14)
-+#define Opt_cutToBeginningOfLine (1LU<<15)
- #define Opt_borderLess (1LU<<16)
-
- /* place holder used for parsing command-line options */
+ #define Opt_scrollKeypress (1LU<<12)
+ #define Opt_transparent (1LU<<13)
+ #define Opt_transparent_sb (1LU<<14)
++#define Opt_cutToBeginningOfLine (1LU<<15)
+ #define Opt_borderLess (1LU<<16)
+
+ /* place holder used for parsing command-line options */
diff -urNad aterm-1.0.1~/src/screen.c src/screen.c
--- aterm-1.0.1~/src/screen.c 2007-08-03 23:55:28.000000000 +0200
+++ src/screen.c 2007-08-04 00:02:35.000000000 +0200
diff --git a/x11/aterm/files/patch-eterm_transparency b/x11/aterm/files/patch-eterm_transparency
index 0c4e6b0..c4ea4fb 100644
--- a/x11/aterm/files/patch-eterm_transparency
+++ b/x11/aterm/files/patch-eterm_transparency
@@ -62,13 +62,13 @@ diff -urNad aterm-1.0.1~/src/rxvt.h src/rxvt.h
--- aterm-1.0.1~/src/rxvt.h 2007-08-04 00:05:30.000000000 +0200
+++ src/rxvt.h 2007-08-04 00:10:31.000000000 +0200
@@ -807,6 +807,7 @@
- /*
- * rxvt extensions of XTerm escape sequences: ESC ] Ps;Pt BEL
- */
-+#define XTerm_EtermSeq 6 /* Eterm proprietary escape sequences */
- #define XTerm_Menu 10 /* set menu item */
- #define XTerm_Pixmap 20 /* new bg pixmap */
- #define XTerm_restoreFG 39 /* change default fg color */
+ /*
+ * rxvt extensions of XTerm escape sequences: ESC ] Ps;Pt BEL
+ */
++#define XTerm_EtermSeq 6 /* Eterm proprietary escape sequences */
+ #define XTerm_Menu 10 /* set menu item */
+ #define XTerm_Pixmap 20 /* new bg pixmap */
+ #define XTerm_restoreFG 39 /* change default fg color */
diff -urNad aterm-1.0.1~/src/screen.c src/screen.c
--- aterm-1.0.1~/src/screen.c 2007-08-04 00:05:30.000000000 +0200
+++ src/screen.c 2007-08-04 00:15:22.000000000 +0200
diff --git a/x11/imwheel/Makefile b/x11/imwheel/Makefile
index 566ab35..f47b2a5 100644
--- a/x11/imwheel/Makefile
+++ b/x11/imwheel/Makefile
@@ -15,7 +15,8 @@ LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
USE_XORG= x11 xpm xtst xext xmu
-USES= gmake
+USES= dos2unix gmake
+DOS2UNIX_FILES= getopt/getopt.c
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-gpm
diff --git a/x11/imwheel/files/patch-Makefile.in b/x11/imwheel/files/patch-Makefile.in
index ea5f4bb..a6bd1d2 100644
--- a/x11/imwheel/files/patch-Makefile.in
+++ b/x11/imwheel/files/patch-Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.orig 2004-08-29 18:36:33.000000000 +0800
-+++ Makefile.in 2014-01-09 21:48:23.000000000 +0800
+--- Makefile.in.orig 2004-08-29 10:36:33 UTC
++++ Makefile.in
@@ -215,7 +215,7 @@ imwheel_LDADD = @GETOPT_LIBS@ -L$(top_bu
imwheel_DEPENDENCIES = imwheel.o util.o cfg.o jax/libjax.a
man_MANS = imwheel.1
diff --git a/x11/imwheel/files/patch-getopt__Makefile.in b/x11/imwheel/files/patch-getopt_Makefile.in
index b1e87ba..9254a81 100644
--- a/x11/imwheel/files/patch-getopt__Makefile.in
+++ b/x11/imwheel/files/patch-getopt_Makefile.in
@@ -1,6 +1,6 @@
---- getopt/Makefile.in.orig Sun Aug 29 06:33:21 2004
-+++ getopt/Makefile.in Sun Nov 7 08:57:49 2004
-@@ -161,7 +161,7 @@
+--- getopt/Makefile.in.orig 2004-08-29 10:33:21 UTC
++++ getopt/Makefile.in
+@@ -161,7 +161,7 @@ subdirs = @subdirs@
suid = @suid@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
@@ -9,4 +9,3 @@
noinst_LIBRARIES = libgetopt.a
libgetopt_a_SOURCES = getopt.c getopt1.c getopt.h
EXTRA_DIST = Makefile.unix
-
diff --git a/x11/imwheel/files/patch-getopt__getopt.c b/x11/imwheel/files/patch-getopt_getopt.c
index 47198b7..aa8b79e 100644
--- a/x11/imwheel/files/patch-getopt__getopt.c
+++ b/x11/imwheel/files/patch-getopt_getopt.c
@@ -1,16 +1,16 @@
---- getopt/getopt.c.orig Tue Apr 6 05:22:57 1999
-+++ getopt/getopt.c Fri Jun 29 01:22:22 2001
-@@ -166,11 +166,12 @@
- /* Value of POSIXLY_CORRECT environment variable. */
- static char *posixly_correct;
-
--#ifdef __GNU_LIBRARY__
-+#if defined(__GNU_LIBRARY__) || defined(__FreeBSD__)
- /* We want to avoid inclusion of string.h with non-GNU libraries
- because there are many ways it can cause trouble.
- On some systems, it contains special magic macros that don't work
- in GCC. */
-+#include <stdlib.h>
- #include <string.h>
- #define my_index strchr
- #else
+--- getopt/getopt.c.orig 2016-06-20 12:59:05 UTC
++++ getopt/getopt.c
+@@ -166,11 +166,12 @@ static enum
+ /* Value of POSIXLY_CORRECT environment variable. */
+ static char *posixly_correct;
+
+-#ifdef __GNU_LIBRARY__
++#if defined(__GNU_LIBRARY__) || defined(__FreeBSD__)
+ /* We want to avoid inclusion of string.h with non-GNU libraries
+ because there are many ways it can cause trouble.
+ On some systems, it contains special magic macros that don't work
+ in GCC. */
++#include <stdlib.h>
+ #include <string.h>
+ #define my_index strchr
+ #else
diff --git a/x11/imwheel/files/patch-imwheel.1 b/x11/imwheel/files/patch-imwheel.1
index b8dad75..b757dd4 100644
--- a/x11/imwheel/files/patch-imwheel.1
+++ b/x11/imwheel/files/patch-imwheel.1
@@ -1,6 +1,6 @@
---- imwheel.1.orig Sun Nov 7 08:47:14 2004
-+++ imwheel.1 Sun Nov 7 08:49:03 2004
-@@ -329,7 +329,7 @@
+--- imwheel.1.orig 2004-06-10 01:41:49 UTC
++++ imwheel.1
+@@ -329,7 +329,7 @@ sum = 0
.fi
.RE
.SH "IMWHEELRC"
@@ -9,13 +9,12 @@
which is used for everybody. The other is $HOME/.imwheelrc, used only for one
user. One is supplied and should have been installed automatically in /etc/X11/imwheel/
if not also in the installing users $HOME as well. All whitespace is ignored
-@@ -671,7 +671,7 @@
+@@ -671,7 +671,7 @@ Jonathan Atkins <jcatki@jonatkins.org>
$HOME/.imwheelrc
- The users configuration file.
-
+ The users configuration file.
+
-/etc/X11/imwheel/imwheelrc
+%%PREFIX%%/etc/imwheelrc
- The global location for the configuration
- file, it is always loaded. Overided by
- the users configuration file.
-
+ The global location for the configuration
+ file, it is always loaded. Overided by
+ the users configuration file.
diff --git a/x11/imwheel/files/patch-imwheelrc b/x11/imwheel/files/patch-imwheelrc
index 8aa449a..ee374d6 100644
--- a/x11/imwheel/files/patch-imwheelrc
+++ b/x11/imwheel/files/patch-imwheelrc
@@ -1,6 +1,6 @@
---- imwheelrc.orig Wed Feb 23 15:14:20 2000
-+++ imwheelrc Wed Feb 23 15:25:12 2000
-@@ -34,6 +34,10 @@
+--- imwheelrc.orig 2004-06-10 01:41:49 UTC
++++ imwheelrc
+@@ -96,6 +96,10 @@ Control_L, Down, C
None, Down, KP_Subtract
None, Up, KP_Add
@@ -11,7 +11,7 @@
"^Xman"
None, Down, F
Shift_L, Down, 3
-@@ -52,14 +56,14 @@
+@@ -138,14 +142,14 @@ None, Up, Shift_L|Page_Up
None, Down, Shift_L|Page_Down
"^rxvt"
@@ -31,4 +31,4 @@
+None, Right, Control_L|E
#Shift_L, Down, Shift_L|1
- "^Netscape"
+ "^VMware"
diff --git a/x11/imwheel/files/patch-util.c b/x11/imwheel/files/patch-util.c
index 7bac752..fa67129 100644
--- a/x11/imwheel/files/patch-util.c
+++ b/x11/imwheel/files/patch-util.c
@@ -1,12 +1,11 @@
---- util.c.orig Sun Aug 29 06:21:46 2004
-+++ util.c Sun Nov 7 09:10:33 2004
-@@ -735,7 +735,7 @@
-
+--- util.c.orig 2004-08-29 10:21:46 UTC
++++ util.c
+@@ -735,7 +735,7 @@ int file_allowed(char *fname)
+
struct WinAction *getRC()
{
- char fname[2][1024]={"","/etc/X11/imwheel/imwheelrc"}, line[1024], *p, *q, winid[1024];
+ char fname[2][1024]={"","/usr/X11R6/etc/imwheelrc"}, line[1024], *p, *q, winid[1024];
- int fi,i;
- struct WinAction *newwa=NULL;
- FILE *f=NULL;
-
+ int fi,i;
+ struct WinAction *newwa=NULL;
+ FILE *f=NULL;
OpenPOWER on IntegriCloud