===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/hackathons.html,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- www/hackathons.html	2018/04/01 00:05:10	1.123
+++ www/hackathons.html	2018/04/25 19:22:00	1.124
@@ -71,6 +71,16 @@
 <tr><td bgcolor="#000000" colspan="3"></td>
 </tr><tr valign="top">
 <td>
+    <a id="p2k18" href="images/hackathons/p2k18.gif">
+    <img src="images/hackathons/p2k18-s.gif"></a><br>
+    p2k18: ports (and pledge) hackathon<br>
+    Apr 23-29, 2018<br>
+    Dunedin, New Zealand<br>
+    24 developers<br>
+    Funded by <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>
+    and with the support of <a href="http://www.epitech.eu">Epitech Nantes</a>.
+</td>
+<td>
     <a id="a2k18" href="images/hackathons/a2k18.gif">
     <img src="images/hackathons/a2k18-s.gif"></a><br>
     a2k18: antipodean hackathon<br>
@@ -90,6 +100,8 @@
     Funded by <a href="http://www.foretell.ca">ForeTell Technologies</a>
     and with the support of <a href="http://www.xplornet.ca">Xplornet</a>.
 </td>
+</tr><tr><td bgcolor="#000000" colspan="3"></td>
+</tr><tr valign="top">
 <td>
     <a id="p2k17" href="images/hackathons/p2k17.gif">
     <img src="images/hackathons/p2k17-s.gif"></a><br>
@@ -101,8 +113,6 @@
     with the support of <a href="http://www.in-berlin.de">IN-Berlin</a> and
     <a href="http://www.hostserver.de/">Hostserver</a>.
 </td>
-</tr><tr><td bgcolor="#000000" colspan="3"></td>
-</tr><tr valign="top">
 <td>
     <a id="t2k17" href="images/hackathons/t2k17.jpg">
     <img src="images/hackathons/t2k17-s.gif"></a><br>
@@ -123,6 +133,8 @@
     Funded by <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>
     and with the support of <a href="http://www.genua.de">genua</a>.
 </td>
+</tr><tr><td bgcolor="#000000" colspan="3"></td>
+</tr><tr valign="top">
 <td>
     <a id="noshirt" href="images/hackathons/noshirt-s.gif">
     <img src="images/hackathons/noshirt-s.gif"></a><br>
@@ -132,8 +144,6 @@
     5 developers<br>
     With the support of Bob Beck.
 </td>
-</tr><tr><td bgcolor="#000000" colspan="3"></td>
-</tr><tr valign="top">
 <td>
     <a id="a2k17" href="images/hackathons/a2k17.gif">
     <img src="images/hackathons/a2k17-s.gif"></a><br>
@@ -166,6 +176,8 @@
     with the help of <a href="http://www.enseeiht.fr">ENSEEIHT</a> and
     <a href="http://www.objectif-libre.com">Objectif Libre</a>.
 </td>
+</tr><tr><td bgcolor="#000000" colspan="3"></td>
+</tr><tr valign="top">
 <td>
     <a id="b2k16" href="images/hackathons/b2k16.gif">
     <img src="images/hackathons/b2k16-s.gif"></a><br>
@@ -175,8 +187,6 @@
     10 developers<br>
     Funded by <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>.
 </td>
-</tr><tr><td bgcolor="#000000" colspan="3"></td>
-</tr><tr valign="top">
 <td>
     <a id="g2k16" href="images/hackathons/g2k16.gif">
     <img src="images/hackathons/g2k16-s.gif"></a><br>
@@ -199,6 +209,8 @@
     and <a href="http://www.oracle.com">Oracle</a>, with the help of
     <a href="http://cuni.cz">Charles University</a>.
 </td>
+</tr><tr><td bgcolor="#000000" colspan="3"></td>
+</tr><tr valign="top">
 <td>
     <a id="p2k16" href="images/hackathons/p2k16.gif">
     <img src="images/hackathons/p2k16-s.gif"></a><br>
@@ -209,8 +221,6 @@
     Funded by <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>
     and with the support of <a href="http://www.epitech.eu">Epitech Nantes</a>.
 </td>
-</tr><tr><td bgcolor="#000000" colspan="3"></td>
-</tr><tr valign="top">
 <td>
     <a id="n2k15" href="images/hackathons/n2k15.gif">
     <img src="images/hackathons/n2k15-s.gif"></a><br>
@@ -231,6 +241,8 @@
     Funded by <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>
     and with the support of <a href="http://www.in-berlin.de">IN-Berlin</a>.
 </td>
+</tr><tr><td bgcolor="#000000" colspan="3"></td>
+</tr><tr valign="top">
 <td>
     <a id="l2k15" href="images/hackathons/l2k15.gif">
     <img src="images/hackathons/l2k15-s.gif"></a><br>
@@ -241,8 +253,6 @@
     Funded by <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>
     with help of the <a href="http://foi.unizg.hr">Open Systems and Security Lab</a>.
 </td>
-</tr><tr><td bgcolor="#000000" colspan="3"></td>
-</tr><tr valign="top">
 <td>
     <a id="j2k15" href="images/hackathons/j2k15.gif">
     <img src="images/hackathons/j2k15-s.gif"></a><br>
@@ -262,6 +272,8 @@
     Funded by <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>
     and with the support of <a href="http://sait.ca">SAIT</a>.
 </td>
+</tr><tr><td bgcolor="#000000" colspan="3"></td>
+</tr><tr valign="top">
 <td>
     <a id="p2k15" href="images/hackathons/p2k15.gif">
     <img src="images/hackathons/p2k15-s.gif"></a><br>
@@ -272,8 +284,6 @@
     Funded by <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>
     and with the support of Andy Henderson.
 </td>
-</tr><tr><td bgcolor="#000000" colspan="3"></td>
-</tr><tr valign="top">
 <td>
     <a id="s2k15" href="images/hackathons/s2k15.gif">
     <img src="images/hackathons/s2k15-s.gif"></a><br>
@@ -294,6 +304,8 @@
     Funded by <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>
     and with the support of Mitja Mu&#382;eni&#269;.
 </td>
+</tr><tr><td bgcolor="#000000" colspan="3"></td>
+</tr><tr valign="top">
 <td>
     <a id="m2k14" href="images/hackathons/m2k14.gif">
     <img src="images/hackathons/m2k14-s.gif"></a><br>
@@ -304,8 +316,6 @@
     Funded by <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>
     and with the support of <a href="http://www.uca.ma/">Universit&eacute; Cadi Ayyad</a>.
 </td>
-</tr><tr><td bgcolor="#000000" colspan="3"></td>
-</tr><tr valign="top">
 <td>
     <a id="n2k14" href="images/hackathons/n2k14.gif">
     <img src="images/hackathons/n2k14-s.gif"></a><br>
@@ -326,6 +336,8 @@
     Funded by <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>
     and with the support of <a href="http://www.in-berlin.de">IN-Berlin</a>.
 </td>
+</tr><tr><td bgcolor="#000000" colspan="3"></td>
+</tr><tr valign="top">
 <td>
     <a id="t2k13" href="images/hackathons/t2k13.jpg">
     <img src="images/hackathons/t2k13-s.gif"></a><br>
@@ -336,8 +348,6 @@
     Funded by <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>
     and with the support of <a href="http://www.utoronto.ca">University of Toronto</a>.
 </td>
-</tr><tr><td bgcolor="#000000" colspan="3"></td>
-</tr><tr valign="top">
 <td>
     <a id="n2k13" href="images/hackathons/n2k13.gif">
     <img src="images/hackathons/n2k13-s.gif"></a><br>
@@ -358,6 +368,8 @@
     Funded by <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>
     and with the support of <a href="http://www.uc.pt">University of Coimbra</a>.
 </td>
+</tr><tr><td bgcolor="#000000" colspan="3"></td>
+</tr><tr valign="top">
 <td>
     <a id="p2k12" href="images/hackathons/p2k12.gif">
     <img src="images/hackathons/p2k12-s.gif"></a><br>
@@ -368,8 +380,6 @@
     Funded by <a href="donations.html">donations to
     The OpenBSD Project</a>.
 </td>
-</tr><tr><td bgcolor="#000000" colspan="3"></td>
-</tr><tr valign="top">
 <td>
     <a id="n2k12" href="images/hackathons/n2k12.gif">
     <img src="images/hackathons/n2k12-s.gif"></a><br>
@@ -388,6 +398,8 @@
     41 developers<br>
     Funded by <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>.
 </td>
+</tr><tr><td bgcolor="#000000" colspan="3"></td>
+</tr><tr valign="top">
 <td>
     <a id="r2k12" href="images/hackathons/r2k12.gif">
     <img src="images/hackathons/r2k12-s.gif"></a><br>
@@ -399,8 +411,6 @@
     and support of <a href="http://www.ihp.fr">Institute Henri Poincar&eacute;</a> and
     <a href="http://www.u-psud.fr">Paris-Sud University</a>.
 </td>
-</tr><tr><td bgcolor="#000000" colspan="3"></td>
-</tr><tr valign="top">
 <td>
     <a id="p2k11" href="images/hackathons/p2k11.gif">
     <img src="images/hackathons/p2k11-s.gif"></a><br>
@@ -421,6 +431,8 @@
     Funded by <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>
     and with the support of <a href="http://www.uc.pt">University of Coimbra</a>.
 </td>
+</tr><tr><td bgcolor="#000000" colspan="3"></td>
+</tr><tr valign="top">
 <td>
     <a id="s2k11" href="images/hackathons/s2k11.jpg">
     <img src="images/hackathons/s2k11-s.gif"></a><br>
@@ -431,8 +443,6 @@
     Funded by <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>
     and with the support of Mitja Mu&#382;eni&#269;.
 </td>
-</tr><tr><td bgcolor="#000000" colspan="3"></td>
-</tr><tr valign="top">
 <td>
     <a id="c2k11" href="images/hackathons/c2k11.gif">
     <img src="images/hackathons/c2k11-s.gif"></a><br>
@@ -451,6 +461,8 @@
     15 developers<br>
     Funded by <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>.
 </td>
+</tr><tr><td bgcolor="#000000" colspan="3"></td>
+</tr><tr valign="top">
 <td>
     <a id="p2k10" href="images/hackathons/p2k10.gif">
     <img src="images/hackathons/p2k10-s.gif"></a><br>
@@ -461,8 +473,6 @@
     Funded by <a href="donations.html">donations to
     the OpenBSD Project</a>.
 </td>
-</tr><tr><td bgcolor="#000000" colspan="3"></td>
-</tr><tr valign="top">
 <td>
     <a id="j2k10" href="images/hackathons/j2k10.gif">
     <img src="images/hackathons/j2k10-s.gif"></a><br>
@@ -480,6 +490,8 @@
     46 developers<br>
     Funded by <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>.
 </td>
+</tr><tr><td bgcolor="#000000" colspan="3"></td>
+</tr><tr valign="top">
 <td>
     <br>
     <br>
@@ -498,8 +510,6 @@
     and support of
     <a href="http://vpac.org">Victorian Partnership for Advanced Computing</a>
 </td>
-</tr><tr><td bgcolor="#000000" colspan="3"></td>
-</tr><tr valign="top">
 <td>
     <a id="h2k9" href="images/hackathons/h2k9.gif">
     <img src="images/hackathons/h2k9-s.gif"></a><br>
@@ -521,6 +531,8 @@
     Funded by <a href="donations.html">donations to
     the OpenBSD Project</a>.
 </td>
+</tr><tr><td bgcolor="#000000" colspan="3"></td>
+</tr><tr valign="top">
 <td>
     <a id="f2k9" href="images/hackathons/f2k9.gif">
     <img src="images/hackathons/f2k9-s.gif"></a><br>
@@ -530,8 +542,6 @@
     14 developers<br>
     Funded by <a href="https://www.iis.se/english/">.se Foundation</a>.
 </td>
-</tr><tr><td bgcolor="#000000" colspan="3"></td>
-</tr><tr valign="top">
 <td>
     <a id="c2k9" href="images/hackathons/c2k9.gif">
     <img src="images/hackathons/c2k9-s.gif"></a><br>
@@ -550,6 +560,8 @@
     Basel, Switzerland<br>
     19 developers<br>
 </td>
+</tr><tr><td bgcolor="#000000" colspan="3"></td>
+</tr><tr valign="top">
 <td>
     <a id="h2k8" href="images/hackathons/h2k8.gif">
     <img src="images/hackathons/h2k8-s.gif"></a><br>
@@ -561,8 +573,6 @@
     the OpenBSD Project</a>
     and with the support of <a href="http://www.uc.pt">University of Coimbra</a>.
 </td>
-</tr><tr><td bgcolor="#000000" colspan="3"></td>
-</tr><tr valign="top">
 <td>
     <a id="p2k8" href="images/hackathons/p2k8.gif">
     <img src="images/hackathons/p2k8-s.gif"></a><br>
@@ -582,6 +592,8 @@
     55 developers<br>
     Funded by <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>.
 </td>
+</tr><tr><td bgcolor="#000000" colspan="3"></td>
+</tr><tr valign="top">
 <td>
     <a id="n2k8" href="images/hackathons/n2k8.gif">
     <img src="images/hackathons/n2k8-s.gif"></a><br>
@@ -592,8 +604,6 @@
     Funded by <a href="donations.html">donations to
     the OpenBSD Project</a> and Mark Uemura.
 </td>
-</tr><tr><td bgcolor="#000000" colspan="3"></td>
-</tr><tr valign="top">
 <td>
     <a id="h2k7" href="images/hackathons/h2k7.gif">
     <img src="images/hackathons/h2k7-s.gif"></a><br>
@@ -615,6 +625,8 @@
     Funded by <a href="donations.html">donations to
     the OpenBSD Project</a>.
 </td>
+</tr><tr><td bgcolor="#000000" colspan="3"></td>
+</tr><tr valign="top">
 <td>
     <a id="c2k7" href="images/hackathons/c2k7.gif">
     <img src="images/hackathons/c2k7-s.gif"></a><br>
@@ -625,8 +637,6 @@
     Funded by <a href="donations.html">donations to
     the OpenBSD Project</a>.
 </td>
-</tr><tr><td bgcolor="#000000" colspan="3"></td>
-</tr><tr valign="top">
 <td>
     <a id="f2k7" href="images/hackathons/f2k7.gif">
     <img src="images/hackathons/f2k7-s.gif"></a><br>
@@ -648,6 +658,8 @@
     the OpenBSD Project</a>
     and with the support of <a href="http://www.uc.pt">University of Coimbra</a>.
 </td>
+</tr><tr><td bgcolor="#000000" colspan="3"></td>
+</tr><tr valign="top">
 <td>
     <a id="p2k6" href="images/hackathons/p2k6.gif">
     <img src="images/hackathons/p2k6-s.gif"></a><br>
@@ -658,8 +670,6 @@
     Funded by <a href="donations.html">donations to
     the OpenBSD Project</a>.
 </td>
-</tr><tr><td bgcolor="#000000" colspan="3"></td>
-</tr><tr valign="top">
 <td>
     <a id="k2k6" href="images/hackathons/k2k6.gif">
     <img src="images/hackathons/k2k6-s.gif"></a><br>
@@ -677,6 +687,8 @@
     6 developers<br>
     Support of Henning Brauer.
 </td>
+</tr><tr><td bgcolor="#000000" colspan="3"></td>
+</tr><tr valign="top">
 <td>
     <a id="c2k6" href="images/hackathons/c2k6.gif">
     <img src="images/hackathons/c2k6-s.gif"></a><br>
@@ -687,8 +699,6 @@
     Funded by <a href="donations.html">donations to
     the OpenBSD Project</a>.
 </td>
-</tr><tr><td bgcolor="#000000" colspan="3"></td>
-</tr><tr valign="top">
 <td>
     <a id="v2k5" href="images/hackathons/v2k5.gif">
     <img src="images/hackathons/v2k5-s.gif"></a><br>
@@ -709,6 +719,8 @@
     Funded by <a href="donations.html">donations to
     the OpenBSD Project</a>.
 </td>
+</tr><tr><td bgcolor="#000000" colspan="3"></td>
+</tr><tr valign="top">
 <td>
     <a id="c2k4" href="images/hackathons/c2k4.gif">
     <img src="images/hackathons/c2k4-s.gif"></a><br>
@@ -719,8 +731,6 @@
     Funded by <a href="donations.html">donations to
     the OpenBSD Project</a>.
 </td>
-</tr><tr><td bgcolor="#000000" colspan="3"></td>
-</tr><tr valign="top">
 <td>
     <a id="pf2k4" href="images/hackathons/pf2k4.gif">
     <img src="images/hackathons/pf2k4-s.gif"></a><br>
@@ -740,6 +750,8 @@
     Funded by <a href="https://www.nlnetlabs.nl">NLnet</a>
     (after DARPA pulled out their support).
 </td>
+</tr><tr><td bgcolor="#000000" colspan="3"></td>
+</tr><tr valign="top">
 <td>
     <a id="c2k2" href="images/hackathons/c2k2.gif">
     <img src="images/hackathons/c2k2-s.gif"></a><br>
@@ -749,8 +761,6 @@
     42 developers<br>
     Funded by DARPA.
 </td>
-</tr><tr><td bgcolor="#000000" colspan="3"></td>
-</tr><tr valign="top">
 <td>
     <a id="c2k1-2" href="images/hackathons/noshirt-s.gif">
     <img src="images/hackathons/noshirt-s.gif"></a><br>
@@ -768,6 +778,8 @@
     25 developers<br>
     Funded by DARPA with the support of <a href="http://www.mit.edu">MIT</a>.
 </td>
+</tr><tr><td bgcolor="#000000" colspan="3"></td>
+</tr><tr valign="top">
 <td>
     <a id="c2k" href="images/hackathons/noshirt-s.gif">
     <img src="images/hackathons/noshirt-s.gif"></a><br>
@@ -778,8 +790,6 @@
     Funded by <a href="donations.html">donations to
     the OpenBSD Project</a>.
 </td>
-</tr><tr><td bgcolor="#000000" colspan="3"></td>
-</tr><tr valign="top">
 <td>
     <a id="c99" href="images/hackathons/noshirt-s.gif">
     <img src="images/hackathons/noshirt-s.gif"></a><br>
@@ -799,7 +809,7 @@
 n2k10 drawn by Theo de Raadt, refined by Ty Semaka.<br>
 c2k10, j2k10, and p2k10 drawn by Damon Mlekuz.<br>
 k2k11 drawn by Bret Lambert.<br>
-r2k12, g2k12, n2k12, b2k13, n2k14, m2k14, g2k14, s2k15, c2k15, l2k15, p2k16, g2k16, b2k16, a2k17, d2k17, p2k17, s2k17 drawn by Markus Hall.<br>
+r2k12, g2k12, n2k12, b2k13, n2k14, m2k14, g2k14, s2k15, c2k15, l2k15, p2k16, g2k16, b2k16, a2k17, d2k17, p2k17, s2k17, a2k18, p2k18 drawn by Markus Hall.<br>
 p2k12 drawn by Bidon Mickael aka Mogmi.<br>
 c2k12 drawn by Theo de Raadt.<br>
 n2k13 is a purchased shirt, with an annotation added.<br>