USE_DOS2UNIX has been deprecated in favor of USES=dos2unix. Replace the code for this variable by an inclusion of this USES together with some compatibility glue code, and remove the describing comments at the top. Fix: Patch attached with submission follows:
Responsible Changed From-To: freebsd-ports-bugs->portmgr bsd.port.mk is portmgr territory (via the GNATS Auto Assign Tool)
Responsible Changed From-To: portmgr->rene Please reroll patch as it conflicts.
Responsible Changed From-To: rene->portmgr New patch available at http://people.freebsd.org/~rene/dos2unix.diff.txt
Responsible Changed From-To: portmgr->rene fetch: http://people.freebsd.org/~rene/dos2unix.diff.txt: Not Found
Responsible Changed From-To: rene->portmgr Correct URL: http://people.freebsd.org/~rene/patches/dos2unix.diff.txt
Responsible Changed From-To: portmgr->bdrewery take for exp-run
This still fails... > 1 open conditional: > at line 1152 (evaluated to true) > make: fatal errors encountered -- cannot continue -- Regards, Bryan Drewery
This is severely hurting extract performance. The exp-run should have been done by now but is only half completed. Note that 'make extract' is eating up cpu on yes(1) now: > 76235 root 1 96 0 120M 107M CPU10 10 2:36 77.10% pkg-static > 1341 root 1 94 0 9916K 1704K CPU27 27 519:07 69.78% yes > 42738 root 1 94 0 9916K 1704K CPU21 21 814:12 69.58% yes > 94555 root 1 94 0 9916K 1704K CPU22 22 417:10 69.38% yes > 96284 root 1 52 0 9916K 1704K RUN 27 164:45 69.38% yes > 73873 root 1 93 0 9916K 1704K CPU1 1 840:27 69.19% yes > 26047 root 1 93 0 9916K 1704K CPU15 15 545:49 69.09% yes > 30218 root 1 52 0 9916K 1704K RUN 30 370:06 69.09% yes > 22114 root 1 93 0 9916K 1704K CPU26 26 863:26 68.90% yes > 11783 root 1 93 0 9916K 1704K CPU9 9 702:55 68.90% yes > 81827 root 1 93 0 9916K 1704K CPU19 19 823:40 68.65% yes > 20041 root 1 93 0 9916K 1704K CPU17 17 798:57 68.55% yes > 79567 root 1 93 0 9916K 1704K CPU28 28 714:33 68.55% yes > 36691 root 1 93 0 9916K 1704K CPU18 18 439:15 68.55% yes > 29435 root 1 93 0 9916K 1704K CPU14 14 514:27 68.46% yes > 51141 root 1 93 0 9916K 1704K CPU8 8 820:32 68.36% yes > 33079 root 1 93 0 9916K 1704K CPU4 4 781:51 68.36% yes > 93890 root 1 93 0 9916K 1704K CPU2 2 474:43 68.36% yes > 86746 root 1 93 0 9916K 1704K CPU20 20 845:17 68.07% yes > 14291 root 1 93 0 9916K 1704K CPU23 23 704:27 68.07% yes > 84176 root 1 52 0 9916K 1704K RUN 12 867:53 67.97% yes > 32426 root 1 52 0 9916K 1704K RUN 0 801:04 67.97% yes > 62411 root 1 93 0 9916K 1704K CPU6 6 411:05 67.87% yes > 11289 root 1 93 0 9916K 1704K CPU30 30 873:24 67.77% yes > 96066 root 1 93 0 9916K 1704K CPU13 13 555:35 67.77% yes > 89481 root 1 93 0 9916K 1704K CPU7 7 894:36 67.68% yes > 52283 root 1 93 0 9916K 1704K CPU25 25 849:27 67.68% yes > 65708 root 1 93 0 9916K 1704K CPU3 3 531:33 67.68% yes > 49818 root 1 93 0 9916K 1704K CPU5 5 441:24 67.68% yes > 93920 root 1 93 0 9916K 1704K CPU11 11 750:01 67.58% yes > 1966 root 1 93 0 9916K 1704K CPU16 16 864:47 67.48% yes > 87220 root 1 91 0 34956K 30184K CPU31 31 0:20 60.60% pkg-static > > > ... > > root 78394 0.0 0.0 21084 5764 4 S+ 1:26PM 11:34.68 | | `-- /bin/sh /usr/local/share/poudriere/bulk.sh -j 91amd64 -z pr_184168 -ca > root 9566 0.0 0.0 21084 5760 4 I+ 6:00PM 0:00.08 | | |-- /bin/sh /usr/local/share/poudriere/bulk.sh -j 91amd64 -z pr_184168 -ca > root 11206 6.5 0.0 12260 1540 4 S+ 6:00PM 64:12.88 | | | |-- tee /poudriere/data/logs/bulk/91amd64-default-pr_184168/2013-12-11_13h26m45s/logs/pear-Image_Canvas-0.3.2 > root 14165 0.0 0.0 21084 5760 4 I+ 6:00PM 0:00.00 | | | `-- /bin/sh /usr/local/share/poudriere/bulk.sh -j 91amd64 -z pr_184168 -ca > root 14167 0.0 0.0 6276 1892 4 I+J 6:00PM 0:00.06 | | | `-- make -C /usr/ports/graphics/pear-Image_Canvas extract > root 14291 80.8 0.0 9916 1704 4 R+J 6:00PM 704:37.84 | | | `-- yes > root 13948 0.0 0.0 21084 5760 4 I+ 3:59PM 0:00.08 | | |-- /bin/sh /usr/local/share/poudriere/bulk.sh -j 91amd64 -z pr_184168 -ca > root 15538 6.1 0.0 12260 1540 4 S+ 3:59PM 72:44.93 | | | |-- tee /poudriere/data/logs/bulk/91amd64-default-pr_184168/2013-12-11_13h26m45s/logs/p5-Pod-Readme-0.11_1.lo > root 19721 0.0 0.0 21084 5760 4 I+ 3:59PM 0:00.00 | | | `-- /bin/sh /usr/local/share/poudriere/bulk.sh -j 91amd64 -z pr_184168 -ca > root 19724 0.0 0.0 6276 1876 4 I+J 3:59PM 0:00.05 | | | `-- make -C /usr/ports/textproc/p5-Pod-Readme extract > root 20041 81.3 0.0 9916 1704 4 R+J 3:59PM 799:07.43 | | | `-- yes > root 16104 0.0 0.0 21084 5760 4 I+ 2:44PM 0:00.12 | | |-- /bin/sh /usr/local/share/poudriere/bulk.sh -j 91amd64 -z pr_184168 -ca > root 17928 6.4 0.0 12260 1540 4 S+ 2:44PM 77:20.05 | | | |-- tee /poudriere/data/logs/bulk/91amd64-default-pr_184168/2013-12-11_13h26m45s/logs/py27-distorm-20121220.r > root 21681 0.0 0.0 21084 5760 4 I+ 2:44PM 0:00.00 | | | `-- /bin/sh /usr/local/share/poudriere/bulk.sh -j 91amd64 -z pr_184168 -ca > root 21684 0.0 0.0 6276 1988 4 I+J 2:44PM 0:00.07 | | | `-- make -C /usr/ports/devel/py-distorm extract > root 22114 81.0 0.0 9916 1704 4 R+J 2:44PM 863:37.06 | | | `-- yes -- Regards, Bryan Drewery
Using freefall:~rene/bsd.port.mk, http://package19.nyi.freebsd.org/bulk/91amd64-default-pr_184168/2013-12-16_02h33m35s new failures: > + {"origin"=>"archivers/paq", "pkgname"=>"paq-20130926", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"archivers/qpress", "pkgname"=>"qpress-1.1", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"archivers/xmill", "pkgname"=>"xmill-0.8", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"archivers/zip-ada", "pkgname"=>"zip-ada-45", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"archivers/zipmix", "pkgname"=>"zipmix-20070221", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"astro/fowsr", "pkgname"=>"fowsr-1.0.20100718", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"astro/gpstk", "pkgname"=>"gpstk-2.0", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"audio/hawkvoice", "pkgname"=>"hawkvoice-0.91", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"audio/libofa", "pkgname"=>"libofa-0.9.3_8", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"audio/mp3splt-gtk", "pkgname"=>"mp3splt-gtk-0.8.2", "phase"=>"package", "errortype"=>"cluster"} > + {"origin"=>"audio/playgsf", "pkgname"=>"playgsf-0.7.1_2", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"audio/portaudio", "pkgname"=>"portaudio-18.1_3", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"audio/stymulator", "pkgname"=>"stymulator-0.21.a_3", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"audio/wavegain", "pkgname"=>"wavegain-1.2.8", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"biology/muscle", "pkgname"=>"muscle-3.6", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"cad/kicad", "pkgname"=>"kicad-2010.05.05.b2356_4,1", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"cad/meshdev", "pkgname"=>"meshdev-0.5", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"chinese/fqterm", "pkgname"=>"zh-fqterm-0.9.3_8", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"comms/openobex", "pkgname"=>"openobex-1.7.1", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"comms/usrp", "pkgname"=>"usrp-3.4.3_1", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"databases/fastdb", "pkgname"=>"fastdb-3.73", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"databases/gigabase", "pkgname"=>"gigabase-3.86_1", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"databases/php-adodb-ext", "pkgname"=>"php-adodb-ext-5.04_2", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"deskutils/myitcrm", "pkgname"=>"myitcrm-0.2.9.3_1", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"devel/charva", "pkgname"=>"charva-1.1.4_5", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"devel/common_lib", "pkgname"=>"common_lib-3.3.4", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"devel/distorm", "pkgname"=>"distorm-20121220.r230_1", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"devel/esdl", "pkgname"=>"esdl-1.0.1_10", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"devel/love", "pkgname"=>"love-0.8.0_2", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"devel/love07", "pkgname"=>"love07-0.7.2_3", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"devel/love5", "pkgname"=>"love5-0.5.0_9", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"devel/luajava", "pkgname"=>"luajava-1.1_1", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"devel/mq4cpp", "pkgname"=>"mq4cpp-1.16", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"devel/py-distorm", "pkgname"=>"py27-distorm-20121220.r230", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"devel/sfml", "pkgname"=>"sfml-1.6_2", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"devel/tokamak", "pkgname"=>"tokamak-1.0.5a", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"dns/dnswall", "pkgname"=>"dnswall-0.1.4_1", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"dns/inadyn", "pkgname"=>"inadyn-1.96.2_3", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"editors/codelite", "pkgname"=>"codelite-5.2", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"games/apricots", "pkgname"=>"apricots-0.2.6_4", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"games/biniax2", "pkgname"=>"biniax2-1.30_6", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"games/brutalchess", "pkgname"=>"brutalchess-0.5.2_10", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"games/connectfive", "pkgname"=>"connectfive-1.0.2_5", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"games/egl", "pkgname"=>"egl-0.3.1_5", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"games/egoboo", "pkgname"=>"egoboo-2.7.5_8,1", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"games/f1spirit-remake", "pkgname"=>"f1spirit-remake-1.0_9", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"games/flobopuyo", "pkgname"=>"flobopuyo-0.20_12", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"games/glaxium", "pkgname"=>"glaxium-0.5_12", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"games/hllib", "pkgname"=>"hllib-2.4.4", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"games/jag", "pkgname"=>"jag-0.3.2_1", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"games/kiki", "pkgname"=>"kiki-1.0.2_14", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"games/megamario", "pkgname"=>"megamario-1.7", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"games/meqcc", "pkgname"=>"meqcc-1.4", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"games/meritous", "pkgname"=>"meritous-1.2_9", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"games/openastromenace", "pkgname"=>"openastromenace-1.2.0_11", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"games/openmortal", "pkgname"=>"openmortal-0.7_9", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"games/pink-pony", "pkgname"=>"pink-pony-1.2.1_9", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"games/q2pro", "pkgname"=>"q2pro-142_7", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"games/qccx", "pkgname"=>"qccx-1.0.0", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"games/quake2-3zb2", "pkgname"=>"quake2-3zb2-0.97_1", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"games/quake2-zaero", "pkgname"=>"quake2-zaero-1.1", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"games/quetoo", "pkgname"=>"quetoo-0.6.1_5", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"games/r1q2", "pkgname"=>"r1q2-7904_5", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"games/sdl-ball", "pkgname"=>"sdl-ball-1.01_7", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"games/solarconquest", "pkgname"=>"solarconquest-0.2_9", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"games/stransball2", "pkgname"=>"stransball2-1.5_6", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"games/untahris", "pkgname"=>"untahris-3.1_3", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"games/violetland", "pkgname"=>"violetland-0.4.3_2", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"games/whichwayisup", "pkgname"=>"whichwayisup-0.7.9_5", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"graphics/eos-movrec", "pkgname"=>"eos-movrec-0.3.2.b_1", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"graphics/flasm", "pkgname"=>"flasm-1.62", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"graphics/fli2gif", "pkgname"=>"fli2gif-1.1_1", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"graphics/glpng", "pkgname"=>"glpng-1.45_5", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"graphics/icat", "pkgname"=>"icat-0.4", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"graphics/jogamp-jogl", "pkgname"=>"jogamp-jogl-2.0.20100914", "phase"=>"build", "errortype"=>"cluster"} > + {"origin"=>"graphics/nomacs", "pkgname"=>"nomacs-1.6.0_1", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"graphics/opennurbs", "pkgname"=>"opennurbs-20121024_1", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"graphics/panomatic", "pkgname"=>"panomatic-0.9.4", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"graphics/pear-Image_Canvas", "pkgname"=>"pear-Image_Canvas-0.3.2_1", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"graphics/structuresynth", "pkgname"=>"structuresynth-1.5.0_2", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"graphics/svgalib", "pkgname"=>"svgalib-1.4.3_6", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"japanese/ajaxzip2-data", "pkgname"=>"ja-ajaxzip2-data-20131031", "phase"=>"build", "errortype"=>"cluster"} > + {"origin"=>"java/eclipse-devel", "pkgname"=>"eclipse-devel-4.2.0_4", "phase"=>"install", "errortype"=>"cluster"} > + {"origin"=>"lang/nqc", "pkgname"=>"nqc-3.1.r6", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"lang/ucc", "pkgname"=>"ucc-1.6.0", "phase"=>"build", "errortype"=>"cluster"} > + {"origin"=>"mail/davmail", "pkgname"=>"davmail-4.2.1", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"mail/thunderbird", "pkgname"=>"thunderbird-24.2.0", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"math/spblas", "pkgname"=>"spblas-1.02", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"multimedia/gpac-libgpac", "pkgname"=>"gpac-libgpac-0.5.0,1", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"multimedia/jmref", "pkgname"=>"jmref-18.4", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"multimedia/opencinematools", "pkgname"=>"opencinematools-1.1.2", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"net-im/gajim", "pkgname"=>"gajim-0.15.4", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"net-im/openfire", "pkgname"=>"openfire-3.8.2,1", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"net-p2p/azureus2", "pkgname"=>"azureus2-2.5.0.4_5", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"net-p2p/bnbt", "pkgname"=>"bnbt-8.5_1", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"net-p2p/retroshare", "pkgname"=>"retroshare-0.5.5a", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"net/arping", "pkgname"=>"arping-2.13", "phase"=>"fetch", "errortype"=>"fetch"} > + {"origin"=>"net/hawknl", "pkgname"=>"hawknl-1.68", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"net/libutp", "pkgname"=>"bittorrent-libutp-0.20120526", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"net/pktanon", "pkgname"=>"pktanon-1.4.0", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"net/rinetd", "pkgname"=>"rinetd-0.62_4", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"net/tn5250j", "pkgname"=>"tn5250j-0.6.0_3", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"net/wizd", "pkgname"=>"wizd-24_5", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"science/mpqc-mpich", "pkgname"=>"mpqc-mpich-2.3.1_17", "phase"=>"build", "errortype"=>"missing_header"} > + {"origin"=>"science/py-pydicom", "pkgname"=>"py27-pydicom-0.9.4.1", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"security/hmap", "pkgname"=>"hmap-0.1_1", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"security/libsparkcrypto", "pkgname"=>"libsparkcrypto-0.1.1_1", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"security/phpdeadlock", "pkgname"=>"phpdeadlock-1.01_1", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"security/rainbowcrack", "pkgname"=>"rainbowcrack-1.2", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"sysutils/ciso", "pkgname"=>"ciso-1.0.0_2", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"sysutils/cronolog", "pkgname"=>"cronolog-1.6.2_4", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"sysutils/memtest86+", "pkgname"=>"memtest86+-4.20_1", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"sysutils/weedit", "pkgname"=>"weedit-2.0.3", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"textproc/kmfl-european-latin", "pkgname"=>"kmfl-european-latin-1.6", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"textproc/kmfl-sil-ezra", "pkgname"=>"kmfl-sil-ezra-2.4_4", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"textproc/kmfl-sil-galatia", "pkgname"=>"kmfl-sil-galatia-1.03", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"textproc/kmfl-sil-ipa-unicode", "pkgname"=>"kmfl-sil-ipa-unicode-1.2_3", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"textproc/kmfl-sil-yi", "pkgname"=>"kmfl-sil-yi-20020903_3", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"textproc/kmfl-varamozhi-malayalam", "pkgname"=>"kmfl-varamozhi-malayalam-1.1.1_4", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"textproc/p5-SGML-Parser-OpenSP", "pkgname"=>"p5-SGML-Parser-OpenSP-0.994_2", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"www/firefox", "pkgname"=>"firefox-26.0,1", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"www/firefox-esr", "pkgname"=>"firefox-esr-24.2.0,1", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"www/libxul", "pkgname"=>"libxul-24.2.0", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"www/sahi", "pkgname"=>"sahi-3.5.2011.07.19", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"www/seamonkey", "pkgname"=>"seamonkey-2.23_1", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"www/tickr", "pkgname"=>"tickr-0.6.4", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"www/xpi-live_http_headers", "pkgname"=>"xpi-live_http_headers-0.17_3", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"x11-toolkits/hs-wxc", "pkgname"=>"hs-wxc-0.90.0.4_4", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"x11-toolkits/irrlicht", "pkgname"=>"irrlicht-1.8", "phase"=>"patch", "errortype"=>"patch"} > + {"origin"=>"x11-toolkits/mygui", "pkgname"=>"mygui-3.2.0_1", "phase"=>"patch", "errortype"=>"patch"} -- Regards, Bryan Drewery
Responsible Changed From-To: bdrewery->rene back to rene
New patch at http://people.freebsd.org/~rene/patches/dos2unix.diff.txt If patching fails (patch generated with 'svn diff'), try http://people.freebsd.org/~patches/bsd.port.mk (r337137) - Slightly change logic for USE_DOS2UNIX=3DYES case (use DOS2UNIX_REGEX instead of _DOS2UNIX_ALL and follow original if/else flow) - Move block above the code that includes the USES files so that dos2unix.mk actually gets included. Ren=E9
Responsible Changed From-To: rene->bdrewery take back...
Responsible Changed From-To: bdrewery->rene approved, please commit
Author: rene Date: Tue Dec 24 10:22:26 2013 New Revision: 337333 URL: http://svnweb.freebsd.org/changeset/ports/337333 Log: - Replace USE_DOS2UNIX target by a wrapper for USES=dos2unix - Remove comments for USE_DOS2UNIX This makes bsd.port.mk line-ending clean. PR: ports/184168 Submitted by: myself Approved by: portmgr (bdrewery) Exp-runs by: bdrewery Modified: head/Mk/bsd.port.mk Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Tue Dec 24 10:21:56 2013 (r337332) +++ head/Mk/bsd.port.mk Tue Dec 24 10:22:26 2013 (r337333) @@ -336,12 +336,6 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # for compression. # USE_MAKESELF - If set, this port distfile uses makeself, not tar w/[bg]zip # for compression. -# USE_DOS2UNIX - If set to "YES", remove the ^M from all files -# under ${WRKSRC}. If set to a string, remove in all -# files under ${WRKSRC} with one of these names the ^Ms. -# DOS2UNIX_REGEX -# - Limit the ^M removal to files which name matches -# the regular expression. # USE_GCC - If set, this port requires this version of gcc, either in # the system or installed from a port. # USE_CSTD - Override the default C language standard (gnu89, gnu99) @@ -1304,8 +1298,6 @@ UNIQUENAME?= ${PKGNAMEPREFIX}${PORTNAME} .endif -DOS2UNIX_REGEX?= .* - # At least KDE needs TMPDIR for the package building, # so we're setting it to the known default value. .if defined(PACKAGE_BUILDING) @@ -1513,6 +1505,19 @@ PKGCOMPATDIR?= ${LOCALBASE}/lib/compat/ USES+= gmake .endif +.if defined(USE_DOS2UNIX) +.if ${USE_DOS2UNIX:U}=="YES" +DOS2UNIX_REGEX?= .* +.else +.if ${USE_DOS2UNIX:M*/*} +DOS2UNIX_FILES+= ${USE_DOS2UNIX} +.else +DOS2UNIX_GLOB+= ${USE_DOS2UNIX} +.endif +.endif +USES+= dos2unix +.endif + .if !defined(UID) UID!= ${ID} -u .endif @@ -3626,31 +3631,6 @@ do-extract: # Patch -.if !target(patch-dos2unix) -patch-dos2unix: -.if defined(USE_DOS2UNIX) -.if ${USE_DOS2UNIX:U}=="YES" - @${ECHO_MSG} "===> Converting DOS text files to UNIX text files" - @${FIND} -E ${WRKSRC} -type f -iregex '${DOS2UNIX_REGEX}' -print0 | \ - ${XARGS} -0 ${REINPLACE_CMD} -i '' -e 's/ $$//' -.else -.if ${USE_DOS2UNIX:M*/*} -.for f in ${USE_DOS2UNIX} - @${ECHO_MSG} "===> Converting DOS text file to UNIX text file: ${f}" - @${REINPLACE_CMD} -i '' -e 's/ $$//' ${WRKSRC}/${f} -.endfor -.else -.for f in ${USE_DOS2UNIX} - @${FIND} ${WRKSRC} -type f -name '${f}' -print0 | \ - ${XARGS} -0 ${REINPLACE_CMD} -i '' -e 's/ $$//' -.endfor -.endif -.endif -.else - @${DO_NADA} -.endif -.endif - .if !target(do-patch) do-patch: .if defined(PATCHFILES) @@ -4410,7 +4390,7 @@ _EXTRACT_SEQ= check-build-conflicts extr pre-extract pre-extract-script do-extract \ post-extract post-extract-script _PATCH_DEP= extract -_PATCH_SEQ= ask-license patch-message patch-depends patch-dos2unix pre-patch \ +_PATCH_SEQ= ask-license patch-message patch-depends pre-patch \ pre-patch-script do-patch post-patch post-patch-script _CONFIGURE_DEP= patch _CONFIGURE_SEQ= build-depends lib-depends configure-message run-autotools-fixup \ _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed Committed, thanks for all your patience.