15 files changed, 57 insertions, 29 deletions
diff --git a/wm/afterstep/distinfo b/wm/afterstep/distinfo
index c8929ac39bf..7409c343697 100644
--- a/wm/afterstep/distinfo
+++ b/wm/afterstep/distinfo
@@ -1,35 +1,35 @@
-$NetBSD: distinfo,v 1.20 2016/05/01 19:26:34 dholland Exp $
+$NetBSD: distinfo,v 1.21 2016/05/01 19:30:58 dholland Exp $
 
 SHA1 (AfterStep-2.2.11.tar.bz2) = ecfd815b659046281530441af0bc4fc42900d0da
 RMD160 (AfterStep-2.2.11.tar.bz2) = a82a4b3fddcbcd97862212669c11d14629e51a4d
 SHA512 (AfterStep-2.2.11.tar.bz2) = cf6663427656162f20cce596f63c7368c66fb336d5865dda5127f5aae123c61d647444336cc4c339ae6c64e5f25e837c0ba8889d30b1298ef26569505e0ff3d9
 Size (AfterStep-2.2.11.tar.bz2) = 6126237 bytes
-SHA1 (patch-aa) = c903ca64b609e4270ead1f1e03cb6ea962b294f8
-SHA1 (patch-afterstep_desktop_desklets_desklet.display) = 8aa9d8e11514086849f1815c838c64c5d538efbf
-SHA1 (patch-configure) = 081192b46d025d9da4c5bc1bbb1e65717a8ed655
-SHA1 (patch-libAfterBase_ashash.c) = 36a1e19a017186aac7829071fa551eb6fe187609
-SHA1 (patch-libAfterBase_asvector.c) = d892e192304a23f32d2c088932f3777b36a026d4
-SHA1 (patch-libAfterBase_asvector.h) = d96a967b81d47c3c4a3c1f82e4e8e42fc2e15d7b
+SHA1 (patch-aa) = 1103686bde4a2b9a071768f4f9447b8192eb3c46
+SHA1 (patch-afterstep_desktop_desklets_desklet.display) = 40c5db3f72cdb7d0a0f6adc43fa9b7968176f47e
+SHA1 (patch-configure) = 14a32d22e101ac43c53b7356333e13f94af5d260
+SHA1 (patch-libAfterBase_ashash.c) = 12f63117a4a3187b85bbcf868483f9b95309985d
+SHA1 (patch-libAfterBase_asvector.c) = b4feb2a0f10110464d798f1ea405fd4a40490e52
+SHA1 (patch-libAfterBase_asvector.h) = f1c775e576dcdbbd8fa73a4fd362dc6e17d84b58
 SHA1 (patch-libAfterBase_output.c) = fe0d9b4cbe3c2d1eac50e4c4c0d6fbd3b8b7487f
 SHA1 (patch-libAfterBase_parse.c) = aba8ed0b11821ed09ded8833140c250abf6ea6da
-SHA1 (patch-libAfterBase_parse.h) = 18dfeb9444a7760df18a41069557b01b8b723c3b
+SHA1 (patch-libAfterBase_parse.h) = 5e2e0a1b3351f7d3b7d84076879e3827d47e3f24
 SHA1 (patch-libAfterConf_Color.c) = 346f16a2ea539cb0ff352b73ba1f60d522efea00
-SHA1 (patch-libAfterConf_DesktopEntry.c) = 18ef3043768e8dc49c7147752649ce9cfe86d3f4
-SHA1 (patch-libAfterImage_asfont.c) = f7ed285b39ba13126531b3e755e20895b1c3857b
+SHA1 (patch-libAfterConf_DesktopEntry.c) = 57b8ff21093434434711d05ad2054c1415de0ca3
+SHA1 (patch-libAfterImage_asfont.c) = 4fd6498495855c2909530ac5e34accb715b48497
 SHA1 (patch-libAfterImage_export.c) = 0b450561673cb3351c2f8685ba7357cc6a1de366
 SHA1 (patch-libAfterImage_import.c) = 57fdfec498ba05aa6d52470c545d1c9958095435
 SHA1 (patch-libAfterStep_asapp.c) = 3d23d40b862aca272aac3e35574f6bf99cbc8e0a
 SHA1 (patch-libAfterStep_font.c) = e47477b5d0a0b54af19d603eb37937dbfa24dd19
 SHA1 (patch-libAfterStep_freestor.c) = e66249ff9edc2f7441e406aa34db923420b201d6
 SHA1 (patch-libAfterStep_functions.c) = a01482b2eff7d659afc98aa028191cca65465d0b
-SHA1 (patch-libAfterStep_functions.h) = 501e1a95419a8933b918f7d8df28df38e810f69a
+SHA1 (patch-libAfterStep_functions.h) = 3561109e4adcffbc2052a1f2a358ffe7cc2d9147
 SHA1 (patch-libAfterStep_hints.c) = 78e336ce1350f6d98ad984fd2d7054449f0d609f
 SHA1 (patch-libAfterStep_kde.c) = 3e10900fe71d659afb99c9580f32829d1483d81f
-SHA1 (patch-libAfterStep_mylook.c) = 56dea9a5acb65dee3faa5adf350c8901bbd495e2
-SHA1 (patch-libAfterStep_mylook.h) = 8fede622d4737510880b88c3cf4b94f13e4892f1
+SHA1 (patch-libAfterStep_mylook.c) = 370a371ca60ee19247e768a5b6efc04d5dfe65ce
+SHA1 (patch-libAfterStep_mylook.h) = 0ebab667d7e03f211f9b4e68ccef2452b49ff9db
 SHA1 (patch-libAfterStep_parser.c) = 668f28c566156fb627482d558d3eb2bb5707c92b
 SHA1 (patch-libAfterStep_parser__xml.c) = d78190be5f4d05b849c92870782c780e9e951d83
 SHA1 (patch-src_ASDocGen_Makefile.in) = 36185b1db36dfda33ef1503d55855e9bbf1ea286
 SHA1 (patch-src_Animate_Makefile.in) = 5a0db32f7e6acc70cd8778b9d6c2d8d8b379acc9
-SHA1 (patch-src_afterstep_asinternals.h) = c19f912d19635dba8c8e07e9ccf7b7463728c9ef
-SHA1 (patch-src_afterstep_misc.c) = 5aad3beb297d64896f286a1eebc5f0d931993c3f
+SHA1 (patch-src_afterstep_asinternals.h) = a93d68540c38880f58cecedb56119dd852323307
+SHA1 (patch-src_afterstep_misc.c) = 1e6ad6bf58bff03caf35e3fb374f9b45924bd869
diff --git a/wm/afterstep/patches/patch-aa b/wm/afterstep/patches/patch-aa
index ed5df4529cd..f5ee8e5d1b3 100644
--- a/wm/afterstep/patches/patch-aa
+++ b/wm/afterstep/patches/patch-aa
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.5 2005/12/06 13:14:06 joerg Exp $
+$NetBSD: patch-aa,v 1.6 2016/05/01 19:30:58 dholland Exp $
+
+Don't declare own errno.
 
 --- src/afterstep/module.c.orig	2005-12-06 12:58:56.000000000 +0000
 +++ src/afterstep/module.c
diff --git a/wm/afterstep/patches/patch-afterstep_desktop_desklets_desklet.display b/wm/afterstep/patches/patch-afterstep_desktop_desklets_desklet.display
index c9c79766a2c..93ca8c65784 100644
--- a/wm/afterstep/patches/patch-afterstep_desktop_desklets_desklet.display
+++ b/wm/afterstep/patches/patch-afterstep_desktop_desklets_desklet.display
@@ -1,5 +1,7 @@
-$NetBSD: patch-afterstep_desktop_desklets_desklet.display,v 1.1 2013/04/07 10:36:54 cheusov Exp $
+$NetBSD: patch-afterstep_desktop_desklets_desklet.display,v 1.2 2016/05/01 19:30:58 dholland Exp $
+
 * fix bash-ism
+
 --- afterstep/desktop/desklets/desklet.display.orig	2007-09-12 15:33:23.000000000 +0000
 +++ afterstep/desktop/desklets/desklet.display
 @@ -8,7 +8,7 @@ then
diff --git a/wm/afterstep/patches/patch-configure b/wm/afterstep/patches/patch-configure
index 5d0b698c922..3363acba2e8 100644
--- a/wm/afterstep/patches/patch-configure
+++ b/wm/afterstep/patches/patch-configure
@@ -1,5 +1,7 @@
-$NetBSD: patch-configure,v 1.1 2013/04/07 10:36:54 cheusov Exp $
+$NetBSD: patch-configure,v 1.2 2016/05/01 19:30:58 dholland Exp $
+
 * fix bash-ism
+
 --- configure.orig	2011-01-13 19:27:10.000000000 +0000
 +++ configure
 @@ -1810,7 +1810,7 @@ fi;
diff --git a/wm/afterstep/patches/patch-libAfterBase_ashash.c b/wm/afterstep/patches/patch-libAfterBase_ashash.c
index 5133dff5358..28efb5e447d 100644
--- a/wm/afterstep/patches/patch-libAfterBase_ashash.c
+++ b/wm/afterstep/patches/patch-libAfterBase_ashash.c
@@ -1,4 +1,6 @@
-$NetBSD: patch-libAfterBase_ashash.c,v 1.2 2013/04/07 10:36:54 cheusov Exp $
+$NetBSD: patch-libAfterBase_ashash.c,v 1.3 2016/05/01 19:30:58 dholland Exp $
+
+Patch up gcc inline mess.
 
 --- libAfterBase/ashash.c.orig	2008-03-17 22:42:32.000000000 +0000
 +++ libAfterBase/ashash.c
diff --git a/wm/afterstep/patches/patch-libAfterBase_asvector.c b/wm/afterstep/patches/patch-libAfterBase_asvector.c
index 27e485b2d39..39479e95b71 100644
--- a/wm/afterstep/patches/patch-libAfterBase_asvector.c
+++ b/wm/afterstep/patches/patch-libAfterBase_asvector.c
@@ -1,4 +1,6 @@
-$NetBSD: patch-libAfterBase_asvector.c,v 1.2 2013/04/07 10:36:54 cheusov Exp $
+$NetBSD: patch-libAfterBase_asvector.c,v 1.3 2016/05/01 19:30:58 dholland Exp $
+
+Patch up gcc inline mess.
 
 --- libAfterBase/asvector.c.orig	2008-12-02 22:35:37.000000000 +0000
 +++ libAfterBase/asvector.c
diff --git a/wm/afterstep/patches/patch-libAfterBase_asvector.h b/wm/afterstep/patches/patch-libAfterBase_asvector.h
index d4edfbc074b..cd482c28144 100644
--- a/wm/afterstep/patches/patch-libAfterBase_asvector.h
+++ b/wm/afterstep/patches/patch-libAfterBase_asvector.h
@@ -1,4 +1,6 @@
-$NetBSD: patch-libAfterBase_asvector.h,v 1.2 2013/04/07 10:36:54 cheusov Exp $
+$NetBSD: patch-libAfterBase_asvector.h,v 1.3 2016/05/01 19:30:58 dholland Exp $
+
+Patch up gcc inline mess.
 
 --- libAfterBase/asvector.h.orig	2008-09-15 22:43:12.000000000 +0000
 +++ libAfterBase/asvector.h
diff --git a/wm/afterstep/patches/patch-libAfterBase_parse.h b/wm/afterstep/patches/patch-libAfterBase_parse.h
index 785e2389153..ce079a998df 100644
--- a/wm/afterstep/patches/patch-libAfterBase_parse.h
+++ b/wm/afterstep/patches/patch-libAfterBase_parse.h
@@ -1,4 +1,6 @@
-$NetBSD: patch-libAfterBase_parse.h,v 1.1 2013/06/26 21:17:45 joerg Exp $
+$NetBSD: patch-libAfterBase_parse.h,v 1.2 2016/05/01 19:30:58 dholland Exp $
+
+Patch up gcc inline mess.
 
 --- libAfterBase/parse.h.orig	2013-06-26 19:42:15.000000000 +0000
 +++ libAfterBase/parse.h
diff --git a/wm/afterstep/patches/patch-libAfterConf_DesktopEntry.c b/wm/afterstep/patches/patch-libAfterConf_DesktopEntry.c
index 5640e1109da..ead17962b57 100644
--- a/wm/afterstep/patches/patch-libAfterConf_DesktopEntry.c
+++ b/wm/afterstep/patches/patch-libAfterConf_DesktopEntry.c
@@ -1,4 +1,6 @@
-$NetBSD: patch-libAfterConf_DesktopEntry.c,v 1.1 2016/05/01 19:26:35 dholland Exp $
+$NetBSD: patch-libAfterConf_DesktopEntry.c,v 1.2 2016/05/01 19:30:58 dholland Exp $
+
+Use ctype.h correctly.
 
 --- libAfterConf/DesktopEntry.c~	2007-07-13 17:18:26.000000000 +0000
 +++ libAfterConf/DesktopEntry.c
diff --git a/wm/afterstep/patches/patch-libAfterImage_asfont.c b/wm/afterstep/patches/patch-libAfterImage_asfont.c
index d5fde178149..def7db2b7d4 100644
--- a/wm/afterstep/patches/patch-libAfterImage_asfont.c
+++ b/wm/afterstep/patches/patch-libAfterImage_asfont.c
@@ -1,4 +1,6 @@
-$NetBSD: patch-libAfterImage_asfont.c,v 1.2 2013/04/07 10:36:54 cheusov Exp $
+$NetBSD: patch-libAfterImage_asfont.c,v 1.3 2016/05/01 19:30:58 dholland Exp $
+
+Patch up gcc inline mess.
 
 --- libAfterImage/asfont.c.orig	2008-08-15 21:47:37.000000000 +0000
 +++ libAfterImage/asfont.c
diff --git a/wm/afterstep/patches/patch-libAfterStep_functions.h b/wm/afterstep/patches/patch-libAfterStep_functions.h
index b5778aca306..35308a835e6 100644
--- a/wm/afterstep/patches/patch-libAfterStep_functions.h
+++ b/wm/afterstep/patches/patch-libAfterStep_functions.h
@@ -1,4 +1,6 @@
-$NetBSD: patch-libAfterStep_functions.h,v 1.1 2012/05/04 16:36:10 joerg Exp $
+$NetBSD: patch-libAfterStep_functions.h,v 1.2 2016/05/01 19:30:58 dholland Exp $
+
+Patch up gcc inline mess.
 
 --- libAfterStep/functions.h.orig	2012-05-04 14:34:21.000000000 +0000
 +++ libAfterStep/functions.h
diff --git a/wm/afterstep/patches/patch-libAfterStep_mylook.c b/wm/afterstep/patches/patch-libAfterStep_mylook.c
index 7b0bbbfb3d3..8fb1c2d0a40 100644
--- a/wm/afterstep/patches/patch-libAfterStep_mylook.c
+++ b/wm/afterstep/patches/patch-libAfterStep_mylook.c
@@ -1,4 +1,6 @@
-$NetBSD: patch-libAfterStep_mylook.c,v 1.1 2012/05/04 16:36:11 joerg Exp $
+$NetBSD: patch-libAfterStep_mylook.c,v 1.2 2016/05/01 19:30:58 dholland Exp $
+
+Patch up gcc inline mess.
 
 --- libAfterStep/mylook.c.orig	2012-05-04 14:35:51.000000000 +0000
 +++ libAfterStep/mylook.c
diff --git a/wm/afterstep/patches/patch-libAfterStep_mylook.h b/wm/afterstep/patches/patch-libAfterStep_mylook.h
index ea1de432cdd..0eb259ea074 100644
--- a/wm/afterstep/patches/patch-libAfterStep_mylook.h
+++ b/wm/afterstep/patches/patch-libAfterStep_mylook.h
@@ -1,4 +1,6 @@
-$NetBSD: patch-libAfterStep_mylook.h,v 1.1 2012/05/04 16:36:11 joerg Exp $
+$NetBSD: patch-libAfterStep_mylook.h,v 1.2 2016/05/01 19:30:58 dholland Exp $
+
+Patch up gcc inline mess.
 
 --- libAfterStep/mylook.h.orig	2012-05-04 14:35:54.000000000 +0000
 +++ libAfterStep/mylook.h
diff --git a/wm/afterstep/patches/patch-src_afterstep_asinternals.h b/wm/afterstep/patches/patch-src_afterstep_asinternals.h
index c880734947d..9e8b0009d0d 100644
--- a/wm/afterstep/patches/patch-src_afterstep_asinternals.h
+++ b/wm/afterstep/patches/patch-src_afterstep_asinternals.h
@@ -1,4 +1,6 @@
-$NetBSD: patch-src_afterstep_asinternals.h,v 1.1 2012/05/04 16:36:11 joerg Exp $
+$NetBSD: patch-src_afterstep_asinternals.h,v 1.2 2016/05/01 19:30:58 dholland Exp $
+
+Patch up gcc inline mess.
 
 --- src/afterstep/asinternals.h.orig	2012-05-04 14:35:02.000000000 +0000
 +++ src/afterstep/asinternals.h
diff --git a/wm/afterstep/patches/patch-src_afterstep_misc.c b/wm/afterstep/patches/patch-src_afterstep_misc.c
index 8189413fca0..c5dbcd638fb 100644
--- a/wm/afterstep/patches/patch-src_afterstep_misc.c
+++ b/wm/afterstep/patches/patch-src_afterstep_misc.c
@@ -1,4 +1,6 @@
-$NetBSD: patch-src_afterstep_misc.c,v 1.1 2012/05/04 16:36:11 joerg Exp $
+$NetBSD: patch-src_afterstep_misc.c,v 1.2 2016/05/01 19:30:58 dholland Exp $
+
+Patch up gcc inline mess.
 
 --- src/afterstep/misc.c.orig	2012-05-04 14:35:08.000000000 +0000
 +++ src/afterstep/misc.c