aboutsummaryrefslogtreecommitdiffstats
path: root/x11
diff options
context:
space:
mode:
authornox <nox@FreeBSD.org>2012-03-01 06:53:20 +0800
committernox <nox@FreeBSD.org>2012-03-01 06:53:20 +0800
commit3790c72a8a4e36b13124ed9d7a2f90e0d7a95e6f (patch)
tree3e6c33ad3024a7fc465a6575fa63fa380e5e58d4 /x11
parentfa7aee96ee0fe0949a92dd0377c06351d4eb9397 (diff)
downloadfreebsd-ports-gnome-3790c72a8a4e36b13124ed9d7a2f90e0d7a95e6f.tar.gz
freebsd-ports-gnome-3790c72a8a4e36b13124ed9d7a2f90e0d7a95e6f.tar.zst
freebsd-ports-gnome-3790c72a8a4e36b13124ed9d7a2f90e0d7a95e6f.zip
- Do not attempt to install gettext locales under WITHOUT_NLS.
- Do all @dirrmtry for localedir under %%NLS%% in plist. PR: ports/161021 Submitted by: h h <aakuusta@gmail.com> Approved by: x11 (kwm)
Diffstat (limited to 'x11')
-rw-r--r--x11/xkeyboard-config/Makefile3
-rw-r--r--x11/xkeyboard-config/pkg-plist2
2 files changed, 4 insertions, 1 deletions
diff --git a/x11/xkeyboard-config/Makefile b/x11/xkeyboard-config/Makefile
index b40a0c247b55..c699bd4f5cda 100644
--- a/x11/xkeyboard-config/Makefile
+++ b/x11/xkeyboard-config/Makefile
@@ -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
diff --git a/x11/xkeyboard-config/pkg-plist b/x11/xkeyboard-config/pkg-plist
index 565c5ad4a06b..e9824e6bd004 100644
--- a/x11/xkeyboard-config/pkg-plist
+++ b/x11/xkeyboard-config/pkg-plist
@@ -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