--- wikisrc/pkgsrc/how_to_convert_autotools_to_meson.mdwn	2020/11/10 19:23:13	1.1
+++ wikisrc/pkgsrc/how_to_convert_autotools_to_meson.mdwn	2020/11/10 19:27:11	1.2
@@ -40,22 +40,6 @@ and msgfmt. If your package uses `i18n.g
 it needs xgettext, and if it uses `i18n.merge_file` it needs msgfmt.
 It's easy to check this with grep.
 
-gettext issues on NetBSD
-------------------------
-
-NetBSD includes an (old, pre-GPLv3?) version of msgfmt. This doesn't
-have the new --desktop or --xml flags, so you'll get a build error
-if a package attempts to use these.
-
-There's an easy workaround:
-
-	.include "../../mk/bsd.prefs.mk"
-
-	# msgfmt: unknown option -- desktop
-	.if ${OPSYS} == "NetBSD"
-	TOOLS_PLATFORM.msgfmt=
-	.endif
-
 Python
 ------
 
@@ -72,17 +56,6 @@ execute scripts during the build, you sh
 This will automatically create a python executable with the appropriate
 suffix (or lack of suffix) for the duration of the build.
 
-Flags
------
-
-Flags of the following form:
-
-	CONFIGURE_ARGS+=	--enable-opengl
-
-Generally now take the following form:
-
-	MESON_ARGS+=		-Dopengl=true
-
 pkgconfig overrides
 -------------------
 
@@ -101,3 +74,30 @@ path for libraries.
 
 Remove any old references to nonexistent .pc files from the old
 build system in the PKGCONFIG_OVERRIDE.
+
+gettext issues on NetBSD
+------------------------
+
+NetBSD includes an (old, pre-GPLv3?) version of msgfmt. This doesn't
+have the new --desktop or --xml flags, so you'll get a build error
+if a package attempts to use these.
+
+There's an easy workaround:
+
+	.include "../../mk/bsd.prefs.mk"
+
+	# msgfmt: unknown option -- desktop
+	.if ${OPSYS} == "NetBSD"
+	TOOLS_PLATFORM.msgfmt=
+	.endif
+
+Flags
+-----
+
+Flags of the following form:
+
+	CONFIGURE_ARGS+=	--enable-opengl
+
+Generally now take the following form:
+
+	MESON_ARGS+=		-Dopengl=true