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

2 files changed, 145 insertions, 145 deletions

diff --git a/x11-wm/afterstep/files/AFstep.xpm b/x11-wm/afterstep/files/AFstep.xpm
index 2f07b6bebc58..fd96ea6bc8d8 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 13401bd352b6..c7282cf09414 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"
+};