Recent changes to this wiki:

no dice, try different whitespace
Index: wikisrc/projects/project/pkgsrc_undo.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/projects/project/pkgsrc_undo.mdwn,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wikisrc/projects/project/pkgsrc_undo.mdwn	30 Aug 2014 06:14:03 -0000	1.3
+++ wikisrc/projects/project/pkgsrc_undo.mdwn	30 Aug 2014 06:15:10 -0000	1.4
@@ -39,8 +39,10 @@
 a waste of disk space.
 Adding code to pkg_install to do this should be straightforward; the
 chief issues are
+
 * choosing the format
 * deciding where to keep the data
+
 both of which require some measure of community consensus.
 
 Preferably, the file should be text-based so it can be manipulated by

now the bullet lists don't work; try again.
Index: wikisrc/projects/project/pkgsrc_undo.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/projects/project/pkgsrc_undo.mdwn,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wikisrc/projects/project/pkgsrc_undo.mdwn	30 Aug 2014 06:10:37 -0000	1.2
+++ wikisrc/projects/project/pkgsrc_undo.mdwn	30 Aug 2014 06:14:03 -0000	1.3
@@ -39,8 +39,8 @@
 a waste of disk space.
 Adding code to pkg_install to do this should be straightforward; the
 chief issues are
-  * choosing the format
-  * deciding where to keep the data
+* choosing the format
+* deciding where to keep the data
 both of which require some measure of community consensus.
 
 Preferably, the file should be text-based so it can be manipulated by

Flog markdown.
Apparently if you use your own numbers at the beginnings of
paragraphs, the markdown grinder decides it should renumber them
arbitrarily. (changing them all to 1, in this case...)
Grr.
Grr.

Members: 
	projects/project/pkgsrc_undo.mdwn:1.1->1.2 

Index: wikisrc/projects/project/pkgsrc_undo.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/projects/project/pkgsrc_undo.mdwn,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wikisrc/projects/project/pkgsrc_undo.mdwn	30 Aug 2014 06:06:57 -0000	1.1
+++ wikisrc/projects/project/pkgsrc_undo.mdwn	30 Aug 2014 06:10:37 -0000	1.2
@@ -29,7 +29,7 @@
 infrastructure; after that adding the support to pkgin (or whatever
 else) should be straightforward.
 
-1. The first thing we need is a machine-readable log somewhere of
+The first thing we need is a machine-readable log somewhere of
 package installs and deinstalls.
 Any time a package is installed or removed, pkg_install adds a record
 to this log.
@@ -59,7 +59,7 @@
 /var/backups/work/pkgs.current,v; but it only updates once a day and
 the format has assorted drawbacks for automated use.
 
-2. The next thing needed is a tool (maybe part of pkg_info, maybe not)
+The next thing needed is a tool (maybe part of pkg_info, maybe not)
 to read this log and both (a) report the installed package state as of
 a particular point in time, and (b) print the differences between then
 and now, or between then and some other point in time.
@@ -69,7 +69,7 @@
 older packages.
 There are then two further things to do:
 
-3. Arrange a mechanism to keep the .tgz files for old packages on file.
+Arrange a mechanism to keep the .tgz files for old packages on file.
 
 With packages one builds oneself, this can already be done by having
 them accumulate in /usr/pkgsrc/packages; however, that has certain
@@ -77,7 +77,7 @@
 hand.
 Also, for downloaded binary packages no comparable scheme exists yet.
 
-4. Provide a way to compute the set of packages to alter, install, or
+Provide a way to compute the set of packages to alter, install, or
 remove to switch to a different state.
 This is somewhat different from, but very similar to, the update
 computations that tools like pkgin and pkg_rolling-replace do, so it

Add a project for pkgsrc undo support, that is, navigating back to a
prior state of installed packages.
--- /dev/null	2014-08-30 06:06:55.000000000 +0000
+++ wikisrc/projects/project/pkgsrc_undo.mdwn	2014-08-30 06:07:00.000000000 +0000
@@ -0,0 +1,95 @@
+[[!template id=project
+
+title="Undo support for pkgsrc"
+
+contact="""
+[tech-pkg](mailto:tech-pkg@NetBSD.org)
+"""
+
+category="pkgsrc"
+difficulty="medium"
+
+description="""
+If one embarks on a set of package updates and it doesn't work out too
+well, it is nice to be able to roll back to a previous state.
+This entails two things: first, reverting the set of installed
+packages to what it was at some chosen prior time, and second,
+reverting changes to configuration, saved application state, and other
+such material that might be needed to restore to a fully working setup.
+
+This project is about the first part, wihch is relatively tractable.
+The second part is Hard(TM), but it's pointless to even speculate
+about it until we can handle the first part, which we currently can't.
+Also, in many cases the first part is perfectly sufficient to recover
+from a problem.
+
+Ultimately the goal would be to be able to do something like
+   pkgin --revert yesterday
+but there are a number of intermediate steps to that to provide the
+infrastructure; after that adding the support to pkgin (or whatever
+else) should be straightforward.
+
+1. The first thing we need is a machine-readable log somewhere of
+package installs and deinstalls.
+Any time a package is installed or removed, pkg_install adds a record
+to this log.
+It also has to be possible to trim the log so it doesn't grow without
+bound -- it might be interesting to keep the full history of all
+package manipulations over ten years, but for many people that's just
+a waste of disk space.
+Adding code to pkg_install to do this should be straightforward; the
+chief issues are
+  * choosing the format
+  * deciding where to keep the data
+both of which require some measure of community consensus.
+
+Preferably, the file should be text-based so it can be manipulated by
+hand if needed.
+If not, there ought to be some way to recover it if it gets corrupted.
+Either way the file format needs to be versioned and extensible to
+allow for future changes.
+
+The file format should probably have a way to enter snapshots of the
+package state in addition to change records; otherwise computing the
+state at a particular point requires scanning the entire file.
+Note that this is very similar to deltas in version control systems
+and there's a fair amount of prior art.
+
+Note that we can already almost do this using
+/var/backups/work/pkgs.current,v; but it only updates once a day and
+the format has assorted drawbacks for automated use.
+
+2. The next thing needed is a tool (maybe part of pkg_info, maybe not)
+to read this log and both (a) report the installed package state as of
+a particular point in time, and (b) print the differences between then
+and now, or between then and some other point in time.
+
+Given these two things it becomes possible to manually revert your
+installed packages to an older state by replacing newer packages with
+older packages.
+There are then two further things to do:
+
+3. Arrange a mechanism to keep the .tgz files for old packages on file.
+
+With packages one builds oneself, this can already be done by having
+them accumulate in /usr/pkgsrc/packages; however, that has certain
+disadvantages, most notably that old packages have to be pruned by
+hand.
+Also, for downloaded binary packages no comparable scheme exists yet.
+
+4. Provide a way to compute the set of packages to alter, install, or
+remove to switch to a different state.
+This is somewhat different from, but very similar to, the update
+computations that tools like pkgin and pkg_rolling-replace do, so it
+probably makes sense to implement this in one or more of those tools
+rather than in pkg_install; but perhaps not.
+
+There are some remaining issues, some of which aren't easily solved
+without strengthening other things in pkgsrc.
+The most notable one is: what about package options? If I rebuild a
+package with different options, it's still the "same" package (same
+name, same version) and even if I record the options in the log,
+there's no good way to distinguish the before and after binary packages.
+
+"""
+]]

Also planning to attend myself
Index: wikisrc/summits/eurobsdcon_2014_netbsd_summit.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/summits/eurobsdcon_2014_netbsd_summit.mdwn,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- wikisrc/summits/eurobsdcon_2014_netbsd_summit.mdwn	29 Aug 2014 07:04:06 -0000	1.17
+++ wikisrc/summits/eurobsdcon_2014_netbsd_summit.mdwn	29 Aug 2014 17:02:02 -0000	1.18
@@ -25,6 +25,7 @@
 Valery Ushakov | `uwe` | yes | 
 Yann Sionneau | | yes | will probably be a bit late
 Bernd Ernesti | `veego` | yes
+Pierre Pronchery | `khorben` | yes
 """]]
 
 

Index: wikisrc/summits/eurobsdcon_2014_netbsd_summit.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/summits/eurobsdcon_2014_netbsd_summit.mdwn,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- wikisrc/summits/eurobsdcon_2014_netbsd_summit.mdwn	28 Aug 2014 15:10:55 -0000	1.16
+++ wikisrc/summits/eurobsdcon_2014_netbsd_summit.mdwn	29 Aug 2014 07:04:06 -0000	1.17
@@ -24,6 +24,7 @@
 Adrian Steinmann | `ast` | yes | 
 Valery Ushakov | `uwe` | yes | 
 Yann Sionneau | | yes | will probably be a bit late
+Bernd Ernesti | `veego` | yes
 """]]
 
 

update wm(4)'s todo list
Index: wikisrc/users/msaitoh.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/msaitoh.mdwn,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wikisrc/users/msaitoh.mdwn	28 May 2014 09:24:56 -0000	1.6
+++ wikisrc/users/msaitoh.mdwn	29 Aug 2014 06:08:33 -0000	1.7
@@ -18,8 +18,8 @@
     * 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 :-(
+* wm(4)
+    * SFP ROM support to work with SFP Copper module.
 * Improve puc(4) as console
 * Update IXP4xx stuff.
 * Support Intel Galileo

Index: wikisrc/summits/eurobsdcon_2014_netbsd_summit.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/summits/eurobsdcon_2014_netbsd_summit.mdwn,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- wikisrc/summits/eurobsdcon_2014_netbsd_summit.mdwn	27 Aug 2014 06:47:48 -0000	1.15
+++ wikisrc/summits/eurobsdcon_2014_netbsd_summit.mdwn	28 Aug 2014 15:10:55 -0000	1.16
@@ -23,6 +23,7 @@
 Stephen Borrill | `sborrill` | yes | 
 Adrian Steinmann | `ast` | yes | 
 Valery Ushakov | `uwe` | yes | 
+Yann Sionneau | | yes | will probably be a bit late
 """]]
 
 

Index: wikisrc/summits/eurobsdcon_2014_netbsd_summit.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/summits/eurobsdcon_2014_netbsd_summit.mdwn,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- wikisrc/summits/eurobsdcon_2014_netbsd_summit.mdwn	27 Aug 2014 05:42:22 -0000	1.14
+++ wikisrc/summits/eurobsdcon_2014_netbsd_summit.mdwn	27 Aug 2014 06:47:48 -0000	1.15
@@ -22,6 +22,7 @@
 Julian Coleman | `jdc` | yes | 
 Stephen Borrill | `sborrill` | yes | 
 Adrian Steinmann | `ast` | yes | 
+Valery Ushakov | `uwe` | yes | 
 """]]
 
 

Index: wikisrc/summits/eurobsdcon_2014_netbsd_summit.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/summits/eurobsdcon_2014_netbsd_summit.mdwn,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- wikisrc/summits/eurobsdcon_2014_netbsd_summit.mdwn	26 Aug 2014 07:58:37 -0000	1.13
+++ wikisrc/summits/eurobsdcon_2014_netbsd_summit.mdwn	27 Aug 2014 05:42:22 -0000	1.14
@@ -21,6 +21,7 @@
 Justin Cormack | `justin` | yes
 Julian Coleman | `jdc` | yes | 
 Stephen Borrill | `sborrill` | yes | 
+Adrian Steinmann | `ast` | yes | 
 """]]
 
 

Index: wikisrc/summits/eurobsdcon_2014_netbsd_summit.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/summits/eurobsdcon_2014_netbsd_summit.mdwn,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- wikisrc/summits/eurobsdcon_2014_netbsd_summit.mdwn	26 Aug 2014 07:58:10 -0000	1.12
+++ wikisrc/summits/eurobsdcon_2014_netbsd_summit.mdwn	26 Aug 2014 07:58:37 -0000	1.13
@@ -20,7 +20,7 @@
 Taylor R Campbell | `riastradh` | yes
 Justin Cormack | `justin` | yes
 Julian Coleman | `jdc` | yes | 
-Stephen Borrill | ``sborrill | yes | 
+Stephen Borrill | `sborrill` | yes | 
 """]]
 
 

Index: wikisrc/summits/eurobsdcon_2014_netbsd_summit.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/summits/eurobsdcon_2014_netbsd_summit.mdwn,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- wikisrc/summits/eurobsdcon_2014_netbsd_summit.mdwn	26 Aug 2014 06:27:00 -0000	1.11
+++ wikisrc/summits/eurobsdcon_2014_netbsd_summit.mdwn	26 Aug 2014 07:58:10 -0000	1.12
@@ -20,6 +20,7 @@
 Taylor R Campbell | `riastradh` | yes
 Justin Cormack | `justin` | yes
 Julian Coleman | `jdc` | yes | 
+Stephen Borrill | ``sborrill | yes | 
 """]]
 
 

Add jdc.
Index: wikisrc/summits/eurobsdcon_2014_netbsd_summit.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/summits/eurobsdcon_2014_netbsd_summit.mdwn,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- wikisrc/summits/eurobsdcon_2014_netbsd_summit.mdwn	25 Aug 2014 20:43:58 -0000	1.10
+++ wikisrc/summits/eurobsdcon_2014_netbsd_summit.mdwn	26 Aug 2014 06:27:00 -0000	1.11
@@ -19,6 +19,7 @@
 Michael van Elst | `mlelstv` | yes | will probably be a bit late
 Taylor R Campbell | `riastradh` | yes
 Justin Cormack | `justin` | yes
+Julian Coleman | `jdc` | yes | 
 """]]
 
 

Planning to attend
Index: wikisrc/summits/eurobsdcon_2014_netbsd_summit.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/summits/eurobsdcon_2014_netbsd_summit.mdwn,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- wikisrc/summits/eurobsdcon_2014_netbsd_summit.mdwn	25 Aug 2014 19:41:13 -0000	1.9
+++ wikisrc/summits/eurobsdcon_2014_netbsd_summit.mdwn	25 Aug 2014 20:43:58 -0000	1.10
@@ -18,6 +18,7 @@
 S.P.Zeidler | `spz` | yes | will probably be a bit late
 Michael van Elst | `mlelstv` | yes | will probably be a bit late
 Taylor R Campbell | `riastradh` | yes
+Justin Cormack | `justin` | yes
 """]]
 
 

Add me to summit attendee list.
Index: wikisrc/summits/eurobsdcon_2014_netbsd_summit.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/summits/eurobsdcon_2014_netbsd_summit.mdwn,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- wikisrc/summits/eurobsdcon_2014_netbsd_summit.mdwn	2 Aug 2014 06:25:13 -0000	1.8
+++ wikisrc/summits/eurobsdcon_2014_netbsd_summit.mdwn	25 Aug 2014 19:41:13 -0000	1.9
@@ -17,6 +17,7 @@
 Thomas Klausner | `wiz` | yes
 S.P.Zeidler | `spz` | yes | will probably be a bit late
 Michael van Elst | `mlelstv` | yes | will probably be a bit late
+Taylor R Campbell | `riastradh` | yes
 """]]
 
 

I seem to be having more time for wikistuff.
Index: wikisrc/users/schmonz.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/users/schmonz.mdwn,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- wikisrc/users/schmonz.mdwn	27 Jun 2014 01:06:08 -0000	1.26
+++ wikisrc/users/schmonz.mdwn	23 Aug 2014 13:14:38 -0000	1.27
@@ -4,5 +4,3 @@
 
 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.
-
-Pretty soon I'll have lots more time for wikistuff.

Remove test file (it did get syntax-highlighted, huzzah).
--- wikisrc/users/schmonz/randompatch.diff	2014-08-23 13:13:02.000000000 +0000
+++ /dev/null	2014-08-23 13:12:04.000000000 +0000
@@ -1,174 +0,0 @@
-$NetBSD: randompatch.diff,v 1.1 2014/08/18 03:51:09 schmonz Exp $
-
-Use pkgsrc-provided paths and tools.
-
---- makefile.orig	2013-06-27 20:36:48.000000000 +0000
-+++ makefile
-@@ -7,7 +7,7 @@
- DESTDIR =
- 
- # Root directory for final installation
--PREFIX = /usr
-+#PREFIX = /usr
- 
- # Location of the highlight data files:
- data_dir = ${PREFIX}/share/highlight/
-@@ -16,7 +16,7 @@ data_dir = ${PREFIX}/share/highlight/
- bin_dir = ${PREFIX}/bin/
- 
- # Location of the highlight man page:
--man_dir = ${PREFIX}/share/man/man1/
-+man_dir = ${PREFIX}/${PKGMANDIR}/man1/
- 
- # Location of the highlight documentation:
- doc_dir = ${PREFIX}/share/doc/highlight/
-@@ -25,7 +25,8 @@ doc_dir = ${PREFIX}/share/doc/highlight/
- examples_dir = ${doc_dir}examples/
- 
- # Location of the highlight config files:
--conf_dir = /etc/highlight/
-+#conf_dir = /etc/highlight/
-+conf_dir = ${PREFIX}/share/examples/highlight/
- #conf_dir = ${PREFIX}/etc/highlight/
- 
- # Location of additional gui files
-@@ -33,10 +34,11 @@ desktop_apps = ${PREFIX}/share/applicati
- desktop_pixmaps = ${PREFIX}/share/pixmaps/
- 
- # Commands:
--INSTALL_DATA=install -m644
--INSTALL_PROGRAM=install -m755
--MKDIR=mkdir -p -m 755
--RMDIR=rm -r -f
-+INSTALL_DATA=${BSD_INSTALL_DATA}
-+INSTALL_LIB=${BSD_INSTALL_LIB}
-+INSTALL_PROGRAM=${BSD_INSTALL_PROGRAM}
-+MKDIR=${BSD_INSTALL_DATA_DIR}
-+RMDIR=${RM} -r -f
- 
- all cli:
- 	${MAKE} -C ./src -f ./makefile HL_DATA_DIR=${data_dir} HL_CONFIG_DIR=${conf_dir}
-@@ -47,6 +49,9 @@ lib lib-static:
- lib-shared:
- 	${MAKE} -C ./src -f ./makefile HL_DATA_DIR=${data_dir} HL_CONFIG_DIR=${conf_dir} PIC=1 lib-shared
- 
-+lib-libtool:
-+	${MAKE} -C ./src -f ./makefile HL_DATA_DIR=${data_dir} HL_CONFIG_DIR=${conf_dir} lib-libtool
-+
- gui:
- 	${MAKE} -C ./src -f ./makefile HL_DATA_DIR=\"${data_dir}\" HL_CONFIG_DIR=\"${conf_dir}\" HL_DOC_DIR=\"${doc_dir}\" gui-qt
- 	@echo
-@@ -75,14 +80,14 @@ install:
- 		${DESTDIR}${data_dir}themes \
- 		${DESTDIR}${data_dir}langDefs \
- 		${DESTDIR}${data_dir}plugins
--	${MKDIR} ${DESTDIR}${man_dir}
-+	${BSD_INSTALL_MAN_DIR} ${DESTDIR}${man_dir}
- 	${MKDIR} ${DESTDIR}${bin_dir}
- 
- 	${INSTALL_DATA} ./langDefs/*.lang ${DESTDIR}${data_dir}langDefs/
- 	${INSTALL_DATA} ./*.conf ${DESTDIR}${conf_dir}
- 	${INSTALL_DATA} ./themes/*.theme ${DESTDIR}${data_dir}themes/
- 	${INSTALL_DATA} ./plugins/*.lua ${DESTDIR}${data_dir}plugins/
--	${INSTALL_DATA} ./man/highlight.1.gz ${DESTDIR}${man_dir}
-+	${BSD_INSTALL_MAN} ./man/highlight.1.gz ${DESTDIR}${man_dir}
- 	${INSTALL_DATA} ./AUTHORS ${DESTDIR}${doc_dir}
- 	${INSTALL_DATA} ./README ${DESTDIR}${doc_dir}
- 	${INSTALL_DATA} ./README_DE ${DESTDIR}${doc_dir}
-@@ -108,6 +113,10 @@ install:
- 	@echo "Execute 'make install-gui' to install the highlight GUI ('make gui')."
- 	@echo "Do not hesitate to report problems. Unknown bugs are hard to fix."
- 
-+install-libtool:
-+	${MKDIR} ${DESTDIR}${PREFIX}/lib
-+	libtool --mode=install ${INSTALL_LIB} -c ./src/libhighlight.la ${DESTDIR}${PREFIX}/lib/libhighlight.la
-+
- install-gui:
- 	@echo "Installing files for the GUI..."
- 	${MKDIR} ${DESTDIR}${data_dir} \
-@@ -129,7 +138,7 @@ uninstall:
- 	${RMDIR} ${DESTDIR}${doc_dir}
- 	${RMDIR} ${DESTDIR}${conf_dir}
- 	${RMDIR} ${DESTDIR}${examples_dir}
--	rm -rf ${DESTDIR}${man_dir}highlight.1.gz
-+	rm -rf ${DESTDIR}${man_dir}highlight.1*
- 	rm -rf ${DESTDIR}${bin_dir}highlight
- 	rm -rf ${DESTDIR}${bin_dir}highlight-gui
- 	rm -rf ${DESTDIR}${desktop_apps}highlight.desktop
-$NetBSD: randompatch.diff,v 1.1 2014/08/18 03:51:09 schmonz Exp $
-
-Use pkgsrc-specified compiler and flags.
-
---- src/makefile.orig	2014-04-04 17:26:25.000000000 +0000
-+++ src/makefile
-@@ -12,12 +12,12 @@
- 
- # See src/gui-qt/highlight.pro for the Qt GUI compilation options
- 
--CXX=c++
-+#CXX=c++
- 
- # Added -qt4 because of Arch Linux Qt5 migration
- QMAKE=qmake-qt4
- 
--CFLAGS:=-Wall -O2 ${CFLAGS} -DNDEBUG
-+#CFLAGS:=-Wall -O2 ${CFLAGS} -DNDEBUG
- #CFLAGS:=-ggdb ${CFLAGS}
- 
- CFLAGS_DILU=-fno-strict-aliasing
-@@ -61,14 +61,15 @@ ifdef PIC
- 	CFLAGS+=-fPIC
- endif
- 
--LDFLAGS = -ldl
-+#LDFLAGS = -ldl
- # Do not strip by default (Mac OS X lazy pointer issues)
- # Add -static to avoid linking with shared libs (can cause trouble when highlight
- # is run as service)
- #LDFLAGS = ${LDFLAGS} -s
- #LDFLAGS= -Wl,--as-needed
- 
--CXX_COMPILE=${CXX} ${CFLAGS} -c -I ${INCLUDE_DIR} ${LUA_CFLAGS}
-+#CXX_COMPILE=${CXX} ${CFLAGS} -c -I ${INCLUDE_DIR} ${LUA_CFLAGS}
-+CXX_COMPILE=libtool --mode=compile ${CXX} ${CFLAGS} -c -I ${INCLUDE_DIR} ${LUA_CFLAGS}
- 
- # Data directories (data dir, configuration file dir)
- CXX_DIR=-DHL_DATA_DIR=\"${HL_DATA_DIR}\" -DHL_CONFIG_DIR=\"${HL_CONFIG_DIR}\"
-@@ -84,6 +85,9 @@ CORE_OBJECTS:=stylecolour.o stringtools.
- 	syntaxreader.o elementstyle.o themereader.o \
- 	datadir.o preformatter.o platform_fs.o\
- 	ASStreamIterator.o ASResource.o ASFormatter.o ASBeautifier.o ASEnhancer.o
-+CORE_OBJECTS_LIBTOOL:=$(CORE_OBJECTS:.o=.lo)
-+.o.lo:
-+	mv $< $@
- 
- DILU_OBJECTS:=InternalUtils.o  LuaExceptions.o  LuaFunction.o  LuaState.o\
- 	LuaUserData.o  LuaUtils.o  LuaValue.o  LuaVariable.o  LuaWrappers.o
-@@ -99,6 +103,9 @@ GUI_OBJECTS:=${GUI_QT_DIR}main.cpp ${GUI
- cli: libhighlight.a ${CLI_OBJECTS}
- 	${CXX} ${LDFLAGS} -o highlight ${CLI_OBJECTS} -L. -lhighlight ${LUA_LIBS}
- 
-+lib-libtool libhighlight.la: ${CORE_OBJECTS} ${CORE_OBJECTS_LIBTOOL}
-+	libtool --mode=link ${CXX} ${LDFLAGS} -o libhighlight.la ${CORE_OBJECTS_LIBTOOL} -version-info 1:0:0 -rpath ${PREFIX}/lib
-+
- lib-static libhighlight.a: ${CORE_OBJECTS}
- 	${AR} ${ARFLAGS} libhighlight.a ${CORE_OBJECTS} ${DILU_OBJECTS}
- 
-@@ -116,7 +123,7 @@ $(OBJECTFILES) : makefile
- 
- 
- datadir.o: ${CORE_DIR}datadir.cpp ${INCLUDE_DIR}datadir.h ${INCLUDE_DIR}platform_fs.h
--	${CXX_COMPILE} ${CORE_DIR}datadir.cpp ${CXX_DIR}
-+	${CXX_COMPILE} ${CXX_DIR} ${CORE_DIR}datadir.cpp
- 
- platform_fs.o: ${CORE_DIR}platform_fs.cpp ${INCLUDE_DIR}platform_fs.h
- 	${CXX_COMPILE} ${CORE_DIR}platform_fs.cpp
-@@ -197,7 +204,7 @@ main.o: ${CLI_DIR}main.cpp ${CLI_DIR}mai
-   ${INCLUDE_DIR}syntaxreader.h ${INCLUDE_DIR}themereader.h ${INCLUDE_DIR}elementstyle.h \
-   ${INCLUDE_DIR}stylecolour.h  ${INCLUDE_DIR}preformatter.h \
-   ${CLI_DIR}help.h ${INCLUDE_DIR}version.h
--	${CXX_COMPILE} ${CLI_DIR}main.cpp ${CXX_DIR}
-+	${CXX_COMPILE} ${CXX_DIR} ${CLI_DIR}main.cpp
- 
- 
- #3rd party libs

riz's syscall provider never got committed.
Index: wikisrc/tutorials/how_to_enable_and_run_dtrace.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/tutorials/how_to_enable_and_run_dtrace.mdwn,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wikisrc/tutorials/how_to_enable_and_run_dtrace.mdwn	23 Aug 2014 00:33:07 -0000	1.6
+++ wikisrc/tutorials/how_to_enable_and_run_dtrace.mdwn	23 Aug 2014 00:50:14 -0000	1.7
@@ -23,6 +23,7 @@
 * Measure effect of `options KDTRACE_HOOKS` on system performance.
 * Determine whether the profile module works and list it here.
 * Put a dtrace target in /dev/MAKEDEV.
+* Integrate [[riz|users/riz]]'s syscall provider patch.
 
 ## TODO for netbsd-6
 
@@ -30,7 +31,6 @@
 Candidates:
 
 * Profile provider.
-* Syscall provider.
 
 # How to use
 

Add some TODO lists for dtrace on netbsd-7 and netbsd-6.
Index: wikisrc/tutorials/how_to_enable_and_run_dtrace.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/tutorials/how_to_enable_and_run_dtrace.mdwn,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wikisrc/tutorials/how_to_enable_and_run_dtrace.mdwn	3 Apr 2014 11:55:12 -0000	1.5
+++ wikisrc/tutorials/how_to_enable_and_run_dtrace.mdwn	23 Aug 2014 00:33:07 -0000	1.6
@@ -17,6 +17,21 @@
 
 You can currently run a hello world DScript. 
 
+## TODO for netbsd-7
+
+* Rename provider modules to `dtrace_*.kmod`: `dtrace_fbt.kmod`, &c.
+* Measure effect of `options KDTRACE_HOOKS` on system performance.
+* Determine whether the profile module works and list it here.
+* Put a dtrace target in /dev/MAKEDEV.
+
+## TODO for netbsd-6
+
+Need to identify changes to pull up to netbsd-6 and pull them up.
+Candidates:
+
+* Profile provider.
+* Syscall provider.
+
 # How to use
 
 ##  Building DTrace 

RealPlayer is gone from pkgsrc, remove it here as well.
Index: wikisrc/tutorials/using_pulseaudio.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/tutorials/using_pulseaudio.mdwn,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wikisrc/tutorials/using_pulseaudio.mdwn	5 Jan 2014 23:21:18 -0000	1.5
+++ wikisrc/tutorials/using_pulseaudio.mdwn	22 Aug 2014 19:02:14 -0000	1.6
@@ -114,10 +114,6 @@
 
 'padsp' works. 
 
-##  Real Player (multimedia/RealPlayerGold) 
-
-Not tested. 
-
 ##  SDL (devel/SDL) 
 
 1.2.12 in pkgsrc. Works fine. 

Post a reply to the comment here. (let's see if this works)
--- /dev/null	2014-08-23 13:12:04.000000000 +0000
+++ wikisrc/projects/project/zfs/comment_2_44e09f28f72ca73ec2bc2a948b5e8775._comment	2014-08-23 13:13:03.000000000 +0000
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="http://localhost"
+ nickname="dholland"
+ subject="Re: Is implementing ZFS on NetBSD Complete ?"
+ date="2014-08-22T05:31:04Z"
+ content="""
+It is not finished. Ask on tech-kern for more information about the
+current state.
+"""]]

add a few notes on how to proceed on this
Index: wikisrc/projects/project/lpr.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/projects/project/lpr.mdwn,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wikisrc/projects/project/lpr.mdwn	27 Feb 2014 09:16:40 -0000	1.4
+++ wikisrc/projects/project/lpr.mdwn	22 Aug 2014 05:16:04 -0000	1.5
@@ -22,5 +22,30 @@
 Note that the goal of this exercise is not to reimplement cups -- cups
 already exists and one like it was enough.
 
+Some notes:
+
+It seems that a useful way to do this would be to divide the printing
+system in two: a client-side system, which is user-facing and allows
+submitting print jobs to arbitrary print servers, and a server-side
+system, which implements queues and knows how to talk to actual
+printer devices.
+In the common case where you don't have a local printer but use
+printers that are out on the network somewhere, the server-side system
+wouldn't be needed at all.
+When you do have a local printer, the client-side system would submit
+jobs to the local server-side system using the lpr protocol (or IPP or
+something else) over a local socket but otherwise treat it no
+differently from any other print server.
+
+The other important thing moving forward: lpr needs to learn about
+MIME types and accept an argument to tell it the MIME types of its
+input files.
+The current family of legacy options lpr accepts for file types are so
+old as to be almost completely useless; meanwhile the standard scheme
+of guessing file types inside the print system is just a bad design
+overall.
+(MIME types aren't great but they're what we have.)
+
+
 """
 ]]

will this standalone file get syntax-highlighted?
--- /dev/null	2014-08-23 13:12:04.000000000 +0000
+++ wikisrc/users/schmonz/randompatch.diff	2014-08-23 13:13:03.000000000 +0000
@@ -0,0 +1,174 @@
+$NetBSD: randompatch.diff,v 1.1 2014/08/18 03:51:09 schmonz Exp $
+
+Use pkgsrc-provided paths and tools.
+
+--- makefile.orig	2013-06-27 20:36:48.000000000 +0000
++++ makefile
+@@ -7,7 +7,7 @@
+ DESTDIR =
+ 
+ # Root directory for final installation
+-PREFIX = /usr
++#PREFIX = /usr
+ 
+ # Location of the highlight data files:
+ data_dir = ${PREFIX}/share/highlight/
+@@ -16,7 +16,7 @@ data_dir = ${PREFIX}/share/highlight/
+ bin_dir = ${PREFIX}/bin/
+ 
+ # Location of the highlight man page:
+-man_dir = ${PREFIX}/share/man/man1/
++man_dir = ${PREFIX}/${PKGMANDIR}/man1/
+ 
+ # Location of the highlight documentation:
+ doc_dir = ${PREFIX}/share/doc/highlight/
+@@ -25,7 +25,8 @@ doc_dir = ${PREFIX}/share/doc/highlight/
+ examples_dir = ${doc_dir}examples/
+ 
+ # Location of the highlight config files:
+-conf_dir = /etc/highlight/
++#conf_dir = /etc/highlight/
++conf_dir = ${PREFIX}/share/examples/highlight/
+ #conf_dir = ${PREFIX}/etc/highlight/
+ 
+ # Location of additional gui files
+@@ -33,10 +34,11 @@ desktop_apps = ${PREFIX}/share/applicati
+ desktop_pixmaps = ${PREFIX}/share/pixmaps/
+ 
+ # Commands:
+-INSTALL_DATA=install -m644
+-INSTALL_PROGRAM=install -m755
+-MKDIR=mkdir -p -m 755
+-RMDIR=rm -r -f
++INSTALL_DATA=${BSD_INSTALL_DATA}
++INSTALL_LIB=${BSD_INSTALL_LIB}
++INSTALL_PROGRAM=${BSD_INSTALL_PROGRAM}
++MKDIR=${BSD_INSTALL_DATA_DIR}
++RMDIR=${RM} -r -f
+ 
+ all cli:
+ 	${MAKE} -C ./src -f ./makefile HL_DATA_DIR=${data_dir} HL_CONFIG_DIR=${conf_dir}
+@@ -47,6 +49,9 @@ lib lib-static:
+ lib-shared:
+ 	${MAKE} -C ./src -f ./makefile HL_DATA_DIR=${data_dir} HL_CONFIG_DIR=${conf_dir} PIC=1 lib-shared
+ 
++lib-libtool:
++	${MAKE} -C ./src -f ./makefile HL_DATA_DIR=${data_dir} HL_CONFIG_DIR=${conf_dir} lib-libtool
++
+ gui:
+ 	${MAKE} -C ./src -f ./makefile HL_DATA_DIR=\"${data_dir}\" HL_CONFIG_DIR=\"${conf_dir}\" HL_DOC_DIR=\"${doc_dir}\" gui-qt
+ 	@echo
+@@ -75,14 +80,14 @@ install:
+ 		${DESTDIR}${data_dir}themes \
+ 		${DESTDIR}${data_dir}langDefs \
+ 		${DESTDIR}${data_dir}plugins
+-	${MKDIR} ${DESTDIR}${man_dir}
++	${BSD_INSTALL_MAN_DIR} ${DESTDIR}${man_dir}
+ 	${MKDIR} ${DESTDIR}${bin_dir}
+ 
+ 	${INSTALL_DATA} ./langDefs/*.lang ${DESTDIR}${data_dir}langDefs/
+ 	${INSTALL_DATA} ./*.conf ${DESTDIR}${conf_dir}
+ 	${INSTALL_DATA} ./themes/*.theme ${DESTDIR}${data_dir}themes/
+ 	${INSTALL_DATA} ./plugins/*.lua ${DESTDIR}${data_dir}plugins/
+-	${INSTALL_DATA} ./man/highlight.1.gz ${DESTDIR}${man_dir}
++	${BSD_INSTALL_MAN} ./man/highlight.1.gz ${DESTDIR}${man_dir}
+ 	${INSTALL_DATA} ./AUTHORS ${DESTDIR}${doc_dir}
+ 	${INSTALL_DATA} ./README ${DESTDIR}${doc_dir}
+ 	${INSTALL_DATA} ./README_DE ${DESTDIR}${doc_dir}
+@@ -108,6 +113,10 @@ install:
+ 	@echo "Execute 'make install-gui' to install the highlight GUI ('make gui')."
+ 	@echo "Do not hesitate to report problems. Unknown bugs are hard to fix."
+ 
++install-libtool:
++	${MKDIR} ${DESTDIR}${PREFIX}/lib
++	libtool --mode=install ${INSTALL_LIB} -c ./src/libhighlight.la ${DESTDIR}${PREFIX}/lib/libhighlight.la
++
+ install-gui:
+ 	@echo "Installing files for the GUI..."
+ 	${MKDIR} ${DESTDIR}${data_dir} \
+@@ -129,7 +138,7 @@ uninstall:
+ 	${RMDIR} ${DESTDIR}${doc_dir}
+ 	${RMDIR} ${DESTDIR}${conf_dir}
+ 	${RMDIR} ${DESTDIR}${examples_dir}
+-	rm -rf ${DESTDIR}${man_dir}highlight.1.gz
++	rm -rf ${DESTDIR}${man_dir}highlight.1*
+ 	rm -rf ${DESTDIR}${bin_dir}highlight
+ 	rm -rf ${DESTDIR}${bin_dir}highlight-gui
+ 	rm -rf ${DESTDIR}${desktop_apps}highlight.desktop
+$NetBSD: randompatch.diff,v 1.1 2014/08/18 03:51:09 schmonz Exp $
+
+Use pkgsrc-specified compiler and flags.
+
+--- src/makefile.orig	2014-04-04 17:26:25.000000000 +0000
++++ src/makefile
+@@ -12,12 +12,12 @@
+ 
+ # See src/gui-qt/highlight.pro for the Qt GUI compilation options
+ 
+-CXX=c++
++#CXX=c++
+ 
+ # Added -qt4 because of Arch Linux Qt5 migration
+ QMAKE=qmake-qt4
+ 
+-CFLAGS:=-Wall -O2 ${CFLAGS} -DNDEBUG
++#CFLAGS:=-Wall -O2 ${CFLAGS} -DNDEBUG
+ #CFLAGS:=-ggdb ${CFLAGS}
+ 
+ CFLAGS_DILU=-fno-strict-aliasing
+@@ -61,14 +61,15 @@ ifdef PIC
+ 	CFLAGS+=-fPIC
+ endif
+ 
+-LDFLAGS = -ldl
++#LDFLAGS = -ldl
+ # Do not strip by default (Mac OS X lazy pointer issues)
+ # Add -static to avoid linking with shared libs (can cause trouble when highlight
+ # is run as service)
+ #LDFLAGS = ${LDFLAGS} -s
+ #LDFLAGS= -Wl,--as-needed
+ 
+-CXX_COMPILE=${CXX} ${CFLAGS} -c -I ${INCLUDE_DIR} ${LUA_CFLAGS}
++#CXX_COMPILE=${CXX} ${CFLAGS} -c -I ${INCLUDE_DIR} ${LUA_CFLAGS}
++CXX_COMPILE=libtool --mode=compile ${CXX} ${CFLAGS} -c -I ${INCLUDE_DIR} ${LUA_CFLAGS}
+ 
+ # Data directories (data dir, configuration file dir)
+ CXX_DIR=-DHL_DATA_DIR=\"${HL_DATA_DIR}\" -DHL_CONFIG_DIR=\"${HL_CONFIG_DIR}\"
+@@ -84,6 +85,9 @@ CORE_OBJECTS:=stylecolour.o stringtools.
+ 	syntaxreader.o elementstyle.o themereader.o \
+ 	datadir.o preformatter.o platform_fs.o\
+ 	ASStreamIterator.o ASResource.o ASFormatter.o ASBeautifier.o ASEnhancer.o
++CORE_OBJECTS_LIBTOOL:=$(CORE_OBJECTS:.o=.lo)
++.o.lo:
++	mv $< $@
+ 
+ DILU_OBJECTS:=InternalUtils.o  LuaExceptions.o  LuaFunction.o  LuaState.o\
+ 	LuaUserData.o  LuaUtils.o  LuaValue.o  LuaVariable.o  LuaWrappers.o
+@@ -99,6 +103,9 @@ GUI_OBJECTS:=${GUI_QT_DIR}main.cpp ${GUI
+ cli: libhighlight.a ${CLI_OBJECTS}
+ 	${CXX} ${LDFLAGS} -o highlight ${CLI_OBJECTS} -L. -lhighlight ${LUA_LIBS}
+ 
++lib-libtool libhighlight.la: ${CORE_OBJECTS} ${CORE_OBJECTS_LIBTOOL}
++	libtool --mode=link ${CXX} ${LDFLAGS} -o libhighlight.la ${CORE_OBJECTS_LIBTOOL} -version-info 1:0:0 -rpath ${PREFIX}/lib
++
+ lib-static libhighlight.a: ${CORE_OBJECTS}
+ 	${AR} ${ARFLAGS} libhighlight.a ${CORE_OBJECTS} ${DILU_OBJECTS}
+ 
+@@ -116,7 +123,7 @@ $(OBJECTFILES) : makefile
+ 
+ 
+ datadir.o: ${CORE_DIR}datadir.cpp ${INCLUDE_DIR}datadir.h ${INCLUDE_DIR}platform_fs.h
+-	${CXX_COMPILE} ${CORE_DIR}datadir.cpp ${CXX_DIR}
++	${CXX_COMPILE} ${CXX_DIR} ${CORE_DIR}datadir.cpp
+ 
+ platform_fs.o: ${CORE_DIR}platform_fs.cpp ${INCLUDE_DIR}platform_fs.h
+ 	${CXX_COMPILE} ${CORE_DIR}platform_fs.cpp
+@@ -197,7 +204,7 @@ main.o: ${CLI_DIR}main.cpp ${CLI_DIR}mai
+   ${INCLUDE_DIR}syntaxreader.h ${INCLUDE_DIR}themereader.h ${INCLUDE_DIR}elementstyle.h \
+   ${INCLUDE_DIR}stylecolour.h  ${INCLUDE_DIR}preformatter.h \
+   ${CLI_DIR}help.h ${INCLUDE_DIR}version.h
+-	${CXX_COMPILE} ${CLI_DIR}main.cpp ${CXX_DIR}
++	${CXX_COMPILE} ${CXX_DIR} ${CLI_DIR}main.cpp
+ 
+ 
+ #3rd party libs

This is done!
Index: wikisrc/wiki/todo/highlight_plugin.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/wiki/todo/highlight_plugin.mdwn,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wikisrc/wiki/todo/highlight_plugin.mdwn	29 Dec 2009 03:59:40 -0000	1.2
+++ wikisrc/wiki/todo/highlight_plugin.mdwn	18 Aug 2014 02:34:04 -0000	1.3
@@ -4,3 +4,5 @@
 > This needs the SWIG Perl bindings from [[!template id=pkg
 > category="textproc" name="highlight"]], which aren't in pkgsrc
 > yet. The package could use an upgrade while we're at it. --[[schmonz]]
+
+[[wiki/todo/done]] --[[schmonz]]

fix ruby21-base toggle (no numbers in here-doc strings)
Index: wikisrc/pkgsrc/macosx_tiger_powerpc.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/pkgsrc/macosx_tiger_powerpc.mdwn,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- wikisrc/pkgsrc/macosx_tiger_powerpc.mdwn	17 Aug 2014 18:19:45 -0000	1.9
+++ wikisrc/pkgsrc/macosx_tiger_powerpc.mdwn	17 Aug 2014 18:22:07 -0000	1.10
@@ -243,7 +243,7 @@
 
 ### [[!toggle id="ruby21-base" text="lang/ruby21-base"]]
 [[!toggleable id="ruby21-base" text="""
-[[!template id=filecontent name="lang/ruby21-base install.log" text=<<RUBY21BASEINNER
+[[!template id=filecontent name="lang/ruby21-base install.log" text=<<RUBYTWOONEBASEINNER
 Failed to configure dbm. It will not be installed.
 => Automatic manual page handling
 => Generating post-install file lists
@@ -253,7 +253,7 @@
 ERROR: The following files are in the PLIST but not in /tmp/lang/ruby21-base/work/.destdir/usr/pkg:
 ERROR:         /tmp/lang/ruby21-base/work/.destdir/usr/pkg/lib/ruby/2.1.2/powerpc-darwin8/dbm.bundle
 *** Error code 
-RUBY21BASEINNER]]
+RUBYTWOONEBASEINNER]]
 """]]
 
 ### [[!toggle id="MesaLib" text="graphics/MesaLib"]]

wrap verbose details in toggleables (defaulting closed)
Index: wikisrc/pkgsrc/macosx_tiger_powerpc.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/pkgsrc/macosx_tiger_powerpc.mdwn,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- wikisrc/pkgsrc/macosx_tiger_powerpc.mdwn	17 Aug 2014 17:43:12 -0000	1.8
+++ wikisrc/pkgsrc/macosx_tiger_powerpc.mdwn	17 Aug 2014 18:19:45 -0000	1.9
@@ -16,13 +16,15 @@
 Bored? Choose one of these problems we need solved. Annoyed? Write
 down the problem here.
 
-### lang/perl5
-
+### [[!toggle id="perl5" text="lang/perl5"]]
+[[!toggleable id="perl5" text="""
 Some apparently incorrect default `MACOSX_DEPLOYMENT_TARGET` breaks
 the build.
+"""]]
 
-### misc/tmux
-[[!template id=filecontent name="misc/tmux" text="""
+### [[!toggle id="tmux" text="misc/tmux"]]
+[[!toggleable id="tmux" text="""
+[[!template id=filecontent name="misc/tmux" text=<<TMUXINNER
 osdep-darwin.c:22:21: error: libproc.h: No such file or directory
 osdep-darwin.c: In function 'osdep_get_name':
 osdep-darwin.c:36: error: storage size of 'bsdinfo' isn't known
@@ -35,11 +37,13 @@
 osdep-darwin.c:54: error: storage size of 'pathinfo' isn't known
 osdep-darwin.c:61: error: 'PROC_PIDVNODEPATHINFO' undeclared (first use in this function)
 *** Error code 1
-"""]]
+TMUXINNER]]
 Macports deals with this issue by [switching osdep-darwin.c out for a previous version](https://svn.macports.org/repository/macports/trunk/dports/sysutils/tmux/files/osdep-darwin.8.c) which compiles under Darwin 8
+"""]]
 
-###devel/cmake
-[[!template id=filecontent name="devel/cmake" text="""
+### [[!toggle id="cmake" text="devel/cmake"]]
+[[!toggleable id="cmake" text="""
+[[!template id=filecontent name="devel/cmake" text=<<CMAKEINNER
 Linking CXX executable ../bin/ccmake
 /usr/libexec/gcc/powerpc-apple-darwin8/4.0.1/ld: warning can't open dynamic library: /Developer/SDKs/MacOSX10.4u.sdk/usr/pkg/lib/liblzma.5.dylib referenced from: /tmp/devel/cmake/work/.buildlink/lib/libarchive.dylib (checking for undefined symbols may be affected) (No such file or directory, errno = 2)
 /usr/libexec/gcc/powerpc-apple-darwin8/4.0.1/ld: warning can't open dynamic library: /Developer/SDKs/MacOSX10.4u.sdk/usr/pkg/lib/libcrypto.1.0.0.dylib referenced from: /tmp/devel/cmake/work/.buildlink/lib/libarchive.dylib (checking for undefined symbols may be affected) (No such file or directory, errno = 2)
@@ -233,11 +237,13 @@
 gmake[1]: *** [Source/CMakeFiles/ccmake.dir/all] Error 2
 Makefile:147: recipe for target 'all' failed
 gmake: *** [all] Error 2
+CMAKEINNER]]
 """]]
 
 
-### lang/ruby21-base
-[[!template id=filecontent name="lang/ruby21-base install.log" text="""
+### [[!toggle id="ruby21-base" text="lang/ruby21-base"]]
+[[!toggleable id="ruby21-base" text="""
+[[!template id=filecontent name="lang/ruby21-base install.log" text=<<RUBY21BASEINNER
 Failed to configure dbm. It will not be installed.
 => Automatic manual page handling
 => Generating post-install file lists
@@ -247,10 +253,12 @@
 ERROR: The following files are in the PLIST but not in /tmp/lang/ruby21-base/work/.destdir/usr/pkg:
 ERROR:         /tmp/lang/ruby21-base/work/.destdir/usr/pkg/lib/ruby/2.1.2/powerpc-darwin8/dbm.bundle
 *** Error code 
+RUBY21BASEINNER]]
 """]]
 
-### graphics/MesaLib
-[[!template id=filecontent name="graphics/MesaLib install.log" text="""
+### [[!toggle id="MesaLib" text="graphics/MesaLib"]]
+[[!toggleable id="MesaLib" text="""
+[[!template id=filecontent name="graphics/MesaLib install.log" text=<<MESALIBINNER
 => Automatic manual page handling
 => Generating post-install file lists
 => Checking file-check results for MesaLib-7.11.2nb5
@@ -282,4 +290,5 @@
  ${PLIST.nodri}lib/libOSMesa.so
  ${PLIST.nodri}lib/libOSMesa.so.7
  ${PLIST.nodri}lib/libOSMesa.so.7.11.0
+MESALIBINNER]]
 """]]

Start covering points which will improve the integration of pkgsrc with OS X
Index: wikisrc/pkgsrc/macosx_tiger_powerpc.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/pkgsrc/macosx_tiger_powerpc.mdwn,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- wikisrc/pkgsrc/macosx_tiger_powerpc.mdwn	17 Aug 2014 03:18:09 -0000	1.7
+++ wikisrc/pkgsrc/macosx_tiger_powerpc.mdwn	17 Aug 2014 17:43:12 -0000	1.8
@@ -4,6 +4,13 @@
 Darwin/powerpc 8.11 (Mac OS X 10.4, a.k.a. "Tiger"), then [building
 binary packages](https://www.geeklan.co.uk/?p=1579).
 
+## Nice to have
+Not specific to tiger, but better integration with OS X as a whole
+
+* Encourage the use of `path_helper(8)` to append `PATH` & `MANPATH` on Leopard & newer
+* Bundle `launchd.plist` for binaries which can be daemonised, inspired from the Joyent effort to bundle `SMF`
+* The means to generate a Mac OS X bootstrap package is deprecated, while it's still currently possible to use tools for older releases to generate a package, the native method for Mavericks & newer needs to be integrated
+
 ## Interesting problems
 
 Bored? Choose one of these problems we need solved. Annoyed? Write
@@ -276,4 +283,3 @@
  ${PLIST.nodri}lib/libOSMesa.so.7
  ${PLIST.nodri}lib/libOSMesa.so.7.11.0
 """]]
-

graphics/MesaLib packing list error even though items referenced have been added to PLIST
Index: wikisrc/pkgsrc/macosx_tiger_powerpc.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/pkgsrc/macosx_tiger_powerpc.mdwn,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wikisrc/pkgsrc/macosx_tiger_powerpc.mdwn	17 Aug 2014 03:12:34 -0000	1.6
+++ wikisrc/pkgsrc/macosx_tiger_powerpc.mdwn	17 Aug 2014 03:18:09 -0000	1.7
@@ -241,3 +241,39 @@
 ERROR:         /tmp/lang/ruby21-base/work/.destdir/usr/pkg/lib/ruby/2.1.2/powerpc-darwin8/dbm.bundle
 *** Error code 
 """]]
+
+### graphics/MesaLib
+[[!template id=filecontent name="graphics/MesaLib install.log" text="""
+=> Automatic manual page handling
+=> Generating post-install file lists
+=> Checking file-check results for MesaLib-7.11.2nb5
+ERROR: ************************************************************
+ERROR: The following files are in /tmp/graphics/MesaLib/work/.destdir/usr/pkg but not in the PLIST:
+ERROR:         /tmp/graphics/MesaLib/work/.destdir/usr/pkg/lib/libGL.dylib
+ERROR:         /tmp/graphics/MesaLib/work/.destdir/usr/pkg/lib/libOSMesa.dylib
+*** Error code 1
+
+Index: PLIST
+===================================================================
+RCS file: /cvsroot/pkgsrc/graphics/MesaLib/PLIST,v
+retrieving revision 1.26
+diff -u -r1.26 PLIST
+--- PLIST	20 May 2013 06:59:18 -0000	1.26
++++ PLIST	17 Aug 2014 03:16:09 -0000
+@@ -16,12 +16,14 @@
+ include/GL/vms_x_fix.h
+ include/GL/wglext.h
+ include/GL/wmesa.h
++lib/libGL.dylib
+ lib/libGL.so
+ lib/libGL.so.1
+ lib/libGL.so.1.2
+ lib/libGLw.so
+ lib/libGLw.so.1
+ lib/libGLw.so.1.0.0
++lib/libOSMesa.dylib
+ ${PLIST.nodri}lib/libOSMesa.so
+ ${PLIST.nodri}lib/libOSMesa.so.7
+ ${PLIST.nodri}lib/libOSMesa.so.7.11.0
+"""]]
+

lang/ruby21-base dbm.bundle not built
Index: wikisrc/pkgsrc/macosx_tiger_powerpc.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/pkgsrc/macosx_tiger_powerpc.mdwn,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wikisrc/pkgsrc/macosx_tiger_powerpc.mdwn	17 Aug 2014 00:36:11 -0000	1.5
+++ wikisrc/pkgsrc/macosx_tiger_powerpc.mdwn	17 Aug 2014 03:12:34 -0000	1.6
@@ -227,3 +227,17 @@
 Makefile:147: recipe for target 'all' failed
 gmake: *** [all] Error 2
 """]]
+
+
+### lang/ruby21-base
+[[!template id=filecontent name="lang/ruby21-base install.log" text="""
+Failed to configure dbm. It will not be installed.
+=> Automatic manual page handling
+=> Generating post-install file lists
+pkg_create: can't stat `/tmp/lang/ruby21-base/work/.destdir/usr/pkg/lib/ruby/2.1.2/powerpc-darwin8/dbm.bundle'
+=> Checking file-check results for ruby212-base-2.1.2
+ERROR: ************************************************************
+ERROR: The following files are in the PLIST but not in /tmp/lang/ruby21-base/work/.destdir/usr/pkg:
+ERROR:         /tmp/lang/ruby21-base/work/.destdir/usr/pkg/lib/ruby/2.1.2/powerpc-darwin8/dbm.bundle
+*** Error code 
+"""]]

devel/cmake gets confused between apple supplied curl & pkgsrc version
Index: wikisrc/pkgsrc/macosx_tiger_powerpc.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/pkgsrc/macosx_tiger_powerpc.mdwn,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wikisrc/pkgsrc/macosx_tiger_powerpc.mdwn	15 Aug 2014 18:55:57 -0000	1.4
+++ wikisrc/pkgsrc/macosx_tiger_powerpc.mdwn	17 Aug 2014 00:36:11 -0000	1.5
@@ -30,3 +30,200 @@
 *** Error code 1
 """]]
 Macports deals with this issue by [switching osdep-darwin.c out for a previous version](https://svn.macports.org/repository/macports/trunk/dports/sysutils/tmux/files/osdep-darwin.8.c) which compiles under Darwin 8
+
+###devel/cmake
+[[!template id=filecontent name="devel/cmake" text="""
+Linking CXX executable ../bin/ccmake
+/usr/libexec/gcc/powerpc-apple-darwin8/4.0.1/ld: warning can't open dynamic library: /Developer/SDKs/MacOSX10.4u.sdk/usr/pkg/lib/liblzma.5.dylib referenced from: /tmp/devel/cmake/work/.buildlink/lib/libarchive.dylib (checking for undefined symbols may be affected) (No such file or directory, errno = 2)
+/usr/libexec/gcc/powerpc-apple-darwin8/4.0.1/ld: warning can't open dynamic library: /Developer/SDKs/MacOSX10.4u.sdk/usr/pkg/lib/libcrypto.1.0.0.dylib referenced from: /tmp/devel/cmake/work/.buildlink/lib/libarchive.dylib (checking for undefined symbols may be affected) (No such file or directory, errno = 2)
+/usr/libexec/gcc/powerpc-apple-darwin8/4.0.1/ld: warning can't open dynamic library: /Developer/SDKs/MacOSX10.4u.sdk/usr/pkg/lib/libidn.11.dylib referenced from: /tmp/devel/cmake/work/.buildlink/lib/libcurl.dylib (checking for undefined symbols may be affected) (No such file or directory, errno = 2)
+/usr/libexec/gcc/powerpc-apple-darwin8/4.0.1/ld: warning can't open dynamic library: /Developer/SDKs/MacOSX10.4u.sdk/usr/pkg/lib/libintl.8.dylib referenced from: /tmp/devel/cmake/work/.buildlink/lib/libcurl.dylib (checking for undefined symbols may be affected) (No such file or directory, errno = 2)
+/usr/libexec/gcc/powerpc-apple-darwin8/4.0.1/ld: warning can't open dynamic library: /Developer/SDKs/MacOSX10.4u.sdk/usr/pkg/lib/libssl.1.0.0.dylib referenced from: /tmp/devel/cmake/work/.buildlink/lib/libcurl.dylib (checking for undefined symbols may be affected) (No such file or directory, errno = 2)
+/usr/libexec/gcc/powerpc-apple-darwin8/4.0.1/ld: Undefined symbols:
+_lzma_alone_decoder referenced from libarchive expected to be defined in /usr/pkg/lib/liblzma.5.dylib
+_lzma_code referenced from libarchive expected to be defined in /usr/pkg/lib/liblzma.5.dylib
+_lzma_end referenced from libarchive expected to be defined in /usr/pkg/lib/liblzma.5.dylib
+_lzma_stream_decoder referenced from libarchive expected to be defined in /usr/pkg/lib/liblzma.5.dylib
+_lzma_alone_encoder referenced from libarchive expected to be defined in /usr/pkg/lib/liblzma.5.dylib
+_lzma_lzma_preset referenced from libarchive expected to be defined in /usr/pkg/lib/liblzma.5.dylib
+_lzma_memusage referenced from libarchive expected to be defined in /usr/pkg/lib/liblzma.5.dylib
+_lzma_stream_encoder referenced from libarchive expected to be defined in /usr/pkg/lib/liblzma.5.dylib
+_RIPEMD160_Final referenced from libarchive expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_RIPEMD160_Init referenced from libarchive expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_RIPEMD160_Update referenced from libarchive expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_SHA256_Final referenced from libarchive expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_SHA256_Init referenced from libarchive expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_SHA256_Update referenced from libarchive expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_SHA384_Final referenced from libarchive expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_SHA384_Init referenced from libarchive expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_SHA384_Update referenced from libarchive expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_SHA512_Final referenced from libarchive expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_SHA512_Init referenced from libarchive expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_SHA512_Update referenced from libarchive expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_idn_free referenced from libcurl expected to be defined in /usr/pkg/lib/libidn.11.dylib
+_idna_to_ascii_lz referenced from libcurl expected to be defined in /usr/pkg/lib/libidn.11.dylib
+_idna_to_unicode_lzlz referenced from libcurl expected to be defined in /usr/pkg/lib/libidn.11.dylib
+_stringprep_check_version referenced from libcurl expected to be defined in /usr/pkg/lib/libidn.11.dylib
+_stringprep_locale_charset referenced from libcurl expected to be defined in /usr/pkg/lib/libidn.11.dylib
+_tld_check_lz referenced from libcurl expected to be defined in /usr/pkg/lib/libidn.11.dylib
+_tld_strerror referenced from libcurl expected to be defined in /usr/pkg/lib/libidn.11.dylib
+_MD5_Final referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_MD5_Init referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_MD5_Update referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_idna_strerror referenced from libcurl expected to be defined in /usr/pkg/lib/libidn.11.dylib
+_DES_ecb_encrypt referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_DES_set_key referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_DES_set_odd_parity referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_MD4_Final referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_MD4_Init referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_MD4_Update referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_ASN1_INTEGER_get referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_ASN1_STRING_data referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_ASN1_STRING_length referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_ASN1_STRING_print referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_ASN1_STRING_to_UTF8 referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_ASN1_STRING_type referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_BIO_ctrl referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_BIO_free referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_BIO_new referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_BIO_s_mem referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_BN_bn2bin referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_BN_num_bits referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_CRYPTO_cleanup_all_ex_data referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_CRYPTO_free referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_CRYPTO_malloc referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_ENGINE_by_id referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_ENGINE_cleanup referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_ENGINE_ctrl referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_ENGINE_ctrl_cmd referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_ENGINE_finish referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_ENGINE_free referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_ENGINE_get_first referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_ENGINE_get_id referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_ENGINE_get_next referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_ENGINE_init referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_ENGINE_load_builtin_engines referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_ENGINE_load_private_key referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_ENGINE_set_default referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_ERR_clear_error referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_ERR_error_string referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_ERR_error_string_n referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_ERR_free_strings referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_ERR_get_error referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_ERR_peek_error referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_ERR_remove_thread_state referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_EVP_PKEY_copy_parameters referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_EVP_PKEY_free referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_EVP_cleanup referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_GENERAL_NAMES_free referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_OPENSSL_add_all_algorithms_noconf referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_OPENSSL_config referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_PEM_read_X509 referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_PEM_write_bio_X509 referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_PKCS12_PBE_add referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_PKCS12_free referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_PKCS12_parse referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_RAND_add referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_RAND_bytes referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_RAND_egd referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_RAND_file_name referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_RAND_load_file referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_RAND_status referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_SSL_CIPHER_get_name referenced from libcurl expected to be defined in /usr/pkg/lib/libssl.1.0.0.dylib
+_SSL_CTX_add_client_CA referenced from libcurl expected to be defined in /usr/pkg/lib/libssl.1.0.0.dylib
+_SSL_CTX_callback_ctrl referenced from libcurl expected to be defined in /usr/pkg/lib/libssl.1.0.0.dylib
+_SSL_CTX_check_private_key referenced from libcurl expected to be defined in /usr/pkg/lib/libssl.1.0.0.dylib
+_SSL_CTX_ctrl referenced from libcurl expected to be defined in /usr/pkg/lib/libssl.1.0.0.dylib
+_SSL_CTX_free referenced from libcurl expected to be defined in /usr/pkg/lib/libssl.1.0.0.dylib
+_SSL_CTX_get_cert_store referenced from libcurl expected to be defined in /usr/pkg/lib/libssl.1.0.0.dylib
+_SSL_CTX_load_verify_locations referenced from libcurl expected to be defined in /usr/pkg/lib/libssl.1.0.0.dylib
+_SSL_CTX_new referenced from libcurl expected to be defined in /usr/pkg/lib/libssl.1.0.0.dylib
+_SSL_CTX_set_cipher_list referenced from libcurl expected to be defined in /usr/pkg/lib/libssl.1.0.0.dylib
+_SSL_CTX_set_default_passwd_cb referenced from libcurl expected to be defined in /usr/pkg/lib/libssl.1.0.0.dylib
+_SSL_CTX_set_default_passwd_cb_userdata referenced from libcurl expected to be defined in /usr/pkg/lib/libssl.1.0.0.dylib
+_SSL_CTX_set_srp_password referenced from libcurl expected to be defined in /usr/pkg/lib/libssl.1.0.0.dylib
+_SSL_CTX_set_srp_username referenced from libcurl expected to be defined in /usr/pkg/lib/libssl.1.0.0.dylib
+_SSL_CTX_set_verify referenced from libcurl expected to be defined in /usr/pkg/lib/libssl.1.0.0.dylib
+_SSL_CTX_use_PrivateKey referenced from libcurl expected to be defined in /usr/pkg/lib/libssl.1.0.0.dylib
+_SSL_CTX_use_PrivateKey_file referenced from libcurl expected to be defined in /usr/pkg/lib/libssl.1.0.0.dylib
+_SSL_CTX_use_certificate referenced from libcurl expected to be defined in /usr/pkg/lib/libssl.1.0.0.dylib
+_SSL_CTX_use_certificate_chain_file referenced from libcurl expected to be defined in /usr/pkg/lib/libssl.1.0.0.dylib
+_SSL_CTX_use_certificate_file referenced from libcurl expected to be defined in /usr/pkg/lib/libssl.1.0.0.dylib
+_SSL_SESSION_free referenced from libcurl expected to be defined in /usr/pkg/lib/libssl.1.0.0.dylib
+_SSL_connect referenced from libcurl expected to be defined in /usr/pkg/lib/libssl.1.0.0.dylib
+_SSL_ctrl referenced from libcurl expected to be defined in /usr/pkg/lib/libssl.1.0.0.dylib
+_SSL_free referenced from libcurl expected to be defined in /usr/pkg/lib/libssl.1.0.0.dylib
+_SSL_get1_session referenced from libcurl expected to be defined in /usr/pkg/lib/libssl.1.0.0.dylib
+_SSL_get_certificate referenced from libcurl expected to be defined in /usr/pkg/lib/libssl.1.0.0.dylib
+_SSL_get_current_cipher referenced from libcurl expected to be defined in /usr/pkg/lib/libssl.1.0.0.dylib
+_SSL_get_error referenced from libcurl expected to be defined in /usr/pkg/lib/libssl.1.0.0.dylib
+_SSL_get_peer_cert_chain referenced from libcurl expected to be defined in /usr/pkg/lib/libssl.1.0.0.dylib
+_SSL_get_peer_certificate referenced from libcurl expected to be defined in /usr/pkg/lib/libssl.1.0.0.dylib
+_SSL_get_privatekey referenced from libcurl expected to be defined in /usr/pkg/lib/libssl.1.0.0.dylib
+_SSL_get_session referenced from libcurl expected to be defined in /usr/pkg/lib/libssl.1.0.0.dylib
+_SSL_get_shutdown referenced from libcurl expected to be defined in /usr/pkg/lib/libssl.1.0.0.dylib
+_SSL_get_verify_result referenced from libcurl expected to be defined in /usr/pkg/lib/libssl.1.0.0.dylib
+_SSL_library_init referenced from libcurl expected to be defined in /usr/pkg/lib/libssl.1.0.0.dylib
+_SSL_load_error_strings referenced from libcurl expected to be defined in /usr/pkg/lib/libssl.1.0.0.dylib
+_SSL_new referenced from libcurl expected to be defined in /usr/pkg/lib/libssl.1.0.0.dylib
+_SSL_peek referenced from libcurl expected to be defined in /usr/pkg/lib/libssl.1.0.0.dylib
+_SSL_pending referenced from libcurl expected to be defined in /usr/pkg/lib/libssl.1.0.0.dylib
+_SSL_read referenced from libcurl expected to be defined in /usr/pkg/lib/libssl.1.0.0.dylib
+_SSL_set_connect_state referenced from libcurl expected to be defined in /usr/pkg/lib/libssl.1.0.0.dylib
+_SSL_set_fd referenced from libcurl expected to be defined in /usr/pkg/lib/libssl.1.0.0.dylib
+_SSL_set_session referenced from libcurl expected to be defined in /usr/pkg/lib/libssl.1.0.0.dylib
+_SSL_shutdown referenced from libcurl expected to be defined in /usr/pkg/lib/libssl.1.0.0.dylib
+_SSL_write referenced from libcurl expected to be defined in /usr/pkg/lib/libssl.1.0.0.dylib
+_SSLeay referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_SSLv23_client_method referenced from libcurl expected to be defined in /usr/pkg/lib/libssl.1.0.0.dylib
+_SSLv2_client_method referenced from libcurl expected to be defined in /usr/pkg/lib/libssl.1.0.0.dylib
+_SSLv3_client_method referenced from libcurl expected to be defined in /usr/pkg/lib/libssl.1.0.0.dylib
+_UI_OpenSSL referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_UI_create_method referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_UI_destroy_method referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_UI_get0_user_data referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_UI_get_input_flags referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_UI_get_string_type referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_UI_method_get_closer referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_UI_method_get_opener referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_UI_method_get_reader referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_UI_method_get_writer referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_UI_method_set_closer referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_UI_method_set_opener referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_UI_method_set_reader referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_UI_method_set_writer referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_UI_set_result referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_X509V3_EXT_print referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_X509_EXTENSION_get_critical referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_X509_EXTENSION_get_object referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_X509_LOOKUP_file referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_X509_NAME_ENTRY_get_data referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_X509_NAME_get_entry referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_X509_NAME_get_index_by_NID referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_X509_NAME_print_ex referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_X509_STORE_CTX_get_current_cert referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_X509_STORE_add_lookup referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_X509_STORE_set_flags referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_X509_check_issued referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_X509_free referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_X509_get_ext_d2i referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_X509_get_issuer_name referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_X509_get_pubkey referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_X509_get_serialNumber referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_X509_get_subject_name referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_X509_load_crl_file referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_X509_verify_cert_error_string referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_d2i_PKCS12_fp referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_i2t_ASN1_OBJECT referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_sk_num referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_sk_pop referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib
+_sk_pop_free referenced from libcurl expected to be defined in /usr/pkg/lib/libcrypto.1.0.0.dylib

(Diff truncated)
How to use this page depends on whether you're bored or annoyed.
Index: wikisrc/pkgsrc/macosx_tiger_powerpc.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/pkgsrc/macosx_tiger_powerpc.mdwn,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wikisrc/pkgsrc/macosx_tiger_powerpc.mdwn	15 Aug 2014 18:42:50 -0000	1.3
+++ wikisrc/pkgsrc/macosx_tiger_powerpc.mdwn	15 Aug 2014 18:55:57 -0000	1.4
@@ -6,7 +6,8 @@
 
 ## Interesting problems
 
-Solve these or add your own.
+Bored? Choose one of these problems we need solved. Annoyed? Write
+down the problem here.
 
 ### lang/perl5
 

Link to Macports fix for tmux on Darwin 8
Index: wikisrc/pkgsrc/macosx_tiger_powerpc.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/pkgsrc/macosx_tiger_powerpc.mdwn,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wikisrc/pkgsrc/macosx_tiger_powerpc.mdwn	15 Aug 2014 09:12:48 -0000	1.2
+++ wikisrc/pkgsrc/macosx_tiger_powerpc.mdwn	15 Aug 2014 18:42:50 -0000	1.3
@@ -28,3 +28,4 @@
 osdep-darwin.c:61: error: 'PROC_PIDVNODEPATHINFO' undeclared (first use in this function)
 *** Error code 1
 """]]
+Macports deals with this issue by [switching osdep-darwin.c out for a previous version](https://svn.macports.org/repository/macports/trunk/dports/sysutils/tmux/files/osdep-darwin.8.c) which compiles under Darwin 8

Vanity edit as a test
Index: wikisrc/pkgsrc/macosx_tiger_powerpc.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/pkgsrc/macosx_tiger_powerpc.mdwn,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wikisrc/pkgsrc/macosx_tiger_powerpc.mdwn	2 Aug 2014 21:35:26 -0000	1.1
+++ wikisrc/pkgsrc/macosx_tiger_powerpc.mdwn	15 Aug 2014 09:12:48 -0000	1.2
@@ -1,6 +1,6 @@
 [[!meta title="pkgsrc on Mac OS X 10.4 (Tiger) powerpc"]]
 
-Sevan Janiyan and others are finding and fixing pkgsrc problems on
+[Sevan Janiyan](https://www.twitter.com/sevanjaniyan) and others are finding and fixing pkgsrc problems on
 Darwin/powerpc 8.11 (Mac OS X 10.4, a.k.a. "Tiger"), then [building
 binary packages](https://www.geeklan.co.uk/?p=1579).
 

Keep track of what's going on with Mac OS X 10.4 powerpc.
--- /dev/null	2014-08-23 13:12:04.000000000 +0000
+++ wikisrc/pkgsrc/macosx_tiger_powerpc.mdwn	2014-08-23 13:13:04.000000000 +0000
@@ -0,0 +1,30 @@
+[[!meta title="pkgsrc on Mac OS X 10.4 (Tiger) powerpc"]]
+
+Sevan Janiyan and others are finding and fixing pkgsrc problems on
+Darwin/powerpc 8.11 (Mac OS X 10.4, a.k.a. "Tiger"), then [building
+binary packages](https://www.geeklan.co.uk/?p=1579).
+
+## Interesting problems
+
+Solve these or add your own.
+
+### lang/perl5
+
+Some apparently incorrect default `MACOSX_DEPLOYMENT_TARGET` breaks
+the build.
+
+### misc/tmux
+[[!template id=filecontent name="misc/tmux" text="""
+osdep-darwin.c:22:21: error: libproc.h: No such file or directory
+osdep-darwin.c: In function 'osdep_get_name':
+osdep-darwin.c:36: error: storage size of 'bsdinfo' isn't known
+osdep-darwin.c:43: warning: implicit declaration of function 'proc_pidinfo'
+osdep-darwin.c:43: error: 'PROC_PIDTBSDINFO' undeclared (first use in this function)
+osdep-darwin.c:43: error: (Each undeclared identifier is reported only once
+osdep-darwin.c:43: error: for each function it appears in.)
+osdep-darwin.c: In function 'osdep_get_cwd':
+osdep-darwin.c:53: error: 'PATH_MAX' undeclared (first use in this function)
+osdep-darwin.c:54: error: storage size of 'pathinfo' isn't known
+osdep-darwin.c:61: error: 'PROC_PIDVNODEPATHINFO' undeclared (first use in this function)
+*** Error code 1
+"""]]

Index: wikisrc/summits/eurobsdcon_2014_netbsd_summit.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/summits/eurobsdcon_2014_netbsd_summit.mdwn,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- wikisrc/summits/eurobsdcon_2014_netbsd_summit.mdwn	1 Aug 2014 11:37:17 -0000	1.7
+++ wikisrc/summits/eurobsdcon_2014_netbsd_summit.mdwn	2 Aug 2014 06:25:13 -0000	1.8
@@ -12,9 +12,11 @@
 ## Planning to attend?
 
 [[!table data="""
-First Last | `login@` | join dinner?
+First Last | `login@` | join dinner? | comment(s)
 Martin Husemann | `martin` | yes
 Thomas Klausner | `wiz` | yes
+S.P.Zeidler | `spz` | yes | will probably be a bit late
+Michael van Elst | `mlelstv` | yes | will probably be a bit late
 """]]
 
 

Try adding myself again.
Index: wikisrc/summits/eurobsdcon_2014_netbsd_summit.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/summits/eurobsdcon_2014_netbsd_summit.mdwn,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wikisrc/summits/eurobsdcon_2014_netbsd_summit.mdwn	1 Aug 2014 08:58:45 -0000	1.6
+++ wikisrc/summits/eurobsdcon_2014_netbsd_summit.mdwn	1 Aug 2014 11:37:17 -0000	1.7
@@ -14,6 +14,7 @@
 [[!table data="""
 First Last | `login@` | join dinner?
 Martin Husemann | `martin` | yes
+Thomas Klausner | `wiz` | yes
 """]]
 
 

Index: wikisrc/summits/eurobsdcon_2014_netbsd_summit.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/summits/eurobsdcon_2014_netbsd_summit.mdwn,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wikisrc/summits/eurobsdcon_2014_netbsd_summit.mdwn	1 Aug 2014 08:56:41 -0000	1.5
+++ wikisrc/summits/eurobsdcon_2014_netbsd_summit.mdwn	1 Aug 2014 08:58:45 -0000	1.6
@@ -13,7 +13,7 @@
 
 [[!table data="""
 First Last | `login@` | join dinner?
-Martin Husemann | `martin@` | yes
+Martin Husemann | `martin` | yes
 """]]
 
 
@@ -26,4 +26,6 @@
 
 ## Discussions
 
+* Foundation Bylaws
+
 ## Varia

Index: wikisrc/summits/eurobsdcon_2014_netbsd_summit.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/summits/eurobsdcon_2014_netbsd_summit.mdwn,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wikisrc/summits/eurobsdcon_2014_netbsd_summit.mdwn	1 Aug 2014 08:48:25 -0000	1.4
+++ wikisrc/summits/eurobsdcon_2014_netbsd_summit.mdwn	1 Aug 2014 08:56:41 -0000	1.5
@@ -11,9 +11,11 @@
 
 ## Planning to attend?
 
-* First Last `login@` (join dinner?)
-* Martin Husemann `martin@` (yes)
-* Thomas Klausner `wiz@` (yes)
+[[!table data="""
+First Last | `login@` | join dinner?
+Martin Husemann | `martin@` | yes
+"""]]
+
 
 ## Planning to present something?
 

Me too.
Index: wikisrc/summits/eurobsdcon_2014_netbsd_summit.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/summits/eurobsdcon_2014_netbsd_summit.mdwn,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wikisrc/summits/eurobsdcon_2014_netbsd_summit.mdwn	1 Aug 2014 08:30:12 -0000	1.3
+++ wikisrc/summits/eurobsdcon_2014_netbsd_summit.mdwn	1 Aug 2014 08:48:25 -0000	1.4
@@ -13,6 +13,7 @@
 
 * First Last `login@` (join dinner?)
 * Martin Husemann `martin@` (yes)
+* Thomas Klausner `wiz@` (yes)
 
 ## Planning to present something?
 

I will attend
Index: wikisrc/summits/eurobsdcon_2014_netbsd_summit.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/summits/eurobsdcon_2014_netbsd_summit.mdwn,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- wikisrc/summits/eurobsdcon_2014_netbsd_summit.mdwn	30 Jul 2014 22:16:07 -0000	1.2
+++ wikisrc/summits/eurobsdcon_2014_netbsd_summit.mdwn	1 Aug 2014 08:30:12 -0000	1.3
@@ -11,7 +11,8 @@
 
 ## Planning to attend?
 
-* First Last `login@`
+* First Last `login@` (join dinner?)
+* Martin Husemann `martin@` (yes)
 
 ## Planning to present something?
 

The map directive works nicely, and wiki's back to normal. Yay!
Index: wikisrc/summits.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/summits.mdwn,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- wikisrc/summits.mdwn	31 Jul 2014 21:34:33 -0000	1.8
+++ wikisrc/summits.mdwn	31 Jul 2014 21:38:41 -0000	1.9
@@ -1,7 +1,5 @@
-Plan upcoming developer summits! Recount tales of past ones.
+Plan upcoming developer summits! Recount tales of past ones!
 
 ## Contents
 
-* [[EuroBSDcon 2013 NetBSD Summit|summits/eurobsdcon_2013_netbsd_summit]] -- Held on September 27, 2013 in Malta
-
 [[!map pages="summits/*" show=title]]
Index: wikisrc/summits/eurobsdcon_2013_netbsd_summit.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/summits/eurobsdcon_2013_netbsd_summit.mdwn,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wikisrc/summits/eurobsdcon_2013_netbsd_summit.mdwn	27 May 2014 20:58:19 -0000	1.3
+++ wikisrc/summits/eurobsdcon_2013_netbsd_summit.mdwn	31 Jul 2014 21:38:41 -0000	1.4
@@ -1,5 +1,7 @@
 [[!meta title="EuroBSDCon 2013 NetBSD Summit"]]
 
+Held on September 27, 2013 in Malta.
+
 Attendees, in alphabetical order:
 
 * Adrian Steinmann `ast@`

Add a map directive so summit pages automatically appear here.
Index: wikisrc/summits.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/summits.mdwn,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- wikisrc/summits.mdwn	31 Oct 2013 06:17:38 -0000	1.7
+++ wikisrc/summits.mdwn	31 Jul 2014 21:34:33 -0000	1.8
@@ -1,13 +1,7 @@
-[[!template id=note text="""
-#### (?) [[How to edit|wiki/start]]
-#### {*} [[Wiki news|wiki/news]]
-#### {i} [[Sitemap|wiki/sitemap]]
-"""]]
-
-The summits area is the place to tell your stories of past developer summits.
-
-See the [[Sitemap|wiki/sitemap]] for the complete contents, or use some of the top level topics below.
+Plan upcoming developer summits! Recount tales of past ones.
 
 ## Contents
 
 * [[EuroBSDcon 2013 NetBSD Summit|summits/eurobsdcon_2013_netbsd_summit]] -- Held on September 27, 2013 in Malta
+
+[[!map pages="summits/*" show=title]]

was `use base` a red herring?
Index: wikisrc/sandbox.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/sandbox.mdwn,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- wikisrc/sandbox.mdwn	31 Jul 2014 19:12:28 -0000	1.12
+++ wikisrc/sandbox.mdwn	31 Jul 2014 19:34:44 -0000	1.13
@@ -34,3 +34,5 @@
 [[ikiwiki/WikiLink]]
 
 Remember Cyrix: <img src="http://www.netbsd.org/images/ports/i386/header.gif" />
+
+fnord again

indexdb was corrupted, rebuilt from scratch, all better?
Index: wikisrc/sandbox.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/sandbox.mdwn,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- wikisrc/sandbox.mdwn	31 Jul 2014 18:38:42 -0000	1.11
+++ wikisrc/sandbox.mdwn	31 Jul 2014 19:12:28 -0000	1.12
@@ -34,5 +34,3 @@
 [[ikiwiki/WikiLink]]
 
 Remember Cyrix: <img src="http://www.netbsd.org/images/ports/i386/header.gif" />
-
-pants

maybe this time
Index: wikisrc/sandbox.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/sandbox.mdwn,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- wikisrc/sandbox.mdwn	31 Jul 2014 18:37:25 -0000	1.10
+++ wikisrc/sandbox.mdwn	31 Jul 2014 18:38:42 -0000	1.11
@@ -34,3 +34,5 @@
 [[ikiwiki/WikiLink]]
 
 Remember Cyrix: <img src="http://www.netbsd.org/images/ports/i386/header.gif" />
+
+pants

maybe fixed all the errors?
Index: wikisrc/sandbox.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/sandbox.mdwn,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- wikisrc/sandbox.mdwn	31 Jul 2014 18:36:00 -0000	1.9
+++ wikisrc/sandbox.mdwn	31 Jul 2014 18:37:25 -0000	1.10
@@ -34,5 +34,3 @@
 [[ikiwiki/WikiLink]]
 
 Remember Cyrix: <img src="http://www.netbsd.org/images/ports/i386/header.gif" />
-
-noodle

down the trail of errors
Index: wikisrc/sandbox.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/sandbox.mdwn,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- wikisrc/sandbox.mdwn	31 Jul 2014 18:34:56 -0000	1.8
+++ wikisrc/sandbox.mdwn	31 Jul 2014 18:36:00 -0000	1.9
@@ -34,3 +34,5 @@
 [[ikiwiki/WikiLink]]
 
 Remember Cyrix: <img src="http://www.netbsd.org/images/ports/i386/header.gif" />
+
+noodle

test
Index: wikisrc/sandbox.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/sandbox.mdwn,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- wikisrc/sandbox.mdwn	31 Jul 2014 18:33:58 -0000	1.7
+++ wikisrc/sandbox.mdwn	31 Jul 2014 18:34:56 -0000	1.8
@@ -34,5 +34,3 @@
 [[ikiwiki/WikiLink]]
 
 Remember Cyrix: <img src="http://www.netbsd.org/images/ports/i386/header.gif" />
-
-fnord

test
Index: wikisrc/sandbox.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/sandbox.mdwn,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wikisrc/sandbox.mdwn	18 May 2014 21:23:25 -0000	1.6
+++ wikisrc/sandbox.mdwn	31 Jul 2014 18:33:58 -0000	1.7
@@ -35,3 +35,4 @@
 
 Remember Cyrix: <img src="http://www.netbsd.org/images/ports/i386/header.gif" />
 
+fnord

test commit -- have things gotten better?
Index: wikisrc/summits/eurobsdcon_2014_netbsd_summit.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/summits/eurobsdcon_2014_netbsd_summit.mdwn,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wikisrc/summits/eurobsdcon_2014_netbsd_summit.mdwn	30 Jul 2014 21:32:28 -0000	1.1
+++ wikisrc/summits/eurobsdcon_2014_netbsd_summit.mdwn	30 Jul 2014 22:16:07 -0000	1.2
@@ -6,7 +6,7 @@
 September 26, 14:15. It will likely be followed by a whole bunch
 of NetBSD developers going out for dinner.
 
-Note that this year's conference will feature [lots of NetBSD- and
+N.B.: this year's conference will feature [lots of NetBSD- and
 rumpkernel-related talks](http://2014.eurobsdcon.org/talks-and-schedule/)!
 
 ## Planning to attend?

Munge a copy of spz's 2013 summit page for 2014, with details from martin.
--- /dev/null	2014-08-23 13:12:04.000000000 +0000
+++ wikisrc/summits/eurobsdcon_2014_netbsd_summit.mdwn	2014-08-23 13:13:05.000000000 +0000
@@ -0,0 +1,25 @@
+[[!meta title="EuroBSDCon 2014 NetBSD Summit"]]
+
+## Details
+
+The NetBSD developer summit at EuroBSDCon 2014 will be held Friday,
+September 26, 14:15. It will likely be followed by a whole bunch
+of NetBSD developers going out for dinner.
+
+Note that this year's conference will feature [lots of NetBSD- and
+rumpkernel-related talks](http://2014.eurobsdcon.org/talks-and-schedule/)!
+
+## Planning to attend?
+
+* First Last `login@`
+
+## Planning to present something?
+
+[[!table data="""
+Speaker  |Title
+`login@` |_Very Interesting Thing_
+"""]]
+
+## Discussions
+
+## Varia

Specify absolute path to ISC footer image so it shows up on subpages.
Index: wikisrc/templates/page.tmpl
===================================================================
RCS file: /cvsroot/wikisrc/templates/page.tmpl,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- wikisrc/templates/page.tmpl	22 Jun 2014 13:18:22 -0000	1.26
+++ wikisrc/templates/page.tmpl	30 Jul 2014 15:33:09 -0000	1.27
@@ -270,7 +270,7 @@
 <div class="rowOfBoxes">
   <div id="footer">
     <div id="footerLogo">
-      <a href="http://www.isc.org/"><img src="images/hosted-isc.png"
+      <a href="http://www.isc.org/"><img src="//wiki.netbsd.org/images/hosted-isc.png"
          alt="wiki.NetBSD.org is hosted at ISC"
          border="0" width="84" height="41"/></a>
     </div>

Lowercase filename (and hence URL). For title case, use meta tag.
--- wikisrc/tutorials/pkgsrc/Debugging_Firefox.mdwn	2014-08-23 13:13:05.000000000 +0000
+++ /dev/null	2014-08-23 13:12:04.000000000 +0000
@@ -1,70 +0,0 @@
-The Firefox package in www/firefox (and also, maybe starting with the next update to firefox 31, the long term stability release version) support various ways to support debugging the resulting binary. Here is when and how to use them:
-
-Assuming you have a firefox from pkgsrc installed already, but it crashes (on startup, or reproducable when you visit certain pages), you can build a special debuggable version of the pkg (without overwriting your existing install).
-
-First, let us look at the options offered by the pkg:
-
-    [/usr/pkgsrc/www/firefox] martin@whoever-brings-the-night > make show-options
-    Any of the following general options may be selected:
-        alsa     Enable ALSA support.
-        debug    Enable debugging facilities in the package.
-        debug-info       Enable debug info in generated binaries (e.g. for crash analysis), but not full scale debugging.
-        gnome    Enable GNOME support.
-        mozilla-jemalloc        Enable building with Mozilla'a jemalloc.
-        official-mozilla-branding       Use official Mozilla reg. trademarks and logos.
-        pulseaudio       Enable support for the PulseAudio sound server.
-        webrtc   Enable web realtime communications API.
-
-    These options are enabled by default:
-        pulseaudio
-
-    These options are currently enabled:
-        official-mozilla-branding pulseaudio
-
-    You can select which build options to use by setting PKG_DEFAULT_OPTIONS
-    or PKG_OPTIONS.firefox.
-
-The two interesting ones are `debug` and `debug-info`:
-
-* `debug` will create a version with all internal mozilla consistency checking enabled, and all optimization turned off. This is usefull when creating extensions or plugins, but not what we want here. Especially the disabled optimization might hide all issues created by optimization or compiler bugs.
-
-* `debug-info` is what we are looking for: it creates a stock release version of firefox, but with debug information available
-
-So set `PKG_OPTIONS.firefox += debug-info` in /etc/mk.conf (or wherever your relevant mk.conf lives) and build the package from scratch (i.e. do `make cleandir && make`). You do **NOT** need to install this version. You can optionally set the environment variable MAKE_JOBS to some number greater than the number of cpu/cores you want the build to use, this will speed up parts of the build significantly.
-
-After building the pkg, you can use files in the obj/workdir to run this firefox inside gdb. But first make sure to not have any remaining firefox instances running, as those would cause just another window to open but running the non-debugable code version of the already running instance.
-
-You have to locate your pkgsrc work directory for this pkg, which could be for example `pkgsrc/www/firefox/work`, or if you have set WRKOBJDIR to a special directory, something like: `/usr/pkgobj/www/firefox/work`. Assuming the latter, now cd to the `build/dist/bin` directory inside it and invoke the helper shell script `run-mozilla.sh` with `-g` option:
-
-    [/usr/pkgobj/www/firefox/work/build/dist/bin] martin@night-owl > ./run-mozilla.sh -g ./firefox
-    MOZILLA_FIVE_HOME=.
-      LD_LIBRARY_PATH=.:./plugins:.
-     DYLD_LIBRARY_PATH=.:.
-     LIBRARY_PATH=
-       SHLIB_PATH=.:.
-          LIBPATH=.:.
-       ADDON_PATH=
-      MOZ_PROGRAM=./firefox
-      MOZ_TOOLKIT=
-        moz_debug=1
-     moz_debugger=
-     moz_debugger_args=
-     /usr/bin/gdb  --args ./firefox
-     GNU gdb (GDB) 7.7.1
-     Copyright (C) 2014 Free Software Foundation, Inc.
-     License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
-     This is free software: you are free to change and redistribute it.
-     There is NO WARRANTY, to the extent permitted by law.  Type "show copying"
-     and "show warranty" for details.
-     This GDB was configured as "x86_64--netbsd".
-     Type "show configuration" for configuration details.
-     For bug reporting instructions, please see:
-     <http://www.gnu.org/software/gdb/bugs/>.
-     Find the GDB manual and other documentation resources online at:
-     <http://www.gnu.org/software/gdb/documentation/>.
-     For help, type "help".
-     Type "apropos word" to search for commands related to "word"...
-     Reading symbols from ./firefox...done.
-     (gdb) 
-
-and issue the `run` command. This will start firefox (with quite a bit of delay, since gdb needs to read a lot symbols from the shared libraries loaded now). Then make firefox crash, and try to find out why.
--- /dev/null	2014-08-23 13:12:04.000000000 +0000
+++ wikisrc/tutorials/pkgsrc/debugging_firefox.mdwn	2014-08-23 13:13:05.000000000 +0000
@@ -0,0 +1,72 @@
+[[!meta title="Debugging Firefox"]]
+
+The Firefox package in www/firefox (and also, maybe starting with the next update to firefox 31, the long term stability release version) support various ways to support debugging the resulting binary. Here is when and how to use them:
+
+Assuming you have a firefox from pkgsrc installed already, but it crashes (on startup, or reproducable when you visit certain pages), you can build a special debuggable version of the pkg (without overwriting your existing install).
+
+First, let us look at the options offered by the pkg:
+
+    [/usr/pkgsrc/www/firefox] martin@whoever-brings-the-night > make show-options
+    Any of the following general options may be selected:
+        alsa     Enable ALSA support.
+        debug    Enable debugging facilities in the package.
+        debug-info       Enable debug info in generated binaries (e.g. for crash analysis), but not full scale debugging.
+        gnome    Enable GNOME support.
+        mozilla-jemalloc        Enable building with Mozilla'a jemalloc.
+        official-mozilla-branding       Use official Mozilla reg. trademarks and logos.
+        pulseaudio       Enable support for the PulseAudio sound server.
+        webrtc   Enable web realtime communications API.
+
+    These options are enabled by default:
+        pulseaudio
+
+    These options are currently enabled:
+        official-mozilla-branding pulseaudio
+
+    You can select which build options to use by setting PKG_DEFAULT_OPTIONS
+    or PKG_OPTIONS.firefox.
+
+The two interesting ones are `debug` and `debug-info`:
+
+* `debug` will create a version with all internal mozilla consistency checking enabled, and all optimization turned off. This is usefull when creating extensions or plugins, but not what we want here. Especially the disabled optimization might hide all issues created by optimization or compiler bugs.
+
+* `debug-info` is what we are looking for: it creates a stock release version of firefox, but with debug information available
+
+So set `PKG_OPTIONS.firefox += debug-info` in /etc/mk.conf (or wherever your relevant mk.conf lives) and build the package from scratch (i.e. do `make cleandir && make`). You do **NOT** need to install this version. You can optionally set the environment variable MAKE_JOBS to some number greater than the number of cpu/cores you want the build to use, this will speed up parts of the build significantly.
+
+After building the pkg, you can use files in the obj/workdir to run this firefox inside gdb. But first make sure to not have any remaining firefox instances running, as those would cause just another window to open but running the non-debugable code version of the already running instance.
+
+You have to locate your pkgsrc work directory for this pkg, which could be for example `pkgsrc/www/firefox/work`, or if you have set WRKOBJDIR to a special directory, something like: `/usr/pkgobj/www/firefox/work`. Assuming the latter, now cd to the `build/dist/bin` directory inside it and invoke the helper shell script `run-mozilla.sh` with `-g` option:
+
+    [/usr/pkgobj/www/firefox/work/build/dist/bin] martin@night-owl > ./run-mozilla.sh -g ./firefox
+    MOZILLA_FIVE_HOME=.
+      LD_LIBRARY_PATH=.:./plugins:.
+     DYLD_LIBRARY_PATH=.:.
+     LIBRARY_PATH=
+       SHLIB_PATH=.:.
+          LIBPATH=.:.
+       ADDON_PATH=
+      MOZ_PROGRAM=./firefox
+      MOZ_TOOLKIT=
+        moz_debug=1
+     moz_debugger=
+     moz_debugger_args=
+     /usr/bin/gdb  --args ./firefox
+     GNU gdb (GDB) 7.7.1
+     Copyright (C) 2014 Free Software Foundation, Inc.
+     License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
+     This is free software: you are free to change and redistribute it.
+     There is NO WARRANTY, to the extent permitted by law.  Type "show copying"
+     and "show warranty" for details.
+     This GDB was configured as "x86_64--netbsd".
+     Type "show configuration" for configuration details.
+     For bug reporting instructions, please see:
+     <http://www.gnu.org/software/gdb/bugs/>.
+     Find the GDB manual and other documentation resources online at:
+     <http://www.gnu.org/software/gdb/documentation/>.
+     For help, type "help".
+     Type "apropos word" to search for commands related to "word"...
+     Reading symbols from ./firefox...done.
+     (gdb) 
+
+and issue the `run` command. This will start firefox (with quite a bit of delay, since gdb needs to read a lot symbols from the shared libraries loaded now). Then make firefox crash, and try to find out why.

Add instructions how to actually invoke gdb
Index: wikisrc/tutorials/pkgsrc/Debugging_Firefox.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/tutorials/pkgsrc/Attic/Debugging_Firefox.mdwn,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wikisrc/tutorials/pkgsrc/Debugging_Firefox.mdwn	30 Jul 2014 07:40:21 -0000	1.1
+++ wikisrc/tutorials/pkgsrc/Debugging_Firefox.mdwn	30 Jul 2014 09:40:50 -0000	1.2
@@ -30,8 +30,41 @@
 
 * `debug-info` is what we are looking for: it creates a stock release version of firefox, but with debug information available
 
-So set `PKG_OPTIONS.firefox += debug-info` in /etc/mk.conf (or wherever your relevant mk.conf lives) and build the package from scratch (i.e. do `make cleandir && make`). You do *NOT* need to install this version. You can set MAKE_JOBS to some number greater than the number of cpu/cores you want the build to use, this will speed up parts of the build significantly.
+So set `PKG_OPTIONS.firefox += debug-info` in /etc/mk.conf (or wherever your relevant mk.conf lives) and build the package from scratch (i.e. do `make cleandir && make`). You do **NOT** need to install this version. You can optionally set the environment variable MAKE_JOBS to some number greater than the number of cpu/cores you want the build to use, this will speed up parts of the build significantly.
 
 After building the pkg, you can use files in the obj/workdir to run this firefox inside gdb. But first make sure to not have any remaining firefox instances running, as those would cause just another window to open but running the non-debugable code version of the already running instance.
 
-(to be continuned)
+You have to locate your pkgsrc work directory for this pkg, which could be for example `pkgsrc/www/firefox/work`, or if you have set WRKOBJDIR to a special directory, something like: `/usr/pkgobj/www/firefox/work`. Assuming the latter, now cd to the `build/dist/bin` directory inside it and invoke the helper shell script `run-mozilla.sh` with `-g` option:
+
+    [/usr/pkgobj/www/firefox/work/build/dist/bin] martin@night-owl > ./run-mozilla.sh -g ./firefox
+    MOZILLA_FIVE_HOME=.
+      LD_LIBRARY_PATH=.:./plugins:.
+     DYLD_LIBRARY_PATH=.:.
+     LIBRARY_PATH=
+       SHLIB_PATH=.:.
+          LIBPATH=.:.
+       ADDON_PATH=
+      MOZ_PROGRAM=./firefox
+      MOZ_TOOLKIT=
+        moz_debug=1
+     moz_debugger=
+     moz_debugger_args=
+     /usr/bin/gdb  --args ./firefox
+     GNU gdb (GDB) 7.7.1
+     Copyright (C) 2014 Free Software Foundation, Inc.
+     License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
+     This is free software: you are free to change and redistribute it.
+     There is NO WARRANTY, to the extent permitted by law.  Type "show copying"
+     and "show warranty" for details.
+     This GDB was configured as "x86_64--netbsd".
+     Type "show configuration" for configuration details.
+     For bug reporting instructions, please see:
+     <http://www.gnu.org/software/gdb/bugs/>.
+     Find the GDB manual and other documentation resources online at:
+     <http://www.gnu.org/software/gdb/documentation/>.
+     For help, type "help".
+     Type "apropos word" to search for commands related to "word"...
+     Reading symbols from ./firefox...done.
+     (gdb) 
+
+and issue the `run` command. This will start firefox (with quite a bit of delay, since gdb needs to read a lot symbols from the shared libraries loaded now). Then make firefox crash, and try to find out why.

rename tutorials/pkgsrc/debugging__95__firefox.mdwn to tutorials/pkgsrc/Debugging_Firefox.mdwn
--- /dev/null	2014-08-23 13:12:04.000000000 +0000
+++ wikisrc/tutorials/pkgsrc/Debugging_Firefox.mdwn	2014-08-23 13:13:05.000000000 +0000
@@ -0,0 +1,37 @@
+The Firefox package in www/firefox (and also, maybe starting with the next update to firefox 31, the long term stability release version) support various ways to support debugging the resulting binary. Here is when and how to use them:
+
+Assuming you have a firefox from pkgsrc installed already, but it crashes (on startup, or reproducable when you visit certain pages), you can build a special debuggable version of the pkg (without overwriting your existing install).
+
+First, let us look at the options offered by the pkg:
+
+    [/usr/pkgsrc/www/firefox] martin@whoever-brings-the-night > make show-options
+    Any of the following general options may be selected:
+        alsa     Enable ALSA support.
+        debug    Enable debugging facilities in the package.
+        debug-info       Enable debug info in generated binaries (e.g. for crash analysis), but not full scale debugging.
+        gnome    Enable GNOME support.
+        mozilla-jemalloc        Enable building with Mozilla'a jemalloc.
+        official-mozilla-branding       Use official Mozilla reg. trademarks and logos.
+        pulseaudio       Enable support for the PulseAudio sound server.
+        webrtc   Enable web realtime communications API.
+
+    These options are enabled by default:
+        pulseaudio
+
+    These options are currently enabled:
+        official-mozilla-branding pulseaudio
+
+    You can select which build options to use by setting PKG_DEFAULT_OPTIONS
+    or PKG_OPTIONS.firefox.
+
+The two interesting ones are `debug` and `debug-info`:
+
+* `debug` will create a version with all internal mozilla consistency checking enabled, and all optimization turned off. This is usefull when creating extensions or plugins, but not what we want here. Especially the disabled optimization might hide all issues created by optimization or compiler bugs.
+
+* `debug-info` is what we are looking for: it creates a stock release version of firefox, but with debug information available
+
+So set `PKG_OPTIONS.firefox += debug-info` in /etc/mk.conf (or wherever your relevant mk.conf lives) and build the package from scratch (i.e. do `make cleandir && make`). You do *NOT* need to install this version. You can set MAKE_JOBS to some number greater than the number of cpu/cores you want the build to use, this will speed up parts of the build significantly.
+
+After building the pkg, you can use files in the obj/workdir to run this firefox inside gdb. But first make sure to not have any remaining firefox instances running, as those would cause just another window to open but running the non-debugable code version of the already running instance.
+
+(to be continuned)
--- wikisrc/tutorials/pkgsrc/debugging__95__firefox.mdwn	2014-08-23 13:13:05.000000000 +0000
+++ /dev/null	2014-08-23 13:12:04.000000000 +0000
@@ -1,37 +0,0 @@
-The Firefox package in www/firefox (and also, maybe starting with the next update to firefox 31, the long term stability release version) support various ways to support debugging the resulting binary. Here is when and how to use them:
-
-Assuming you have a firefox from pkgsrc installed already, but it crashes (on startup, or reproducable when you visit certain pages), you can build a special debuggable version of the pkg (without overwriting your existing install).
-
-First, let us look at the options offered by the pkg:
-
-    [/usr/pkgsrc/www/firefox] martin@whoever-brings-the-night > make show-options
-    Any of the following general options may be selected:
-        alsa     Enable ALSA support.
-        debug    Enable debugging facilities in the package.
-        debug-info       Enable debug info in generated binaries (e.g. for crash analysis), but not full scale debugging.
-        gnome    Enable GNOME support.
-        mozilla-jemalloc        Enable building with Mozilla'a jemalloc.
-        official-mozilla-branding       Use official Mozilla reg. trademarks and logos.
-        pulseaudio       Enable support for the PulseAudio sound server.
-        webrtc   Enable web realtime communications API.
-
-    These options are enabled by default:
-        pulseaudio
-
-    These options are currently enabled:
-        official-mozilla-branding pulseaudio
-
-    You can select which build options to use by setting PKG_DEFAULT_OPTIONS
-    or PKG_OPTIONS.firefox.
-
-The two interesting ones are `debug` and `debug-info`:
-
-* `debug` will create a version with all internal mozilla consistency checking enabled, and all optimization turned off. This is usefull when creating extensions or plugins, but not what we want here. Especially the disabled optimization might hide all issues created by optimization or compiler bugs.
-
-* `debug-info` is what we are looking for: it creates a stock release version of firefox, but with debug information available
-
-So set `PKG_OPTIONS.firefox += debug-info` in /etc/mk.conf (or wherever your relevant mk.conf lives) and build the package from scratch (i.e. do `make cleandir && make`). You do *NOT* need to install this version. You can set MAKE_JOBS to some number greater than the number of cpu/cores you want the build to use, this will speed up parts of the build significantly.
-
-After building the pkg, you can use files in the obj/workdir to run this firefox inside gdb. But first make sure to not have any remaining firefox instances running, as those would cause just another window to open but running the non-debugable code version of the already running instance.
-
-(to be continuned)

Index: wikisrc/tutorials/pkgsrc/debugging__95__firefox.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/tutorials/pkgsrc/Attic/debugging__95__firefox.mdwn,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wikisrc/tutorials/pkgsrc/debugging__95__firefox.mdwn	30 Jul 2014 07:38:08 -0000	1.1
+++ wikisrc/tutorials/pkgsrc/debugging__95__firefox.mdwn	30 Jul 2014 07:39:19 -0000	1.2
@@ -30,7 +30,7 @@
 
 * `debug-info` is what we are looking for: it creates a stock release version of firefox, but with debug information available
 
-So set `PKG_OPTIONS.firefox += debug-info` in /etc/mk.conf (or wherever your relevant mk.conf lives) and build the package from scratch (i.e. do `make cleandir && make`). You do *NOT* need to install this version.
+So set `PKG_OPTIONS.firefox += debug-info` in /etc/mk.conf (or wherever your relevant mk.conf lives) and build the package from scratch (i.e. do `make cleandir && make`). You do *NOT* need to install this version. You can set MAKE_JOBS to some number greater than the number of cpu/cores you want the build to use, this will speed up parts of the build significantly.
 
 After building the pkg, you can use files in the obj/workdir to run this firefox inside gdb. But first make sure to not have any remaining firefox instances running, as those would cause just another window to open but running the non-debugable code version of the already running instance.
 

update for rename of tutorials/pkgsrc_debugging_firefox.mdwn to tutorials/pkgsrc/debugging__95__firefox.mdwn
Index: wikisrc/tutorials/pkgsrc.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/tutorials/pkgsrc.mdwn,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- wikisrc/tutorials/pkgsrc.mdwn	30 Jul 2014 07:37:07 -0000	1.7
+++ wikisrc/tutorials/pkgsrc.mdwn	30 Jul 2014 07:38:09 -0000	1.8
@@ -3,4 +3,4 @@
 * [[Speeding up pkgsrc builds with ccache and distcc|build_ccache_distcc]]
 * [[Distributing pkgsrc builds across different OSes|cross_compile_distcc]]
 * [[Using clang with pkgsrc|tutorials/pkgsrc/clang]]
-* [[Debugging crashes in the Firefox package|pkgsrc_debugging_firefox]]
+* [[Debugging crashes in the Firefox package|tutorials/pkgsrc/debugging_firefox]]

rename tutorials/pkgsrc_debugging_firefox.mdwn to tutorials/pkgsrc/debugging__95__firefox.mdwn
--- wikisrc/tutorials/pkgsrc_debugging_firefox.mdwn	2014-08-23 13:13:05.000000000 +0000
+++ /dev/null	2014-08-23 13:12:04.000000000 +0000
@@ -1,37 +0,0 @@
-The Firefox package in www/firefox (and also, maybe starting with the next update to firefox 31, the long term stability release version) support various ways to support debugging the resulting binary. Here is when and how to use them:
-
-Assuming you have a firefox from pkgsrc installed already, but it crashes (on startup, or reproducable when you visit certain pages), you can build a special debuggable version of the pkg (without overwriting your existing install).
-
-First, let us look at the options offered by the pkg:
-
-    [/usr/pkgsrc/www/firefox] martin@whoever-brings-the-night > make show-options
-    Any of the following general options may be selected:
-        alsa     Enable ALSA support.
-        debug    Enable debugging facilities in the package.
-        debug-info       Enable debug info in generated binaries (e.g. for crash analysis), but not full scale debugging.
-        gnome    Enable GNOME support.
-        mozilla-jemalloc        Enable building with Mozilla'a jemalloc.
-        official-mozilla-branding       Use official Mozilla reg. trademarks and logos.
-        pulseaudio       Enable support for the PulseAudio sound server.
-        webrtc   Enable web realtime communications API.
-
-    These options are enabled by default:
-        pulseaudio
-
-    These options are currently enabled:
-        official-mozilla-branding pulseaudio
-
-    You can select which build options to use by setting PKG_DEFAULT_OPTIONS
-    or PKG_OPTIONS.firefox.
-
-The two interesting ones are `debug` and `debug-info`:
-
-* `debug` will create a version with all internal mozilla consistency checking enabled, and all optimization turned off. This is usefull when creating extensions or plugins, but not what we want here. Especially the disabled optimization might hide all issues created by optimization or compiler bugs.
-
-* `debug-info` is what we are looking for: it creates a stock release version of firefox, but with debug information available
-
-So set `PKG_OPTIONS.firefox += debug-info` in /etc/mk.conf (or wherever your relevant mk.conf lives) and build the package from scratch (i.e. do `make cleandir && make`). You do *NOT* need to install this version.
-
-After building the pkg, you can use files in the obj/workdir to run this firefox inside gdb. But first make sure to not have any remaining firefox instances running, as those would cause just another window to open but running the non-debugable code version of the already running instance.
-
-(to be continuned)
--- /dev/null	2014-08-23 13:12:04.000000000 +0000
+++ wikisrc/tutorials/pkgsrc/debugging__95__firefox.mdwn	2014-08-23 13:13:05.000000000 +0000
@@ -0,0 +1,37 @@
+The Firefox package in www/firefox (and also, maybe starting with the next update to firefox 31, the long term stability release version) support various ways to support debugging the resulting binary. Here is when and how to use them:
+
+Assuming you have a firefox from pkgsrc installed already, but it crashes (on startup, or reproducable when you visit certain pages), you can build a special debuggable version of the pkg (without overwriting your existing install).
+
+First, let us look at the options offered by the pkg:
+
+    [/usr/pkgsrc/www/firefox] martin@whoever-brings-the-night > make show-options
+    Any of the following general options may be selected:
+        alsa     Enable ALSA support.
+        debug    Enable debugging facilities in the package.
+        debug-info       Enable debug info in generated binaries (e.g. for crash analysis), but not full scale debugging.
+        gnome    Enable GNOME support.
+        mozilla-jemalloc        Enable building with Mozilla'a jemalloc.
+        official-mozilla-branding       Use official Mozilla reg. trademarks and logos.
+        pulseaudio       Enable support for the PulseAudio sound server.
+        webrtc   Enable web realtime communications API.
+
+    These options are enabled by default:
+        pulseaudio
+
+    These options are currently enabled:
+        official-mozilla-branding pulseaudio
+
+    You can select which build options to use by setting PKG_DEFAULT_OPTIONS
+    or PKG_OPTIONS.firefox.
+
+The two interesting ones are `debug` and `debug-info`:
+
+* `debug` will create a version with all internal mozilla consistency checking enabled, and all optimization turned off. This is usefull when creating extensions or plugins, but not what we want here. Especially the disabled optimization might hide all issues created by optimization or compiler bugs.
+
+* `debug-info` is what we are looking for: it creates a stock release version of firefox, but with debug information available
+
+So set `PKG_OPTIONS.firefox += debug-info` in /etc/mk.conf (or wherever your relevant mk.conf lives) and build the package from scratch (i.e. do `make cleandir && make`). You do *NOT* need to install this version.
+
+After building the pkg, you can use files in the obj/workdir to run this firefox inside gdb. But first make sure to not have any remaining firefox instances running, as those would cause just another window to open but running the non-debugable code version of the already running instance.
+
+(to be continuned)

update for rename of tutorials/pkgsrc_clang.mdwn to tutorials/pkgsrc/clang.mdwn
Index: wikisrc/tutorials/pkgsrc.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/tutorials/pkgsrc.mdwn,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wikisrc/tutorials/pkgsrc.mdwn	30 Jul 2014 07:12:20 -0000	1.6
+++ wikisrc/tutorials/pkgsrc.mdwn	30 Jul 2014 07:37:07 -0000	1.7
@@ -2,5 +2,5 @@
 * [[Using pbulk to create a pkgsrc binary repository|pbulk]]
 * [[Speeding up pkgsrc builds with ccache and distcc|build_ccache_distcc]]
 * [[Distributing pkgsrc builds across different OSes|cross_compile_distcc]]
-* [[Using clang with pkgsrc|pkgsrc_clang]]
+* [[Using clang with pkgsrc|tutorials/pkgsrc/clang]]
 * [[Debugging crashes in the Firefox package|pkgsrc_debugging_firefox]]

rename tutorials/pkgsrc_clang.mdwn to tutorials/pkgsrc/clang.mdwn
--- wikisrc/tutorials/pkgsrc_clang.mdwn	2014-08-23 13:13:05.000000000 +0000
+++ /dev/null	2014-08-23 13:12:04.000000000 +0000
@@ -1,19 +0,0 @@
-When building NetBSD, you can set
-
-    MKLLVM=yes
-
-to also build clang and install it, and additionally
-
-    HAVE_LLVM=yes
-
-if you want to use it to compile NetBSD itself during build.sh.
-
-When you have a NetBSD compiled this way, you can set
-
-    PKGSRC_COMPILER=       clang
-    CLANGBASE=             /usr
-    HAVE_LLVM=             yes
-
-in your /etc/mk.conf to use it. You must do that before building
-packages, especially libtool. It's usually fine to link binaries
-generated from gcc to those generated with clang or vice versa.
--- /dev/null	2014-08-23 13:12:04.000000000 +0000
+++ wikisrc/tutorials/pkgsrc/clang.mdwn	2014-08-23 13:13:05.000000000 +0000
@@ -0,0 +1,19 @@
+When building NetBSD, you can set
+
+    MKLLVM=yes
+
+to also build clang and install it, and additionally
+
+    HAVE_LLVM=yes
+
+if you want to use it to compile NetBSD itself during build.sh.
+
+When you have a NetBSD compiled this way, you can set
+
+    PKGSRC_COMPILER=       clang
+    CLANGBASE=             /usr
+    HAVE_LLVM=             yes
+
+in your /etc/mk.conf to use it. You must do that before building
+packages, especially libtool. It's usually fine to link binaries
+generated from gcc to those generated with clang or vice versa.

Add tuturoial how to create a debuggable version of www/firefox and how to run it in gdb
--- /dev/null	2014-08-23 13:12:04.000000000 +0000
+++ wikisrc/tutorials/pkgsrc_debugging_firefox.mdwn	2014-08-23 13:13:05.000000000 +0000
@@ -0,0 +1,37 @@
+The Firefox package in www/firefox (and also, maybe starting with the next update to firefox 31, the long term stability release version) support various ways to support debugging the resulting binary. Here is when and how to use them:
+
+Assuming you have a firefox from pkgsrc installed already, but it crashes (on startup, or reproducable when you visit certain pages), you can build a special debuggable version of the pkg (without overwriting your existing install).
+
+First, let us look at the options offered by the pkg:
+
+    [/usr/pkgsrc/www/firefox] martin@whoever-brings-the-night > make show-options
+    Any of the following general options may be selected:
+        alsa     Enable ALSA support.
+        debug    Enable debugging facilities in the package.
+        debug-info       Enable debug info in generated binaries (e.g. for crash analysis), but not full scale debugging.
+        gnome    Enable GNOME support.
+        mozilla-jemalloc        Enable building with Mozilla'a jemalloc.
+        official-mozilla-branding       Use official Mozilla reg. trademarks and logos.
+        pulseaudio       Enable support for the PulseAudio sound server.
+        webrtc   Enable web realtime communications API.
+
+    These options are enabled by default:
+        pulseaudio
+
+    These options are currently enabled:
+        official-mozilla-branding pulseaudio
+
+    You can select which build options to use by setting PKG_DEFAULT_OPTIONS
+    or PKG_OPTIONS.firefox.
+
+The two interesting ones are `debug` and `debug-info`:
+
+* `debug` will create a version with all internal mozilla consistency checking enabled, and all optimization turned off. This is usefull when creating extensions or plugins, but not what we want here. Especially the disabled optimization might hide all issues created by optimization or compiler bugs.
+
+* `debug-info` is what we are looking for: it creates a stock release version of firefox, but with debug information available
+
+So set `PKG_OPTIONS.firefox += debug-info` in /etc/mk.conf (or wherever your relevant mk.conf lives) and build the package from scratch (i.e. do `make cleandir && make`). You do *NOT* need to install this version.
+
+After building the pkg, you can use files in the obj/workdir to run this firefox inside gdb. But first make sure to not have any remaining firefox instances running, as those would cause just another window to open but running the non-debugable code version of the already running instance.
+
+(to be continuned)

Index: wikisrc/tutorials/pkgsrc.mdwn
===================================================================
RCS file: /cvsroot/wikisrc/tutorials/pkgsrc.mdwn,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wikisrc/tutorials/pkgsrc.mdwn	18 Jul 2013 22:31:52 -0000	1.5
+++ wikisrc/tutorials/pkgsrc.mdwn	30 Jul 2014 07:12:20 -0000	1.6
@@ -3,3 +3,4 @@
 * [[Speeding up pkgsrc builds with ccache and distcc|build_ccache_distcc]]
 * [[Distributing pkgsrc builds across different OSes|cross_compile_distcc]]
 * [[Using clang with pkgsrc|pkgsrc_clang]]
+* [[Debugging crashes in the Firefox package|pkgsrc_debugging_firefox]]

Added a comment: Is implementing ZFS on NetBSD Complete ?
--- /dev/null	2014-08-23 13:12:04.000000000 +0000
+++ wikisrc/projects/project/zfs/comment_1_8a76529815014a1ceddbbd38c55bc62b._comment	2014-08-23 13:13:05.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-08-23 13:12:04.000000000 +0000
+++ wikisrc/users/spz/sandbox/comment_1_6efed48ef93304ccbcdd3652efee3990._comment	2014-08-23 13:13:05.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-08-23 13:12:04.000000000 +0000
+++ wikisrc/examples/socket_programming/comment_2_a836730a2789ef150aa044450c85b44a._comment	2014-08-23 13:13:06.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-08-23 13:12:04.000000000 +0000
+++ wikisrc/pkgsrc/intro_to_packaging.mdwn	2014-08-23 13:13:06.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-08-23 13:12:04.000000000 +0000
+++ wikisrc/examples/socket_programming/comment_1_4fa1037d20f091573b81c12b8e1fde24._comment	2014-08-23 13:13:06.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-08-23 13:13:07.000000000 +0000
+++ /dev/null	2014-08-23 13:12:04.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-08-23 13:13:07.000000000 +0000
+++ /dev/null	2014-08-23 13:12:04.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-08-23 13:13:07.000000000 +0000
+++ /dev/null	2014-08-23 13:12:04.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-08-23 13:12:04.000000000 +0000
+++ wikisrc/wiki/todo/merge_pkgsrc_wiki.mdwn	2014-08-23 13:13:07.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-08-23 13:12:04.000000000 +0000
+++ wikisrc/bugtracking/stuff_we_dislike_about_gnats.mdwn	2014-08-23 13:13:08.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>

Add a comment