Index: x11/xkeyboard-config/Makefile
===================================================================
RCS file: /a/.csup/ports/x11/xkeyboard-config/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- x11/xkeyboard-config/Makefile	23 Sep 2011 22:26:15 -0000	1.21
+++ x11/xkeyboard-config/Makefile	25 Sep 2011 22:50:20 -0000
@@ -42,6 +42,9 @@ PLIST_SUB+=	NLS=""
 .endif
 
 post-patch:
+.if defined(WITHOUT_NLS)
+	@${REINPLACE_CMD} '/^SUBDIR/s/ po//' ${WRKSRC}/Makefile.in
+.endif
 	@${REINPLACE_CMD} -e 's|/bin/bash|/bin/sh|g' -e 's|==|=|g' \
 		${WRKSRC}/rules/merge.sh
 
Index: x11/xkeyboard-config/pkg-plist
===================================================================
RCS file: /a/.csup/ports/x11/xkeyboard-config/pkg-plist,v
retrieving revision 1.14
diff -u -p -r1.14 pkg-plist
--- x11/xkeyboard-config/pkg-plist	22 Sep 2011 13:51:52 -0000	1.14
+++ x11/xkeyboard-config/pkg-plist	25 Sep 2011 22:51:13 -0000
@@ -372,8 +372,8 @@ share/X11/xkb/types/pc
 %%NLS%%@dirrmtry share/locale/ky/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/ky
 %%NLS%%@dirrmtry share/locale/crh/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/crh
 @exec mkdir -p /var/lib/xkb
-@dirrmtry share/locale/crh
 @dirrm share/X11/xkb/types
 @dirrm share/X11/xkb/symbols/xfree68_vndr
 @dirrm share/X11/xkb/symbols/sun_vndr