ports/161021: [patch] x11/xkeyboard-config: orphaned dirs when WITHOUT_NLS

[h h]

>Number:         161021
>Category:       ports
>Synopsis:       [patch] x11/xkeyboard-config: orphaned dirs when WITHOUT_NLS
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Sep 25 23:20:09 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     h h
>Release:        FreeBSD 9.0-BETA2 amd64
>Organization:
>Environment:
>Description:
Do not attempt to install gettext locales under WITHOUT_NLS.
And do all @dirrmtry for localedir under %%NLS%% in plist.
>How-To-Repeat:
$ export WITHOUT_NLS= PREFIX=/foo
$ make install deinstall
$ find $PREFIX ! -type d
$ mtree -f $(make -V MTREE_FILE) $PREFIX
share/locale/crh extra
share/locale/ky extra
share/locale/rw extra
$ mtree -indc -ktype -p $PREFIX | diff -uw $(make -V MTREE_FILE) -
[...]
@@ -325,6 +314,10 @@
                 LC_MESSAGES
                 ..
             ..
+            crh            
+                LC_MESSAGES    
+                ..
+            ..
             cs
                 LC_MESSAGES
                 ..
@@ -473,6 +466,10 @@
                 LC_MESSAGES
                 ..
             ..
+            ky             
+                LC_MESSAGES    
+                ..
+            ..
             li
                 LC_MESSAGES
                 ..
@@ -557,6 +554,10 @@
                 LC_MESSAGES
                 ..
             ..
+            rw             
+                LC_MESSAGES    
+                ..
+            ..
             sk
                 LC_MESSAGES
                 ..

>Fix:
--- a.diff begins here ---
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
- at dirrmtry share/locale/crh
 @dirrm share/X11/xkb/types
 @dirrm share/X11/xkb/symbols/xfree68_vndr
 @dirrm share/X11/xkb/symbols/sun_vndr
--- a.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted: