diff options
| author | oliver <oliver@FreeBSD.org> | 2009-12-03 00:32:36 +0800 |
|---|---|---|
| committer | oliver <oliver@FreeBSD.org> | 2009-12-03 00:32:36 +0800 |
| commit | a4254c18e6ebafc8b039bfb20f8378b84ee008b1 (patch) | |
| tree | 9437be639c88dbd6cc70339d7608f91eba9e75d2 /sysutils | |
| parent | a04f685ee6bfd8f674aec7cf129c9e210e46ff0e (diff) | |
| download | freebsd-ports-gnome-a4254c18e6ebafc8b039bfb20f8378b84ee008b1.tar.gz freebsd-ports-gnome-a4254c18e6ebafc8b039bfb20f8378b84ee008b1.tar.zst freebsd-ports-gnome-a4254c18e6ebafc8b039bfb20f8378b84ee008b1.zip | |
- add optional xklavier support (default off)
- fix compilation if xklavier support is enabled (PR)
- bump portrevision
PR: 141035
Submitted by: Ashish SHUKLA <wahjava@gmail.com>
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/xfce4-settings/Makefile | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/sysutils/xfce4-settings/Makefile b/sysutils/xfce4-settings/Makefile index e3427117c151..0035ee8ddca1 100644 --- a/sysutils/xfce4-settings/Makefile +++ b/sysutils/xfce4-settings/Makefile @@ -7,7 +7,7 @@ PORTNAME= xfce4-settings PORTVERSION= 4.6.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils xfce MASTER_SITES= ${MASTER_SITE_XFCE} DIST_SUBDIR= xfce4 @@ -19,6 +19,9 @@ BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-X RUN_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser LIB_DEPENDS= wnck-1.22:${PORTSDIR}/x11-toolkits/libwnck +OPTIONS= XKLAVIER "Keyboard layout settings" off + +CONFIGURE_ARGS= --disable-sound-settings GNU_CONFIGURE= yes INSTALLS_ICONS= yes USE_BZIP2= yes @@ -27,9 +30,21 @@ USE_GMAKE= yes USE_GNOME= gnometarget gtk20 intltool intlhack pkgconfig USE_XFCE= configenv libexo libgui libutil xfconf +.include <bsd.port.pre.mk> + +.if defined(WITH_XKLAVIER) +LIB_DEPENDS+= xklavier.12:${PORTSDIR}/x11/libxklavier +CONFIGURE_ARGS+=--enable-libxklavier +.else +CONFIGURE_ARGS+=--disable-libxklavier +.endif + post-patch: # until xfce4-icon-theme is back we rely on Tango @${REINPLACE_CMD} -e 's|Rodent|Tango|g' \ ${WRKSRC}/dialogs/appearance-settings/main.c \ ${WRKSRC}/xfsettingsd/xsettings.xml -.include <bsd.port.mk> + @${REINPLACE_CMD} -e 's|xkl_config_registry_load (settings->priv->xkl_registry)|xkl_config_registry_load (settings->priv->xkl_registry, FALSE)|g' \ + ${WRKSRC}/dialogs/keyboard-settings/xfce-keyboard-settings.c + +.include <bsd.port.post.mk> |