mykola/freebsd-ports
1
0
Fork 0
forked from Lainports/freebsd-ports
Code Pull requests Activity

Fix build with nls unset. the extra locale directories are created anyway.

Browse source 
While here:
- Convert WITHOUT_NLS -> NLS option
- Trim headers
- Convert gnomehack -> USES=pathfix

Approved by:	x11 (zeising)
Approved by:	portmgr (implicit)
This commit is contained in:
Baptiste Daroussin 2013-04-04 13:08:21 +00:00
parent eb643638fb
commit cbdcb47c0b
2 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
x11/xkeyboard-config/Makefile
View file

@ -1,9 +1,5 @@
# New ports collection makefile for: xkeyboard-config
# Date Created: Dec 20 2006
# Whom: Florent Thoumie <flz@FreeBSD.org>
#
# Created by: Florent Thoumie <flz@FreeBSD.org>
# $FreeBSD$
#
PORTNAME= xkeyboard-config
PORTVERSION= 2.5.1
@ -18,9 +14,10 @@ BUILD_DEPENDS= xkbcomp:${PORTSDIR}/x11/xkbcomp \
xsltproc:${PORTSDIR}/textproc/libxslt
XORG_CAT= data
USES= pathfix
USE_BZIP2= yes
USE_GMAKE= yes
USE_GNOME= intlhack gnomehack
USE_GNOME= intlhack
USE_PERL5_BUILD=yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-xkb-base=${PREFIX}/share/X11/xkb \
@ -30,16 +27,18 @@ LDFLAGS+= -L${LOCALBASE}/lib
MAN7= xkeyboard-config.7
.if defined(WITHOUT_NLS)
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MNLS}
USE_ICONV= yes
USE_GETTEXT= yes
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+= --disable-nls
CONFIGURE_ENV+= MSGFMT="/bin/echo '(GNU '" \
XGETTEXT="/bin/echo '(GNU '" \
MSGMERGE="/bin/echo '(GNU '"
PLIST_SUB+= NLS="@comment "
.else
USE_ICONV= yes
USE_GETTEXT= yes
PLIST_SUB+= NLS=""
.endif
post-patch:

10
x11/xkeyboard-config/pkg-plist
View file

@ -366,11 +366,11 @@ share/X11/xkb/types/pc
%%NLS%%share/locale/vi/LC_MESSAGES/xkeyboard-config.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/xkeyboard-config.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/xkeyboard-config.mo
%%NLS%%@dirrmtry share/locale/rw/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/rw
%%NLS%%@dirrmtry share/locale/ky/LC_MESSAGES
%%NLS%%@dirrmtry share/locale/ky
%%NLS%%@dirrmtry share/locale/crh/LC_MESSAGES
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
@dirrmtry share/locale/ky/LC_MESSAGES
@dirrmtry share/locale/ky
@dirrmtry share/locale/crh/LC_MESSAGES
@exec mkdir -p /var/lib/xkb
@dirrmtry share/locale/crh
@dirrm share/X11/xkb/types