diff options
| author | zeising <zeising@058c260c-8361-11dd-a0ac-aa2bafec7d09> | 2013-04-09 00:21:56 +0800 |
|---|---|---|
| committer | zeising <zeising@058c260c-8361-11dd-a0ac-aa2bafec7d09> | 2013-04-09 00:21:56 +0800 |
| commit | d112df24d3d0a32218d0bd89958336ff0a746fd7 (patch) | |
| tree | b0dd940bab1f7e60ccff1fb59fdbc52484b55aac | |
| parent | a21bfea9246012c22cb3fae33757d1be2559f9a8 (diff) | |
| download | xorg-devel-ports-d112df24d3d0a32218d0bd89958336ff0a746fd7.tar.gz xorg-devel-ports-d112df24d3d0a32218d0bd89958336ff0a746fd7.tar.zst xorg-devel-ports-d112df24d3d0a32218d0bd89958336ff0a746fd7.zip | |
Merge r790:
Convert to optionsNG
Try to fix plist
Submitted by: bapt (from regular ports repo, adapted by me)
Obtained from: regular ports repo (adapted from)
git-svn-id: https://trillian.chruetertee.ch/svn/ports/branches/xorg-7.7@794 058c260c-8361-11dd-a0ac-aa2bafec7d09
| -rw-r--r-- | x11/xkeyboard-config/Makefile | 13 | ||||
| -rw-r--r-- | x11/xkeyboard-config/pkg-plist | 3 |
2 files changed, 9 insertions, 7 deletions
diff --git a/x11/xkeyboard-config/Makefile b/x11/xkeyboard-config/Makefile index ecdc3b5..b37eb46 100644 --- a/x11/xkeyboard-config/Makefile +++ b/x11/xkeyboard-config/Makefile @@ -29,16 +29,15 @@ LDFLAGS+= -L${LOCALBASE}/lib MAN7= xkeyboard-config.7 -.if defined(WITHOUT_NLS) -CONFIGURE_ARGS+= --disable-nls -CONFIGURE_ENV+= MSGFMT="/bin/echo '(GNU '" \ - XGETTEXT="/bin/echo '(GNU '" \ - MSGMERGE="/bin/echo '(GNU '" -PLIST_SUB+= NLS="@comment " -.else +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MNLS} USE_ICONV= yes USE_GETTEXT= yes PLIST_SUB+= NLS="" +.else +CONFIGURE_ARGS+=--disable-nls +PLIST_SUB+= NLS="@comment " .endif post-patch: diff --git a/x11/xkeyboard-config/pkg-plist b/x11/xkeyboard-config/pkg-plist index 8d9e129..6529344 100644 --- a/x11/xkeyboard-config/pkg-plist +++ b/x11/xkeyboard-config/pkg-plist @@ -345,3 +345,6 @@ share/X11/xkb/types/pc @dirrm share/X11/xkb/compat @dirrm share/X11/xkb @dirrmtry share/X11 +@cwd / +@dirrmtry var/lib/xkb +@dirrmtry var/lib |