Recent changes to this wiki:

Added a comment: Is implementing ZFS on NetBSD Complete ?
--- /dev/null	2014-07-28 04:40:00.000000000 +0000
+++ wikisrc/projects/project/zfs/comment_1_8a76529815014a1ceddbbd38c55bc62b._comment	2014-07-28 04:41:47.000000000 +0000
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://me.yahoo.com/a/sS_m__Any9Ur0y76CtXCkrcKvL5ObBKEM_AQ#6a649"
+ nickname="Sanchit"
+ subject="Is implementing ZFS on NetBSD Complete ?"
+ date="2014-07-28T04:41:43Z"
+ content="""
+I was wondering if this project was finished or not as I am really interested in working on this project. Please reply to this comment as soon as possible.
+"""]]

Remove dubious advice.
Index: wikisrc/tutorials/pkgsrc/pbulk.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/tutorials/pkgsrc/pbulk.mdwn,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- wikisrc/tutorials/pkgsrc/pbulk.mdwn	27 Jul 2014 18:20:52 -0000	1.12
+++ wikisrc/tutorials/pkgsrc/pbulk.mdwn	27 Jul 2014 18:22:28 -0000	1.13
@@ -118,8 +118,4 @@
 
 ### Hints
 
-If you'd like to restart the build to retry building some failing packages, **empty** */meta/error* (don't delete it):
-
-	# printf "" > /meta/error
-
 If you'd like to rebuild a single package, use the *bulkbuild-rebuild* command followed by the package name.

It's better to use sh rather than ksh.
Index: wikisrc/tutorials/pkgsrc/pbulk.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/tutorials/pkgsrc/pbulk.mdwn,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- wikisrc/tutorials/pkgsrc/pbulk.mdwn	27 Jul 2014 17:09:06 -0000	1.11
+++ wikisrc/tutorials/pkgsrc/pbulk.mdwn	27 Jul 2014 18:20:52 -0000	1.12
@@ -63,7 +63,7 @@
 
 Now that our sandbox is available and mounted, we will chroot to it:
 
-	# chroot /home/bulk /bin/ksh
+	# chroot /home/bulk /bin/sh
 
 Create pbulk user
 
@@ -91,7 +91,7 @@
 
 Deploy and configure pbulk tools
 
-	# ksh /usr/pkgsrc/mk/pbulk/pbulk.sh -n -c mk.conf.frag
+	# sh /usr/pkgsrc/mk/pbulk/pbulk.sh -n -c mk.conf.frag
 
 *pbulk* configuration file is */usr/pbulk/etc/pbulk.conf*.
 You may want to review and customize some parameters like

Make it follow the Guide.
Index: wikisrc/tutorials/pkgsrc/pbulk.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/tutorials/pkgsrc/pbulk.mdwn,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- wikisrc/tutorials/pkgsrc/pbulk.mdwn	26 Aug 2012 11:05:55 -0000	1.10
+++ wikisrc/tutorials/pkgsrc/pbulk.mdwn	27 Jul 2014 17:09:06 -0000	1.11
@@ -7,7 +7,7 @@
 Its setup needs a bit of work, here is how to prepare and run your bulk-build
 box. In this article we will only consider a one-node machine.
 
-This documentation is based on the [pbulk-HOWTO](http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/doc/HOWTO-pbulk?rev=1.7&content-type=text/x-cvsweb-markup).
+This documentation is based on the [The pkgsrc Guide](http://netbsd.org/docs/pkgsrc/bulk.html).
 
 ### Prerequisites
 
@@ -65,73 +65,12 @@
 
 	# chroot /home/bulk /bin/ksh
 
-As the [pbulk-HOWTO](http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/doc/HOWTO-pbulk?rev=1.7&content-type=text/x-cvsweb-markup) suggests, we will create some helpers directories to keep things clean:
-
-	# mkdir /bulklog # bulk meta data and log files of each package
-	# mkdir /scratch # WRKOBJDIR
-	# mkdir /distfiles # DISTDIR
-	# mkdir /packages # PACKAGES
-
-The */scratch* directory must be writable by a *bulk* user defined below in */usr/pkg_bulk/etc/pbulk.conf* as the build is done using DESTDIR.
+Create pbulk user
 
 	# useradd bulk
-	# chown bulk /scratch
-
-It is now time to bootstrap (yes, even on NetBSD) a *pbulk* environment so the latter is not wiped out when a new bulk build is started:
-
-	# cd /usr/pkgsrc/bootstrap
-	# ./bootstrap --prefix=/usr/pkg_bulk --pkgdbdir=/usr/pkg_bulk/.pkgdb
-	# rm -rf work
-
-Add the line:
-
-	PACKAGES=	/scratch/pbulk_packages
-
-to *pbulk*'s prefix *mk.conf* (*/usr/pkg_bulk/etc/mk.conf*).
-
-Then install *pbulk* itself on this newly created separate prefix:
-
-	# cd /usr/pkgsrc/pkgtools/pbulk
-	# env PATH=/usr/pkg_bulk/bin:/usr/pkg_bulk/sbin:${PATH} bmake install
-
-### Configuring pbulk
-
-*pbulk* configuration file is */usr/pkg_bulk/etc/pbulk.conf*, here are
-some parameters you should modify to customize the run to your needs:
-
-	base_url= # should point to the URL where the txt report will be
-	master_mode=no # this will not be a distributed build
-	# [...]
-	report_recipients="your@email.com"
-	# [...]
-	#bootstrapkit= must be commented on NetBSD !
-	unprivileged_user=bulk # used for unprivileged user-destdir builds
-	# [...]
-	bulklog=/bulklog
-	packages=/packages
-	prefix=/usr/pkg
-	pkgsrc=/usr/pkgsrc
-	pkgdb=/var/db/pkg
-	varbase=/var
-	# [...]
-	make=/usr/bin/make # must be modified on NetBSD !
-
-Also, in order to avoid hangs, it might be a good idea to add the following to the top of *pbulk.conf*
-
-	ulimit -t 1800 # set the limit on CPU time (in seconds)
-	ulimit -v 2097152 # limits process address space
-
-### Configuring the build
 
-Last but not least, you should configure your */etc/mk.conf* (in the *chroot* !).
-Here's an example of what we use at [NetBSDfr](http://www.netbsdfr.org/):
-
-	WRKOBJDIR=              /scratch
-	PKGSRCDIR=              /usr/pkgsrc
-	DISTDIR=                /distfiles
-	PACKAGES=               /packages
-
-	FAILOVER_FETCH=         yes
+Prepare configuration for packages build (mk.conf fragment).
+Here's sample mk.conf.frag file:
 
 	SKIP_LICENSE_CHECK=             yes
 	ALLOW_VULNERABLE_PACKAGES=      yes
@@ -150,19 +89,32 @@
 
 	X11_TYPE=               modular
 
+Deploy and configure pbulk tools
+
+	# ksh /usr/pkgsrc/mk/pbulk/pbulk.sh -n -c mk.conf.frag
+
+*pbulk* configuration file is */usr/pbulk/etc/pbulk.conf*.
+You may want to review and customize some parameters like
+"base_url" and "report_recipients".
+
+Also, in order to avoid hangs, it might be a good idea to add the following to the top of *pbulk.conf*
+
+	ulimit -t 1800 # set the limit on CPU time (in seconds)
+	ulimit -v 2097152 # limits process address space
+
 ### Running the build
 
 Now that everything's in place, we can fire up the build from the *chroot* using
 the following command:
 
-	# /usr/pkg_bulk/bin/bulkbuild
+	# /usr/pbulk/bin/bulkbuild
 
 It is recommended to run the build inside a tool like *misc/screen* or
 *misc/tmux* as it will take a lot of time.
 
 If the build is stopped, it is possible to restart it by invoking:
 
-	# /usr/pkg_bulk/bin/bulkbuild-restart
+	# /usr/pbulk/bin/bulkbuild-restart
 
 ### Hints
 

Added a comment: too hot to move
--- /dev/null	2014-07-20 08:20:01.000000000 +0000
+++ wikisrc/users/spz/sandbox/comment_1_6efed48ef93304ccbcdd3652efee3990._comment	2014-07-20 08:24:42.000000000 +0000
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="spz"
+ ip="2001:a60:f000:67::2"
+ subject="too hot to move"
+ date="2014-07-20T08:24:39Z"
+ content="""
+  .. so keep well hydrated
+"""]]

Index: wikisrc/users/spz/sandbox.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/spz/sandbox.mdwn,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wikisrc/users/spz/sandbox.mdwn	22 Jun 2014 12:28:37 -0000	1.6
+++ wikisrc/users/spz/sandbox.mdwn	20 Jul 2014 08:23:46 -0000	1.7
@@ -1 +1,3 @@
-Johannisbeerschorle
+- Johannisbeerschorle
+- Eistee
+- Wassermelone

Typo fixes, from Lewis Muir.
Index: wikisrc/tutorials/pkgsrc/pkg_comp_pkg_chk.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/tutorials/pkgsrc/pkg_comp_pkg_chk.mdwn,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wikisrc/tutorials/pkgsrc/pkg_comp_pkg_chk.mdwn	25 Oct 2013 17:36:02 -0000	1.4
+++ wikisrc/tutorials/pkgsrc/pkg_comp_pkg_chk.mdwn	19 Jul 2014 04:03:21 -0000	1.5
@@ -1,10 +1,10 @@
 ## Keeping packages up-to-date with pkg_comp and pkg_chk
 
-*Pkgsrc* is a fantastic package management framework, but when it comes to upgrades, some usecases may lead to an unstable situation. Also, if by any chance you have 2 or more NetBSD machines to keep up-to-date, upgrading each one separately could be risky and a real waste of time. Well see how to flawlessly keep your packages up-to-date with minimal risks.
+*Pkgsrc* is a fantastic package management framework, but when it comes to upgrades, some use cases may lead to an unstable situation. Also, if by any chance you have 2 or more NetBSD machines to keep up-to-date, upgrading each one separately could be risky and a real waste of time. We'll see how to flawlessly keep your packages up-to-date with minimal risks.
 
 ### pkg_comp
 
-Under *pkgsrc/pkgtools* you will find a great utility called *pkg_comp*. This script permits to handle packages manipulation in a *chroot*ed environment, thus keeping your real packages safe from any misakes.
+Under *pkgsrc/pkgtools* you will find a great utility called *pkg_comp*. This script permits to handle packages manipulation in a *chroot*ed environment, thus keeping your real packages safe from any mistakes.
 
 Let's install *pkg_comp*
 
@@ -17,10 +17,10 @@
 	# cd /home/pkg_comp
 	# pkg_comp -C test.conf maketemplate
 
-This will create a template file, which will be used to build our fake NetBSD system, but first, we'll have to setup some informations. Using your favourite editor, change the following variables to suit your needs:
+This will create a template file, which will be used to build our fake NetBSD system, but first, we'll have to set up some information. Using your favourite editor, change the following variables to suit your needs:
 
 * DESTDIR, where the *chroot* will be built
-* DISTRIBDIR, where pkg_comp fill find your NetBSD binaries sets
+* DISTRIBDIR, where pkg_comp will find your NetBSD binary sets
 * SETS_X11 may be set to "no" if you do not intend to use the X Window system
 
 This is my *pkg_comp* configuration:

Index: wikisrc/pkgsrc/intro_to_packaging.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/pkgsrc/intro_to_packaging.mdwn,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- wikisrc/pkgsrc/intro_to_packaging.mdwn	9 Jul 2014 12:35:41 -0000	1.7
+++ wikisrc/pkgsrc/intro_to_packaging.mdwn	9 Jul 2014 12:44:32 -0000	1.8
@@ -671,7 +671,7 @@
 
 use this `zsh` function to :
 
-[[!format bash """
+[[!format sh """
 add () {
 	# upload the package to remote server
 	scp $1 yrmt@saveosx.org:/usr/local/www/saveosx/packages/Darwin/2013Q4/x86_64/All/ 2> /dev/null
@@ -723,7 +723,7 @@
 And this shell alias to upload all my built packages, but I still
 need to run `add()` mentionned above to update the pkg_summary
 
-[[!format bash """
+[[!format sh """
 up='rsync -avhz --progress /pkgsrc/packages/ root@saveosx.org:/usr/local/www/saveosx/packages/Darwin/2013Q4/x86_64/'
 """]]
 

Remove ridiculous self promotion
Index: wikisrc/pkgsrc/intro_to_packaging.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/pkgsrc/intro_to_packaging.mdwn,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wikisrc/pkgsrc/intro_to_packaging.mdwn	9 Jul 2014 12:34:13 -0000	1.6
+++ wikisrc/pkgsrc/intro_to_packaging.mdwn	9 Jul 2014 12:35:41 -0000	1.7
@@ -115,8 +115,7 @@
 
 DESCR:
 	
-	Small and fast Mac OS X info program written in C
-	by Youri Mouton.
+	Small and fast Mac OS X info program written in C.
 
 
 PLIST:
@@ -712,8 +711,7 @@
 		REQUIRES=/usr/pkg/lib/libsqlite3.0.dylib
 		FILE_NAME=osxinfo-0.1.tgz
 		FILE_SIZE=9710
-		DESCRIPTION=Small and fast Mac OS X info program written in C
-		DESCRIPTION=by Youri Mouton.
+		DESCRIPTION=Small and fast Mac OS X info program written in C.
 		DESCRIPTION=
 		DESCRIPTION=Homepage:
 		DESCRIPTION=http://github.com/yrmt/osxinfo

Remove blog specific data
Index: wikisrc/pkgsrc/intro_to_packaging.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/pkgsrc/intro_to_packaging.mdwn,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wikisrc/pkgsrc/intro_to_packaging.mdwn	9 Jul 2014 12:28:19 -0000	1.5
+++ wikisrc/pkgsrc/intro_to_packaging.mdwn	9 Jul 2014 12:34:13 -0000	1.6
@@ -13,9 +13,7 @@
 ## pkgsrc tree
 
 You should have a copy of the pkgsrc tree sitting somewhere on your
-disk, already bootstrapped, see this [blog
-post](http://saveosx.org/pkgsrc-bootstrap/) on how to do this.
-
+disk, already bootstrapped.
 The tree contains a `Makefile`, a `README`, distfiles, packages,
 category directories containing the ports, the bootstrap directory
 and some documentation.
@@ -269,8 +267,7 @@
   I disabled a few options so less ports would break, pulseaudio
   doesn't build on Mac OS X for example, neither do x264, dconf
 
-Keep in mind that there are many other available options documented
-in the official pkgsrc guide.
+Keep in mind that there are many other available options.
 
 
 ## creating a simple port
@@ -596,20 +593,13 @@
 ## pkgsrc and wip
 
 If you want to submit your port for others to use you can either
-subscribe to pkgsrc-wip or ask a NetBSD developer to add it for you
-which can be tough. Even though there are many IRC channels in which
-you can find nice developers, you will have to take the time to get
-to know them. The easiest way for beginners is to submit to pkgsrc-wip
-so other people can review and test it first.
+subscribe to pkgsrc-wip or ask a NetBSD developer to add it for you.
 
 pkgsrc-wip is hosted on
 [sourceforge](https://sourceforge.net/projects/pkgsrc-wip/) and you
 can easily get cvs access to it if you create an account on there
 and send an email to NetBSD developer `@wiz` (Thomas Klausner)
-asking nicely for commit access. I got access fairly quickly and
-he even fixed a port to show me how to do it properly.
-
-You can also send me an email or talk to me on IRC so I can submit it for you.
+asking nicely for commit access.
 
 
 ## the options framework
@@ -680,9 +670,9 @@
 on the host system. I host my [packages](http://pkgsrc.saveosx.org/)
 on a FreeBSD server with a bootstrapped pkgsrc.
 
-I use this `zsh` function to :
+use this `zsh` function to :
 
-[[!format make """
+[[!format bash """
 add () {
 	# upload the package to remote server
 	scp $1 yrmt@saveosx.org:/usr/local/www/saveosx/packages/Darwin/2013Q4/x86_64/All/ 2> /dev/null
@@ -748,8 +738,7 @@
 
 ## build all packages
 
-Bulk building pkgsrc packages is a topic for another post, see
-jperkin's excellent blog
+see jperkin's excellent blog
 [posts](http://www.perkin.org.uk/posts/distributed-chrooted-pkgsrc-bulk-builds.html)
 about this.
 

Remove links and author reference
Index: wikisrc/pkgsrc/intro_to_packaging.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/pkgsrc/intro_to_packaging.mdwn,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wikisrc/pkgsrc/intro_to_packaging.mdwn	8 Jul 2014 14:52:13 -0000	1.4
+++ wikisrc/pkgsrc/intro_to_packaging.mdwn	9 Jul 2014 12:28:19 -0000	1.5
@@ -848,21 +848,6 @@
 - If you have a feeling a port is stuck in the building stage,
   disable make jobs in your mk.conf
 
-- Please contribute here :)
-
-
-## links
-- [Jonathan Perkin's excellent blog](http://www.perkin.org.uk/)
-- [NetBSD's very extensive pkgsrc guide](http://www.netbsd.org/docs/pkgsrc/)
-- [NetBSD's pkgsrc wiki](http://wiki.netbsd.org/pkgsrc/)
-- Other blog posts here :)
-
-## where to find me
-
-- yrmt@edgebsd.org
-- irc.oftc.net
-	
-	`#saveosx`
 
 [[!cut id=rcsid1 text="$Net"]]
 [[!cut id=rcsid2 text="BSD$"]]

Added a comment: Please provide source code :)
--- /dev/null	2014-07-09 10:40:00.000000000 +0000
+++ wikisrc/examples/socket_programming/comment_2_a836730a2789ef150aa044450c85b44a._comment	2014-07-09 10:44:05.000000000 +0000
@@ -0,0 +1,16 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawmctq-5pm0gmzv3H9bPhvgE1c0cQumgly4"
+ nickname="Saikrishna"
+ subject="Please provide source code :)"
+ date="2014-07-09T10:44:02Z"
+ content="""
+Please provide the source code the for the below question.
+
+Message Details
+There are totally 7 messages - Syntax/Structure is as below. 1. LOGIN 2. NEEDAUTH - randomly generated 3. AUTH 4. LOGINOK - no value sent. O byte length 5. ERROR - can be 0 byte length or contain an error string 6. GETFILE 7. DATA - x bytes indicating size + x bytes of data Note: x can be 0. which means empty file! A Sample Messaging
+
+C - Client; S - Server
+C: LOGIN rajesh S: NEEDAUTH aa1123 C: AUTH <Hash(Password + aa1123)> S: LOGINOK C: GETFILE detail.txt S: ERROR \"No Such file\" C: GETFILE details.txt S: DATA 100 \"some data ... of 100 bytes\" Client closes the connection after receiving the DATA and stores the data received into a file.
+
+
+"""]]

Format code blocks with the ikiwiki syntax.
Index: wikisrc/pkgsrc/intro_to_packaging.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/pkgsrc/intro_to_packaging.mdwn,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wikisrc/pkgsrc/intro_to_packaging.mdwn	8 Jul 2014 14:44:38 -0000	1.3
+++ wikisrc/pkgsrc/intro_to_packaging.mdwn	8 Jul 2014 14:52:13 -0000	1.4
@@ -92,7 +92,7 @@
 
 Makefile:
 	
-{% highlight make %}
+[[!format make """
 # [[!paste id=rcsid1]][[!paste id=rcsid2]]
 
 PKGNAME=      osxinfo-0.1
@@ -113,7 +113,7 @@
 
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
-{% endhighlight %}
+"""]]
 
 DESCR:
 	
@@ -200,7 +200,7 @@
 The framework uses an `mk.conf` file, usually found in /etc. Here's
 how mine looks:
 
-{% highlight make %}
+[[!format make """
 # Tue Oct 15 21:21:46 CEST 2013
 
 .ifdef BSD_PKG_MK          # begin pkgsrc settings
@@ -232,7 +232,7 @@
 SIGN_PACKAGES=             gpg
 PKG_DEFAULT_OPTIONS+=      -pulseaudio -x264 -imlib2-amd64 -dconf
 .endif                     # end pkgsrc settings
-{% endhighlight %}
+"""]]
 
 - I use `DISTDIR`, `PACKAGES`, `WRKOBJDIR` to move distfiles,
   packages and source files somewhere else to keep my pkgsrc tree
@@ -316,7 +316,7 @@
 Here's how they look like at the moment:
 	
 Makefile:
-{% highlight make %}
+[[!format make """
 # [[!paste id=rcsid1]][[!paste id=rcsid2]]
 
 DISTNAME=       2bwm-0.1
@@ -329,7 +329,7 @@
 LICENSE=        isc
 
 .include "../../mk/bsd.pkg.mk"
-{% endhighlight %}
+"""]]
 
 distinfo:
 
@@ -399,7 +399,7 @@
 Clean, build again, and add more dependencies until it passes the
 build stage. Here's how my Makefile ends up looking like:
 
-{% highlight make %}
+[[!format make """
 # [[!paste id=rcsid1]][[!paste id=rcsid2]]
 
 DISTNAME=       2bwm-0.1
@@ -416,7 +416,7 @@
 .include "../../x11/xcb-util-keysyms/buildlink3.mk"
 .include "../../x11/xcb-util/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
-{% endhighlight %}
+"""]]
 
 
 #### install phase
@@ -456,7 +456,7 @@
 
 From 2bwm's Makefile:
 
-{% highlight make %}
+[[!format make """
 install: $(TARGETS)
         test -d $(DESTDIR)$(PREFIX)/bin || mkdir -p $(DESTDIR)$(PREFIX)/bin
         install -pm 755 2bwm $(DESTDIR)$(PREFIX)/bin
@@ -464,7 +464,7 @@
         test -d $(DESTDIR)$(MANPREFIX)/man1 || mkdir -p $(DESTDIR)$(MANPREFIX)/man1
         install -pm 644 2bwm.man $(DESTDIR)$(MANPREFIX)/man1/2bwm.1
         install -pm 644 hidden.man $(DESTDIR)$(MANPREFIX)/man1/hidden.1
-{% endhighlight %}
+"""]]
 
 This looks fine since it installs in a `DESTDIR`/`PREFIX` but it sets
 
@@ -554,14 +554,14 @@
 the patching explained above thanks to the sed substitution framework.
 Here's how it looks like in my port Makefile:
 
-{% highlight make %}
+[[!format make """
 SUBST_CLASSES+=         makefile
 SUBST_STAGE.makefile=   pre-build
 SUBST_MESSAGE.makefile= Fixing makefile
 SUBST_FILES.makefile=   Makefile
 SUBST_SED.makefile=     -e 's,/usr/local,${PREFIX},g'
 SUBST_SED.makefile+=    -e 's,share/man,${PKGMANDIR},g'
-{% endhighlight %}
+"""]]
 
 As you can see, you can do multiple commands on multiple files, it
 is very useful for very small fixes like this.
@@ -617,7 +617,7 @@
 You can create port options with the `options.mk` file, like for `wm/dwm`
 
 	
-{% highlight make %}
+[[!format make """
 # [[!paste id=rcsid1]][[!paste id=rcsid2]]
 
 PKG_OPTIONS_VAR=			PKG_OPTIONS.dwm
@@ -642,7 +642,7 @@
 SUBST_SED.options+=     -e '/^XINERAMA/d'
 .  include "../../x11/libX11/buildlink3.mk"
 .endif
-{% endhighlight %}
+"""]]
 
 This file should be included in the Makefile:
 
@@ -682,7 +682,7 @@
 
 I use this `zsh` function to :
 
-{% highlight bash %}
+[[!format make """
 add () {
 	# upload the package to remote server
 	scp $1 yrmt@saveosx.org:/usr/local/www/saveosx/packages/Darwin/2013Q4/x86_64/All/ 2> /dev/null
@@ -695,7 +695,7 @@
 	# pkgin update
 	sudo pkgin update
 }
-{% endhighlight %}
+"""]]
 
 - upload a package
 - update the package summary, which is an archive containing
@@ -735,9 +735,9 @@
 And this shell alias to upload all my built packages, but I still
 need to run `add()` mentionned above to update the pkg_summary
 
-{% highlight bash %}
+[[!format bash """
 up='rsync -avhz --progress /pkgsrc/packages/ root@saveosx.org:/usr/local/www/saveosx/packages/Darwin/2013Q4/x86_64/'
-{% endhighlight %}
+"""]]
 
 Then you should be able to set the url in repositories.conf to use
 your packages with pkgin. You can also install them directly with
@@ -767,7 +767,7 @@
 
 pkgsrc supports fetching archives from specific git commits on
 GitHub like this:
-{% highlight make %}
+[[!format make """
 PKGNAME=           2bwm-0.1
 CATEGORIES=        wm
 GHCOMMIT=          52a097ca644eb571b22a135951c945fcca57a25c
@@ -775,7 +775,7 @@
 MASTER_SITES=      https://github.com/venam/2bwm/archive/
 DIST_SUBDIR=       2bwm
 WRKSRC=            ${WRKDIR}/2bwm-${GHCOMMIT}
-{% endhighlight %}
+"""]]
 
 You can then easily update the git commit and the distinfo with it
 to update the program.
@@ -786,24 +786,24 @@
 like this:
 
 
-{% highlight make %}
+[[!format make """
 post-extract:
 	${CHMOD} a-x ${WRKSRC}/elementary/apps/48/internet-mail.svg
 
 do-install:
 	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/icons
 	cd ${WRKSRC} && pax -rw -pe . ${DESTDIR}${PREFIX}/share/icons/
-{% endhighlight %}
+"""]]
 
 To install, but you can also build programs from the Makefile. This
 is what qt4-sqlite3 uses:
 
-{% highlight make %}

(Diff truncated)
Split RCS Id into two cut-paste strings to avoid expansion.
Index: wikisrc/pkgsrc/intro_to_packaging.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/pkgsrc/intro_to_packaging.mdwn,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wikisrc/pkgsrc/intro_to_packaging.mdwn	8 Jul 2014 14:35:33 -0000	1.2
+++ wikisrc/pkgsrc/intro_to_packaging.mdwn	8 Jul 2014 14:44:38 -0000	1.3
@@ -93,7 +93,7 @@
 Makefile:
 	
 {% highlight make %}
-# [[!paste id=rcsid]]
+# [[!paste id=rcsid1]][[!paste id=rcsid2]]
 
 PKGNAME=      osxinfo-0.1
 CATEGORIES=   misc
@@ -123,12 +123,12 @@
 
 PLIST:
 	
-	@comment [[!paste id=rcsid]]
+	@comment [[!paste id=rcsid1]][[!paste id=rcsid2]]
 	bin/osxinfo
 
 distinfo:
 
-	[[!paste id=rcsid]]
+	[[!paste id=rcsid1]][[!paste id=rcsid2]]
 
 	SHA1 (osxinfo/de74b8960f27844f7b264697d124411f81a1eab6.tar.gz) = 83a2838ad95ff73255bea7f496a8cc9aaa4e17ca
 	RMD160 (osxinfo/de74b8960f27844f7b264697d124411f81a1eab6.tar.gz) = 9102eb2a938be38c4adf8cfbf781c04d0844d09a
@@ -317,7 +317,7 @@
 	
 Makefile:
 {% highlight make %}
-# [[!paste id=rcsid]]
+# [[!paste id=rcsid1]][[!paste id=rcsid2]]
 
 DISTNAME=       2bwm-0.1
 CATEGORIES=     wm
@@ -334,7 +334,7 @@
 distinfo:
 
 	
-	[[!paste id=rcsid]]
+	[[!paste id=rcsid1]][[!paste id=rcsid2]]
 
 	SHA1 (2bwm-0.1.tar.gz) = e83c862dc1d9aa198aae472eeca274e5d98df0ad
 	RMD160 (2bwm-0.1.tar.gz) = d9a93a7d7ae7183f5921f9ad76abeb1401184ef9
@@ -400,7 +400,7 @@
 build stage. Here's how my Makefile ends up looking like:
 
 {% highlight make %}
-# [[!paste id=rcsid]]
+# [[!paste id=rcsid1]][[!paste id=rcsid2]]
 
 DISTNAME=       2bwm-0.1
 CATEGORIES=     wm
@@ -539,7 +539,7 @@
 	
 	containing:
 
-		@comment [[!paste id=rcsid]]
+		@comment [[!paste id=rcsid1]][[!paste id=rcsid2]]
 		bin/2bwm
 		bin/hidden
 
@@ -618,7 +618,7 @@
 
 	
 {% highlight make %}
-# [[!paste id=rcsid]]
+# [[!paste id=rcsid1]][[!paste id=rcsid2]]
 
 PKG_OPTIONS_VAR=			PKG_OPTIONS.dwm
 PKG_SUPPORTED_OPTIONS=	xinerama
@@ -864,6 +864,7 @@
 	
 	`#saveosx`
 
-[[!cut id=rcsid text="\$NetBSD: intro_to_packaging.mdwn,v 1.2 2014/07/08 14:35:33 schmonz Exp $"]]
+[[!cut id=rcsid1 text="$Net"]]
+[[!cut id=rcsid2 text="BSD$"]]
 [[!meta title="An introduction to packaging"]]
 [[!meta author="Youri Mouton"]]

Fix title, wrap lines, trim some whitespace.
Index: wikisrc/pkgsrc/intro_to_packaging.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/pkgsrc/intro_to_packaging.mdwn,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wikisrc/pkgsrc/intro_to_packaging.mdwn	8 Jul 2014 14:19:33 -0000	1.1
+++ wikisrc/pkgsrc/intro_to_packaging.mdwn	8 Jul 2014 14:35:33 -0000	1.2
@@ -1,8 +1,10 @@
-This guide should allow you to learn how to create a new port or simply fix a port that you need. There are three target demographics listed below:
+This guide should allow you to learn how to create a new port or
+simply fix a port that you need. There are three target demographics
+listed below:
 
-	- binary packages user with pkgin or pkg_add 
+	- binary packages user with pkgin or pkg_add
  		(you should be confident here)
-	- build from source, use options 
+	- build from source, use options
  		(you will know this after reading the guide)
 	- port developers
 		(you should be able to get started here)
@@ -10,33 +12,40 @@
 
 ## pkgsrc tree
 
-You should have a copy of the pkgsrc tree sitting somewhere on your disk, already bootstrapped, see this [blog post](http://saveosx.org/pkgsrc-bootstrap/) on how to do this.
+You should have a copy of the pkgsrc tree sitting somewhere on your
+disk, already bootstrapped, see this [blog
+post](http://saveosx.org/pkgsrc-bootstrap/) on how to do this.
+
+The tree contains a `Makefile`, a `README`, distfiles, packages,
+category directories containing the ports, the bootstrap directory
+and some documentation.
 
-The tree contains a `Makefile`, a `README`, distfiles, packages, category directories containing the ports, the bootstrap directory and some documentation.
+The `mk/*` directory contains the pkgsrc framework Makefiles but
+also shell and Awk scripts
 
-The `mk/*` directory contains the pkgsrc framework Makefiles but also shell and Awk scripts
-
-`pkglocate` is a script to find port names in the tree, though `pkgtools/pkgfind` is much faster.
+`pkglocate` is a script to find port names in the tree, though
+`pkgtools/pkgfind` is much faster.
 
 
 ## use the right tools
 
-If you want to get started working on ports like creating new ones or simply fix ones you need, you should know about these tools:
+If you want to get started working on ports like creating new ones
+or simply fix ones you need, you should know about these tools:
 
- - install package developer utilities: 
+ - install package developer utilities:
 	
 		pkgin -y in pkg_developer
 
 It contains very useful programs like:
 
- - checkperms: 
+ - checkperms:
  		
 		verify file permissions
  - createbuildlink:
- 
+
 		create buildlink3.mk files, which I'll explain later
  - digest:
- 
+
 		create hashes for messages with crypto algorithms such as sha512 and many others
  - lintpkgsrc:
 
@@ -48,8 +57,8 @@
 
 		create archives of installed programs for later use on other machines or backups
  - pkgdiff:
- 
-		show diffs of patched files 
+
+		show diffs of patched files
  - pkglint:
 
 		verify the port you're creating for common mistakes (very useful!)
@@ -68,18 +77,23 @@
 
 A pkgsrc port should at least contain:
 
-- `Makefile` : a comment, developer info, software download site and lots of other possibilities
-- `DESCR` : a paragraph containing the description for the software of the port we're making
-- `PLIST` : the list of files to install, pkgsrc will only install the files listed here to your prefix
-- `distinfo` : hashes of the software archive and patches or files in the port
+- `Makefile` : a comment, developer info, software download site
+  and lots of other possibilities
+- `DESCR` : a paragraph containing the description for the software
+  of the port we're making
+- `PLIST` : the list of files to install, pkgsrc will only install
+  the files listed here to your prefix
+- `distinfo` : hashes of the software archive and patches or files
+  in the port
 
 
-Here's how they would look like for a small port I submitted not long ago in pkgsrc-wip
+Here's how they would look like for a small port I submitted not
+long ago in pkgsrc-wip
 
-Makefile: 
+Makefile:
 	
 {% highlight make %}
-# $NetBSD: intro_to_packaging.mdwn,v 1.1 2014/07/08 14:19:33 schmonz Exp $
+# [[!paste id=rcsid]]
 
 PKGNAME=      osxinfo-0.1
 CATEGORIES=   misc
@@ -101,7 +115,7 @@
 .include "../../mk/bsd.pkg.mk"
 {% endhighlight %}
 
-DESCR: 
+DESCR:
 	
 	Small and fast Mac OS X info program written in C
 	by Youri Mouton.
@@ -109,12 +123,12 @@
 
 PLIST:
 	
-	@comment $NetBSD: intro_to_packaging.mdwn,v 1.1 2014/07/08 14:19:33 schmonz Exp $
+	@comment [[!paste id=rcsid]]
 	bin/osxinfo
 
 distinfo:
 
-	$NetBSD: intro_to_packaging.mdwn,v 1.1 2014/07/08 14:19:33 schmonz Exp $
+	[[!paste id=rcsid]]
 
 	SHA1 (osxinfo/de74b8960f27844f7b264697d124411f81a1eab6.tar.gz) = 83a2838ad95ff73255bea7f496a8cc9aaa4e17ca
 	RMD160 (osxinfo/de74b8960f27844f7b264697d124411f81a1eab6.tar.gz) = 9102eb2a938be38c4adf8cfbf781c04d0844d09a
@@ -123,33 +137,58 @@
 
 ## make
 
-Now you know what kind of files you can see when you're in a port directory. The command used to compile it is the NetBSD `make` but often `bmake` on non NetBSD systems to avoid Makefile errors. Typing make alone will only compile the program but you can also use other command line arguments to make such as extract, patch, configure, install, package, ...
+Now you know what kind of files you can see when you're in a port
+directory. The command used to compile it is the NetBSD `make` but
+often `bmake` on non NetBSD systems to avoid Makefile errors. Typing
+make alone will only compile the program but you can also use other
+command line arguments to make such as extract, patch, configure,
+install, package, ...
 
 I'll try to list them and explain them in logical order. You can run them together.
 
-- `make clean` will remove the source file from the work directory so you can restart with either new options, new patches, ...
-- `make fetch` will simply fetch the file and check if the hash corresponds. It will throw an error if it doesn't.
-- `make distinfo` or `make mdi` to update the file hashes in the `distinfo` file mentionned above.
-- `make extract` extracts the program source files from it's archive in the work directory
+- `make clean` will remove the source file from the work directory
+  so you can restart with either new options, new patches, ...
+- `make fetch` will simply fetch the file and check if the hash
+  corresponds. It will throw an error if it doesn't.
+- `make distinfo` or `make mdi` to update the file hashes in the
+  `distinfo` file mentionned above.
+- `make extract` extracts the program source files from it's archive
+  in the work directory
 - `make patch` applies the local pkgsrc patches to the source
 - `make configure` run the GNU configure script
-- `make` or `make build` or `make all` will stop after the program is compiled
-- `make stage-install` will install in the port destdir, where pkgsrc first installs program files to check if the files correspond with the `PLIST` contents before installing to your prefix. For `wget`, if you have a default WRKOBJDIR (I'll explain later), the program files will first be installed in `<path>/pkgsrc/net/wget/work/.destdir` then after a few checks, in your actual prefix like `/usr/pkg`
+- `make` or `make build` or `make all` will stop after the program
+  is compiled
+- `make stage-install` will install in the port destdir, where
+  pkgsrc first installs program files to check if the files correspond
+  with the `PLIST` contents before installing to your prefix. For
+  `wget`, if you have a default WRKOBJDIR (I'll explain later), the
+  program files will first be installed in
+  `<path>/pkgsrc/net/wget/work/.destdir` then after a few checks,
+  in your actual prefix like `/usr/pkg`
 - `make test` run package tests, if they have any
-- `make package` create a package without installing it, it will install dependencies though
+- `make package` create a package without installing it, it will
+  install dependencies though
 - `make replace` upgrade or reinstall the port if already installed
 - `make deinstall` deinstall the program
-- `make install` installs from the aforementionned `work/.destdir` to your prefix
-- `make bin-install` installs a package for the port, locally if previously built or remotely, as defined by BINPKG_SITES in `mk.conf`, you can make a port install dependencies from packages rather than building them with the DEPENDS_TARGET= bin-install in `mk.conf`
+- `make install` installs from the aforementionned `work/.destdir`
+  to your prefix
+- `make bin-install` installs a package for the port, locally if
+  previously built or remotely, as defined by BINPKG_SITES in
+  `mk.conf`, you can make a port install dependencies from packages
+  rather than building them with the DEPENDS_TARGET= bin-install
+  in `mk.conf`
 - `make show-depends` show port dependencies
 - `make show-options` show various port options, as defined by `options.mk`
 - `make clean-depends` cleans all port dependencies
 - `make distclean` remove the source archive
 - `make package-clean` remove the package
-- `make distinfo` or `make mdi` to update the `distinfo` file containing file hashes if you have a new distfile or patch
-- `make print-PLIST` to generate a `PLIST` file from files found in `work/.destdir`

(Diff truncated)
Add introductory packaging tutorial, written and submitted by Youri Mouton.
--- /dev/null	2014-07-08 14:40:59.000000000 +0000
+++ wikisrc/pkgsrc/intro_to_packaging.mdwn	2014-07-08 14:47:11.000000000 +0000
@@ -0,0 +1,731 @@
+This guide should allow you to learn how to create a new port or simply fix a port that you need. There are three target demographics listed below:
+
+	- binary packages user with pkgin or pkg_add 
+ 		(you should be confident here)
+	- build from source, use options 
+ 		(you will know this after reading the guide)
+	- port developers
+		(you should be able to get started here)
+
+
+## pkgsrc tree
+
+You should have a copy of the pkgsrc tree sitting somewhere on your disk, already bootstrapped, see this [blog post](http://saveosx.org/pkgsrc-bootstrap/) on how to do this.
+
+The tree contains a `Makefile`, a `README`, distfiles, packages, category directories containing the ports, the bootstrap directory and some documentation.
+
+The `mk/*` directory contains the pkgsrc framework Makefiles but also shell and Awk scripts
+
+`pkglocate` is a script to find port names in the tree, though `pkgtools/pkgfind` is much faster.
+
+
+## use the right tools
+
+If you want to get started working on ports like creating new ones or simply fix ones you need, you should know about these tools:
+
+ - install package developer utilities: 
+	
+		pkgin -y in pkg_developer
+
+It contains very useful programs like:
+
+ - checkperms: 
+ 		
+		verify file permissions
+ - createbuildlink:
+ 
+		create buildlink3.mk files, which I'll explain later
+ - digest:
+ 
+		create hashes for messages with crypto algorithms such as sha512 and many others
+ - lintpkgsrc:
+
+		checks the whole pkgsrc tree, list all explicitly broken packages for example
+ - pkg_chk:
+
+		checks package versions and update if necessary
+ - pkg_tarup:
+
+		create archives of installed programs for later use on other machines or backups
+ - pkgdiff:
+ 
+		show diffs of patched files 
+ - pkglint:
+
+		verify the port you're creating for common mistakes (very useful!)
+ - revbump:
+ 	
+		update package version by one bump by increasing PKGREVISION
+ - url2pkg:
+
+		create a blank port from the software download link, it saves you some time by filling out a few basic Makefile settings
+ - verifypc:
+
+		sanity check for pkg-config in ports
+
+
+## port contents
+
+A pkgsrc port should at least contain:
+
+- `Makefile` : a comment, developer info, software download site and lots of other possibilities
+- `DESCR` : a paragraph containing the description for the software of the port we're making
+- `PLIST` : the list of files to install, pkgsrc will only install the files listed here to your prefix
+- `distinfo` : hashes of the software archive and patches or files in the port
+
+
+Here's how they would look like for a small port I submitted not long ago in pkgsrc-wip
+
+Makefile: 
+	
+{% highlight make %}
+# $NetBSD: intro_to_packaging.mdwn,v 1.1 2014/07/08 14:19:33 schmonz Exp $
+
+PKGNAME=      osxinfo-0.1
+CATEGORIES=   misc
+GHCOMMIT=     de74b8960f27844f7b264697d124411f81a1eab6
+DISTNAME=     ${GHCOMMIT}
+MASTER_SITES= https://github.com/yrmt/osxinfo/archive/
+
+MAINTAINER=   youri.mout@gmail.com
+HOMEPAGE=     http://github.com/yrmt/osxinfo
+COMMENT=      Small Mac OS X Info Program
+LICENSE=      isc
+
+ONLY_FOR_PLATFORM= Darwin-*-*
+
+DIST_SUBDIR= osxinfo
+WRKSRC= ${WRKDIR}/osxinfo-${GHCOMMIT}
+
+.include "../../databases/sqlite3/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
+{% endhighlight %}
+
+DESCR: 
+	
+	Small and fast Mac OS X info program written in C
+	by Youri Mouton.
+
+
+PLIST:
+	
+	@comment $NetBSD: intro_to_packaging.mdwn,v 1.1 2014/07/08 14:19:33 schmonz Exp $
+	bin/osxinfo
+
+distinfo:
+
+	$NetBSD: intro_to_packaging.mdwn,v 1.1 2014/07/08 14:19:33 schmonz Exp $
+
+	SHA1 (osxinfo/de74b8960f27844f7b264697d124411f81a1eab6.tar.gz) = 83a2838ad95ff73255bea7f496a8cc9aaa4e17ca
+	RMD160 (osxinfo/de74b8960f27844f7b264697d124411f81a1eab6.tar.gz) = 9102eb2a938be38c4adf8cfbf781c04d0844d09a
+	Size (osxinfo/de74b8960f27844f7b264697d124411f81a1eab6.tar.gz) = 5981 bytes
+
+
+## make
+
+Now you know what kind of files you can see when you're in a port directory. The command used to compile it is the NetBSD `make` but often `bmake` on non NetBSD systems to avoid Makefile errors. Typing make alone will only compile the program but you can also use other command line arguments to make such as extract, patch, configure, install, package, ...
+
+I'll try to list them and explain them in logical order. You can run them together.
+
+- `make clean` will remove the source file from the work directory so you can restart with either new options, new patches, ...
+- `make fetch` will simply fetch the file and check if the hash corresponds. It will throw an error if it doesn't.
+- `make distinfo` or `make mdi` to update the file hashes in the `distinfo` file mentionned above.
+- `make extract` extracts the program source files from it's archive in the work directory
+- `make patch` applies the local pkgsrc patches to the source
+- `make configure` run the GNU configure script
+- `make` or `make build` or `make all` will stop after the program is compiled
+- `make stage-install` will install in the port destdir, where pkgsrc first installs program files to check if the files correspond with the `PLIST` contents before installing to your prefix. For `wget`, if you have a default WRKOBJDIR (I'll explain later), the program files will first be installed in `<path>/pkgsrc/net/wget/work/.destdir` then after a few checks, in your actual prefix like `/usr/pkg`
+- `make test` run package tests, if they have any
+- `make package` create a package without installing it, it will install dependencies though
+- `make replace` upgrade or reinstall the port if already installed
+- `make deinstall` deinstall the program
+- `make install` installs from the aforementionned `work/.destdir` to your prefix
+- `make bin-install` installs a package for the port, locally if previously built or remotely, as defined by BINPKG_SITES in `mk.conf`, you can make a port install dependencies from packages rather than building them with the DEPENDS_TARGET= bin-install in `mk.conf`
+- `make show-depends` show port dependencies
+- `make show-options` show various port options, as defined by `options.mk`
+- `make clean-depends` cleans all port dependencies
+- `make distclean` remove the source archive
+- `make package-clean` remove the package
+- `make distinfo` or `make mdi` to update the `distinfo` file containing file hashes if you have a new distfile or patch
+- `make print-PLIST` to generate a `PLIST` file from files found in `work/.destdir`
+
+You should be aware that there are many make options along with these targets, like 
+
+- `PKG_DEBUG_LEVEL`
+- `CHECK_FILES`
+- and many others described the the NetBSD pkgsrc guide
+
+
+## pkgsrc configuration
+
+The framework uses an `mk.conf` file, usually found in /etc. Here's how mine looks:
+
+{% highlight make %}
+# Tue Oct 15 21:21:46 CEST 2013
+
+.ifdef BSD_PKG_MK          # begin pkgsrc settings
+
+DISTDIR=                   /pkgsrc/distfiles
+PACKAGES=                  /pkgsrc/packages
+WRKOBJDIR=                 /pkgsc/work
+ABI=                       64
+PKGSRC_COMPILER=           clang
+CC=                        clang
+CXX=                       clang++
+CPP=                       ${CC} -E
+
+PKG_DBDIR=                 /var/db/pkg
+LOCALBASE=                 /usr/pkg
+VARBASE=                   /var
+PKG_TOOLS_BIN=             /usr/pkg/sbin
+PKGINFODIR=                info
+PKGMANDIR=                 man
+BINPKG_SITES=              http://pkgsrc.saveosx.org/Darwin/2013Q4/x86_64
+DEPENDS_TARGET=            bin-install
+X11_TYPE=                  modular
+TOOLS_PLATFORM.awk?=       /usr/pkg/bin/nawk
+TOOLS_PLATFORM.sed?=       /usr/pkg/bin/nbsed
+ALLOW_VULNERABLE_PACKAGES= yes
+MAKE_JOBS=                 8
+SKIP_LICENSE_CHECK=        yes
+PKG_DEVELOPER=             yes
+SIGN_PACKAGES=             gpg
+PKG_DEFAULT_OPTIONS+=      -pulseaudio -x264 -imlib2-amd64 -dconf
+.endif                     # end pkgsrc settings
+{% endhighlight %}
+
+- I use `DISTDIR`, `PACKAGES`, `WRKOBJDIR` to move distfiles, packages and source files somewhere else to keep my pkgsrc tree clean

(Diff truncated)
don't encode paths for cvsweb
Index: wikisrc/shortcuts.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/shortcuts.mdwn,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wikisrc/shortcuts.mdwn	5 Jul 2014 14:21:26 -0000	1.2
+++ wikisrc/shortcuts.mdwn	5 Jul 2014 14:22:30 -0000	1.3
@@ -87,4 +87,4 @@
 # Shortcuts specific to this wiki
 
 * [[!shortcut name=nbbug url="http://gnats.netbsd.org/%s"]]
-* [[!shortcut name=nbcvsweb url="http://cvsweb.netbsd.org/bsdweb.cgi/%s"]]
+* [[!shortcut name=nbcvsweb url="http://cvsweb.netbsd.org/bsdweb.cgi/%S"]]

document current state (src has it, pkgsrc still doesn't)
Index: wikisrc/shortcuts.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/shortcuts.mdwn,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wikisrc/shortcuts.mdwn	13 Jun 2013 17:53:26 -0000	1.1
+++ wikisrc/shortcuts.mdwn	5 Jul 2014 14:21:26 -0000	1.2
@@ -87,3 +87,4 @@
 # Shortcuts specific to this wiki
 
 * [[!shortcut name=nbbug url="http://gnats.netbsd.org/%s"]]
+* [[!shortcut name=nbcvsweb url="http://cvsweb.netbsd.org/bsdweb.cgi/%s"]]
Index: wikisrc/projects/project/pkgsrc_tls_support_in_tnftp.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/projects/project/pkgsrc_tls_support_in_tnftp.mdwn,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wikisrc/projects/project/pkgsrc_tls_support_in_tnftp.mdwn	14 Feb 2013 22:34:39 -0000	1.2
+++ wikisrc/projects/project/pkgsrc_tls_support_in_tnftp.mdwn	5 Jul 2014 14:21:26 -0000	1.3
@@ -27,4 +27,10 @@
 """
 ]]
 
+## Current state
+
+* [[!nbcvsweb src/usr.bin/ftp]] has https support since
+  [2013/05/05](http://mail-index.netbsd.org/source-changes/2013/05/05/msg043604.html)
+* [[!nbcvsweb pkgsrc/net/tnftp]] does _not_ have https support
+
 [[!tag gsoc]]

Added a comment: Using NetBSD based sockets, implement a TCP client and TCP Server to demonstrate trivially secure file download from server.
--- /dev/null	2014-07-08 14:40:59.000000000 +0000
+++ wikisrc/examples/socket_programming/comment_1_4fa1037d20f091573b81c12b8e1fde24._comment	2014-07-08 14:47:12.000000000 +0000
@@ -0,0 +1,177 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawm4w8p8mQ2-kj0UGVKSlhhiAPbUYHlPpao"
+ nickname="Ashish"
+ subject="Using NetBSD based sockets, implement a TCP client and TCP Server to demonstrate trivially secure file download from server."
+ date="2014-07-01T06:32:32Z"
+ content="""
+Using NetBSD based sockets, implement a TCP client and TCP Server to demonstrate trivially secure file download from server.
+
+Environment/Tools required:
+Linux RHEL4/5/6 and gcc/g++ compiler and vi editor
+(recommended)
+OR
+Windows XP/Vista/7/8 with Visual studio.
+Learning Objective for student:
+--------------------------------
+1. Understand Protocol messaging and parsing.
+2. Manage multiple connections at a server side
+3. Manage the state of a connection at both client and server side.
+4. Ability to use NetBSD Sockets via C API.
+5. Binary vs Text and practical issues with Endianness !
+6. Ability to effectively use fread, fwrite APIs for file management
+- can also use read/write system calls.
+7. Understanding Standards and compatibility (and the inherent difficulty!)
+between different (not differing!) implementations.
+Note: This is a group assignment.
+Each group can have maximum of 10 students.
+- If group of 10 students is opted,
+5 students may contribute to the client
+and another 5 students may contribute to the server.
+but put together at a minimum, the expected result is
+a group's server should work with its own client.
+- If a group's server/client are compatible with
+other group's client/servers, it will receive more credit.
+** Each group is expected to write both the client and a server.\"
+-1-
+Details:
+-----------
+1. The messaging mechanism is based on Type-Length-Value (TLV)
+The Message Format is
+TYPE Field ---- Length Field --- Value field ---------------
+---- 8 bytes --- 4 Bytes int ---- buffer of length bytes ----
+Note: If Length Field is ZERO, then the Value field is empty
+which is still a perfectly valid message.
+- eg. LOGINOK message - See details below.
+2. All types are of size 8 chars and always uppercase.
+Valid Types for Client messages are:
+LOGIN, AUTH, GETFILE
+Valid Types for Server messages are:
+NEEDAUTH, LOGINOK, DATA, ERROR
+As Type field is 8 bytes, it will employ 'SPACE' as padding.
+i.e. LOGIN will be sent as \"LOGIN \"
+3. The message exchange details are as below:
+Client connects to the server.
+LOGIN is the first message sent by the client.
+If server requires authentication, it replies with NEEDAUTH message.
+If server does not require authentication, it replies with LOGINOK message.
+Client sends back AUTH message as a reply to NEEDAUTH message
+Server replies with LOGINOK if authentication successful, else
+replies will reply with ERROR and close the connection.
+Client if login was ok, i.e. received LOGINOK message, can send at any time,
+a file download request by sending the message GETFILE.
+Note: Only outgoing request must be in the network pipe.
+Upon receiving a GETFILE message, if server finds a matching file
+it can send the file contents back in the DATA message.
+If no matching file, it may send back an ERROR message.
+4. Note, any time the client can close the connection and go away,
+- server needs to detect this and close the connection on its side as well.
+eg. if while server is sending a file, the client goes away,
+server needs to stop then and there.
+-2-
+5. The Client upon receiving the DATA message should store the contents
+appropriately into a file for later viewing.
+6. Server never advertises the file list on the server (unlike SCP/SFTP/FTP !)
+- so clients need to know the file names
+- a simple way is to query the user
+Note: A fancy UI is not required,
+rather a basic working UI with scanf() or fgets() should suffice.
+Note about GETFILE:
+The GETFILE message can send as value a full path name (absolute)
+or a relative path name. with \"/\" as directory separator.
+eg. If \"hello/details.txt\" is sent, server is supposed to
+look in its working directory the given path of the file.
+So in this case \"hello/details.txt\" and \"details.txt\" may refer
+to completely different files.
+Command Line arguments:
+-----------------------
+./TSServer <serverBindIP> <serverBindPort> <serverWorkingDirectory>
+./TSClient <serverIP> <serverPort> <downloadStoreDirectory>
+Note about Auth Mechanism:
+Any 2-way auth mechanism can be employed, trivially a
+Salted Password hash based mechanism can be employed.
+This avoids replay attacks!
+NOTE:
+* If the environment chosen is Linux, it comes with a tool called
+'md5sum' which can be used to generate the Hashes
+on both client side and server side.
+* The server can store the list of passwords in some file.
+(Bad! Not secure, but ok for this barebones version)
+* Both the server and client programs may run in the same machine
+during development, but for testing it would be ideal to
+run them in different machines, to see how a client/server reacts
+when network goes away. ( Intentionally pull out the ethernet cable
+when the client is downloading a big file!)
+-3-
+Message Details
+----------------
+There are totally 7 messages - Syntax/Structure is as below.
+1. LOGIN <username>
+2. NEEDAUTH <Some salt data> - randomly generated
+3. AUTH <hash>
+4. LOGINOK
+- no value sent. O byte length
+5. ERROR
+- can be 0 byte length or contain an error string
+6. GETFILE <filename>
+7. DATA - x bytes indicating size + x bytes of data
+Note: x can be 0. which means empty file!
+A Sample Messaging
+C - Client; S - Server
+=============================================
+C: LOGIN rajesh
+S: NEEDAUTH aa1123
+C: AUTH <Hash(Password + aa1123)>
+S: LOGINOK
+C: GETFILE detail.txt
+S: ERROR \"No Such file\"
+C: GETFILE details.txt
+S: DATA 100 \"some data ... of 100 bytes\"
+Client closes the connection after receiving the DATA
+and stores the data received into a file.
+Extras/Optional: (Attempting will lead to Extra credit)
+---------------------------------------------------------
+Server side :
+1. Server can timeout an idle connection, where the idle timeout can be
+set as a command line argument.
+2. Server can close the connection if client sends 'x' number of bad
+GETFILE messages. 'x' can be made configurable.
+3. Server side handling of BAD Clients sending
+BAD/Invalid Messages/Out-of-Sequence Messages
+eg. A Client connecting and trying to send GETFILE Message without sending LOGIN
+4. Implementing a simple Server side log with timestamp.
+5. Server support for parallel multiple client connections
+with select() and FDSET mechanism of checking socket data availability
+or truly parallel threaded server!
+-4-
+Client side:
+1. Supporting Parallel Connections to download multiple files from the server
+at a same time. eg. Via the UI can get the list of files as input from the user
+and open multiple parallel connections to the server
+send it to the server and start downloading the files at the same time.
+- Will need to reuse the connections as well.
+2. Implementing a simple Client side download log with timestamp.
+3. Take a download folder as a command line argument and
+all downloaded files with unique names to be stored in this folder.
+eg. if same file is downloaded twice, each filename will be unique
+by suffixing it with a timestamp.
+Note: As can be seen, the filesize in this barebones mechanism
+is restricted to 2^32 bytes - 4GB as the length field is only 4 Bytes.
+Extras (needs both server and client side co-operative changes)
+- Ability to support better Authentication schemes.
+- Ability to support big files on server side and client side
+- Ability to support RANGE where the server can send a portion of the file.
+RANGE message syntax:
+---------------------
+RANGE <filename> start end --- Value field has delimiter as CRLF \"\r\n\"
+eg. RANGE details.txt
+20
+300
+When server receives a RANGE message it reads the file only the range requested
+i.e. 20 to 300 bytes (both inclusive) and returns that data.
+so data size will be typically end-start+1 bytes
+in this case 300-20+1 = 281 bytes
+Of course, if the file is much smaller than 300 bytes,
+server can only send the available bytes.
+Server should not choke on invalid RANGE values sent by a client,
+if 'start' is greater than 'end', etc.
+"""]]

Add some releases which happened.
Index: wikisrc/releng.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/releng.mdwn,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- wikisrc/releng.mdwn	20 Sep 2013 16:25:07 -0000	1.9
+++ wikisrc/releng.mdwn	1 Jul 2014 04:27:26 -0000	1.10
@@ -15,9 +15,9 @@
 * Next Minor Release: NetBSD 6.2 (No release date proposed)
   + CVS branch tag: <code>netbsd-6</code>
 * Actively supported teeny releases:
-  + [NetBSD 6.1.1](http://www.netbsd.org/releases/formal-6/NetBSD-6.1.1.html)
+  + [NetBSD 6.1.4](http://www.netbsd.org/releases/formal-6/NetBSD-6.1.4.html)
     - CVS branch tag: <code>netbsd-6-1</code>
-  + [NetBSD 6.0.2](http://www.netbsd.org/releases/formal-6/NetBSD-6.0.2.html)
+  + [NetBSD 6.0.5](http://www.netbsd.org/releases/formal-6/NetBSD-6.0.5.html)
     - CVS branch tag: <code>netbsd-6-0</code>
 * [Current pull-up queue for the netbsd-6 branch](http://releng.netbsd.org/cgi-bin/req-6.cgi)
 
@@ -26,9 +26,9 @@
 * Next Minor release: NetBSD 5.3 (No release date proposed)
   + CVS branch tag: <code>netbsd-5</code>
 * Actively supported teeny releases:
-  + [NetBSD 5.2](http://www.netbsd.org/releases/formal-5/NetBSD-5.2.html)
+  + [NetBSD 5.2.2](http://www.netbsd.org/releases/formal-5/NetBSD-5.2.2.html)
     - CVS branch tag: <code>netbsd-5-2</code>
-  + [NetBSD 5.1.2](http://www.netbsd.org/releases/formal-5/NetBSD-5.1.2.html)
+  + [NetBSD 5.1.4](http://www.netbsd.org/releases/formal-5/NetBSD-5.1.4.html)
     - CVS branch tag: <code>netbsd-5-1</code>
 * [Current pull-up queue for the netbsd-5 branch](http://releng.netbsd.org/cgi-bin/req-5.cgi)
 

link to Youri Mouton's post-pkgsrcCon post
Index: wikisrc/users/schmonz/pkgsrccon2014.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/schmonz/pkgsrccon2014.mdwn,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- wikisrc/users/schmonz/pkgsrccon2014.mdwn	27 Jun 2014 01:03:50 -0000	1.15
+++ wikisrc/users/schmonz/pkgsrccon2014.mdwn	28 Jun 2014 19:55:39 -0000	1.16
@@ -192,4 +192,10 @@
    everyone to do so? If not, what do we need to improve before we
    do that?
 
+# Afterward
+
+## Blog posts
+
+* [Youri Mouton](http://saveosx.org/pkgsrcCon/)
+
 [[!meta title="pkgsrcCon 2014: notes and scratchings"]]

Backquotes aren't interpreted in titles, so don't bother.
Index: wikisrc/wiki/todo/ikiwiki_as_blog.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/wiki/todo/ikiwiki_as_blog.mdwn,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wikisrc/wiki/todo/ikiwiki_as_blog.mdwn	27 Jun 2014 01:04:49 -0000	1.2
+++ wikisrc/wiki/todo/ikiwiki_as_blog.mdwn	27 Jun 2014 01:07:36 -0000	1.3
@@ -1,4 +1,4 @@
-[[!meta title="merge `blog.netbsd.org` into this site"]]
+[[!meta title="merge blog.netbsd.org into this site"]]
 
 ## What was the original goal of powering the blog with Roller?
 * To have a blog, and
Index: wikisrc/wiki/todo/merge_pkgsrc_wiki.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/wiki/todo/merge_pkgsrc_wiki.mdwn,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wikisrc/wiki/todo/merge_pkgsrc_wiki.mdwn	27 Jun 2014 01:04:49 -0000	1.1
+++ wikisrc/wiki/todo/merge_pkgsrc_wiki.mdwn	27 Jun 2014 01:07:36 -0000	1.2
@@ -1,4 +1,4 @@
-[[!meta title="merge `pkgsrc.org` into this site"]]
+[[!meta title="merge pkgsrc.org into this site"]]
 
 7. `cvs checkout wiki.netbsd.org:/home/pkgwiki/pkgsrc-wiki.cvs`
 7. `cvs checkout wiki.netbsd.org:/cvsroot`

Update my status, remove test comments.
Index: wikisrc/users/schmonz.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/schmonz.mdwn,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- wikisrc/users/schmonz.mdwn	21 Jun 2014 09:18:33 -0000	1.25
+++ wikisrc/users/schmonz.mdwn	27 Jun 2014 01:06:08 -0000	1.26
@@ -1,6 +1,6 @@
 [[schmonz_73x73.jpg]]
 
-Current status: [[pkgsrccon2014]]
+I attended, and took some quick notes during, [[pkgsrccon2014]].
 
 If you've got an idea about how this wiki ought to work, edit the
 [[wiki/todo]] list! Here's what's been [[wiki/todo/done]] so far.
--- wikisrc/users/schmonz/comment_1_128cb82ab76f0faa4ef64dbfeed5d174._comment	2014-07-08 14:47:12.000000000 +0000
+++ /dev/null	2014-07-08 14:40:59.000000000 +0000
@@ -1,7 +0,0 @@
-[[!comment format=mdwn
- username="schmonz"
- subject="first comment!"
- date="2011-10-22T05:41:30Z"
- content="""
-Posting a comment as schmonz (Kerberos, Safari).
-"""]]
--- wikisrc/users/schmonz/comment_2_ce8bfa5652c8018a2aeca39422a6ba72._comment	2014-07-08 14:47:12.000000000 +0000
+++ /dev/null	2014-07-08 14:40:59.000000000 +0000
@@ -1,9 +0,0 @@
-[[!comment format=mdwn
- username="https://www.google.com/accounts/o8/id?id=AItOawn4s9LIk3M02RHXP85tpNlnS9aaY3bvlss"
- nickname="Amitai"
- subject="second comment!"
- date="2011-10-22T05:48:40Z"
- content="""
-Posting a comment as not-schmonz (OpenID, Camino).
-
-"""]]
--- wikisrc/users/schmonz/comment_3_825ce6c939424d95597d555304a888e5._comment	2014-07-08 14:47:12.000000000 +0000
+++ /dev/null	2014-07-08 14:40:59.000000000 +0000
@@ -1,8 +0,0 @@
-[[!comment format=mdwn
- username="https://www.google.com/accounts/o8/id?id=AItOawn4s9LIk3M02RHXP85tpNlnS9aaY3bvlss"
- nickname="Amitai"
- subject="third comment!"
- date="2011-10-22T06:07:38Z"
- content="""
-Posting a comment as not-schmonz (OpenID, Camino) that ought to pass muster sans moderation, since blogspam is off.
-"""]]

Flesh out ikiwiki plans, as discussed with spz at pkgsrcCon.
Index: wikisrc/wiki/todo/ikiwiki_as_blog.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/wiki/todo/ikiwiki_as_blog.mdwn,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wikisrc/wiki/todo/ikiwiki_as_blog.mdwn	27 May 2013 12:47:05 -0000	1.1
+++ wikisrc/wiki/todo/ikiwiki_as_blog.mdwn	27 Jun 2014 01:04:49 -0000	1.2
@@ -1,8 +1,42 @@
-If we like ikiwiki-as-wiki, we might [[eventually|wiki/todo/later]]
-want to use it for [the NetBSD blog](http://blog.netbsd.org/) as
-well.
+[[!meta title="merge `blog.netbsd.org` into this site"]]
 
-What's needed:
+## What was the original goal of powering the blog with Roller?
+* To have a blog, and
+* To counter the misconception that NetBSD doesn't run Java
+  well (or at all)...
+* By demonstrating that NetBSD runs Java (and well)
+
+## How well have we met that goal?
+* It's hardly obvious to passersby that the blog is Java-powered
+* It's somewhat annoying to admin (and few of us know how)
+
+## Could we get more of the intended marketing benefit for less admin cost?
+* Document loudly (e.g., on the wiki) how NetBSD supports Java
+* Publish the blog with a CMS we already happily admin and use (ikiwiki)
+
+## Would anyone feel strongly opposed to the change?
+* Not that we can think of (but we'll find out)
+
+## Would anyone be particularly happy about the change?
+* Yes, some members of `admins` and `www`
+
+## What functionality is important to preserve when migrating?
+* Data: articles and comments (stored as HTML in database)
+* Metadata: dates, ordering, relation of comments to posts
+* Feeds: feed URLs, UUIDs
+* Media: include images in posts
+* Commentspam: lock post after N months, no URLs, easy manual delete
+
+## What admin-facing functionality would change?
+* Accounts: Kerberos suffices, no more blog-specific accounts
+
+## What do admins need to feel more comfortable with more ikiwiki?
+* More documentation and training
+
+-----
+
+Previous thinking on what was needed (please merge with the above
+or discard):
 
 7. [[!iki desc="Comments" plugins/comments]]
 7. Facility for authors to write a [[!iki desc="summary"
--- /dev/null	2014-07-08 14:40:59.000000000 +0000
+++ wikisrc/wiki/todo/merge_pkgsrc_wiki.mdwn	2014-07-08 14:47:12.000000000 +0000
@@ -0,0 +1,24 @@
+[[!meta title="merge `pkgsrc.org` into this site"]]
+
+7. `cvs checkout wiki.netbsd.org:/home/pkgwiki/pkgsrc-wiki.cvs`
+7. `cvs checkout wiki.netbsd.org:/cvsroot`
+7. (./) Enable ikiwiki's localstyle plugin
+7. (./) Copy pkgsrc-wiki's `local.css` into `wikisrc/pkgsrc`
+7. (./) Catch up our custom `page.tmpl` to the basewiki's so localstyle works
+    * XXX more divergence than that; catch up and try to minimize
+7. Figure out how to apply the `pkgsrc.org` logo and header-links
+   template to everything under `wikisrc/pkgsrc/`
+    * We can wrap a _single_ page in a custom template [like
+      so](http://ikiwiki.info/ikiwiki/directive/pagetemplate/)
+    * We can modify templates for entire subtrees, but only [outside
+      wikisrc](http://ikiwiki.info/todo/multiple_template_directories/)
+    * Can we do it with CSS?
+7. Where do we put the pages that are currently under `pkgsrc/`?
+7. Repo-copy content from pkgsrc-wiki to `wikisrc/pkgsrc/`)
+7. Preview at <http://wiki.netbsd.org/pkgsrc/>
+7. Add links to the pages that had already been under `pkgsrc/`
+7. Move `pkgwiki`'s `cron` jobs to `wiki`'s
+7. Point `{www.,}pkgsrc.org` at that HTML directory
+7. Figure out how to leave the "Edit" links off the top-level
+   `wikisrc/pkgsrc/` page and maybe some others, so that non-developers
+   won't be able to edit them

Remove todo items that are either mine or wiki-related.
Index: wikisrc/users/schmonz/pkgsrccon2014.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/schmonz/pkgsrccon2014.mdwn,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- wikisrc/users/schmonz/pkgsrccon2014.mdwn	23 Jun 2014 14:37:41 -0000	1.14
+++ wikisrc/users/schmonz/pkgsrccon2014.mdwn	27 Jun 2014 01:03:50 -0000	1.15
@@ -175,58 +175,6 @@
 
 ### Ideas
 
-#### Merge `pkgsrc.org` into `wiki.netbsd.org/pkgsrc/`
-
-7. `cvs checkout wiki.netbsd.org:/home/pkgwiki/pkgsrc-wiki.cvs`
-7. `cvs checkout wiki.netbsd.org:/cvsroot`
-7. (./) Enable ikiwiki's localstyle plugin
-7. (./) Copy pkgsrc-wiki's `local.css` into `wikisrc/pkgsrc`
-7. (./) Catch up our custom `page.tmpl` to the basewiki's so localstyle works
-7. Figure out how to apply the `pkgsrc.org` logo and header-links
-   template to everything under `wikisrc/pkgsrc/`
-    * We can wrap a _single_ page in a custom template [like
-      so](http://ikiwiki.info/ikiwiki/directive/pagetemplate/)
-    * We can modify templates for entire subtrees, but only [outside
-      wikisrc](http://ikiwiki.info/todo/multiple_template_directories/)
-    * Can we do it with CSS?
-7. Where do we put the pages that are currently under `pkgsrc/`?
-7. Repo-copy content from pkgsrc-wiki to `wikisrc/pkgsrc/`)
-7. Preview at <http://wiki.netbsd.org/pkgsrc/>
-7. Add links to the pages that had already been under `pkgsrc/`
-7. Move `pkgwiki`'s `cron` jobs to `wiki`'s
-7. Point `{www.,}pkgsrc.org` at that HTML directory
-7. Figure out how to leave the "Edit" links off the top-level
-   `wikisrc/pkgsrc/` page and maybe some others, so that non-developers
-   won't be able to edit them
-
-#### Merge `blog.netbsd.org` into `wiki.netbsd.org/blog/` (or so)
-
-7. What was the original goal of powering the blog with Roller?
-    * To have a blog, and
-    * To counter the misconception that NetBSD doesn't run Java
-      well (or at all)...
-    * By demonstrating that NetBSD runs Java (and well)
-7. How well have we met that goal?
-    * It's hardly obvious to passersby that the blog is Java-powered
-    * It's somewhat annoying to admin (and few of us know how)
-7. Could we get more of the intended marketing benefit for less admin cost?
-    * Document loudly (e.g., on the wiki) how NetBSD supports Java
-    * Publish the blog with a CMS we already happily admin and use (ikiwiki)
-7. Would anyone feel strongly opposed to the change?
-    * Not that we can think of (but we'll find out)
-7. Would anyone be particularly happy about the change?
-    * Yes, some members of `admins` and `www`
-7. What functionality is important to preserve when migrating?
-    * Data: articles and comments (stored as HTML in database)
-    * Metadata: dates, ordering, relation of comments to posts
-    * Feeds: feed URLs, UUIDs
-    * Media: include images in posts
-    * Commentspam: lock post after N months, no URLs, easy manual delete
-7. What admin-facing functionality would change?
-    * Accounts: Kerberos suffices, no more blog-specific accounts
-7. What do admins need to feel more comfortable with more ikiwiki?
-    * More documentation and training
-
 #### Integrate `joerg`'s C wrappers
 
 7. `hg clone ssh://ftp.netbsd.org/~joerg/cwrapper`
@@ -235,24 +183,6 @@
 7. Do one bulk build on `HEAD` and one on your branch
 7. Let's see how it went
 
-#### `[schmonz]` Merge hard-coded pkgsrcCon 2013 site into `wiki.netbsd.org`
-
-7. Get a local copy of everything
-7. Fix up template
-7. Get previous sites to not break (maybe not editable)
-7. Commit to `pkgwiki`
-
-#### Document "how to host a pkgsrcCon"
-* A room for 20-30 people
-* Coffee
-* Projector
-* WiFi and perhaps wired networking
-* Travel instructions
-* Nearby hotels
-* Dinner and pub locations for the Friday and Saturday
-* Post the talk schedule
-* Publicize the conference every so often -- to which lists, sites, etc.?
-
 #### Fix `pkgtools/pkg_regress` tests
 
 7. The one that was still passing, do we believe that? Can we make it break?
@@ -262,23 +192,4 @@
    everyone to do so? If not, what do we need to improve before we
    do that?
 
-#### Write an initial pkgsrc "product backlog"
-
-7. Starting with the work we need to do to make it easier to develop
-   pkgsrc internals
-7. Further down, the developer features we want pkgsrc to have
-7. Further down, the user features we want pkgsrc to have
-
-#### Debug why just-in-time `su` sometimes doesn't
-
-7. It seems to be working just about all the time for nearly everyone
-7. It doesn't work for `schmonz` in this case:
-    * `mail/qmail` (which is not `user-destdir`, only `destdir`)
-    * on Mac OS X 10.9.3 (haven't tried other systems)
-    * `make package`
-7. It does work for `schmonz` in this similar-looking case:
-    * `mail/relay-ctrl` (also only `destdir`)
-    * on Mac OS X 10.9.3
-    * `make package`
-
 [[!meta title="pkgsrcCon 2014: notes and scratchings"]]

Add bsiegert's wish for more meaningful states of "closed".
Index: wikisrc/bugtracking.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/bugtracking.mdwn,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wikisrc/bugtracking.mdwn	23 Jun 2014 17:36:29 -0000	1.6
+++ wikisrc/bugtracking.mdwn	26 Jun 2014 13:52:33 -0000	1.7
@@ -138,7 +138,7 @@
 This basically constitutes a total failure of the bugtracker: it was
 completely unable to provide useful information of any kind.
 
-I (dholland) have since learned some tricks and have also accumulated
+I ([[dholland]]) have since learned some tricks and have also accumulated
 an external index for the database; this means I can get stuff out of
 it now, at least sometimes, but most developers are in the position I
 was then: the bug database is a completely useless black hole.
@@ -164,7 +164,7 @@
 
 Note that in addition to the above analysis we also have some
 supporting results.
-Based on the analysis I (dholland) started maintaining an annotated
+Based on the analysis I ([[dholland]]) started maintaining an annotated
 browseable index (aka the "buglists" pages) of the bug database.
 This basically amounted to additional per-bug metadata of several
 kinds, organized in a fashion that allowed generating an index as a
@@ -425,6 +425,8 @@
 personal priority or other criteria.
 * A way to turn off mail for bouncing addresses.
 * A way to move misfiled comments from one PR to another.
+* A way to mark bugs not merely as "closed" but one of fixed,
+  invalid, obsolete, or "won't fix".
 
 Some other stuff that would be nice:
 
Index: wikisrc/bugtracking/stuff_we_dislike_about_gnats.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/bugtracking/stuff_we_dislike_about_gnats.mdwn,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wikisrc/bugtracking/stuff_we_dislike_about_gnats.mdwn	23 Jun 2014 06:26:06 -0000	1.3
+++ wikisrc/bugtracking/stuff_we_dislike_about_gnats.mdwn	26 Jun 2014 13:52:33 -0000	1.4
@@ -29,6 +29,10 @@
 * There's no way to disable sending mail to email addresses that are
 known to be invalid.
 
+* When a bug is closed, there's no way to disambiguate from its
+  closed state whether it's fixed, invalid, obsolete, or otherwise
+  "won't fix".
+
 ## User interface
 
 * gnats has no ability to do anything by web besides display PRs, and

Some events have passed (including pkgsrcCon). Add upcoming EuroBSDCon.
Index: wikisrc/events.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/events.mdwn,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- wikisrc/events.mdwn	25 Jun 2014 20:45:22 -0000	1.9
+++ wikisrc/events.mdwn	26 Jun 2014 13:35:19 -0000	1.10
@@ -10,42 +10,6 @@
 Future Events
 -------------
 
-### `Mar 2014` - AsiaBSDCon 2014
-
-*Mar 13-16, 2014, Tokyo University of Science,Tokyo, Japan*
-
-[AsiaBSDCon](http://2014.asiabsdcon.org/) will be a conference for users
-and developers on BSD based systems. The conference was for anyone
-developing, deploying and using systems based on FreeBSD, NetBSD,
-OpenBSD, DragonFly BSD, Darwin, and MacOS X. AsiaBSDCon was a technical
-conference and aimed to collect the best technical papers and
-presentations available to ensure that the latest developments in our
-open source community are shared with the widest possible audience.
-
-### `Mar 2014` - Open Source Conference 2014 Hamanako
-
-*Mar. 22, 2014, [Hamamatsu Shimin Kyodo
-Center](http://www.machien-hamamatsu.jp/) , Shizuoka, Japan*
-
-At the [Open Source Conference 2014
-Hamanako](http://www.ospn.jp/osc2014-hamanako/) , there will be a NetBSD
-booth staffed by members of the [Japan NetBSD Users'
-Group](http://www.jp.NetBSD.org/) with many gadgets demonstration (
-[hpcarm](../ports/hpcarm/), [hpcmips](../ports/hpcmips/),
-[hpcsh](../ports/hpcsh/)).
-
-### `Jun 2014` - Open Source Conference 2014 Hokkaido
-
-*Jun. 13-14, 2014, [Sapporo Business Innovation Center, Sapporo,
-Japan](http://www.sapporosansin.jp/access/)*
-
-At the [Open Source Conference 2014
-Hokkaido](http://www.ospn.jp/osc2014-do/) , there will be a NetBSD booth
-staffed by members of the [Japan NetBSD Users'
-Group](http://www.jp.NetBSD.org/) and [NoBUG](http://www.no.bug.gr.jp/)
-with NetBSD gadget demonstrations ( [hpcarm](../ports/hpcarm/),
-[hpcmips](../ports/hpcmips/), [hpcsh](../ports/hpcsh/)).
-
 ### `Jul 2014` - Open Source Conference 2014 Nagoya
 
 *Jul. 4-5, 2014, [Nagoya International
@@ -59,6 +23,18 @@
 (NBUG)](http://www.nagoya.bug.gr.jp/). There will be a gadget
 demonstration [BSD booth](http://twitpic.com/czat1r) and NBUG BOF.
 
+### `Sep 2014` - EuroBSDCon 2014, Sofia, Bulgaria
+
+*Sep. 25-28, 2012, Sofia, Bulgaria*
+
+[EuroBSDcon](http://2014.EuroBSDCon.org) is the premier European
+conference on the open source BSD operating systems attracting about
+250 highly skilled engineering professionals, software developers,
+computer science students and professors, and users from all over
+Europe and other parts of the world. The goal of EuroBSDcon is to
+exchange knowledge about the BSD operating systems, facilitate
+coordination and cooperation among users and developers.
+
 ### `Nov 2014` - Kansai OpenSource 2014
 
 *Nov. 7-8, 2014, [Asia and Pacific Trade Center ITM
@@ -74,6 +50,52 @@
 Past Events
 -----------
 
+### `Jun 2014` - pkgsrcCon 2014, London, England
+
+*Jun. 21-22, 2014, Middlesex University, London, England*
+
+[pkgsrcCon](http://www.pkgsrc.org/pkgsrcCon/2014/) is a technical
+conference for people working on the NetBSD Packages Collection
+(pkgsrc), focusing on existing technologies, research projects, and
+works-in-progress in pkgsrc infrastructure. Developers, contributors,
+interested developers and users are all welcome to attend.
+
+### `Jun 2014` - Open Source Conference 2014 Hokkaido
+
+*Jun. 13-14, 2014, [Sapporo Business Innovation Center, Sapporo,
+Japan](http://www.sapporosansin.jp/access/)*
+
+At the [Open Source Conference 2014
+Hokkaido](http://www.ospn.jp/osc2014-do/) , there will be a NetBSD booth
+staffed by members of the [Japan NetBSD Users'
+Group](http://www.jp.NetBSD.org/) and [NoBUG](http://www.no.bug.gr.jp/)
+with NetBSD gadget demonstrations ( [hpcarm](../ports/hpcarm/),
+[hpcmips](../ports/hpcmips/), [hpcsh](../ports/hpcsh/)).
+
+### `Mar 2014` - Open Source Conference 2014 Hamanako
+
+*Mar. 22, 2014, [Hamamatsu Shimin Kyodo
+Center](http://www.machien-hamamatsu.jp/) , Shizuoka, Japan*
+
+At the [Open Source Conference 2014
+Hamanako](http://www.ospn.jp/osc2014-hamanako/) , there will be a NetBSD
+booth staffed by members of the [Japan NetBSD Users'
+Group](http://www.jp.NetBSD.org/) with many gadgets demonstration (
+[hpcarm](../ports/hpcarm/), [hpcmips](../ports/hpcmips/),
+[hpcsh](../ports/hpcsh/)).
+
+### `Mar 2014` - AsiaBSDCon 2014
+
+*Mar 13-16, 2014, Tokyo University of Science,Tokyo, Japan*
+
+[AsiaBSDCon](http://2014.asiabsdcon.org/) will be a conference for users
+and developers on BSD based systems. The conference was for anyone
+developing, deploying and using systems based on FreeBSD, NetBSD,
+OpenBSD, DragonFly BSD, Darwin, and MacOS X. AsiaBSDCon was a technical
+conference and aimed to collect the best technical papers and
+presentations available to ensure that the latest developments in our
+open source community are shared with the widest possible audience.
+
 ### `Feb 2014` - Open Source Conference 2014 Tokyo/Spring
 
 *Feb. 28- Mar. 1, 2014, [MEISEI

Index: wikisrc/events.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/events.mdwn,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- wikisrc/events.mdwn	5 Mar 2014 06:52:32 -0000	1.8
+++ wikisrc/events.mdwn	25 Jun 2014 20:45:22 -0000	1.9
@@ -5,6 +5,8 @@
 For a list of NetBSD-related presentations, please check out our
 [presentation pages](/gallery/presentations/).
 
+[Conference Attendance and Organizations](conferences)
+
 Future Events
 -------------
 

Handling confidential PRs correctly is a hard requirement; noted by erh.
Index: wikisrc/bugtracking.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/bugtracking.mdwn,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wikisrc/bugtracking.mdwn	18 Jun 2014 11:48:45 -0000	1.5
+++ wikisrc/bugtracking.mdwn	23 Jun 2014 17:36:29 -0000	1.6
@@ -367,6 +367,8 @@
 * Must be able to import the existing bug database.
 * Doing so must not lose information.
 * Must be able to accept incoming email from deployed send-pr scripts.
+* Must handle confidential PRs in a way that does not make them
+accessible to non-NetBSD people.
 * Must be able to accept and file commit messages.
 * It is not necessary to sign up to file a problem report.
 * Nothing may be written in php.

that one fellow's name was Daniel, or so he claimed
Index: wikisrc/users/schmonz/pkgsrccon2014.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/schmonz/pkgsrccon2014.mdwn,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- wikisrc/users/schmonz/pkgsrccon2014.mdwn	22 Jun 2014 15:12:16 -0000	1.13
+++ wikisrc/users/schmonz/pkgsrccon2014.mdwn	23 Jun 2014 14:37:41 -0000	1.14
@@ -35,7 +35,7 @@
 * `spz`
 * `prlw1`
 * `wiedi`
-* one fellow I didn't recognize and didn't get to meet
+* Daniel
 * `sborrill`
 * `morr`
 
@@ -165,7 +165,7 @@
 * `spz`
 * `prlw1`
 * `wiedi`
-* that fellow I didn't recognize and haven't gotten to meet
+* Daniel
 * `sborrill`
 * `morr`
 

uninvite the newly added pkgsrc-local local.css to the map party
Index: wikisrc/pkgsrc.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/pkgsrc.mdwn,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wikisrc/pkgsrc.mdwn	20 Nov 2011 19:16:52 -0000	1.3
+++ wikisrc/pkgsrc.mdwn	23 Jun 2014 14:34:49 -0000	1.4
@@ -1,3 +1,3 @@
 <http://pkgsrc.org>
 
-[[!map pages="pkgsrc/*" ]]
+[[!map pages="pkgsrc/* and !*.css"]]

try again on markup
Index: wikisrc/bugtracking/stuff_we_dislike_about_gnats.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/bugtracking/stuff_we_dislike_about_gnats.mdwn,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wikisrc/bugtracking/stuff_we_dislike_about_gnats.mdwn	22 Jun 2014 22:21:40 -0000	1.2
+++ wikisrc/bugtracking/stuff_we_dislike_about_gnats.mdwn	23 Jun 2014 06:26:06 -0000	1.3
@@ -34,18 +34,18 @@
 * gnats has no ability to do anything by web besides display PRs, and
 they display only as plain text. Things that you should be able to do
 that you can't include:
-** filing comments
-** browsing from one PR to other related ones (either explicit links
+   * filing comments
+   * browsing from one PR to other related ones (either explicit links
 from one PR to another, or retriving other PRs with similar
 properties)
-** subscribing to PRs to get updates (even by email, let alone by RSS)
+   * subscribing to PRs to get updates (even by email, let alone by RSS)
 
 * The only way to do administrative operations is to run an editor on
 the backend text file representation of a single bug. This means you
 can't readily:
-** massedit PRs (e.g. put a lot of related PRs in feedback at once)
-** update someone's email address
-** move misfiled comments from one PR to another
+   * massedit PRs (e.g. put a lot of related PRs in feedback at once)
+   * update someone's email address
+   * move misfiled comments from one PR to another
 
 * But you can't file a comment on a PR from the command line; you have
 to send email.

rant a bit
Index: wikisrc/bugtracking/stuff_we_dislike_about_gnats.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/bugtracking/stuff_we_dislike_about_gnats.mdwn,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wikisrc/bugtracking/stuff_we_dislike_about_gnats.mdwn	22 Jun 2014 21:09:10 -0000	1.1
+++ wikisrc/bugtracking/stuff_we_dislike_about_gnats.mdwn	22 Jun 2014 22:21:40 -0000	1.2
@@ -1 +1,73 @@
 # Stuff we dislike about gnats
+
+## Storage and filing
+
+* gnats does not understand MIME attachments. (At all.) They end up as
+text blobs in the database. And worse, they end up mildly corrupted so
+they need to be edited to be decoded.
+
+* gnats makes it a nuisance to extract even inline patches from PRs.
+
+* gnats has no way to prevent accidentally filing messages in old PRs,
+and it's frequently necessary to hand-edit old PRs to clean up the
+consequences.
+
+* gnats accepts a wide range of misformatted incoming PRs, then
+mangles them further and drops them into an internal queue needing
+manual attention.
+
+* gnats fairly frequently belches on incoming mail requiring
+intervention from admins.
+
+* By default gnats does not treat incoming confidential PRs as
+confidential; it requires manual filtering in the surrounding email
+logic.
+
+* gnats has no support whatsoever for automatically handling bounced
+mail.
+
+* There's no way to disable sending mail to email addresses that are
+known to be invalid.
+
+## User interface
+
+* gnats has no ability to do anything by web besides display PRs, and
+they display only as plain text. Things that you should be able to do
+that you can't include:
+** filing comments
+** browsing from one PR to other related ones (either explicit links
+from one PR to another, or retriving other PRs with similar
+properties)
+** subscribing to PRs to get updates (even by email, let alone by RSS)
+
+* The only way to do administrative operations is to run an editor on
+the backend text file representation of a single bug. This means you
+can't readily:
+** massedit PRs (e.g. put a lot of related PRs in feedback at once)
+** update someone's email address
+** move misfiled comments from one PR to another
+
+* But you can't file a comment on a PR from the command line; you have
+to send email.
+
+* The nag mails that gnats sends to submitters are annoying to handle;
+in particular just replying to them does not go anywhere useful.
+
+* The nag mails that gnats sends to developers list a bunch of PRs but
+do not list them in any kind of useful order; nor does gnats note
+what's different since the previous one.
+
+## Querying and search
+
+* There's a web search form, but it's close to useless, partly because
+it doesn't take input well and partly because the lists of results it
+produces is unsorted, unstructured, and impossible to work with.
+
+* The command-line interface supports search... using a custom query
+"language" that's nearly impossible to use and that furthermore has
+most of the same drawbacks as the web search page. In order to do
+anything much useful you need to write your own scripts that wrap the
+output.
+
+* Finding stuff in the database is sufficiently hard that many people
+consider it effectively impossible.

Add the "stuff we dislike about gnats" page, I forgot to the other day.
nothing here yet, but I'm about to add a load. feel free to go to
town...
Members: 
	bugtracking/stuff_we_dislike_about_gnats.mdwn:INITIAL->1.1 

--- /dev/null	2014-07-08 14:40:59.000000000 +0000
+++ wikisrc/bugtracking/stuff_we_dislike_about_gnats.mdwn	2014-07-08 14:47:13.000000000 +0000
@@ -0,0 +1 @@
+# Stuff we dislike about gnats

spz's idea: document how to host a pkgsrcCon
Index: wikisrc/users/schmonz/pkgsrccon2014.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/schmonz/pkgsrccon2014.mdwn,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- wikisrc/users/schmonz/pkgsrccon2014.mdwn	22 Jun 2014 13:54:27 -0000	1.12
+++ wikisrc/users/schmonz/pkgsrccon2014.mdwn	22 Jun 2014 15:12:16 -0000	1.13
@@ -242,6 +242,17 @@
 7. Get previous sites to not break (maybe not editable)
 7. Commit to `pkgwiki`
 
+#### Document "how to host a pkgsrcCon"
+* A room for 20-30 people
+* Coffee
+* Projector
+* WiFi and perhaps wired networking
+* Travel instructions
+* Nearby hotels
+* Dinner and pub locations for the Friday and Saturday
+* Post the talk schedule
+* Publicize the conference every so often -- to which lists, sites, etc.?
+
 #### Fix `pkgtools/pkg_regress` tests
 
 7. The one that was still passing, do we believe that? Can we make it break?

a few more things we want to get right
Index: wikisrc/users/schmonz/pkgsrccon2014.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/schmonz/pkgsrccon2014.mdwn,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- wikisrc/users/schmonz/pkgsrccon2014.mdwn	22 Jun 2014 13:50:25 -0000	1.11
+++ wikisrc/users/schmonz/pkgsrccon2014.mdwn	22 Jun 2014 13:54:27 -0000	1.12
@@ -190,9 +190,14 @@
       wikisrc](http://ikiwiki.info/todo/multiple_template_directories/)
     * Can we do it with CSS?
 7. Where do we put the pages that are currently under `pkgsrc/`?
-7. Copy content from the former to the latter (under `pkgsrc/`)
+7. Repo-copy content from pkgsrc-wiki to `wikisrc/pkgsrc/`)
 7. Preview at <http://wiki.netbsd.org/pkgsrc/>
+7. Add links to the pages that had already been under `pkgsrc/`
+7. Move `pkgwiki`'s `cron` jobs to `wiki`'s
 7. Point `{www.,}pkgsrc.org` at that HTML directory
+7. Figure out how to leave the "Edit" links off the top-level
+   `wikisrc/pkgsrc/` page and maybe some others, so that non-developers
+   won't be able to edit them
 
 #### Merge `blog.netbsd.org` into `wiki.netbsd.org/blog/` (or so)
 

what spz and I have learned so far
Index: wikisrc/users/schmonz/pkgsrccon2014.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/schmonz/pkgsrccon2014.mdwn,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- wikisrc/users/schmonz/pkgsrccon2014.mdwn	22 Jun 2014 11:17:10 -0000	1.10
+++ wikisrc/users/schmonz/pkgsrccon2014.mdwn	22 Jun 2014 13:50:25 -0000	1.11
@@ -179,6 +179,17 @@
 
 7. `cvs checkout wiki.netbsd.org:/home/pkgwiki/pkgsrc-wiki.cvs`
 7. `cvs checkout wiki.netbsd.org:/cvsroot`
+7. (./) Enable ikiwiki's localstyle plugin
+7. (./) Copy pkgsrc-wiki's `local.css` into `wikisrc/pkgsrc`
+7. (./) Catch up our custom `page.tmpl` to the basewiki's so localstyle works
+7. Figure out how to apply the `pkgsrc.org` logo and header-links
+   template to everything under `wikisrc/pkgsrc/`
+    * We can wrap a _single_ page in a custom template [like
+      so](http://ikiwiki.info/ikiwiki/directive/pagetemplate/)
+    * We can modify templates for entire subtrees, but only [outside
+      wikisrc](http://ikiwiki.info/todo/multiple_template_directories/)
+    * Can we do it with CSS?
+7. Where do we put the pages that are currently under `pkgsrc/`?
 7. Copy content from the former to the latter (under `pkgsrc/`)
 7. Preview at <http://wiki.netbsd.org/pkgsrc/>
 7. Point `{www.,}pkgsrc.org` at that HTML directory

try using the local.css
Index: wikisrc/templates/page.tmpl
===================================================================
RCS file: /cvsroot/wikisrc/templates/page.tmpl,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- wikisrc/templates/page.tmpl	12 Apr 2014 02:18:09 -0000	1.25
+++ wikisrc/templates/page.tmpl	22 Jun 2014 13:18:22 -0000	1.26
@@ -15,7 +15,12 @@
 </TMPL_IF>
 <link rel="stylesheet" href="//wiki.netbsd.org/global.css" type="text/css" />
 <link rel="stylesheet" href="//wiki.netbsd.org/style.css" type="text/css" />
-<link rel="stylesheet" href="//wiki.netbsd.org/local.css" type="text/css" />
+<TMPL_IF LOCAL_CSS>
+<link rel="stylesheet" href="<TMPL_VAR BASEURL><TMPL_VAR LOCAL_CSS>" type="text/css" />
+<TMPL_ELSE>
+<link rel="stylesheet" href="<TMPL_VAR BASEURL>local.css" type="text/css" />
+</TMPL_IF>
+
 <TMPL_IF NAME="EDITURL">
 <link rel="alternate" type="application/x-wiki" title="Edit this page" href="<TMPL_VAR EDITURL>" />
 </TMPL_IF>

local.css from the pkgwiki. Yay, branding unity
--- /dev/null	2014-07-08 14:40:59.000000000 +0000
+++ wikisrc/pkgsrc/local.css	2014-07-08 14:47:13.000000000 +0000
@@ -0,0 +1,123 @@
+body {
+  margin: 1em;
+  padding: 0;
+  font-family: "Helvetica", "Trebuchet MS", "Geneva", "Verdana", "sans-serif";
+  *font-size: small;
+  color: black;
+  background: white;
+  font-size: 1em;
+}
+
+ul {
+  padding-left: 1em;
+}
+
+a:link {
+  color: #F26711;
+}
+a:visited {
+  color: #F26711;
+}
+
+#pagebody {
+  width: 98%;
+}
+
+.digestbox {
+  float: right;
+  margin-left: 2ex;
+  margin-top: 1ex;
+  margin-bottom: 1ex;
+  padding: 1ex 1ex;
+  border: 0px solid #ddd;
+  background: white;
+  color: black !important;
+  a:color: black !important;
+  font-size: .8em;
+  max-width: 20%;
+  clear: both;
+}
+
+.digestbox a:link {
+  font-size: .7em;
+  color: black;
+}
+
+.digestbox a:visited {
+  font-size: .7em;
+  color: black;
+}
+
+.pageheader {
+  width: 95%;
+  padding: 1em 1em .5em 1em;
+  position: relative;
+  overflow: hidden;
+  background: white;
+  border-color: orange;
+  border-style: none none solid none;
+  border-width: 1px;
+  padding: 0px;
+}
+
+.pageheader a {
+  text-decoration: none;
+  font-size: .8em;
+  color: #F26711;
+}
+
+.pageheader a:hover {
+  text-decoration: underline;
+}
+
+.pageheader .actions ul {
+  border-style: none;
+}
+
+
+
+li.L1 {
+  list-style: circle outside none;
+}
+
+.logolink {
+  float: left;
+  clear: both;
+}
+
+.releasenotes {
+  float: left;
+  padding-left: 1em;
+}
+
+.pagedate ul {
+  list-style: none outside none;
+  padding: 0;
+}
+
+code, pre {
+  background-color: #f2f2f2;
+  color: #2e1a05;
+  white-space: pre-wrap;
+  white-space: -moz-pre-wrap;
+  white-space: -o-pre-wrap;
+}
+
+pre {
+  padding: .5em;
+  margin: 1em;
+  border-style: solid;
+  border-width: 2px;
+  border-color: gray;
+  -moz-border-radius: 4px;
+  -webkit-border-radius: 4px;
+  border-radius: 4px;
+  -moz-box-shadow: 0px 0px 2px #1a1a1a;
+  -webkit-box-shadow: 0px 0px 2px #1a1a1a;
+  box-shadow: 0px 0px 2px #1a1a1a;
+}
+
+h1, h2, h3, h4, h5, h6 {
+  font-weight: bold;
+  color: gray; 
+}

test non-web commits for paranoia's sake
Index: wikisrc/users/spz/sandbox.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/spz/sandbox.mdwn,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wikisrc/users/spz/sandbox.mdwn	22 Jun 2014 12:07:54 -0000	1.5
+++ wikisrc/users/spz/sandbox.mdwn	22 Jun 2014 12:28:37 -0000	1.6
@@ -1,3 +1 @@
-fussel blah!
-
-and gah
+Johannisbeerschorle

tasting the log_accum and loginfo change
Index: wikisrc/users/spz/sandbox.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/spz/sandbox.mdwn,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wikisrc/users/spz/sandbox.mdwn	7 Oct 2013 06:38:22 -0000	1.4
+++ wikisrc/users/spz/sandbox.mdwn	22 Jun 2014 12:07:54 -0000	1.5
@@ -1 +1,3 @@
 fussel blah!
+
+and gah

a plan for blog.n.o, vetted by a smart person who knows stuff
Index: wikisrc/users/schmonz/pkgsrccon2014.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/schmonz/pkgsrccon2014.mdwn,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- wikisrc/users/schmonz/pkgsrccon2014.mdwn	21 Jun 2014 23:00:20 -0000	1.9
+++ wikisrc/users/schmonz/pkgsrccon2014.mdwn	22 Jun 2014 11:17:10 -0000	1.10
@@ -183,6 +183,34 @@
 7. Preview at <http://wiki.netbsd.org/pkgsrc/>
 7. Point `{www.,}pkgsrc.org` at that HTML directory
 
+#### Merge `blog.netbsd.org` into `wiki.netbsd.org/blog/` (or so)
+
+7. What was the original goal of powering the blog with Roller?
+    * To have a blog, and
+    * To counter the misconception that NetBSD doesn't run Java
+      well (or at all)...
+    * By demonstrating that NetBSD runs Java (and well)
+7. How well have we met that goal?
+    * It's hardly obvious to passersby that the blog is Java-powered
+    * It's somewhat annoying to admin (and few of us know how)
+7. Could we get more of the intended marketing benefit for less admin cost?
+    * Document loudly (e.g., on the wiki) how NetBSD supports Java
+    * Publish the blog with a CMS we already happily admin and use (ikiwiki)
+7. Would anyone feel strongly opposed to the change?
+    * Not that we can think of (but we'll find out)
+7. Would anyone be particularly happy about the change?
+    * Yes, some members of `admins` and `www`
+7. What functionality is important to preserve when migrating?
+    * Data: articles and comments (stored as HTML in database)
+    * Metadata: dates, ordering, relation of comments to posts
+    * Feeds: feed URLs, UUIDs
+    * Media: include images in posts
+    * Commentspam: lock post after N months, no URLs, easy manual delete
+7. What admin-facing functionality would change?
+    * Accounts: Kerberos suffices, no more blog-specific accounts
+7. What do admins need to feel more comfortable with more ikiwiki?
+    * More documentation and training
+
 #### Integrate `joerg`'s C wrappers
 
 7. `hg clone ssh://ftp.netbsd.org/~joerg/cwrapper`

organize a bit better
Index: wikisrc/users/schmonz/pkgsrccon2014.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/schmonz/pkgsrccon2014.mdwn,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- wikisrc/users/schmonz/pkgsrccon2014.mdwn	21 Jun 2014 22:56:34 -0000	1.8
+++ wikisrc/users/schmonz/pkgsrccon2014.mdwn	21 Jun 2014 23:00:20 -0000	1.9
@@ -1,21 +1,4 @@
-# Attendees
-
-* Calum
-* Youri
-* `abs`
-* `justin`
-* `jaapb`
-* `alnsn`
-* Sevan
-* `bsiegert`
-* `mlelstv`
-* `tron`
-* `spz`
-* `prlw1`
-* `wiedi`
-* one fellow I didn't recognize and didn't get to meet
-* `sborrill`
-* `morr`
+[[!template id=note text="[[!toc levels=2]]"]]
 
 # Thursday
 
@@ -39,6 +22,23 @@
 
 # Saturday
 
+* Calum
+* Youri
+* `abs`
+* `justin`
+* `jaapb`
+* `alnsn`
+* Sevan
+* `bsiegert`
+* `mlelstv`
+* `tron`
+* `spz`
+* `prlw1`
+* `wiedi`
+* one fellow I didn't recognize and didn't get to meet
+* `sborrill`
+* `morr`
+
 ## Benny Siegert: "BulkTracker"
 
 * [BulkTracker](http://bulktracker.appspot.com) is WIP to parse
@@ -49,7 +49,7 @@
     * side comment: pkgsrc is missing some trendy stuff
 * [Source code](http://github.com/bsiegert/bulktracker)
 
-## Side discussion with Youri and Calum
+### Side discussion with Youri and Calum
 
 * how can we induce people to choose pkgsrc over Homebrew?
     * most people are looking for an OS-specific package manager
@@ -144,7 +144,7 @@
 * based on 2007 EuroBSDCon presentation
 * thin clients
 
-## Me: "pkgsrc design goals"
+## Amitai Schlair: "pkgsrc design goals"
 
 * blah blah blah
 * slides forthcoming

more events, more attendees, hackathon ideas for tomorrow
Index: wikisrc/users/schmonz/pkgsrccon2014.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/schmonz/pkgsrccon2014.mdwn,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- wikisrc/users/schmonz/pkgsrccon2014.mdwn	21 Jun 2014 16:14:41 -0000	1.7
+++ wikisrc/users/schmonz/pkgsrccon2014.mdwn	21 Jun 2014 22:56:34 -0000	1.8
@@ -13,10 +13,30 @@
 * `spz`
 * `prlw1`
 * `wiedi`
-* ???
+* one fellow I didn't recognize and didn't get to meet
 * `sborrill`
 * `morr`
 
+# Thursday
+
+## Drinks: Doric Arch
+
+* `jaapb`
+* `alnsn`
+* another fellow named Alex
+* `gavan`
+
+# Friday
+
+## Dinner: Edinboro Castle
+
+* `jaapb`
+* `mlelstv`
+* `spz`
+* `prlw1`
+* `wiedi`
+* `sborrill`
+
 # Saturday
 
 ## Benny Siegert: "BulkTracker"
@@ -129,6 +149,81 @@
 * blah blah blah
 * slides forthcoming
 
+## Dinner: Gourmet Garden
+
+* `jperkin`
+* Calum
+* Youri
+* `abs`
+* `justin`
+* `jaapb`
+* `alnsn`
+* Sevan
+* `bsiegert` and wife and cute kid
+* `mlelstv`
+* `tron`
+* `spz`
+* `prlw1`
+* `wiedi`
+* that fellow I didn't recognize and haven't gotten to meet
+* `sborrill`
+* `morr`
+
 # Sunday
 
+## Hackathon
+
+### Ideas
+
+#### Merge `pkgsrc.org` into `wiki.netbsd.org/pkgsrc/`
+
+7. `cvs checkout wiki.netbsd.org:/home/pkgwiki/pkgsrc-wiki.cvs`
+7. `cvs checkout wiki.netbsd.org:/cvsroot`
+7. Copy content from the former to the latter (under `pkgsrc/`)
+7. Preview at <http://wiki.netbsd.org/pkgsrc/>
+7. Point `{www.,}pkgsrc.org` at that HTML directory
+
+#### Integrate `joerg`'s C wrappers
+
+7. `hg clone ssh://ftp.netbsd.org/~joerg/cwrapper`
+7. Figure out how to get pkgsrc to use them
+7. Commit on a branch
+7. Do one bulk build on `HEAD` and one on your branch
+7. Let's see how it went
+
+#### `[schmonz]` Merge hard-coded pkgsrcCon 2013 site into `wiki.netbsd.org`
+
+7. Get a local copy of everything
+7. Fix up template
+7. Get previous sites to not break (maybe not editable)
+7. Commit to `pkgwiki`
+
+#### Fix `pkgtools/pkg_regress` tests
+
+7. The one that was still passing, do we believe that? Can we make it break?
+7. The ones that are failing, can we understand them and make them pass?
+7. Let's think of something else worth testing and write a new test for it
+7. Do we feel good about adding more such tests and encouraging
+   everyone to do so? If not, what do we need to improve before we
+   do that?
+
+#### Write an initial pkgsrc "product backlog"
+
+7. Starting with the work we need to do to make it easier to develop
+   pkgsrc internals
+7. Further down, the developer features we want pkgsrc to have
+7. Further down, the user features we want pkgsrc to have
+
+#### Debug why just-in-time `su` sometimes doesn't
+
+7. It seems to be working just about all the time for nearly everyone
+7. It doesn't work for `schmonz` in this case:
+    * `mail/qmail` (which is not `user-destdir`, only `destdir`)
+    * on Mac OS X 10.9.3 (haven't tried other systems)
+    * `make package`
+7. It does work for `schmonz` in this similar-looking case:
+    * `mail/relay-ctrl` (also only `destdir`)
+    * on Mac OS X 10.9.3
+    * `make package`
+
 [[!meta title="pkgsrcCon 2014: notes and scratchings"]]

mention sborrill's talk and mine
Index: wikisrc/users/schmonz/pkgsrccon2014.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/schmonz/pkgsrccon2014.mdwn,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wikisrc/users/schmonz/pkgsrccon2014.mdwn	21 Jun 2014 14:30:28 -0000	1.6
+++ wikisrc/users/schmonz/pkgsrccon2014.mdwn	21 Jun 2014 16:14:41 -0000	1.7
@@ -119,8 +119,14 @@
 * vulnerabilities detected with `pkg_admin audit`
 * (missed some details)
 
+### Stephen Borrill: building products with NetBSD and pkgsrc
+
+* based on 2007 EuroBSDCon presentation
+* thin clients
+
 ## Me: "pkgsrc design goals"
 
+* blah blah blah
 * slides forthcoming
 
 # Sunday

lightning talks I was mostly busy during, regrettably
Index: wikisrc/users/schmonz/pkgsrccon2014.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/schmonz/pkgsrccon2014.mdwn,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wikisrc/users/schmonz/pkgsrccon2014.mdwn	21 Jun 2014 12:11:34 -0000	1.5
+++ wikisrc/users/schmonz/pkgsrccon2014.mdwn	21 Jun 2014 14:30:28 -0000	1.6
@@ -81,11 +81,47 @@
 * hey, let's take some time as a group and merge `pkgsrc.org` into
     `wiki.n.o/pkgsrc/`
 
-### Jaap Boender: OCaml
+### Jaap Boender: OCaml packages
+
+* OCaml has a build system akin to Haskell's "cabal"
+* would like to factor it out, not sure how best to do that
+* (I was busy prepping a talk)
+
+### Justin Cormack: cross-compiling
+
+* with `qemu`, non-native binaries can run from `./configure` and the like
+* syscall emulation
+* (I'm still prepping a talk)
+
+### Sevan Janiyan: Mac OS X `powerpc`
+
+* GCC>4.4 doesn't build with XCode
+* he's managed to get up to 4.7 now
+* next thing GCC 4.8 and then he'll be able to build stuff
+* (I'm still prepping)
 
 ### Matthias Scheler: world's best ISP
 
-## Me: "pkgsrc design ideas"
+* XKCD 806
+* (still prepping)
+
+### Sebastian Wiedenroth: merging trivial fixes
+
+* (still prepping)
+
+### S.P. Zeidler: packaging for TNF servers
+
+* to be installed on TNF servers, it must be in pkgsrc
+* if it might ever run as root, it must be built on certain protected systems
+* `pkg_chk_(8)` for seeing what needs to be built
+* packages are built in `pkg_comp(8)` with sets matching arch and NetBSD version
+* then they're transferred to the destination systems and `pkg_add(8)`ed
+* vulnerabilities detected with `pkg_admin audit`
+* (missed some details)
+
+## Me: "pkgsrc design goals"
+
+* slides forthcoming
 
 # Sunday
 

break for lunch
Index: wikisrc/users/schmonz/pkgsrccon2014.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/schmonz/pkgsrccon2014.mdwn,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wikisrc/users/schmonz/pkgsrccon2014.mdwn	21 Jun 2014 11:19:29 -0000	1.4
+++ wikisrc/users/schmonz/pkgsrccon2014.mdwn	21 Jun 2014 12:11:34 -0000	1.5
@@ -44,6 +44,49 @@
 * how are people finding their OS X binary packages?
     * screenshots they post on [/r/unixporn](http://www.reddit.com/r/unixporn)
 
+## Lightning talks
+
+### David Brownlee: "Pretty tabular data without much effort"
+
+* jQuery
+* [example](http://www.netbsd.org/~wiz/perl.html)
+* see also <http://sync.absd.org/www>
+
+### Youri Mouton: pkgsrc for new developers
+
+* used NetBSD and `pkgin` without knowing what pkgsrc was
+* saw `pkgin` supported on other OSes (e.g., Minix)
+* and OS X (a main OS he uses)
+* started manually making packages for `pkgin`, not realizing
+* _then_ understood it was pkgsrc being used to make packages
+* a few months doing bulk builds
+* there isn't a tutorial on how to start as a pkgsrc developer
+* submitted ports to pkgsrc-wip
+* people usually find MacPorts, Homebrew, Fink, and _then_ maybe `pkgin`
+* this is too bad, they ought to be finding us
+* Youri and Calum's project: <http://saveosx.org>
+    * they're doing gpg-signed packages
+* people ask "where can I find documentation" and there isn't a great answer
+* writing clear, clean docs for new users and developers would be great
+* we all think jperkin's writeups and docs on this are terrific
+    * can we have them?
+* tron: bootstrap experience for MacPorts may be nicer
+    * schmonz: should be possible to build a Mac `.pkg` from bootstrap
+* abs: three target demographics:
+    * use binary packages
+    * build from source, use options, don't want to fix things
+    * developers
+* this underscores the need for user-editable wiki
+* design patterns for pkgsrc: e.g., how to fetch from a certain git commit
+* hey, let's take some time as a group and merge `pkgsrc.org` into
+    `wiki.n.o/pkgsrc/`
+
+### Jaap Boender: OCaml
+
+### Matthias Scheler: world's best ISP
+
+## Me: "pkgsrc design ideas"
+
 # Sunday
 
 [[!meta title="pkgsrcCon 2014: notes and scratchings"]]

s/Bulktracker/BulkTracker/g
Index: wikisrc/users/schmonz/pkgsrccon2014.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/schmonz/pkgsrccon2014.mdwn,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wikisrc/users/schmonz/pkgsrccon2014.mdwn	21 Jun 2014 11:14:42 -0000	1.3
+++ wikisrc/users/schmonz/pkgsrccon2014.mdwn	21 Jun 2014 11:19:29 -0000	1.4
@@ -19,9 +19,9 @@
 
 # Saturday
 
-## Benny Siegert: "Bulktracker"
+## Benny Siegert: "BulkTracker"
 
-* [Bulktracker](http://bulktracker.appspot.com) is WIP to parse
+* [BulkTracker](http://bulktracker.appspot.com) is WIP to parse
   `pkgsrc-bulk` reports and present them in an organized way
 * Uses lots of trendy stuff:
     * Google App Engine

attendees + a hallway-track discussion
Index: wikisrc/users/schmonz/pkgsrccon2014.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/schmonz/pkgsrccon2014.mdwn,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wikisrc/users/schmonz/pkgsrccon2014.mdwn	21 Jun 2014 09:37:33 -0000	1.2
+++ wikisrc/users/schmonz/pkgsrccon2014.mdwn	21 Jun 2014 11:14:42 -0000	1.3
@@ -1,3 +1,22 @@
+# Attendees
+
+* Calum
+* Youri
+* `abs`
+* `justin`
+* `jaapb`
+* `alnsn`
+* Sevan
+* `bsiegert`
+* `mlelstv`
+* `tron`
+* `spz`
+* `prlw1`
+* `wiedi`
+* ???
+* `sborrill`
+* `morr`
+
 # Saturday
 
 ## Benny Siegert: "Bulktracker"
@@ -10,6 +29,21 @@
     * side comment: pkgsrc is missing some trendy stuff
 * [Source code](http://github.com/bsiegert/bulktracker)
 
+## Side discussion with Youri and Calum
+
+* how can we induce people to choose pkgsrc over Homebrew?
+    * most people are looking for an OS-specific package manager
+    * they don't realize they should look for cross-platform
+    * I've learned that I should
+    * we need to attract OS X users on their own terms
+        * what if we managed /Applications, from source or not?
+    * likewise for other platforms
+    * what if we branded pkgsrc differently for each platform?
+    * also concentrate on binary package experience
+    * `pkgin` is a real nice user experience
+* how are people finding their OS X binary packages?
+    * screenshots they post on [/r/unixporn](http://www.reddit.com/r/unixporn)
+
 # Sunday
 
 [[!meta title="pkgsrcCon 2014: notes and scratchings"]]

bsiegert's talk
Index: wikisrc/users/schmonz/pkgsrccon2014.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/schmonz/pkgsrccon2014.mdwn,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wikisrc/users/schmonz/pkgsrccon2014.mdwn	21 Jun 2014 09:19:31 -0000	1.1
+++ wikisrc/users/schmonz/pkgsrccon2014.mdwn	21 Jun 2014 09:37:33 -0000	1.2
@@ -1,6 +1,14 @@
 # Saturday
 
-## Benny Siegert: "the talk he is about to give"
+## Benny Siegert: "Bulktracker"
+
+* [Bulktracker](http://bulktracker.appspot.com) is WIP to parse
+  `pkgsrc-bulk` reports and present them in an organized way
+* Uses lots of trendy stuff:
+    * Google App Engine
+    * Ruby, Node.js, Twitter Bootstrap
+    * side comment: pkgsrc is missing some trendy stuff
+* [Source code](http://github.com/bsiegert/bulktracker)
 
 # Sunday
 

Notes will go here.
--- /dev/null	2014-07-08 14:40:59.000000000 +0000
+++ wikisrc/users/schmonz/pkgsrccon2014.mdwn	2014-07-08 14:47:14.000000000 +0000
@@ -0,0 +1,7 @@
+# Saturday
+
+## Benny Siegert: "the talk he is about to give"
+
+# Sunday
+
+[[!meta title="pkgsrcCon 2014: notes and scratchings"]]

Commence note-taking from pkgsrcCon 2014.
Index: wikisrc/users/schmonz.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/schmonz.mdwn,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- wikisrc/users/schmonz.mdwn	18 Jun 2014 19:10:06 -0000	1.24
+++ wikisrc/users/schmonz.mdwn	21 Jun 2014 09:18:33 -0000	1.25
@@ -1,5 +1,7 @@
 [[schmonz_73x73.jpg]]
 
+Current status: [[pkgsrccon2014]]
+
 If you've got an idea about how this wiki ought to work, edit the
 [[wiki/todo]] list! Here's what's been [[wiki/todo/done]] so far.
 

Remove the boilerplate dreamcast peripherals.
Index: wikisrc/ports/emips.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/emips.mdwn,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wikisrc/ports/emips.mdwn	18 Apr 2014 20:46:30 -0000	1.4
+++ wikisrc/ports/emips.mdwn	18 Jun 2014 22:05:53 -0000	1.5
@@ -15,18 +15,5 @@
 
 All components of eMIPS are public source, including the CPU and peripherals. 
 """
-supported_hardware="""
-###Supported Peripherals
-* Builtin serial port (scif)
-* PowerVR video controller (text and Xserver) (pvr)
-* SEGA Broadband Adapter (HIT-0400) (rtk)
-* SEGA LAN Adapter (HIT-0300) (mbe)
-* Maple bus keyboard (mkbd)
-* Maple bus mouse (mms)
-* Maple bus memory card (mmem)
-* Maple bus LCD (mlcd)
-* GD-ROM drive (gdrom)
-* AICA sound system (aica)
-"""
 ]]
 [[!tag tier2port]]

We don't have ImageMagick (yet?). Try again in a less cool way.
Index: wikisrc/users/schmonz.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/schmonz.mdwn,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- wikisrc/users/schmonz.mdwn	18 Jun 2014 19:07:15 -0000	1.23
+++ wikisrc/users/schmonz.mdwn	18 Jun 2014 19:10:06 -0000	1.24
@@ -1,4 +1,4 @@
-[[!img schmonz_73x73.jpg size="73x73" alt="schmonz's face" align=left]]
+[[schmonz_73x73.jpg]]
 
 If you've got an idea about how this wiki ought to work, edit the
 [[wiki/todo]] list! Here's what's been [[wiki/todo/done]] so far.

Add my face, if we enabled the img directive and have ImageMagick.
Index: wikisrc/users/schmonz.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/schmonz.mdwn,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- wikisrc/users/schmonz.mdwn	30 Mar 2014 15:40:23 -0000	1.22
+++ wikisrc/users/schmonz.mdwn	18 Jun 2014 19:07:15 -0000	1.23
@@ -1,3 +1,5 @@
+[[!img schmonz_73x73.jpg size="73x73" alt="schmonz's face" align=left]]
+
 If you've got an idea about how this wiki ought to work, edit the
 [[wiki/todo]] list! Here's what's been [[wiki/todo/done]] so far.
 

Increase priority of one line, for easier pkgsrc support; as discussed
with dholland.
Index: wikisrc/bugtracking.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/bugtracking.mdwn,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wikisrc/bugtracking.mdwn	16 Jun 2014 09:31:36 -0000	1.4
+++ wikisrc/bugtracking.mdwn	18 Jun 2014 11:48:45 -0000	1.5
@@ -378,11 +378,11 @@
 * Support for systems of tags.
 * A decent workflow for retrieving incoming PRs and tagging them with
 the desired new metadata.
+* Support for free-form text metadata fields (for pkgsrc)
 
 Desired based on problem analysis:
 
 * Support for enumerated metadata fields.
-* Support for free-form text metadata fields.
 
 Very strongly desired because we have existing workflows and habits:
 

minor wording fix
Index: wikisrc/bugtracking.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/bugtracking.mdwn,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wikisrc/bugtracking.mdwn	16 Jun 2014 09:19:19 -0000	1.3
+++ wikisrc/bugtracking.mdwn	16 Jun 2014 09:31:36 -0000	1.4
@@ -62,7 +62,7 @@
 Some of these tools turn out to work ok on large databases, and others
 don't.
 
-There are also currently some 5400 open bug reports; many databases
+There are also currently some 5400 open bug reports; some bugtrackers
 that scale adequately to 50,000 bugs in the database turn out to not
 be able to handle having so many of them open at once.
 

try again
Index: wikisrc/bugtracking.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/bugtracking.mdwn,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wikisrc/bugtracking.mdwn	16 Jun 2014 09:17:52 -0000	1.2
+++ wikisrc/bugtracking.mdwn	16 Jun 2014 09:19:19 -0000	1.3
@@ -363,6 +363,7 @@
 Please don't edit this randomly; talk it over first.
 
 Hard requirements
+
 * Must be able to import the existing bug database.
 * Doing so must not lose information.
 * Must be able to accept incoming email from deployed send-pr scripts.
@@ -371,6 +372,7 @@
 * Nothing may be written in php.
 
 Very strongly desired based on problem analysis:
+
 * Support for arbitrary metadata fields not precooked in the database.
 * Support for hierarchical taxonomies.
 * Support for systems of tags.
@@ -378,17 +380,21 @@
 the desired new metadata.
 
 Desired based on problem analysis:
+
 * Support for enumerated metadata fields.
 * Support for free-form text metadata fields.
 
 Very strongly desired because we have existing workflows and habits:
+
 * Command-line access (search, update, administer)
 * Web access (search)
 
 Desired because we have existing workflows and habits:
+
 * Web access (update, maybe also administer)
 
 Very strongly desired because we're tired of gnats:
+
 * Proper handling of incoming MIME attachments.
 * Some mechanism to prevent commit messages from accidentally
 spamming the database.
@@ -408,6 +414,7 @@
 PRs one at a time.
 
 Desired because we're tired of gnats:
+
 * A way to file comments on a PR directly from the command line.
 * Something like a newsreader for working the bug database.
 * Feedback nag mail that comes out such that replying directly to it
@@ -418,14 +425,17 @@
 * A way to move misfiled comments from one PR to another.
 
 Some other stuff that would be nice:
+
 * Being able to vote PRs up and down from the web interface.
 * A smartphone app for working the database.
 
 Things that are less important:
+
 * Merging multiple PRs on the same subject.
 * Explicit crosslinks when one PR is blocking progress on another.
 
 Things we don't care that much about:
+
 * Padded cells for juvenile developers.
 * Click-and-drool support for developers without basic clues.
 
@@ -441,6 +451,7 @@
 changed much in the meantime.
 
 There are two key points in the material above:
+
 * Schema conversion (to just about anything) without losing
 information is going to be hard.
 * Nothing that already exists off the shelf is going to handle the
@@ -448,6 +459,7 @@
 
 There is another point that is not obvious to those who haven't dealt
 with gnats at length:
+
 * gnats does very little.
 
 Gnats contains a fair amount of code, but most of that code is storage

fix bullet lists
Index: wikisrc/bugtracking.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/bugtracking.mdwn,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wikisrc/bugtracking.mdwn	16 Jun 2014 09:12:37 -0000	1.1
+++ wikisrc/bugtracking.mdwn	16 Jun 2014 09:17:52 -0000	1.2
@@ -363,71 +363,71 @@
 Please don't edit this randomly; talk it over first.
 
 Hard requirements
- * Must be able to import the existing bug database.
- * Doing so must not lose information.
- * Must be able to accept incoming email from deployed send-pr scripts.
- * Must be able to accept and file commit messages.
- * It is not necessary to sign up to file a problem report.
- * Nothing may be written in php.
+* Must be able to import the existing bug database.
+* Doing so must not lose information.
+* Must be able to accept incoming email from deployed send-pr scripts.
+* Must be able to accept and file commit messages.
+* It is not necessary to sign up to file a problem report.
+* Nothing may be written in php.
 
 Very strongly desired based on problem analysis:
- * Support for arbitrary metadata fields not precooked in the database.
- * Support for hierarchical taxonomies.
- * Support for systems of tags.
- * A decent workflow for retrieving incoming PRs and tagging them with
+* Support for arbitrary metadata fields not precooked in the database.
+* Support for hierarchical taxonomies.
+* Support for systems of tags.
+* A decent workflow for retrieving incoming PRs and tagging them with
 the desired new metadata.
 
 Desired based on problem analysis:
- * Support for enumerated metadata fields.
- * Support for free-form text metadata fields.
+* Support for enumerated metadata fields.
+* Support for free-form text metadata fields.
 
 Very strongly desired because we have existing workflows and habits:
- * Command-line access (search, update, administer)
- * Web access (search)
+* Command-line access (search, update, administer)
+* Web access (search)
 
 Desired because we have existing workflows and habits:
- * Web access (update, maybe also administer)
+* Web access (update, maybe also administer)
 
 Very strongly desired because we're tired of gnats:
- * Proper handling of incoming MIME attachments.
- * Some mechanism to prevent commit messages from accidentally
+* Proper handling of incoming MIME attachments.
+* Some mechanism to prevent commit messages from accidentally
 spamming the database.
- * A way to file comments on a PR from a web browser.
- * A web-based search form that works usefully.
- * Crosslinks in the web interface to allow browsing.
- * Command-line search that doesn't involve query-pr's nasty little
+* A way to file comments on a PR from a web browser.
+* A web-based search form that works usefully.
+* Crosslinks in the web interface to allow browsing.
+* Command-line search that doesn't involve query-pr's nasty little
 query "language".
- * A nondegenerate way to subscribe to PRs, for both developers and
+* A nondegenerate way to subscribe to PRs, for both developers and
 ordinary folks, at least by email and preferably also via RSS.
- * A mail ingester that returns broken PR submissions instead of
+* A mail ingester that returns broken PR submissions instead of
 filing sometimes-mangled versions for manual attention.
- * A mail ingester that honors the confidential field of incoming PRs
+* A mail ingester that honors the confidential field of incoming PRs
 properly.
- * At least slightly automated handling of email bounces.
- * A way to update email addresses without hand-editing a bajillion
+* At least slightly automated handling of email bounces.
+* A way to update email addresses without hand-editing a bajillion
 PRs one at a time.
 
 Desired because we're tired of gnats:
- * A way to file comments on a PR directly from the command line.
- * Something like a newsreader for working the bug database.
- * Feedback nag mail that comes out such that replying directly to it
+* A way to file comments on a PR directly from the command line.
+* Something like a newsreader for working the bug database.
+* Feedback nag mail that comes out such that replying directly to it
 does something useful.
- * A way to configure the contents of responsible nag mail to sort by
+* A way to configure the contents of responsible nag mail to sort by
 personal priority or other criteria.
- * A way to turn off mail for bouncing addresses.
- * A way to move misfiled comments from one PR to another.
+* A way to turn off mail for bouncing addresses.
+* A way to move misfiled comments from one PR to another.
 
 Some other stuff that would be nice:
- * Being able to vote PRs up and down from the web interface.
- * A smartphone app for working the database.
+* Being able to vote PRs up and down from the web interface.
+* A smartphone app for working the database.
 
 Things that are less important:
- * Merging multiple PRs on the same subject.
- * Explicit crosslinks when one PR is blocking progress on another.
+* Merging multiple PRs on the same subject.
+* Explicit crosslinks when one PR is blocking progress on another.
 
 Things we don't care that much about:
- * Padded cells for juvenile developers.
- * Click-and-drool support for developers without basic clues.
+* Padded cells for juvenile developers.
+* Click-and-drool support for developers without basic clues.
 
 
 ## The (old) plan
@@ -441,14 +441,14 @@
 changed much in the meantime.
 
 There are two key points in the material above:
- * Schema conversion (to just about anything) without losing
+* Schema conversion (to just about anything) without losing
 information is going to be hard.
- * Nothing that already exists off the shelf is going to handle the
+* Nothing that already exists off the shelf is going to handle the
 most important thing we/I want anyway.
 
 There is another point that is not obvious to those who haven't dealt
 with gnats at length:
- * gnats does very little.
+* gnats does very little.
 
 Gnats contains a fair amount of code, but most of that code is storage
 code (not user interface or analysis or other valuable material) and

blather (at length) about bugtracking and migration plans
--- /dev/null	2014-07-08 14:40:59.000000000 +0000
+++ wikisrc/bugtracking.mdwn	2014-07-08 14:47:14.000000000 +0000
@@ -0,0 +1,518 @@
+# Bugtracking in NetBSD
+
+Currently NetBSD uses gnats for bugtracking.
+Gnats is a horrible legacy tool.
+There is a whole page of [[stuff we dislike about gnats]].
+
+It has been clear for a long time (years) that we need to migrate to
+some other bugtracker.
+Various tools have been proposed, usually without much thought being
+applied.
+
+The way this usually works is that
+the topic comes up and then a dozen people say "Let's use
+$MY_FAVORITE_TOOL! It's great!"
+Then a shouting match ensues and the people who call for requirements
+analysis or even a list of criteria to pick one tool over another get
+slagged for standing in the way of 'progress'.
+These arguments inevitably take place with little understanding of
+either the project's needs or the problems that a bugtracker needs to
+handle for us.
+Little or no information is generated, and nothing happens, except
+that the particpants tend to get alienated and demotivated.
+
+In order to avoid going around this barn again and again I'm creating
+this page to try to document some of the genuine issues, as well as
+conclusions that have been drawn in the past about requirements and
+paths forward.
+
+
+## Problems with bugtracking in NetBSD
+
+This section lists and discusses some of the challenges that arise
+handling NetBSD's bug reports.
+This is not meant to be a list of gripes about gnats -- there's
+another page for that (above) -- but a list of things that are still
+issues no matter what bugtracker we're using.
+
+### We already have a bug database.
+
+Any plan for moving forward has to be able to import the existing bug
+database without losing information.
+This is basically not negotiable -- we cannot throw away the existing
+bug data.
+(The alternative to importing the existing data is to keep gnats
+running indefinitely in parallel with a new system.
+Besides being confusing, this does nothing to solve the problems with
+gnats itself.)
+
+### The bug database is large.
+
+NetBSD's existing bug database currently contains almost 48,000 bugs.
+This is not especially large compared to other large projects
+(consider the likely size of the Windows bug database, if you will...)
+but it is large compared to _most projects_.
+A lot of bugtrackers will creak, groan, and tip over if asked to track
+this many bugs.
+Or, they may be able to store and retrieve the bugs fine but the user
+interface for handling them just fails to scale to the database size.
+
+Many people who propose their favorite tool have used it for assorted
+projects but never actually tried using it on a large bug database.
+Some of these tools turn out to work ok on large databases, and others
+don't.
+
+There are also currently some 5400 open bug reports; many databases
+that scale adequately to 50,000 bugs in the database turn out to not
+be able to handle having so many of them open at once.
+
+Another consequence of the database size is that the schema conversion
+for any migration must be automatic.
+It is not feasible to hand-edit or even review all bugs, or even all
+open bugs, as part of a transition to a new system.
+This creates problems for many otherwise decent choices for a new
+bugtracker, as most bugtrackers (just like gnats itself) have their
+own hardcoded assumptions about the schema and about things like what
+states bugs can be in, and no two are the same.
+
+### The bug database is broad and not readily subdivided.
+
+There is a wide range of software in NetBSD, and an even wider range
+in pkgsrc, and we get bug reports on all of it.
+There are plenty of identifiable units in this, such as specific
+pkgsrc packages, but many bugs can't be linked directly to one of
+these.
+
+Furthermore, the existing database is only divided into broad
+categories (kern, bin, pkg, etc.) and even these don't work all that
+well sometimes.
+(And the deployed base of send-pr scripts causes new PRs to come in
+with only this much classification, something that can be changed only
+slowly.)
+
+The result of this is that it's hard to find things in the bug
+database by looking around.
+You can browse the database based on metadata (or you could if gnats
+sucked less, currently it's hard) but we don't have the metadata
+needed to do this effectively.
+You can also search the database based on metadata (even gnats can do
+this) but it doesn't really produce useful results for the same
+reason.
+This will remain true if we just switch to a different bugtracker;
+to make progress on this problem we need more and better metadata.
+
+Many large bug databases (CPAN's bug database was recently floated as
+an example) can be clearly subdivided into individual projects or
+subprojects and don't have this problem.
+You can just look at bugs for the (sub)project you're interested in
+and the number of those is manageable.
+
+This problem is not unique to NetBSD (FreeBSD shares it, for example)
+but as far as I know it's not common outside of OS projects because
+most other projects are not broad in the same way.
+
+### Search doesn't work too well.
+
+Because of the nature of the names of Unix entities (programs,
+drivers, virtually everything), searching for them in a large text
+corpus like the bug database doesn't work too well.
+This problem is exacerbated if you're trying to find bugs filed
+against programs that often appear incidentally in bug reports, like
+make or sh.
+
+This is not just a consequence of gnats issues; search won't work all
+that well no matter what we do.
+(Try typing "sh site:gnats.netbsd.org" into Google.
+When Google can't do it, no bugtracker is going to do better.)
+
+This means that text search really does not work as an alternative to
+be able to find things by browsing or via metadata.
+
+
+## Some observations about the problems
+
+The most basic problem we have is _finding stuff_.
+Back when I first started tackling the bug database, I found that the
+best way to make progress was not to search (either for text or
+metadata) or to browse but to ask for a randomly selected open PR.
+This basically constitutes a total failure of the bugtracker: it was
+completely unable to provide useful information of any kind.
+
+I (dholland) have since learned some tricks and have also accumulated
+an external index for the database; this means I can get stuff out of
+it now, at least sometimes, but most developers are in the position I
+was then: the bug database is a completely useless black hole.
+Several developers have recently said so; also we have the same
+problem that FreeBSD observed in their database some time back, which
+is that new bugs come in and get seen, and maybe they get fixed, but
+if they don't get fixed fairly soon they get forgotten and hang around
+indefinitely.
+
+This is partly a consequence of gnats issues, and this is why gnats
+must go.
+However, as described above it isn't entirely because of gnats:
+finding stuff by navigating (or searching) metadata is hard because we
+don't have adequate metadata, and finding stuff by searching for text
+is hard because it's a fundamentally hard text-retrieval problem.
+
+Therefore, if we want to actually improve the situation, any migration
+plan needs to include a way to get more metadata into the database.
+This metadata will mostly need to be hand-applied; this is expensive
+but not insurmountable (for 5400 open existing PRs) and not that big a
+deal for incoming new PRs... provided the new bugtracker has adequate
+support for arbitrary metadata, which many don't.
+
+Note that in addition to the above analysis we also have some
+supporting results.
+Based on the analysis I (dholland) started maintaining an annotated
+browseable index (aka the "buglists" pages) of the bug database.
+This basically amounted to additional per-bug metadata of several
+kinds, organized in a fashion that allowed generating an index as a
+tree of web pages.
+Unfortunately because it was a gimcrack thing only I could update it,
+and unfortunately it also needed to be synchronized with the gnats
+database by hand, with the result that when my available time dried up
+it went out of date and is now pretty much useless.
+
+However, while it existed people used it and it helped them.
+Before we had it the number of open PRs had been steadily increasing
+over time.
+(The occasional hackathon brought down the count from time to time,
+but never persistently.)
+During the time we had it, the number of open PRs remained more or
+less stable at around 4800-4900.
+Now we don't have it again and we're up to 5400 open PRs.
+The influx has not changed much since I got behind on it; if anything
+it's dropped.
+What this means is that the rate PRs are getting fixed has dropped,
+and that's because it's become impossible to find anything again.
+
+It seems to me that one of the chief things we want from a new
+bugtracker is to be able to provide something like this browseable
+index.
+Therefore it must be able to support the kinds of metadata that the
+buglists tree was using.
+
+If we move to a bugtracker without this support, it may solve some of
+the more glaring problems with gnats, but it isn't going to help us

(Diff truncated)
dhcpcd has it now
Index: wikisrc/projects/project/ipv6-stable-privacy-addresses.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/projects/project/ipv6-stable-privacy-addresses.mdwn,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wikisrc/projects/project/ipv6-stable-privacy-addresses.mdwn	27 Feb 2014 08:38:59 -0000	1.4
+++ wikisrc/projects/project/ipv6-stable-privacy-addresses.mdwn	15 Jun 2014 19:48:11 -0000	1.5
@@ -11,6 +11,7 @@
 category="networking"
 difficulty="easy"
 duration="3 months"
+done_by="Roy Marples"
 
 description="""
 Implement "A method for Generating Stable Privacy-Enhanced Addresses with IPv6 - Stateless Address Autoconfiguration (SLAAC)" - [draft-ietf-6man-stable-privacy-addresses-06](http://tools.ietf.org/html/draft-ietf-6man-stable-privacy-addresses-06) or the current successor thereof.

Remove obsolated information.
Index: wikisrc/users/obache.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/obache.mdwn,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- wikisrc/users/obache.mdwn	24 Jul 2012 08:53:04 -0000	1.9
+++ wikisrc/users/obache.mdwn	11 Jun 2014 04:49:45 -0000	1.10
@@ -1,26 +1,3 @@
 is mostly working on pkgsrc.
 
-# My test environments
-* NetBSD-5.1.2-i386
-* NetBSD-5.1.2-amd64
-* NetBSD-4.0.1-i386
-* NetBSD-*-macppc
-* NetBSD-*-mac68k
-* DragonFly-2.8.2-i386
-* DragonFly-2.8.2-x86_64
-* FreeBSD-8.3-i386
-* OpenBSD-5.1-i386
-* Darwin-powerpc-8.11.0
-* Haiku R1 Alpha 2
-* interix-3.5-i386
-* interix-6.0-i386
-* SSD/Linux-0.4
-* Cygwin 1.7.15
-
-# Work In Progress
-* Improve Haiku support.
-* Improve SUA support.
-* Add support of MSC on SUA as compiler.
-* Add Cygwin support.
-
 # ToDo

Another instance of what non-developers can do, for now.
Index: wikisrc/wiki/web.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/wiki/web.mdwn,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- wikisrc/wiki/web.mdwn	4 Jul 2010 03:37:33 -0000	1.12
+++ wikisrc/wiki/web.mdwn	11 Jun 2014 00:33:05 -0000	1.13
@@ -1,7 +1,7 @@
 #### Getting access
 
 7. Developer? [[Set a password|kerberos/password]]. Non-developer?
-[[Tell us your OpenID|non-developer]].
+Bear with us. For now, please freely add comments to pages.
 
 #### Creating page "Foo Bar"
 

Splain the current situation better.
Index: wikisrc/wiki/start.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/wiki/start.mdwn,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- wikisrc/wiki/start.mdwn	26 May 2013 13:59:19 -0000	1.8
+++ wikisrc/wiki/start.mdwn	11 Jun 2014 00:28:56 -0000	1.9
@@ -1,10 +1,16 @@
 ### Setup
 
-If you're a NetBSD developer, you can [[commit to `wikisrc`|cvs]].
-No setup. No web browser needed. For [[in-browser editing|web]],
-just set a [[kerberos/password]] first.
+If you're a NetBSD developer, you can:
 
-If you're not a NetBSD developer, [[tell us your OpenID|non-developer]].
+* [[commit to `wikisrc`|cvs]] (no web browser needed!)
+* [[edit in your browser|web]] (with easy previewing! just set a [[kerberos/password]] first)
+
+Either or both. Whichever's more convenient when the urge strikes you.
+
+If you're not a NetBSD developer, you can add a comment to any page.
+We intend to develop some custom features for ikiwiki that'll provide
+more meaningful ways for you to participate. Until then, please
+bear with us and comment freely.
 
 ### Wikitext
 

Fix typo
Index: wikisrc/users/ryoon/how_to_install_netbsd_amd64_to_macbook_air_11_inch.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/ryoon/how_to_install_netbsd_amd64_to_macbook_air_11_inch.mdwn,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- wikisrc/users/ryoon/how_to_install_netbsd_amd64_to_macbook_air_11_inch.mdwn	9 Jun 2014 08:40:36 -0000	1.13
+++ wikisrc/users/ryoon/how_to_install_netbsd_amd64_to_macbook_air_11_inch.mdwn	9 Jun 2014 20:28:12 -0000	1.14
@@ -61,7 +61,7 @@
 
 
 ## Boot NetBSD from the USB stick
-Connect the USB stick, push power button, and press and hold Option keys to
+Connect the USB stick, push power button, and press and hold Option key to
 Startup Manager (builtin boot selector).
 See <http://support.apple.com/kb/HT1948?viewlocale=en_US>.
 Select USB stick icon, and NetBSD is booted.

Fix typo
Index: wikisrc/users/ryoon/how_to_update_www_firefox.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/ryoon/how_to_update_www_firefox.mdwn,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wikisrc/users/ryoon/how_to_update_www_firefox.mdwn	9 Jun 2014 08:46:25 -0000	1.5
+++ wikisrc/users/ryoon/how_to_update_www_firefox.mdwn	9 Jun 2014 08:47:26 -0000	1.6
@@ -100,7 +100,7 @@
 	$ vi file/marked/as/U
 	$ hg resolve --mark file/marked/as/U
 	(loop)
-	$ hg commit -m "Merge pkgsrc_firefox-29.0.1 brnach to 30.0"
+	$ hg commit -m "Merge pkgsrc_firefox-29.0.1 branch to 30.0"
 
 
 # Create patch file for patch -p0

WRKSRC means WRKSRC variable
Index: wikisrc/users/ryoon/how_to_update_www_firefox.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/ryoon/how_to_update_www_firefox.mdwn,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wikisrc/users/ryoon/how_to_update_www_firefox.mdwn	9 Jun 2014 08:45:21 -0000	1.4
+++ wikisrc/users/ryoon/how_to_update_www_firefox.mdwn	9 Jun 2014 08:46:25 -0000	1.5
@@ -117,7 +117,7 @@
 	$ vi Makefile
 	(Update version)
 	(Remove PKGREVISION)
-	(Fix WRKSRC)
+	(Fix WRKSRC variable)
 	$ make mdi
 	$ make extract
 	$ pushd ${WRKOBJDIR}/www/firefox/work/mozilla-beta

Add missing prompt
Index: wikisrc/users/ryoon/how_to_update_www_firefox.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/ryoon/how_to_update_www_firefox.mdwn,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wikisrc/users/ryoon/how_to_update_www_firefox.mdwn	9 Jun 2014 08:32:38 -0000	1.3
+++ wikisrc/users/ryoon/how_to_update_www_firefox.mdwn	9 Jun 2014 08:45:21 -0000	1.4
@@ -107,7 +107,7 @@
 
 	$ hg diff -r (revision of first commit in ryoon_freebsd-30.0) | \
 	sed -e 's!^--- a/!--- !' -e 's!^+++ b/!+++ !' > ~/firefox-30.0.diff
-	vi ~/firefox-30.0.diff
+	$ vi ~/firefox-30.0.diff
 	(Remove patch to .hgignore)
 	(Remove patch to .hgtags)
 

Fix typo
Index: wikisrc/users/ryoon/how_to_install_netbsd_amd64_to_macbook_air_11_inch.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/ryoon/how_to_install_netbsd_amd64_to_macbook_air_11_inch.mdwn,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- wikisrc/users/ryoon/how_to_install_netbsd_amd64_to_macbook_air_11_inch.mdwn	9 Jun 2014 08:33:19 -0000	1.12
+++ wikisrc/users/ryoon/how_to_install_netbsd_amd64_to_macbook_air_11_inch.mdwn	9 Jun 2014 08:40:36 -0000	1.13
@@ -257,7 +257,7 @@
 
 ## Clear NVRAM of MacBook Air
 Now your MacBook Air is configured to boot OS X from the USB stick.
-You should reset NVRAM with the staps descrived in
+You should reset NVRAM with the steps described in
 <http://support.apple.com/kb/HT1379?viewlocale=en_US>.
 If NVRAM is not cleared, it takes long time to boot NetBSD from
 internal SSD.

Update to reflect my current installation
Index: wikisrc/users/ryoon/how_to_install_netbsd_amd64_to_macbook_air_11_inch.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/ryoon/how_to_install_netbsd_amd64_to_macbook_air_11_inch.mdwn,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- wikisrc/users/ryoon/how_to_install_netbsd_amd64_to_macbook_air_11_inch.mdwn	4 May 2013 14:59:53 -0000	1.11
+++ wikisrc/users/ryoon/how_to_install_netbsd_amd64_to_macbook_air_11_inch.mdwn	9 Jun 2014 08:33:19 -0000	1.12
@@ -1,34 +1,24 @@
 # How to install NetBSD/amd64 current on MacBook Air 11 inch (mid 2012)
 
-XXX THIS DOCUMENT IS OBSOLETE AFTER <http://mail-index.netbsd.org/source-changes/2013/04/28/msg043382.html>.
-
 For older MacBook, please read [how to install netbsd on an apple macbook with core2duo](http://wiki.netbsd.org/tutorials/how_to_install_netbsd_on_an_apple_macbook_with_core2duo/)
 
 This tutorial is based on it.
 
 [[!toc	startlevel=2	levels=2]]
 
-## Caution
-
-* To follow this tutorial, you must have other NetBSD or other Unix like operating system installation to create no-dkwedge kernel.
-
-* With this tutorial, your MacBook Air's default operating system becomes NetBSD! You can boot OS X with Power+option.
+# Caution
 
-* Do not try to install NetBSD on dkwedge partition (/dev/dk*) and with dkwedge enabled kernel, I cannot install NetBSD to hybrid MBR disk, so I have gotten "newfs: /dev/rwd0a: open for read: Device busy" error message.
-  See [PR/39510](http://gnats.netbsd.org/39510).
-  If you can install NetBSD to dkwedge partition, please tell me!
-  All my attempts are failed :(
+* With this tutorial, you will remove OS X from your MacBook Air (no dual boot).
+And you can install it to USB 3.0 stick (20GB or larger is required).
 
-* Do not install NetBSD bootselect code in sysinst.
-
-* Installing NetBSD/i386 is not tested.
+* NetBSD/i386 installation is not tested.
 
 * I have not tested modular-xorg (X.org from pkgsrc).
 
 
-## What works and what doesn't
+# What works and what doesn't
 
-### This stuff all seems to work fine
+## This stuff all seems to work fine
 
 * SATA disk drivers
 
@@ -36,117 +26,313 @@
 
 * TrackPad (as one button mouse, no multitouch extension)
 
-* USB 2.0/1.0 (no USB 3.0)
+* USB 2.0/1.0 (no USB 3.0!, it causes kernel panic.)
 
 * FaceTime HD Camera (uvideo device)
 
-* Keyboard backlight
+* Intel HD video support
 
 
-### What Doesn't work
+## What Doesn't work
 
 * Internal BCM43224 WiFi adapter
 
-* Sound (hdaudio seems work, but if you disable boot sound,
-  you have no audio from internal speaker)
+* Sound from internal speaker (hdaudio works fine, but if you disable boot
+sound, you have no audio from internal speaker)
+
+* Keyboard backlight
+
+* Low battery shutdown with powerd(8)
+
+* Automated LCD power-off when lid is closed
+
+
+# Setup NetBSD
+## Creating NetBSD installation image USB stick
+Download
+http://nyftp.netbsd.org/pub/NetBSD-daily/HEAD/(date_and_time)/images/NetBSD-6.99.43-amd64-install.img.gz
+and write it to your USB stick.
+
+If you have Unix-like OS machine (including out-of-the-box MacBook Air),
+you can use gunzip(1) and dd(1).
+If you have Microsoft Windows machine, you can use Rawrite32 from
+<http://www.netbsd.org/~martin/rawrite32/index.html>.
+gunzip is not needed.
+
+
+## Boot NetBSD from the USB stick
+Connect the USB stick, push power button, and press and hold Option keys to
+Startup Manager (builtin boot selector).
+See <http://support.apple.com/kb/HT1948?viewlocale=en_US>.
+Select USB stick icon, and NetBSD is booted.
+Then you will see sysinst's blue screen.
+
+
+## Create new partitions for NetBSD and EFI
+sysinst does not support GPT installation yet.
+You should create partitions manually.
+Press Ctrl+c and get shell prompt.
+
+	# gpt show wd0
+	(Current GPT map is shown.)
+	# gpt destroy wd0
+	(All partition has been removed.)
+	# gpt create wd0
+	(New GPT headers and tables has been created.)
+	# gpt add -s (your EFI partition size) -t efi -l EFI wd0
+	# gpt add -s (your FFSv2 root partition size) -t ffs -l ROOT wd0
+	# gpt add -s (your Swap partition size) -t swap -l SWAP wd0
+
+	# gpt biosboot -i 2 wd0
+	(GPT biosboot is installed.)
+
+Reboot your MacBook Air, and get shell prompt again.
+
+
+## Prepare the partitions
+You should run newfs(8) to create NetBSD FFSv2 partition,
+and run newfs_msdos(8) to create EFI partition.
+
+	# newfs -O2 /dev/dk1
+	# newfs_msdos /dev/dk0
+
+## Install rEFInd
+rEFInd is good boot loader for out Hybrid MBR installation.
+Download latest rEFInd zip archive from
+<http://www.rodsbooks.com/refind/getting.html>.
+But you have no web browser now.
+You can download rEFInd zip archive from ftp.jaist.ac.jp (sourceforge.net ftp
+mirror site)
+
+	# cd /
+	# ftp ftp.jaist.ac.jp
+<pre><code>
+Connected to ftp.jaist.ac.jp.
+220 (vsFTPd 3.0.2)
+Name (ftp.jaist.ac.jp:ryo_on): ftp
+331 Please specify the password.
+Password:
+230-Welcome to JAIST Public Mirror Service (ftp.jaist.ac.jp).
+230-If you have any problem, please contact ftp-admin@jaist.ac.jp.
+230 Login successful.
+Remote system type is UNIX.
+Using binary mode to transfer files.
+
+ftp> get pub/sourceforge/r/re/refind/0.8.2/refind-bin-0.8.2.zip
+</code></pre>
+
+	# unzip refind-bin-0.8.2.zip
+	# mount_msdos /dev/dk0 /mnt2
+	# cd /mnt2
+	# mkdir -p EFI/BOOT
+	# cd EFI/BOOT
+	# cp -r /refind-bin-0.8.2/refind/drivers_x64 .
+	# cp -r /refind-bin-0.8.2/refind/tools_x64 .
+	# cp -r /refind-bin-0.8.2/refind/icons .
+	# cp /refind-bin-0.8.2/refind/refind_x64.efi bootx64.efi
+	# cp /refind-bin-0.8.2/refind/refind.conf.sample refind.conf
+
+## Install NetBSD
+Un-tar NetBSD distribution tarballs in the USB stick.
+
+	# mount -o log /dev/dk1 /mnt
+	# cd /mnt
+	# mkdir proc kern
+	# tar zxvfp amd64/binary/sets/base.tgz
+	# tar zxvfp amd64/binary/sets/comp.tgz
+	# tar zxvfp amd64/binary/sets/comp.tgz
+	# tar zxvfp amd64/binary/sets/etc.tgz
+	# tar zxvfp amd64/binary/sets/games.tgz
+	# tar zxvfp amd64/binary/sets/kern-GENERIC.tgz
+	# tar zxvfp amd64/binary/sets/man.tgz
+	# tar zxvfp amd64/binary/sets/misc.tgz
+	# tar zxvfp amd64/binary/sets/modules.tgz
+	# tar zxvfp amd64/binary/sets/tests.tgz
+	# tar zxvfp amd64/binary/sets/text.tgz
+	# tar zxvfp amd64/binary/sets/xbase.tgz
+	# tar zxvfp amd64/binary/sets/xcomp.tgz
+	# tar zxvfp amd64/binary/sets/xetc.tgz
+	# tar zxvfp amd64/binary/sets/xfont.tgz
+	# tar zxvfp amd64/binary/sets/xserver.tgz
+
+
+## Create nodes in /dev
+You should have nodes in /dev. If you have no node in /dev, tmpfs is used.
+It is annoying for me.
+
+	# cd dev
+	# ./MAKEDEV all
+
+
+## Setup /etc/rc.conf and /etc/fstab
+To boot your NetBSD properly, you should write etc/rc.conf and etc/fstab.
 
-* Bluetooth device (with patches in [PR/46992](http://gnats.netbsd.org/46992), it works)

(Diff truncated)
Write my recent preocedure
Index: wikisrc/users/ryoon/how_to_update_www_firefox.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/ryoon/how_to_update_www_firefox.mdwn,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wikisrc/users/ryoon/how_to_update_www_firefox.mdwn	25 Mar 2012 01:30:20 -0000	1.2
+++ wikisrc/users/ryoon/how_to_update_www_firefox.mdwn	9 Jun 2014 08:32:38 -0000	1.3
@@ -1,19 +1,132 @@
-## How to update www/firefox, mail/thunderbord, devel/xulrunner, devel/nspr, devel/nss, and www/seamonkey and their l10n package.
+[[!meta title="How to update pkgsrc/www/firefox"]]
 
-1) Update devel/nspr with firefox's source.
-// The source tar ball of nspr is provided. Which is better?
-// Patches are prepared in xulrunner's patches directory.
+This article shows how to update pkgsrc/www/firefox package to latest release.
+You can use Mozilla's Mercurial (hg) repositories to track upstream changes.
 
-2) Update devel/nss with firefox's source.
-// nss's tar ball is not provided. It must be extracted from firefox's
-   source tar ball.
-// Patches are prepared in xulrunner's patches directory.
+You should have pkgsrc/meta-pkgs/pkg_developer package.
 
-3) Update devel/xulrunner with firefox's source.
+# Clone hg tree
+See <https://developer.mozilla.org/en-US/docs/Mozilla/Developer_guide/Source_Code/Mercurial>.
 
-4) Update www/firefox
+You should follow "Using Bookmarks to Manage Multiple Repositories from a Single Clone" section.
 
-5) Re-install all above packages with latest patches in xulrunner.
 
-6) Apply xulrunner's patches to www/thunderbird and www/seamonkey's mozilla directory.
-   And add thunderbird or seamonkey specific patches to its own patches directory.
+# Update trees to latest
+
+	$ hg pull central
+	$ hg pull inbound
+	$ hg pull aurora
+	$ hg pull beta
+	$ hg pull release
+
+	$ hg update
+
+
+# Checkout last release source, and create your branch
+
+Find latest release.
+
+	$ hg branches | grep 2901
+	GECKO2901_2014050617_RELBRANCH 207485:3fd2b5510ccf
+	(snip)
+
+Checkout the branch.
+
+	$ hg checkout GECKO2901_2014050617_RELBRANCH
+
+Create named branch for applying pkgsrc patches
+
+	$ hg branch pkgsrc_firefox-29.0.1
+	$ hg commit -m "Create pkgsrc_firefox-29.0.1 branch for applying pkgsrc patches"
+
+Add .*\.orig$ to .hgignore, and commit this change
+
+	$ hg commit -m "Ignore .orig files" .hgignore
+
+
+# Apply pkgsrc patches
+
+	$ pushd /usr/pkgsrc/www/firefox
+	$ mkpatches -c
+	$ popd
+	$ cat /usr/pkgsrc/www/firefox/patches/patch-*|patch -p0
+	$ hg add ...(necessary files)
+	$ hg commit -m "Apply pkgsrc patches for firefox-29.0.1nb2"
+
+
+# Checkout latest beta source, and create your branch
+
+Find latest branch.
+
+	$ hg branches | grep 300b9
+	GECKO300b9_2014052918_RELBRANCH 199964:b7037f050049
+
+Checkout the branch.
+
+	$ hg checkout GECKO300b9_2014052918_RELBRANCH
+
+Create named branch for working.
+
+	$ hg branch ryoon_firefox-30.b9
+
+Create named branch for applying pkgsrc patches
+
+	$ hg branch ryoon_firefox-30.0
+	$ hg commit -m "Create ryoon_firefox-30.0 branch for applying freebsd-gecko patches"
+
+Add .*\.orig$ to .hgignore, and commit this change
+
+	$ hg commit -m "Ignore .orig files" .hgignore
+
+Apply patches from freebsd-gecko
+
+	$ cat ~/repos/freebsd-gecko/trunk/www/firefox/files/patch-*|patch -p0
+
+Fix rejected patches manually
+
+	$ hg status | grep rej$
+	$ vi path/to/a/certain/file.c
+
+Commit the patches
+
+	$ hg add (necessary files)
+	$ hg commit -m "Apply freebsd-gecko patches for firefox-30.0"
+
+
+# Merge your patches
+
+	$ hg merge pkgsrc_firefox-29.0.1
+	$ hg resolve -l
+	$ vi file/marked/as/U
+	$ hg resolve --mark file/marked/as/U
+	(loop)
+	$ hg commit -m "Merge pkgsrc_firefox-29.0.1 brnach to 30.0"
+
+
+# Create patch file for patch -p0
+
+	$ hg diff -r (revision of first commit in ryoon_freebsd-30.0) | \
+	sed -e 's!^--- a/!--- !' -e 's!^+++ b/!+++ !' > ~/firefox-30.0.diff
+	vi ~/firefox-30.0.diff
+	(Remove patch to .hgignore)
+	(Remove patch to .hgtags)
+
+# Create patches/patch-* for pkgsrc/www/firefox
+
+	$ cd /usr/pkgsrc/www/firefox
+	$ vi Makefile
+	(Update version)
+	(Remove PKGREVISION)
+	(Fix WRKSRC)
+	$ make mdi
+	$ make extract
+	$ pushd ${WRKOBJDIR}/www/firefox/work/mozilla-beta
+	$ patch -p0 < ~/firefox-30.0.diff
+	$ popd
+	$ mkpatches
+	$ patchdiff
+	$ make mps
+
+# Test your patches
+
+	$ make clean && make package

Fix disappeared link with pseudo tag
Index: wikisrc/ports/acorn32.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/acorn32.mdwn,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wikisrc/ports/acorn32.mdwn	3 Jun 2014 04:02:41 -0000	1.6
+++ wikisrc/ports/acorn32.mdwn	8 Jun 2014 04:29:58 -0000	1.7
@@ -9,7 +9,7 @@
 about="""
 NetBSD/acorn32 is a port to ARM- and StrongARM-powered Acorn RiscPC compatible
 machines and is maintained by Reinoud Zandijk
-[(<reinoud>)](mailto:reinoud@NetBSD.org).  The first formal release of
+[(reinoud)](mailto:reinoud@NetBSD.org).  The first formal release of
 NetBSD/acorn32 is 1.6. In earlier releases of NetBSD, these machines are
 supported by NetBSD/arm32.
 

Fix copy and paste error in last commit.
Index: wikisrc/tutorials/openldap_authentication_on_netbsd.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/tutorials/openldap_authentication_on_netbsd.mdwn,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wikisrc/tutorials/openldap_authentication_on_netbsd.mdwn	4 Jun 2014 20:56:19 -0000	1.4
+++ wikisrc/tutorials/openldap_authentication_on_netbsd.mdwn	4 Jun 2014 20:57:12 -0000	1.5
@@ -300,7 +300,7 @@
 
 ##  /etc/pam.d/system 
     
-    # $NetBSD: openldap_authentication_on_netbsd.mdwn,v 1.4 2014/06/04 20:56:19 tron Exp $
+    # $NetBSD: openldap_authentication_on_netbsd.mdwn,v 1.5 2014/06/04 20:57:12 tron Exp $
     #
     # System-wide defaults
     #
@@ -335,7 +335,7 @@
 <http://mail-index.netbsd.org/tech-userlevel/2007/08/25/0006.html>
 
 
-##  /etc/pam.d/system 
+##  /etc/pam.d/sudo 
 
     #
     # PAM configuration for the "sudo" service

Explain how to use "sudo" with LDAP.
Index: wikisrc/tutorials/openldap_authentication_on_netbsd.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/tutorials/openldap_authentication_on_netbsd.mdwn,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wikisrc/tutorials/openldap_authentication_on_netbsd.mdwn	31 May 2014 17:49:28 -0000	1.3
+++ wikisrc/tutorials/openldap_authentication_on_netbsd.mdwn	4 Jun 2014 20:56:19 -0000	1.4
@@ -300,7 +300,7 @@
 
 ##  /etc/pam.d/system 
     
-    # $NetBSD: openldap_authentication_on_netbsd.mdwn,v 1.3 2014/05/31 17:49:28 tron Exp $
+    # $NetBSD: openldap_authentication_on_netbsd.mdwn,v 1.4 2014/06/04 20:56:19 tron Exp $
     #
     # System-wide defaults
     #
@@ -335,6 +335,27 @@
 <http://mail-index.netbsd.org/tech-userlevel/2007/08/25/0006.html>
 
 
+##  /etc/pam.d/system 
+
+    #
+    # PAM configuration for the "sudo" service
+    #
+    
+    # auth
+    auth            sufficient      pam_ldap.so             no_warn try_first_pass
+    auth            required        pam_unix.so             no_warn try_first_pass nullok use_uid
+    
+    # account
+    account         required        pam_login_access.so
+    account         include         system
+    
+    # session
+    session         required        pam_permit.so
+    
+This file is only required if you want to use the "sudo" package from "pkgsrc".
+You will have to compile this package manually with "PKG_OPTIONS.sudo" set to
+"pam" because it doesn't support PAM by default.
+    
 #  Securing your system 
 
 As far as the document goes now, this setup is unprotected in that anyone listening in to the packets travelling trough your network would be able to find the unencrypted messages of your ldap users. Not a happy thought. 

Fix wikilink again.
Index: wikisrc/ports/acorn32.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/acorn32.mdwn,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wikisrc/ports/acorn32.mdwn	3 Jun 2014 03:59:28 -0000	1.5
+++ wikisrc/ports/acorn32.mdwn	3 Jun 2014 04:02:41 -0000	1.6
@@ -32,7 +32,7 @@
 * Acorn Network Computer
 
 Earlier ARM-based Acorn machines are supported by
-[NetBSD/acorn26](ports/acorn26).
+[[NetBSD/acorn26|acorn26]].
 
 """
 

Fix typo in wikilink to acorn26
Index: wikisrc/ports/acorn32.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/acorn32.mdwn,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wikisrc/ports/acorn32.mdwn	18 Apr 2014 20:46:30 -0000	1.4
+++ wikisrc/ports/acorn32.mdwn	3 Jun 2014 03:59:28 -0000	1.5
@@ -32,7 +32,7 @@
 * Acorn Network Computer
 
 Earlier ARM-based Acorn machines are supported by
-[NetBSD/acorn26](ports/acord26).
+[NetBSD/acorn26](ports/acorn26).
 
 """
 

Various corrections:
1.) We absolutely do *not* want to enabel SSLv2 on the LDAP server.
2.) We don't want to use "ldaps" either because it is not standardized.
LDAP with STARTTLS however is.
3.) We also want to use LDAP for netgroup even if it doesn't work
fully yet (see PR lib/48859).
4.) Fix the examples for the various PAM configuration files. The previous
examples would e.g. bypass the "wheel" group check for LDAP users.
We also don't need to use LDAP for session management. As we have
configure NSS to use LDAP the normal UNIX flavours will work just fine.
5.) Remove the "bindpw" option in the example "ldap.conf". I've never
seen an LDAP setup using that.
6.) Replace "${LOCALBASE}/etc" with "${PKG_SYSCONFBASE}".
Index: wikisrc/tutorials/openldap_authentication_on_netbsd.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/tutorials/openldap_authentication_on_netbsd.mdwn,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wikisrc/tutorials/openldap_authentication_on_netbsd.mdwn	5 Feb 2012 07:14:36 -0000	1.2
+++ wikisrc/tutorials/openldap_authentication_on_netbsd.mdwn	31 May 2014 17:49:28 -0000	1.3
@@ -19,13 +19,13 @@
     nis.schema
     
 
-These are (in pkgsrc-2008Q2) installed in ${LOCALBASE}/share/examples/openldap/schema, and can just be included from there, and tells the server which record keys (as in key-value pairs) it shall accept. 
+These are (in pkgsrc-2014Q1) installed in ${LOCALBASE}/share/examples/openldap/schema, and can just be included from there, and tells the server which record keys (as in key-value pairs) it shall accept. 
 
 And that really is it for the server bit. Next comes testing it out with a few ldap commands. 
 
 The basic commands of talking directly with the ldap database are ldapadd, ldapmodify and ldapsearch. These are in the openldap-client package, so you won't have to install the entire server on a client machine. 
 
-Options you'll be using alot like -b (base) and -H (host URI) can conveninently be stuck in a client configuration file, ${LOCALBASE}/etc/openldap/ldap.conf, which will save you time and aggravation from having to type them all the time. 
+Options you'll be using alot like -b (base) and -H (host URI) can conveninently be stuck in a client configuration file, ${PKG_SYSCONFBASE}/openldap/ldap.conf, which will save you time and aggravation from having to type them all the time. 
 
 To talk to your ldap server, try running ldapsearch; 
     
@@ -131,8 +131,7 @@
     databases/nss_ldap
     
     
-
-Once these are installed, you can either link them, copy or use in place from ${LOCALBASE}/lib and ${LOCALBASE}/lib/security into /usr/lib and /usr/lib/security respectively. I prefer to use symbolic links because then any upgrade I make will automatically have the latest version already in place. 
+The latest version of these packages (pkgrsc-2014Q2 and newer) will automatically created the necessary symbolic links in /usr/lib and /usr/lib/security to be able to use these modules. For older version you will have create a symbolic link from /usr/lib/nss_ldap.so.0 to ${LOCALBASE}/lib/nss_ldap.so.1 and from /usr/lib/security/pam_ldap.so to ${LOCALBASE}/lib/security/pam_ldap.so
 
 Before we go any further, I'd like to introduce some security into the mix; up til now we've talked to the ldap server without any limitations and what's called anonymous binds, i.e. not logged in. 
 
@@ -172,7 +171,7 @@
 
 This user will be used for ACL filtering later. 
 
-Next we'll need to configure the LDAP part of the plugins, a convenience here is that since both the plugins are made by the same people, they can share a configuration file. They will look for ${LOCALBASE}/etc/nss_ldap.conf and ${LOCALBASE}/etc/pam_ldap.conf, but linking them to the same file will let you have just one place to configure (and protect for your ldap user password) 
+Next we'll need to configure the LDAP part of the plugins, a convenience here is that since both the plugins are made by the same people, they can share a configuration file. They will look for ${PKG_SYSCONFBASE}/nss_ldap.conf and ${PKG_SYSCONFBASE}/pam_ldap.conf, but linking them to the same file will let you have just one place to configure (and protect for your ldap user password) 
 
 The important bits in this file is the base setting and the uri for your ldap server: 
     
@@ -187,9 +186,6 @@
     binddn cn=nss,dc=example,dc=org
     
     
-    bindpw unencrypted-password
-    
-
 And if you want to be able to change passwords as root without knowing the user's password in advance (with passwd, using ldapmodify you can still just set it, if you bind with the credentials to do it (see ACLs).) 
 
 I haven't mentioned this user before, it's the database's root user, allowed to do anything; 
@@ -197,7 +193,7 @@
     rootbinddn cn=root,dc=example,dc=org
     
 
-The password for this will not be in this file, but in a separate file called ${LOCALBASE}/etc/nss_ldap.secret or for pam; ${LOCALBASE}/etc/pam_ldap.secret 
+The password for this will not be in this file, but in a separate file called ${PKG_SYSCONFBASE}/nss_ldap.secret or for pam; ${PKG_SYSCONFBASE}/pam_ldap.secret 
 
   * ) not sure about this, but my system has both, linked together 
 
@@ -228,9 +224,10 @@
     group:	files ldap
     ...
     passwd:	files ldap
-    
+    ...
+    netgroup:   files ldap
 
-This will enable you to have local accounts as well as ldap users. You could test this out now, by running the getent program; 
+This will enable you to have local accounts as well as LDAP users. You could test this out now, by running the getent program; 
     
     % getent group
     
@@ -250,51 +247,47 @@
 
 ##  /etc/pam.d/sshd 
     
-    # $NetBSD: openldap_authentication_on_netbsd.mdwn,v 1.2 2012/02/05 07:14:36 schmonz Exp $
     #
     # PAM configuration for the "sshd" service
     #
      
     # auth
     auth            required        pam_nologin.so  no_warn
-    auth            sufficient      pam_ldap.so
     auth            sufficient      pam_krb5.so     no_warn try_first_pass
+    auth            sufficient      pam_ldap.so     no_warn try_first_pass
     # pam_ssh has potential security risks.  See pam_ssh(8).
     #auth           sufficient      pam_ssh.so      no_warn try_first_pass
     auth            required        pam_unix.so     no_warn try_first_pass
      
     # account
     account         required        pam_krb5.so
-    account         sufficient      pam_ldap.so
     account         required        pam_login_access.so
     account         required        pam_unix.so
      
     # session
     # pam_ssh has potential security risks.  See pam_ssh(8).
     #session        optional        pam_ssh.so
-    session         sufficient      pam_ldap.so
     session         required        pam_permit.so
      
     # password
     password        sufficient      pam_krb5.so     no_warn try_first_pass
-    password        sufficient      pam_ldap.so
+    password        sufficient      pam_ldap.so     no_warn try_first_pass
     password        required        pam_unix.so     no_warn try_first_pass
     
 
 ##  /etc/pam.d/su 
     
-    # $NetBSD: openldap_authentication_on_netbsd.mdwn,v 1.2 2012/02/05 07:14:36 schmonz Exp $
     #
     # PAM configuration for the "su" service
     #
      
     # auth
-    auth            sufficient      pam_ldap.so
     auth            sufficient      pam_rootok.so           no_warn
     auth            sufficient      pam_self.so             no_warn
     auth            sufficient      pam_ksu.so              no_warn try_first_pass
-    auth            requisite       pam_group.so            no_warn group=wheel root_only fail_safe
     #auth           sufficient      pam_group.so            no_warn group=rootauth root_only fail_safe authenticate
+    auth            requisite       pam_group.so            no_warn group=wheel root_only fail_safe
+    auth            sufficient      pam_ldap.so             no_warn try_first_pass
     auth            required        pam_unix.so             no_warn try_first_pass nullok
      
     # account
@@ -307,29 +300,27 @@
 
 ##  /etc/pam.d/system 
     
-    # $NetBSD: openldap_authentication_on_netbsd.mdwn,v 1.2 2012/02/05 07:14:36 schmonz Exp $
+    # $NetBSD: openldap_authentication_on_netbsd.mdwn,v 1.3 2014/05/31 17:49:28 tron Exp $
     #
     # System-wide defaults
     #
      
     # auth
-    auth            sufficient      pam_ldap.so
     auth            sufficient      pam_krb5.so             no_warn try_first_pass
+    auth            sufficient      pam_ldap.so             no_warn try_first_pass
     auth            required        pam_unix.so             no_warn try_first_pass nullok
      
     # account
-    account         sufficient      pam_ldap.so
     account         required        pam_krb5.so
     account         required        pam_unix.so
     
     # session
-    session         sufficient      pam_ldap.so
     session         required        pam_lastlog.so          no_fail no_nested
      
     # password
-    password        sufficient      pam_ldap.so
-    password        sufficient      pam_krb5.so             try_first_pass
-    password        sufficient      pam_unix.so             try_first_pass
+    password        sufficient      pam_krb5.so             no_warn try_first_pass
+    password        sufficient      pam_ldap.so             no_warn try_first_pass
+    password        sufficient      pam_unix.so             no_warn try_first_pass
     password        required        pam_deny.so             prelim_ignore
     
 
@@ -354,27 +345,18 @@
 
 We'll also need to configure slapd to use it, I put my keys in the /etc/openssl hierachy, since it seemed made for it. 
     
-    TLSCipherSuite          HIGH:MEDIUM:+SSLv2
+    TLSCipherSuite          HIGH
     TLSCertificateFile      /etc/openssl/certs/openldap.pem
     TLSCertificateKeyFile   /etc/openssl/private/openldap.pem
     TLSCACertificateFile    /etc/openssl/certs/openldap.pem
     
 
-And we'll also have to change the way slapd is started, so add this to your /etc/rc.conf 
-    
-    slapd_flags="-h ldaps://"
-    
-
-Note that this will make slapd answer only to ldaps! 
-
-Next we'll need to change the clients setup so that they will use ldaps. Enable ssl in ${LOCALBASE}/etc/{nss_,pam_}ldap.conf; 
-    
-    ssl on
+Next we'll need to change the clients setup so that they will use encryption. Enable ssl in ${PKG_SYSCONFBASE}/{nss_,pam_}ldap.conf; 
     
+    ssl start_tls
 
-Next if you're like me using the ${LOCALBASE}/etc/openldap/ldap.conf file, telling the client libs where to find the cert file is enough, we don't have to put it in the nss/pam config: 
+Next if you're like me using the ${PKG_SYSCONFBASE}/openldap/ldap.conf file, telling the client libs where to find the cert file is enough, we don't have to put it in the nss/pam config: 
     
-    URI		ldaps://my.server
     TLS_CACERT	/etc/openssl/certs/openldap.pem
     
 

whoops, forgot to commit this a couple months ago. add a few more notes.
Index: wikisrc/releng/release-prep.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/releng/release-prep.mdwn,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- wikisrc/releng/release-prep.mdwn	30 May 2014 08:39:56 -0000	1.13
+++ wikisrc/releng/release-prep.mdwn	30 May 2014 16:58:51 -0000	1.14
@@ -42,7 +42,7 @@
    - Adjust known issues section as necessary
    - Adjust compatibility issues section as necessary
    - Check the {core,portmasters,releng,developers} lists (while grumbling 
-     bout how you really ought to just remove this ridiculous self-indulgent
+     about how you really ought to just remove this ridiculous self-indulgent
      section from the notes entirely).
 
    Note: the "changes" part of this should be taken from an mdoc file that
@@ -98,13 +98,14 @@
    and proceed.
 
 8. Create ISOs (macppc, mac68k, source).  See below for instructions.
-   Rename ISOs to blahcd-&lt;release&gt;.iso
-   Create hashes for ISOs (<code>cksum -a 512 *iso > SHA512</code>)
+   Rename ISOs to blahcd-&lt;release&gt;.iso (for 6.0 and beyond, NetBSD-&lt;version&gt;-&lt;port&gt;.iso)
+   Create hashes for ISOs (<code>cksum -a sha512 NetBSD* > SHA512</code>)
 
 9. rsync to nbftp.  It goes to a staging dir in /pub/NetBSD/misc/releng first.
 
         rsync -avu --progress --port 874 --password-file /home/builds/.rsync &lt;path-to-top-level-release-dir&gt; builds@ftp.netbsd.org::builds/
-This will upload the files to <code>ftp.NetBSD.org:/pub/NetBSD/misc/releng/</code>.
+
+   This will upload the files to <code>ftp.NetBSD.org:/pub/NetBSD/misc/releng/</code>.
    After that, get admins to create <code>/pub/NetBSD/NetBSD-&lt;release&gt;</code> and
    <code>/pub/NetBSD/iso/&lt;release&gt;</code> directories for you, owned by builds:builds.
    Once these have been made, move images/* to the iso directory and symlink to "iso" and "images" in the main release directory, and move the rest
@@ -143,14 +144,17 @@
 15. Update the website.
 
     - Commit release's HTML file in htdocs/releases/formal-&lt;blah&gt;
+    - Update htdocs/share/xml/misc.ent (release.*)
     - Add htdocs/support/security/patches-&lt;blah&gt;
     - Update htdocs/releases/formal-&lt;blah&gt;/index.xml
     - Update htdocs/mirrors/torrents/
-    - Update htdocs/share/xml/misc.ent (release.*)
-    - Update htdocs/index.html
     - Update htdocs/releases/formal.xml
-    - Update htdocs/changes/index.xml
     - Top-level regen of everything
+    - Update htdocs/changes/index.xml
+    - Update htdocs/index.html
+    - Port pages in wikisrc -- sed? :\ (don't bother with xen)
+    - Update htdocs/developers/features/
+    - Update htdocs/docs/guide/en/chap-fetch.xml
 
 16. Update <code>/pub/NetBSD/README</code> to mention the new release
 

Index: wikisrc/releng/release-prep.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/releng/release-prep.mdwn,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- wikisrc/releng/release-prep.mdwn	30 May 2014 05:25:13 -0000	1.12
+++ wikisrc/releng/release-prep.mdwn	30 May 2014 08:39:56 -0000	1.13
@@ -186,6 +186,7 @@
 * change name to 5.0_STABLE
 * 5-0 branch becomes 5.0.0_PATCH
 * Update src/share/misc/bsd-family-tree
+* Update src/usr.bin/calendar/calendars/calendar.netbsd
 
 create netbsd-5-0 branch:
 

Index: wikisrc/releng/release-prep.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/releng/release-prep.mdwn,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- wikisrc/releng/release-prep.mdwn	12 Apr 2014 18:59:12 -0000	1.11
+++ wikisrc/releng/release-prep.mdwn	30 May 2014 05:25:13 -0000	1.12
@@ -185,6 +185,7 @@
 
 * change name to 5.0_STABLE
 * 5-0 branch becomes 5.0.0_PATCH
+* Update src/share/misc/bsd-family-tree
 
 create netbsd-5-0 branch:
 

Index: wikisrc/users/msaitoh.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/msaitoh.mdwn,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wikisrc/users/msaitoh.mdwn	25 Apr 2014 14:01:31 -0000	1.5
+++ wikisrc/users/msaitoh.mdwn	28 May 2014 09:24:56 -0000	1.6
@@ -14,7 +14,10 @@
 * Atomic access of MII PHY.
     * There is no common framework to do multiple register accesses as atomic.
     * See my slide in AsiaBSDCon 2014 WIP session <<http://www.netbsd.org/~msaitoh/Improving_MII_PHY.pdf>>
+* Change the return value of mii_readreg() and mii_writereg().
+    * Currently there is no way to know whether the call was failed(timeout) or not.
 * IEEE 802.3az (Energy Efficiency Ethernet(EEE)) supprot
+*
 * Serdes support for wm(4)
     * I have no any serdes machines/cards :-(
 * Improve puc(4) as console

Improve formatting.
Index: wikisrc/summits/eurobsdcon_2013_netbsd_summit.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/summits/eurobsdcon_2013_netbsd_summit.mdwn,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wikisrc/summits/eurobsdcon_2013_netbsd_summit.mdwn	20 Oct 2013 23:25:11 -0000	1.2
+++ wikisrc/summits/eurobsdcon_2013_netbsd_summit.mdwn	27 May 2014 20:58:19 -0000	1.3
@@ -1,34 +1,36 @@
-Attendees, in alphabetical order:
-
-* Adrian Steinmann <ast@NetBSD.org>
-* Alistair Crooks <agc@NetBSD.org>
-* Bernd Ernesti <veego@NetBSD.org>
-* Christoph Badura <bad@NetBSD.org>
-* Guillaume Lasmayous <gls@NetBSD.org>
-* Joerg Sonnenberger <joerg@NetBSD.org>
-* Julian Coleman <jdc@NetBSD.org>
-* Masanobu SAITOH <msaitoh@NetBSD.org>
-* Michael van Elst <mlelstv@NetBSD.org>
-* Mindaugas Rasiukevicius <rmind@NetBSD.org>
-* Petra Zeidler <spz@NetBSD.org>
-* Pierre Pronchery <khorben@NetBSD.org>
-* Soren Jorvang <soren@NetBSD.org>
-* Valery Ushakov <uwe@NetBSD.org>
-
-(rmind@, spz@, and mlelstv@ were a bit late due to late flight arrivals).
-
-**Short Talks**
+[[!meta title="EuroBSDCon 2013 NetBSD Summit"]]
 
-* khorben@      **EdgeBSD (Experience with git, Pkg-signing in pkgsrc, Modular Xorg)**
-
-* uwe@          **NetBSD & VirtualBox**
-
-* joerg@        **Bulk builds of pkgsrc**
+Attendees, in alphabetical order:
 
-* msaitoh@      **IIJ SA-W1 Port (not in NetBSD CVS yet)**, **TNF candidates from Japan**
+* Adrian Steinmann `ast@`
+* Alistair Crooks `agc@`
+* Bernd Ernesti `veego@`
+* Christoph Badura `bad@`
+* Guillaume Lasmayous `gls@`
+* Joerg Sonnenberger `joerg@`
+* Julian Coleman `jdc@`
+* Masanobu SAITOH `msaitoh@`
+* Michael van Elst `mlelstv@`
+* Mindaugas Rasiukevicius `rmind@`
+* Petra Zeidler `spz@`
+* Pierre Pronchery `khorben@`
+* Soren Jorvang `soren@`
+* Valery Ushakov `uwe@`
+
+(`rmind@`, `spz@`, and `mlelstv@` were a bit late due to late flight arrivals.)
+
+## Short Talks
+
+[[!table data="""
+Speaker|Title
+`khorben@`|_EdgeBSD (Experience with git, Pkg-signing in pkgsrc, Modular Xorg)_
+`uwe@`|_NetBSD & VirtualBox_
+`joerg@`|_Bulk builds of pkgsrc_
+`msaitoh@`|_IIJ SA-W1 Port (not in NetBSD CVS yet)_, _TNF candidates from Japan_
+"""]]
 
-**Discussions**
+## Discussions
 
-**Varia**
+## Varia
 
 Dinner at Il Pirata was better than Mama Maltese but service abysmal.

Added slightly updated FAQ files from NetBSD www.
--- /dev/null	2014-07-08 14:40:59.000000000 +0000
+++ wikisrc/ports/mac68k/faq/faq-1.html	2014-07-08 14:47:16.000000000 +0000
@@ -0,0 +1,130 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
+
+<html>
+<head>
+<!-- Copyright (c) 1997-2003
+	The NetBSD Foundation, Inc.  ALL RIGHTS RESERVED. -->
+<TITLE>NetBSD/mac68k FAQ - Introduction</TITLE>
+</HEAD>
+<BODY>
+<H1>1. <A NAME="s1"></A>Introduction</H1>
+<P>
+<HR>
+<a href="./#toc1">Contents of this section</a><hr>
+</P>
+
+<P>This FAQ is the Frequently Asked Questions document for the NetBSD/mac68k
+project, aka NetBSD/Mac, aka port-mac68k, aka MacBSD, and formerly known as
+the Alice project.  Most of the questions and answers herein should apply
+equally well to the mac68k ports of other *BSD projects.</P>
+<P>If I refer to "we", I mean the team of contributers to NetBSD/mac68k as a
+whole. </P>
+<P></P>
+<H2>1.1 <A NAME="ss1.1"></A> Purpose of this FAQ</H2>
+
+<P>We hope that this document will answer many of the frequently asked questions
+of anyone from  beginners to experienced developers regarding all aspects of
+the NetBSD/mac68k operating system.  However, particular attention is paid
+to those features unique to the Macintosh port.</P>
+<P></P>
+
+<H2>1.2 <A NAME="ss1.2"></A> Scope</H2>
+
+<P>With a focus on the Macintosh port of NetBSD, this version of the FAQ
+currently attempts to cover NetBSD/mac68k distributions with a focus on the
+NetBSD 1.3 release.  New questions or problems arising from the 1.3-current
+distribution will be handled as soon as I can get to them.</P>
+<P>Since many issues arising from running NetBSD are not specific to the
+mac68k port, the reader is advised to check the *BSD FAQ for answers to
+general NetBSD questions not answered within this document:</P>
+<P>
+<A HREF="http://cynjut.neonramp.com/FAQ.html">http://cynjut.neonramp.com/FAQ.html</A>
+</P>
+<P></P>
+
+<H2>1.3 <A NAME="ss1.3"></A> Availability</H2>
+
+<P>The most recent copy of this FAQ in html format can be found on:
+<a href="http://www.NetBSD.org/ports/mac68k/faq/">http://www.NetBSD.org/ports/mac68k/faq/</a>
+
+or on any of the <a href="http://www.NetBSD.org/mirrors/#www">NetBSD
+WWW mirrors</a>.
+<P>
+Text format and the sgml source files can be found at:
+<A HREF="ftp://ftp.macbsd.org/pub/NetBSD/docs/">ftp://ftp.macbsd.org/pub/NetBSD/docs/</A>
+</P>
+<P></P>
+
+<H2>1.4 <A NAME="ss1.4"></A> Copyright and Disclaimers</H2>
+
+<P>This FAQ is based on the FAQ originally written by David Holcomb
+(holcomb@acm.vt.edu)  It contains much of the material from that original
+document, but its format has been modified to help it operate better with
+Matt Welsh's linuxdoc-sgml tool for producing documentation.</P>
+<P>Like David, I am also relying on linuxdoc-sgml for converting the
+FAQ from SGML format to several other formats.  The FAQ will use the
+constructs of the linuxdoc SGML document type definition as far as I am
+capable of making them.</P>
+<P>Although I try to verify that the information contained within this FAQ
+is correct, I accept no responsibility for loss or damage caused by the
+use of the information contained within this FAQ.</P>
+<P>This FAQ is (c) 1998, 1997, 1996, 1995 by Colin Wood with portions (c)
+1994, 1993  by the Alice Group.</P>
+<P>Quoted excerpts are copyright their respective authors.</P>
+<P></P>
+
+<H2>1.5 <A NAME="ss1.5"></A> Additions and Corrections</H2>
+
+<P>Please send all additions and corrections to ender@macbsd.com.  If making a
+correction, please do not send a copy of the entire FAQ.  Just send the
+relevant text from the FAQ plus the corrected text.</P>
+<P></P>
+
+<H2>1.6 <A NAME="ss1.6"></A> FAQ Contributors</H2>
+
+<P>The following individuals contributed to this FAQ, directly or indirectly:
+<UL>
+<LI>Allen Briggs                (briggs@puma.macbsd.com)</LI>
+<LI>Lawrence Kesteloot  (lk@unc.edu)</LI>
+<LI>Brad Grantham               (grantham@tenon.com)</LI>
+<LI>Mike Finch          (finchm@acm.vt.edu)</LI>
+<LI>Steve Allen         (wormey@eskimo.com)</LI>
+<LI>Brad Parker         (brad@fcr.com)</LI>
+<LI>David Holcomb               (holcomb@acm.vt.edu)</LI>
+<LI>Scott Reynolds              (scottr@og.org)</LI>
+<LI>Ken Nakata          (kenn@rutgers.edu)</LI>
+<LI>Bill Studenmund             (wrstuden@loki.standford.edu)</LI>
+<LI>Colin Wood          (ender@macbsd.com)</LI>
+<LI>and a cast of hundreds...</LI>
+</UL>
+</P>
+<P>I am trying to recognize everyone who has contributed to this FAQ.  If I
+have missed your name, please e-mail me (ender@macbsd.com) and I will
+make sure to include your name.</P>
+<P></P>
+
+<P>
+<HR>
+<A HREF="faq-2.html">Next Chapter</A><HR>
+</P>
+<P>
+
+Table of contents of <a href="./#toc1">this chapter</a>,
+General <a href="./">table of contents</a>
+<p>
+
+<a href="#s1">Beginning of this Chapter</a>
+<p>
+
+<hr>
+<address>
+  <small>
+  <a href="http://www.NetBSD.org/cgi-bin/feedback.cgi">(Contact us)</a>
+  $NetBSD: faq-1.html,v 1.1 2014/05/21 06:34:56 jklos Exp $<br>
+  <a href="../../../about/disclaimer.html">Copyright &copy; 1994-2003
+  The NetBSD Foundation, Inc.  ALL RIGHTS RESERVED.</a>
+  </small>
+</address>
+
+</body>
+</html>
--- /dev/null	2014-07-08 14:40:59.000000000 +0000
+++ wikisrc/ports/mac68k/faq/faq-10.html	2014-07-08 14:47:16.000000000 +0000
@@ -0,0 +1,763 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
+
+<html>
+<head>
+<!-- Copyright (c) 1997-2003
+	The NetBSD Foundation, Inc.  ALL RIGHTS RESERVED. -->
+<TITLE>NetBSD/mac68k FAQ - Errors</TITLE>
+</HEAD>
+<BODY>
+<A NAME="errors"></A> <H1>10. <A NAME="s10"></A>Errors</H1>
+<P>
+<HR>
+<a href="./#toc10">Contents of this section</a><hr>
+</P>
+
+<A NAME="H.A"></A> <H2>10.1 <A NAME="ss10.1"></A> When rebooting it says, <CODE>"WARNING: cannot set battery backed clock..."</CODE>.  Should I be concerned?</H2>
+
+<P>Not really, but it means that you are using a rather old kernel.  Newer
+kernels give the error message 
+<A HREF="#H.Y">below</A>
+.</P>
+<P></P>
+
+<A NAME="H.Y"></A> <H2>10.2 <A NAME="ss10.2"></A> When rebooting it says, <CODE>"NetBSD/mac68k does not trust itself to update the RTC on shutdown."</CODE>  Should I be concerned?</H2>
+
+<P>No.  This is simply an indication that NetBSD/mac68k would rather not set
+your Real Time Clock since NetBSD
+<A HREF="faq-3.html#A.P">loses more time the longer it runs</A>
+
+(this would lead to your clock being off in Mac OS as well).  The code to
+update the RTC on most machines does exist, though, and you can turn it on
+in the kernel if you truly wish to do so.</P>
+<P></P>
+
+<A NAME="H.B"></A> <H2>10.3 <A NAME="ss10.3"></A> When I boot, I get the following error message:</H2>
+
+<P>
+<BLOCKQUOTE><CODE>
+<PRE>
+init: not found
+panic: no init
+Pausing forever.
+</PRE>
+</CODE></BLOCKQUOTE>
+
+What's wrong?</P>
+<P></P>
+<P><CODE>/sbin/init</CODE> was not installed.  Use the Installer to "ls /sbin/init"
+and make sure it is there.  Make sure that you have installed a base
+distribution set such as the NetBSD 1.3 release, or a -current snapshot:
+<UL>
+<LI>
+<a href="ftp://ftp.NetBSD.org/pub/NetBSD/NetBSD-1.5/mac68k/binary/sets/">ftp://ftp.NetBSD.org/pub/NetBSD/NetBSD-1.5/mac68k/binary/sets/</a>
+</LI>
+<LI>
+<A HREF="ftp://ftp.NetBSD.org/pub/NetBSD/arch/mac68k/new/">ftp://ftp.NetBSD.org/pub/NetBSD/arch/mac68k/new/</A>
+</LI>
+</UL>
+</P>
+<P></P>
+
+<A NAME="H.C"></A> <H2>10.4 <A NAME="ss10.4"></A> When I boot, I get the following unusual lines:</H2>
+
+<P>

(Diff truncated)
macbsd.com -> macbsd.org
Index: wikisrc/ports/mac68k.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/mac68k.mdwn,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wikisrc/ports/mac68k.mdwn	18 Apr 2014 20:46:30 -0000	1.6
+++ wikisrc/ports/mac68k.mdwn	21 May 2014 06:19:57 -0000	1.7
@@ -63,7 +63,7 @@
 
 [1]<a name="68LC040"></a>System is based on the Motorola 68LC040 and [FPU
 functions are not yet fully
-supported](http://www.macbsd.com/macbsd/LC040-and-BSD.html).
+supported](http://www.macbsd.org/macbsd/LC040-and-BSD.html).
 """
 additional="""
 * [NetBSD/mac68k FAQ](http://www.NetBSD.org/ports/mac68k/faq/)

Removed "aoeu"... it seems that I can edit the wiki!
Index: wikisrc/sandbox.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/sandbox.mdwn,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wikisrc/sandbox.mdwn	18 May 2014 21:20:53 -0000	1.5
+++ wikisrc/sandbox.mdwn	18 May 2014 21:23:25 -0000	1.6
@@ -35,4 +35,3 @@
 
 Remember Cyrix: <img src="http://www.netbsd.org/images/ports/i386/header.gif" />
 
-aoeu

testing if editing works
Index: wikisrc/sandbox.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/sandbox.mdwn,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wikisrc/sandbox.mdwn	30 Dec 2009 04:28:58 -0000	1.4
+++ wikisrc/sandbox.mdwn	18 May 2014 21:20:53 -0000	1.5
@@ -34,3 +34,5 @@
 [[ikiwiki/WikiLink]]
 
 Remember Cyrix: <img src="http://www.netbsd.org/images/ports/i386/header.gif" />
+
+aoeu

fix broken image on footer
--- /dev/null	2014-07-08 14:40:59.000000000 +0000
+++ wikisrc/images/hosted-isc.png	2014-07-08 14:47:16.000000000 +0000
@@ -0,0 +1,9 @@
+‰PNG
+
+
+ŠŸ…dÐÜ!G•jÌ0æíú|È=7	©C䩨(
+Š_ÈÒÛBYÒ´òÊô@u8e‡óù!Þ˜„)rÎÛ
+üU†`ÜÒ.$(d×Uø¬Y¤í€n€5€¯.V[P
+åq
+hÓLAöf[q!ƒ+­€U
+ÝÄ*V@

Added a comment: Why not /usr/pkg/etc/rc.d?
--- /dev/null	2014-07-08 14:40:59.000000000 +0000
+++ wikisrc/tutorials/how_to_set_up_a_xen_dom0/comment_2_b024b470d056743d507c87e1c055d090._comment	2014-07-08 14:47:16.000000000 +0000
@@ -0,0 +1,15 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawlLYXNcaa6_fHcRVVxo3Rik5VJzW9ONTtA"
+ nickname="Raimundo"
+ subject="Why not /usr/pkg/etc/rc.d?"
+ date="2014-04-28T02:31:46Z"
+ content="""
+Hello,
+
+nice to see a more updated Xen how to.
+
+But I am curious on that: why not use /usr/pkg/etc/rc.d instead of polluting /etc/rc.d with third part scripts?
+
+Thank you,
+Raimundo Santos
+"""]]

Index: wikisrc/users/msaitoh.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/msaitoh.mdwn,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wikisrc/users/msaitoh.mdwn	25 Apr 2014 04:24:31 -0000	1.4
+++ wikisrc/users/msaitoh.mdwn	25 Apr 2014 14:01:31 -0000	1.5
@@ -32,3 +32,5 @@
     * Steal from FreeBSD :)
 * Think about the behavior of ETHERCAP_*
 * Use MI kern/subr_disk_mbr.c on some ARM platforms <<http://gnats.netbsd.org/47463>>.
+* Fix/improve pmc(1) and PERFCTRS. At least it doesn't work on i386 MP system.
+* MI(or common) format or API for "cpuctl identify"

Index: wikisrc/users/msaitoh.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/msaitoh.mdwn,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wikisrc/users/msaitoh.mdwn	24 Apr 2014 05:57:33 -0000	1.3
+++ wikisrc/users/msaitoh.mdwn	25 Apr 2014 04:24:31 -0000	1.4
@@ -31,3 +31,4 @@
 * Add support dot3 MIB
     * Steal from FreeBSD :)
 * Think about the behavior of ETHERCAP_*
+* Use MI kern/subr_disk_mbr.c on some ARM platforms <<http://gnats.netbsd.org/47463>>.

Index: wikisrc/users/msaitoh.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/msaitoh.mdwn,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wikisrc/users/msaitoh.mdwn	24 Apr 2014 05:06:32 -0000	1.2
+++ wikisrc/users/msaitoh.mdwn	24 Apr 2014 05:57:33 -0000	1.3
@@ -14,6 +14,7 @@
 * Atomic access of MII PHY.
     * There is no common framework to do multiple register accesses as atomic.
     * See my slide in AsiaBSDCon 2014 WIP session <<http://www.netbsd.org/~msaitoh/Improving_MII_PHY.pdf>>
+* IEEE 802.3az (Energy Efficiency Ethernet(EEE)) supprot
 * Serdes support for wm(4)
     * I have no any serdes machines/cards :-(
 * Improve puc(4) as console

Index: wikisrc/users/msaitoh.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/msaitoh.mdwn,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wikisrc/users/msaitoh.mdwn	24 Apr 2014 04:57:34 -0000	1.1
+++ wikisrc/users/msaitoh.mdwn	24 Apr 2014 05:06:32 -0000	1.2
@@ -14,15 +14,16 @@
 * Atomic access of MII PHY.
     * There is no common framework to do multiple register accesses as atomic.
     * See my slide in AsiaBSDCon 2014 WIP session <<http://www.netbsd.org/~msaitoh/Improving_MII_PHY.pdf>>
-
 * Serdes support for wm(4)
     * I have no any serdes machines/cards :-(
 * Improve puc(4) as console
+* Update IXP4xx stuff.
 * Support Intel Galileo
 
 
-
 # Interests
+* Build daily autotest system for arm
+    * e.g.: <<http://releng.netbsd.org/test-results.html>>
 * To be able to map and access PCI extended configuration space.
     * PLEASE SOMEONE!
 * PCI MSI, MSI-X support

--- /dev/null	2014-07-08 14:40:59.000000000 +0000
+++ wikisrc/users/msaitoh.mdwn	2014-07-08 14:47:17.000000000 +0000
@@ -0,0 +1,31 @@
+# Work area?
+
+* maintain wm(4)
+* maintain bge(4)
+* maintain some MII PHYs
+* maintain puc(4)
+* fix bugs :-)
+* Release engineering
+
+
+# TODO
+* IEEE 802.3 Clause 45. MDIO access:
+    * See my slide in AsiaBSDCon 2014 WIP session <<http://www.netbsd.org/~msaitoh/Improving_MII_PHY.pdf>>
+* Atomic access of MII PHY.
+    * There is no common framework to do multiple register accesses as atomic.
+    * See my slide in AsiaBSDCon 2014 WIP session <<http://www.netbsd.org/~msaitoh/Improving_MII_PHY.pdf>>
+
+* Serdes support for wm(4)
+    * I have no any serdes machines/cards :-(
+* Improve puc(4) as console
+* Support Intel Galileo
+
+
+
+# Interests
+* To be able to map and access PCI extended configuration space.
+    * PLEASE SOMEONE!
+* PCI MSI, MSI-X support
+* Add support dot3 MIB
+    * Steal from FreeBSD :)
+* Think about the behavior of ETHERCAP_*

Index: wikisrc/ports/vax.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/vax.mdwn,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wikisrc/ports/vax.mdwn	18 Apr 2014 20:46:30 -0000	1.5
+++ wikisrc/ports/vax.mdwn	21 Apr 2014 20:01:48 -0000	1.6
@@ -9,7 +9,7 @@
 about="""
 NetBSD/vax is the port of NetBSD to DEC VAX computers.
 The first model was announced in 1977 and they were sold
-until September 30, 2000! NetBSD/vax was the first free OS that ran on
+until September 30, 2000. NetBSD/vax was the first free OS that ran on
 the VAX series of computers, and by far runs on the largest number of models.
 
 Development activity on NetBSD/vax continues at a speed depending

try to get my <li> working
Index: wikisrc/ports/xen.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/xen.mdwn,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wikisrc/ports/xen.mdwn	19 Apr 2014 14:46:02 -0000	1.6
+++ wikisrc/ports/xen.mdwn	19 Apr 2014 17:42:15 -0000	1.7
@@ -14,6 +14,7 @@
 isolation. Xen is Open Source software.
 
 [[Xen Howto|/ports/xen/howto]]
+
   * installation instructions
   * help on networking
 

try to say a little of what is in the howto
Index: wikisrc/ports/xen.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/xen.mdwn,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wikisrc/ports/xen.mdwn	19 Apr 2014 14:42:35 -0000	1.5
+++ wikisrc/ports/xen.mdwn	19 Apr 2014 14:46:02 -0000	1.6
@@ -14,6 +14,8 @@
 isolation. Xen is Open Source software.
 
 [[Xen Howto|/ports/xen/howto]]
+  * installation instructions
+  * help on networking
 
 See [http://www.xen.org/](http://www.xen.org/) for more details on Xen.
 

drop cur release to see if it just removes the download links (broken)
Index: wikisrc/ports/xen.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/ports/xen.mdwn,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wikisrc/ports/xen.mdwn	18 Apr 2014 20:46:30 -0000	1.4
+++ wikisrc/ports/xen.mdwn	19 Apr 2014 14:42:35 -0000	1.5
@@ -1,6 +1,5 @@
 [[!template id=port
 port="xen"
-cur_rel="6.1.4"  
 future_rel="7.0"
 changes_cur="6.0"
 changes_future="7.0"

Retire some AMIs:
6.0 6.0.1 6.0.2 6.0.3
6.1 6.1.1 6.1.2
Members: 
	amazon_ec2/amis.mdwn:1.37->1.38 

Index: wikisrc/amazon_ec2/amis.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/amazon_ec2/amis.mdwn,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- wikisrc/amazon_ec2/amis.mdwn	18 Apr 2014 22:10:12 -0000	1.37
+++ wikisrc/amazon_ec2/amis.mdwn	19 Apr 2014 00:00:59 -0000	1.38
@@ -46,50 +46,6 @@
   <td>ami-876dcd9a</td><!-- sa-east-1 -->
 </tr>
 <tr>
-  <th>NetBSD 6.0</th>
-  <td>ami-1400bf7d</td><!-- us-east-1 -->
-  <td>ami-9bac8bde</td><!-- us-west-1 -->
-  <td>ami-22d65f12</td><!-- us-west-2 -->
-  <td>ami-7fc3c30b</td><!-- eu-west-1 -->
-  <td>ami-b6c383e4</td><!-- ap-southeast-1 -->
-  <td>ami-a181169b</td><!-- ap-southeast-2 -->
-  <td>ami-7e2d927f</td><!-- ap-northeast-1 -->
-  <td>ami-c839e0d5</td><!-- sa-east-1 -->
-</tr>
-<tr>
-  <th>NetBSD 6.0.1</th>
-  <td>ami-a754dbce</td><!-- us-east-1 -->
-  <td>ami-bc3f1ff9</td><!-- us-west-1 -->
-  <td>ami-6ced665c</td><!-- us-west-2 -->
-  <td>ami-18f0fc6c</td><!-- eu-west-1 -->
-  <td>ami-53521001</td><!-- ap-southeast-1 -->
-  <td>ami-011b8c3b</td><!-- ap-southeast-2 -->
-  <td>ami-4a1ea54b</td><!-- ap-northeast-1 -->
-  <td>ami-4809d155</td><!-- sa-east-1 -->
-</tr>
-<tr>
-  <th>NetBSD 6.0.2</th>
-  <td>ami-315d3458</td><!-- us-east-1 -->
-  <td>ami-1381ae56</td><!-- us-west-1 -->
-  <td>ami-87d243b7</td><!-- us-west-2 -->
-  <td>ami-e50e1f91</td><!-- eu-west-1 -->
-  <td>ami-ee1a54bc</td><!-- ap-southeast-1 -->
-  <td>ami-</td><!-- ap-southeast-2 -->
-  <td>ami-a126a8a0</td><!-- ap-northeast-1 -->
-  <td>ami-366cb62b</td><!-- sa-east-1 -->
-</tr>
-<tr>
-  <th>NetBSD 6.0.3</th>
-  <td>ami-e7f6a28e</td><!-- us-east-1 -->
-  <td>ami-46241003</td><!-- us-west-1 -->
-  <td>ami-f4f26cc4</td><!-- us-west-2 -->
-  <td>ami-d618ffa1</td><!-- eu-west-1 -->
-  <td>ami-e58719e4</td><!-- ap-northeast-1 -->
-  <td>ami-d6155f84</td><!-- ap-southeast-1 -->
-  <td>ami-c56df0ff</td><!-- ap-southeast-2 -->
-  <td>ami-7541e668</td><!-- sa-east-1 -->
-</tr>
-<tr>
   <th>NetBSD 6.0.4</th>
   <td>ami-e192af88</td><!-- us-east-1 -->
   <td>ami-5cc5f719</td><!-- us-west-1 -->
@@ -112,39 +68,6 @@
   <td>ami-5119bb4c</td><!-- sa-east-1 -->
 </tr>
 <tr>
-  <th>NetBSD 6.1</th>
-  <td>ami-8b751ce2</td><!-- us-east-1 -->
-  <td>ami-1185aa54</td><!-- us-west-1 -->
-  <td>ami-b1d24381</td><!-- us-west-2 -->
-  <td>ami-e70a1b93</td><!-- eu-west-1 -->
-  <td>ami-2a1d5378</td><!-- ap-southeast-1 -->
-  <td>ami-2136a61b</td><!-- ap-southeast-2 -->
-  <td>ami-1b3fb11a</td><!-- ap-northeast-1 -->
-  <td>ami-c66cb6db</td><!-- sa-east-1 -->
-</tr>
-<tr>
-  <th>NetBSD 6.1.1</th>
-  <td>ami-29420240</td><!-- us-east-1 -->
-  <td>ami-54795311</td><!-- us-west-1 -->
-  <td>ami-6a7be65a</td><!-- us-west-2 -->
-  <td>ami-599a822d</td><!-- eu-west-1 -->
-  <td>ami-44c28a16</td><!-- ap-southeast-1 -->
-  <td>ami-b968fa83</td><!-- ap-southeast-2 -->
-  <td>ami-65dd4e64</td><!-- ap-northeast-1 -->
-  <td>ami-1f4de902</td><!-- sa-east-1 -->
-</tr>
-<tr>
-  <th>NetBSD 6.1.2</th>
-  <td>ami-f7bbef9e</td><!-- us-east-1 -->
-  <td>ami-a43c08e1</td><!-- us-west-1 -->
-  <td>ami-26fb6516</td><!-- us-west-2 -->
-  <td>ami-7814f30f</td><!-- eu-west-1 -->
-  <td>ami-c8115b9a</td><!-- ap-southeast-1 -->
-  <td>ami-ff70edc5</td><!-- ap-southeast-2 -->
-  <td>ami-8d930d8c</td><!-- ap-northeast-1 -->
-  <td>ami-9f44e382</td><!-- sa-east-1 -->
-</tr>
-<tr>
   <th>NetBSD 6.1.3</th>
   <td>ami-1d90ad74</td><!-- us-east-1 -->
   <td>ami-aea092eb</td><!-- us-west-1 -->
@@ -208,50 +131,6 @@
   <td>ami-476ece5a</td><!-- sa-east-1 -->
 </tr>
 <tr>
-  <th>NetBSD 6.0</th>
-  <td>ami-68ff4101</td><!-- us-east-1 -->
-  <td>ami-59b4931c</td><!-- us-west-1 -->
-  <td>ami-6cd65f5c</td><!-- us-west-2 -->
-  <td>ami-abd0d0df</td><!-- eu-west-1 -->
-  <td>ami-70c48422</td><!-- ap-southeast-1 -->
-  <td>ami-3f801705</td><!-- ap-southeast-2 -->
-  <td>ami-562c9357</td><!-- ap-northeast-1 -->
-  <td>ami-e639e0fb</td><!-- sa-east-1 -->
-</tr>
-<tr>
-  <th>NetBSD 6.0.1</th>
-  <td>ami-5d0f8034</td><!-- us-east-1 -->
-  <td>ami-1800205d</td><!-- us-west-1 -->
-  <td>ami-f0ed66c0</td><!-- us-west-2 -->
-  <td>ami-00f2fe74</td><!-- eu-west-1 -->
-  <td>ami-6f52103d</td><!-- ap-southeast-1 -->
-  <td>ami-6b1b8c51</td><!-- ap-southeast-2 -->
-  <td>ami-8e15ae8f</td><!-- ap-northeast-1 -->
-  <td>ami-e409d1f9</td><!-- sa-east-1 -->
-</tr>
-<tr>
-  <th>NetBSD 6.0.2</th>
-  <td>ami-995039f0</td><!-- us-east-1 -->
-  <td>ami-8b80afce</td><!-- us-west-1 -->
-  <td>ami-d5d544e5</td><!-- us-west-2 -->
-  <td>ami-cf0e1fbb</td><!-- eu-west-1 -->
-  <td>ami-i881b55da</td><!-- ap-southeast-1 -->
-  <td>ami-cd37a7f7</td><!-- ap-southeast-2 -->
-  <td>ami-9b3eb09a</td><!-- ap-northeast-1 -->
-  <td>ami-d26cb6cf</td><!-- sa-east-1 -->
-</tr>
-<tr>
-  <th>NetBSD 6.0.3</th>
-  <td>ami-aff6a2c6</td><!-- us-east-1 -->
-  <td>ami-42241007</td><!-- us-west-1 -->
-  <td>ami-e8f26cd8</td><!-- us-west-2 -->
-  <td>ami-b218ffc5</td><!-- eu-west-1 -->
-  <td>ami-e2155fb0</td><!-- ap-southeast-1 -->
-  <td>ami-216cf11b</td><!-- ap-southeast-2 -->
-  <td>ami-3d841a3c</td><!-- ap-northeast-1 -->
-  <td>ami-6b41e676</td><!-- sa-east-1 -->
-</tr>
-<tr>
   <th>NetBSD 6.0.4</th>
   <td>ami-8b87bae2</td><!-- us-east-1 -->
   <td>ami-30cbf975</td><!-- us-west-1 -->
@@ -274,39 +153,6 @@
   <td>ami-a7ef42ba</td><!-- sa-east-1 -->
 </tr>
 <tr>
-  <th>NetBSD 6.1</th>
-  <td>ami-815138e8</td><!-- us-east-1 -->
-  <td>ami-db80af9e</td><!-- us-west-1 -->
-  <td>ami-cbd243fb</td><!-- us-west-2 -->
-  <td>ami-5d0f1e29</td><!-- eu-west-1 -->
-  <td>ami-fe1b55ac</td><!-- ap-southeast-1 -->
-  <td>ami-1337a729</td><!-- ap-southeast-2 -->
-  <td>ami-4523ad44</td><!-- ap-northeast-1 -->
-  <td>ami-2c6cb631</td><!-- sa-east-1 -->
-</tr>
-<tr>
-  <th>NetBSD 6.1.1</th>
-  <td>ami-0345056a</td><!-- us-east-1 -->
-  <td>ami-7c795339</td><!-- us-west-1 -->
-  <td>ami-127ae722</td><!-- us-west-2 -->
-  <td>ami-a79c84d3</td><!-- eu-west-1 -->
-  <td>ami-8ac28ad8</td><!-- ap-southeast-1 -->
-  <td>ami-f568facf</td><!-- ap-southeast-2 -->
-  <td>ami-2bc4572a</td><!-- ap-northeast-1 -->
-  <td>ami-5d4de940</td><!-- sa-east-1 -->
-</tr>
-<tr>
-  <th>NetBSD 6.1.2</th>
-  <td>ami-65a7f30c</td><!-- us-east-1 -->
-  <td>ami-223d0967</td><!-- us-west-1 -->
-  <td>ami-70fb6540</td><!-- us-west-2 -->
-  <td>ami-2013f457</td><!-- eu-west-1 -->
-  <td>ami-8e115bdc</td><!-- ap-southeast-1 -->
-  <td>ami-3973ee03</td><!-- ap-southeast-2 -->
-  <td>ami-d3930dd2</td><!-- ap-northeast-1 -->
-  <td>ami-c944e3d4</td><!-- sa-east-1 -->
-</tr>
-<tr>
   <th>NetBSD 6.1.3</th>
   <td>ami-a185b8c8</td><!-- us-east-1 -->
   <td>ami-e4cefca1</td><!-- us-west-1 -->

Retire NetBSD 5.1.2, 5.1.3, 5.2 and 5.2.1 images.
Index: wikisrc/amazon_ec2/amis.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/amazon_ec2/amis.mdwn,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- wikisrc/amazon_ec2/amis.mdwn	18 Apr 2014 21:26:55 -0000	1.36
+++ wikisrc/amazon_ec2/amis.mdwn	18 Apr 2014 22:10:12 -0000	1.37
@@ -24,28 +24,6 @@
   <th>sa-east-1<br />(Sao Paulo)</th>
 </tr>
 <tr>
-  <th>NetBSD 5.1.2</th><!-- Version -->
-  <td>ami-98904bf1</td><!-- us-east-1 -->
-  <td>ami-6d267d28</td><!-- us-west-1 -->
-  <td>ami-04f37f34</td><!-- us-west-2 -->
-  <td>ami-e93d069d</td><!-- eu-west-1 -->
-  <td>ami-caa9ee98</td><!-- ap-southeast-1 -->
-  <td>-</td><!-- ap-southeast-2 -->
-  <td>ami-10e25211</td><!-- ap-northeast-1 -->
-  <td>ami-5ca17f41</td><!-- sa-east-1 -->
-</tr>
-<tr>
-  <th>NetBSD 5.1.3</th>
-  <td>ami-bff4a0d6</td><!-- us-east-1 -->
-  <td>ami-fe3b0fbb</td><!-- us-west-1 -->
-  <td>ami-40f26c70</td><!-- us-west-2 -->
-  <td>ami-a619fed1</td><!-- eu-west-1 -->
-  <td>ami-86145ed4</td><!-- ap-southeast-1 -->
-  <td>ami-a96df093</td><!-- ap-southeast-2 -->
-  <td>ami-ff8917fe</td><!-- ap-northeast-1 -->
-  <td>ami-2141e63c</td><!-- sa-east-1 -->
-</tr>
-<tr>
   <th>NetBSD 5.1.4</th>
   <td>ami-738eb31a</td><!-- us-east-1 -->
   <td>ami-8cc5f7c9</td><!-- us-west-1 -->
@@ -57,28 +35,6 @@
   <td>ami-c96dcdd4</td><!-- sa-east-1 -->
 </tr>
 <tr>
-  <th>NetBSD 5.2</th>
-  <td>ami-097cfc60</td><!-- us-east-1 -->
-  <td>ami-7ae8c93f</td><!-- us-west-1 -->
-  <td>ami-9abb33aa</td><!-- us-west-2 -->
-  <td>ami-af171adb</td><!-- eu-west-1 -->
-  <td>ami-eec88bbc</td><!-- ap-southeast-1 -->
-  <td>ami-d155c2eb</td><!-- ap-southeast-2 -->
-  <td>ami-c4942cc5</td><!-- ap-northeast-1 -->
-  <td>ami-bca77fa1</td><!-- sa-east-1 -->
-</tr>
-<tr>
-  <th>NetBSD 5.2.1</th>
-  <td>ami-a7f5a1ce</td><!-- us-east-1 -->
-  <td>ami-a03b0fe5</td><!-- us-west-1 -->
-  <td>ami-92f26ca2</td><!-- us-west-2 -->
-  <td>ami-5418ff23</td><!-- eu-west-1 -->
-  <td>ami-66155f34</td><!-- ap-southeast-1 -->
-  <td>ami-ff6df0c5</td><!-- ap-southeast-2 -->
-  <td>ami-8b86188a</td><!-- ap-northeast-1 -->
-  <td>ami-4f41e652</td><!-- sa-east-1 -->
-</tr>
-<tr>
   <th>NetBSD 5.2.2</th>
   <td>ami-198cb170</td><!-- us-east-1 -->
   <td>ami-20c5f765</td><!-- us-west-1 -->
@@ -230,28 +186,6 @@
   <th>sa-east-1<br />(Sao Paulo)</th>
 </tr>
 <tr>
-  <th>NetBSD 5.1.2</th><!-- Version -->
-  <td>ami-0e71a967</td><!-- us-east-1 -->
-  <td>ami-472c7702</td><!-- us-west-1 -->
-  <td>ami-f0f27ec0</td><!-- us-west-2 -->
-  <td>ami-27477c53</td><!-- eu-west-1 -->
-  <td>ami-5c55110e</td><!-- ap-southeast-1 -->
-  <td>-</td><!-- ap-southeast-2 -->
-  <td>ami-a8fb4ba9</td><!-- ap-northeast-1 -->
-  <td>ami-e6a37dfb</td><!-- sa-east-1 -->
-</tr>
-<tr>
-  <th>NetBSD 5.1.3</th>
-  <td>ami-65f5a10c</td><!-- us-east-1 -->
-  <td>ami-923b0fd7</td><!-- us-west-1 -->
-  <td>ami-b4f26c84</td><!-- us-west-2 -->
-  <td>ami-6218ff15</td><!-- eu-west-1 -->
-  <td>ami-49861848</td><!-- ap-northeast-1 -->
-  <td>ami-56155f04</td><!-- ap-southeast-1 -->
-  <td>ami-836df0b9</td><!-- ap-southeast-2 -->
-  <td>ami-5541e648</td><!-- sa-east-1 -->
-</tr>
-<tr>
   <th>NetBSD 5.1.4</th>
   <td>ami-0d82bf64</td><!-- us-east-1 -->
   <td>ami-50c8fa15</td><!-- us-west-1 -->
@@ -263,28 +197,6 @@
   <td>ami-776ece6a</td><!-- sa-east-1 -->
 </tr>
 <tr>
-  <th>NetBSD 5.2</th><!-- Version -->
-  <td>ami-637fff0a</td><!-- us-east-1 -->
-  <td>ami-9ce8c9d9</td><!-- us-west-1 -->
-  <td>ami-70bc3440</td><!-- us-west-2 -->
-  <td>ami-a3161bd7</td><!-- eu-west-1 -->
-  <td>ami-76cf8c24</td><!-- ap-southeast-1 -->
-  <td>ami-2f54c315</td><!-- ap-southeast-2 -->
-  <td>ami-4a972f4b</td><!-- ap-northeast-1 -->
-  <td>ami-cca77fd1</td><!-- sa-east-1 -->
-</tr>
-<tr>
-  <th>NetBSD 5.2.1</th>
-  <td>ami-75f6a21c</td><!-- us-east-1 -->
-  <td>ami-b23b0ff7</td><!-- us-west-1 -->
-  <td>ami-8af26cba</td><!-- us-west-2 -->
-  <td>ami-4c18ff3b</td><!-- eu-west-1 -->
-  <td>ami-6c155f3e</td><!-- ap-southeast-1 -->
-  <td>ami-e76df0dd</td><!-- ap-southeast-2 -->
-  <td>ami-9b87199a</td><!-- ap-northeast-1 -->
-  <td>ami-4141e65c</td><!-- sa-east-1 -->
-</tr>
-<tr>
   <th>NetBSD 5.2.2</th>
   <td>ami-3583be5c</td><!-- us-east-1 -->
   <td>ami-cccefc89</td><!-- us-west-1 -->

NetBSD 6.0.5 and 6.1.4 AMIs are out!
Index: wikisrc/amazon_ec2/amis.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/amazon_ec2/amis.mdwn,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- wikisrc/amazon_ec2/amis.mdwn	26 Jan 2014 20:03:56 -0000	1.35
+++ wikisrc/amazon_ec2/amis.mdwn	18 Apr 2014 21:26:55 -0000	1.36
@@ -145,6 +145,17 @@
   <td>ami-936dcd8e</td><!-- sa-east-1 -->
 </tr>
 <tr>
+  <th>NetBSD 6.0.5</th>
+  <td>ami-45465e2c</td><!-- us-east-1 -->
+  <td>ami-22300867</td><!-- us-west-1 -->
+  <td>ami-883643b8</td><!-- us-west-2 -->
+  <td>ami-154bb162</td><!-- eu-west-1 -->
+  <td>ami-c47f2c96</td><!-- ap-southeast-1 -->
+  <td>ami-3108900b</td><!-- ap-southeast-2 -->
+  <td>ami-b52853b4</td><!-- ap-northeast-1 -->
+  <td>ami-5119bb4c</td><!-- sa-east-1 -->
+</tr>
+<tr>
   <th>NetBSD 6.1</th>
   <td>ami-8b751ce2</td><!-- us-east-1 -->
   <td>ami-1185aa54</td><!-- us-west-1 -->
@@ -188,6 +199,17 @@
   <td>ami-93e68f92</td><!-- ap-northeast-1 -->
   <td>ami-6b6dcd76</td><!-- sa-east-1 -->
 </tr>
+<tr>
+  <th>NetBSD 6.1.4</th>
+  <td>ami-87435bee</td><!-- us-east-1 -->
+  <td>ami-223e0667</td><!-- us-west-1 -->
+  <td>ami-26344116</td><!-- us-west-2 -->
+  <td>ami-6b55af1c</td><!-- eu-west-1 -->
+  <td>ami-7e7f2c2c</td><!-- ap-southeast-1 -->
+  <td>ami-fb178fc1</td><!-- ap-southeast-2 -->
+  <td>ami-ab2a51aa</td><!-- ap-northeast-1 -->
+  <td>ami-2f19bb32</td><!-- sa-east-1 -->
+</tr>
 </table>
 
 ## i386 -- 32 bit AMIs
@@ -329,6 +351,17 @@
   <td>ami-236ece3e</td><!-- sa-east-1 -->
 </tr>
 <tr>
+  <th>NetBSD 6.0.5</th>
+  <td>ami-fd2f3794</td><!-- us-east-1 -->
+  <td>ami-da2b139f</td><!-- us-west-1 -->
+  <td>ami-e42d58d4</td><!-- us-west-2 -->
+  <td>ami-ad9550da</td><!-- eu-west-1 -->
+  <td>ami-02613250</td><!-- ap-southeast-1 -->
+  <td>ami-450b937f</td><!-- ap-southeast-2 -->
+  <td>ami-11146f10</td><!-- ap-northeast-1 -->
+  <td>ami-a7ef42ba</td><!-- sa-east-1 -->
+</tr>
+<tr>
   <th>NetBSD 6.1</th>
   <td>ami-815138e8</td><!-- us-east-1 -->
   <td>ami-db80af9e</td><!-- us-west-1 -->
@@ -372,4 +405,15 @@
   <td>ami-13c2ab12</td><!-- ap-northeast-1 -->
   <td>ami-016ece1c</td><!-- sa-east-1 -->
 </tr>
+<tr>
+  <th>NetBSD 6.1.4</th>
+  <td>ami-cd2b33a4</td><!-- us-east-1 -->
+  <td>ami-6c2b1329</td><!-- us-west-1 -->
+  <td>ami-fc2257cc</td><!-- us-west-2 -->
+  <td>ami-294fb55e</td><!-- eu-west-1 -->
+  <td>ami-be7e2dec</td><!-- ap-southeast-1 -->
+  <td>ami-7d089047</td><!-- ap-southeast-2 -->
+  <td>ami-a52e55a4</td><!-- ap-northeast-1 -->
+  <td>ami-4b1ebc56</td><!-- sa-east-1 -->
+</tr>
 </table>

Add a comment