aboutsummaryrefslogtreecommitdiff
path: root/textproc/ibus
diff options
context:
space:
mode:
authorTijl Coosemans <tijl@FreeBSD.org>2014-07-03 13:56:31 +0000
committerTijl Coosemans <tijl@FreeBSD.org>2014-07-03 13:56:31 +0000
commit5cb5032cd8bda1b0c16de236c678575291221f71 (patch)
treeea5892cda107dd1c1a33036b404b97bc47332610 /textproc/ibus
parent0f8ea07ded8161fec271344b3a9614e850199021 (diff)
downloadports-5cb5032cd8bda1b0c16de236c678575291221f71.tar.gz
ports-5cb5032cd8bda1b0c16de236c678575291221f71.zip
Notes
Diffstat (limited to 'textproc/ibus')
-rw-r--r--textproc/ibus/Makefile22
-rw-r--r--textproc/ibus/files/patch-po_Makefile.in.in11
-rw-r--r--textproc/ibus/pkg-plist112
3 files changed, 63 insertions, 82 deletions
diff --git a/textproc/ibus/Makefile b/textproc/ibus/Makefile
index 0ea6cb67d845..ae381dfe58d1 100644
--- a/textproc/ibus/Makefile
+++ b/textproc/ibus/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ibus
PORTVERSION= 1.5.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
@@ -22,16 +22,18 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.83.0:${PORTSDIR}/devel/py-dbus \
setxkbmap:${PORTSDIR}/x11/setxkbmap
LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
+USES= compiler gmake libtool pathfix pkgconfig
USE_GNOME= pygobject3
USE_PYTHON= yes
-
USE_LDCONFIG= yes
-USES= gmake pkgconfig compiler
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
-CONFIGURE_ARGS+= --disable-tests
+INSTALL_TARGET= install-strip
+CONFIGURE_ARGS= --disable-tests
+CPPFLAGS+= -I${LOCALBASE}/include
+LIBS+= -L${LOCALBASE}/lib
-OPTIONS_DEFINE= ISOCODES NLS GTK2 GTK3 VALA GINTRO PYTHON_LIB DOC XIM ENGINE
+OPTIONS_DEFINE= ISOCODES NLS GTK2 GTK3 VALA GINTRO PYTHON_LIB DOCS XIM ENGINE
OPTIONS_RADIO= CONFIG
OPTIONS_RADIO_CONFIG= GCONF DCONF
OPTIONS_DEFAULT= ISOCODES NLS GTK2 GTK3 VALA GINTRO PYTHON_LIB DCONF XIM ENGINE
@@ -44,12 +46,9 @@ GINTRO_DESC= Install GObject Introspection data
PYTHON_LIB_DESC= Install ibus Python libraries
GCONF_DESC= Use GConf for configuration
DCONF_DESC= Use dconf for configuration
-DOC_DESC= Install HTML documents
XIM_DESC= Install XIM server
ENGINE_DESC= Install ibus simple engine
-.include <bsd.port.options.mk>
-
.include <bsd.port.pre.mk>
.if ${COMPILER_TYPE} == gcc && ${COMPILER_VERSION} < 46
@@ -140,12 +139,10 @@ CONFIGURE_ARGS+= --disable-dconf
PLIST_SUB+= DCONF="@comment "
.endif
-.if ${PORT_OPTIONS:MDOC}
-CONFIGURE_ARGS+= --enable-gtk-doc-html
-PLIST_SUB+= DOC=""
+.if ${PORT_OPTIONS:MDOCS}
+CONFIGURE_ARGS+= --enable-gtk-doc-html --with-html-dir=${PREFIX}/share/doc
.else
CONFIGURE_ARGS+= --disable-gtk-doc-html
-PLIST_SUB+= DOC="@comment "
.endif
.if ${PORT_OPTIONS:MXIM}
@@ -176,7 +173,6 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-xigrabkeycode
.endif
post-patch:
- @${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|' ${WRKSRC}/Makefile.in
@${REINPLACE_CMD} -e 's|/var/lib/dbus|/var/db/dbus|g' ${WRKSRC}/src/ibusshare.c
post-install:
diff --git a/textproc/ibus/files/patch-po_Makefile.in.in b/textproc/ibus/files/patch-po_Makefile.in.in
deleted file mode 100644
index f46b94abb208..000000000000
--- a/textproc/ibus/files/patch-po_Makefile.in.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- po/Makefile.in.in.orig 2007-09-25 01:35:53.000000000 +0900
-+++ po/Makefile.in.in 2007-09-25 01:36:59.000000000 +0900
-@@ -33,7 +33,7 @@
- datadir = @datadir@
- datarootdir = @datarootdir@
- libdir = @libdir@
--DATADIRNAME = @DATADIRNAME@
-+DATADIRNAME = share
- itlocaledir = $(prefix)/$(DATADIRNAME)/locale
- subdir = po
- install_sh = @install_sh@
diff --git a/textproc/ibus/pkg-plist b/textproc/ibus/pkg-plist
index e9e899573ae1..dd05f8ef57ed 100644
--- a/textproc/ibus/pkg-plist
+++ b/textproc/ibus/pkg-plist
@@ -42,18 +42,16 @@ include/ibus-1.0/ibusversion.h
include/ibus-1.0/ibusxml.h
include/ibus-1.0/ibuskeysyms-compat.h
include/ibus-1.0/ibusenginesimple.h
-%%GTK2%%lib/gtk-2.0/2.10.0/immodules/im-ibus.la
%%GTK2%%lib/gtk-2.0/2.10.0/immodules/im-ibus.so
%%GINTRO%%lib/girepository-1.0/IBus-1.0.typelib
%%GINTRO%%share/gir-1.0/IBus-1.0.gir
%%GINTRO%%%%PYTHON_SITELIBDIR%%/gi/overrides/IBus.py
%%GINTRO%%%%PYTHON_SITELIBDIR%%/gi/overrides/IBus.pyc
%%GINTRO%%%%PYTHON_SITELIBDIR%%/gi/overrides/IBus.pyo
-%%GTK3%%lib/gtk-3.0/3.0.0/immodules/im-ibus.la
%%GTK3%%lib/gtk-3.0/3.0.0/immodules/im-ibus.so
-lib/libibus-1.0.la
lib/libibus-1.0.so
lib/libibus-1.0.so.5
+lib/libibus-1.0.so.5.0.505
%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/__init__.py
%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/__init__.pyc
%%PYTHON_LIB%%%%PYTHON_SITELIBDIR%%/ibus/__init__.pyo
@@ -165,61 +163,61 @@ libdata/pkgconfig/ibus-1.0.pc
%%GCONF%%libexec/ibus-gconf
%%DCONF%%libexec/ibus-dconf
%%ENGINE%%libexec/ibus-engine-simple
-share/applications/ibus-setup.desktop
-%%DOC%%share/gtk-doc/html/ibus/IBusAttrList.html
-%%DOC%%share/gtk-doc/html/ibus/IBusAttribute.html
-%%DOC%%share/gtk-doc/html/ibus/IBusBus.html
-%%DOC%%share/gtk-doc/html/ibus/IBusComponent.html
-%%DOC%%share/gtk-doc/html/ibus/IBusConfig.html
-%%DOC%%share/gtk-doc/html/ibus/IBusConfigService.html
-%%DOC%%share/gtk-doc/html/ibus/IBusEngine.html
-%%DOC%%share/gtk-doc/html/ibus/IBusEngineDesc.html
-%%DOC%%share/gtk-doc/html/ibus/IBusFactory.html
-%%DOC%%share/gtk-doc/html/ibus/IBusHotkeyProfile.html
-%%DOC%%share/gtk-doc/html/ibus/IBusInputContext.html
-%%DOC%%share/gtk-doc/html/ibus/IBusKeymap.html
-%%DOC%%share/gtk-doc/html/ibus/IBusLookupTable.html
-%%DOC%%share/gtk-doc/html/ibus/IBusObject.html
-%%DOC%%share/gtk-doc/html/ibus/IBusObservedPath.html
-%%DOC%%share/gtk-doc/html/ibus/IBusPanelService.html
-%%DOC%%share/gtk-doc/html/ibus/IBusPropList.html
-%%DOC%%share/gtk-doc/html/ibus/IBusProperty.html
-%%DOC%%share/gtk-doc/html/ibus/IBusProxy.html
-%%DOC%%share/gtk-doc/html/ibus/IBusRegistry.html
-%%DOC%%share/gtk-doc/html/ibus/IBusSerializable.html
-%%DOC%%share/gtk-doc/html/ibus/IBusService.html
-%%DOC%%share/gtk-doc/html/ibus/IBusText.html
-%%DOC%%share/gtk-doc/html/ibus/ch01.html
-%%DOC%%share/gtk-doc/html/ibus/ch02.html
-%%DOC%%share/gtk-doc/html/ibus/ch03.html
-%%DOC%%share/gtk-doc/html/ibus/ch04.html
-%%DOC%%share/gtk-doc/html/ibus/ch05.html
-%%DOC%%share/gtk-doc/html/ibus/ch06.html
-%%DOC%%share/gtk-doc/html/ibus/home.png
-%%DOC%%share/gtk-doc/html/ibus/ibus-IBusKeysyms.html
-%%DOC%%share/gtk-doc/html/ibus/ibus-ibusdebug.html
-%%DOC%%share/gtk-doc/html/ibus/ibus-ibuserror.html
-%%DOC%%share/gtk-doc/html/ibus/ibus-ibusshare.html
-%%DOC%%share/gtk-doc/html/ibus/ibus-ibustypes.html
-%%DOC%%share/gtk-doc/html/ibus/ibus-ibusversion.html
-%%DOC%%share/gtk-doc/html/ibus/ibus-ibusxml.html
-%%DOC%%share/gtk-doc/html/ibus/ibus-IBusEngineSimple.html
-%%DOC%%share/gtk-doc/html/ibus/ibus-ibuskeys.html
-%%DOC%%share/gtk-doc/html/ibus/ibus-ibuskeysyms-compat.html
-%%DOC%%share/gtk-doc/html/ibus/ibus-ibusutil.html
-%%DOC%%share/gtk-doc/html/ibus/annotation-glossary.html
-%%DOC%%share/gtk-doc/html/ibus/api-index-deprecated.html
-%%DOC%%share/gtk-doc/html/ibus/api-index-full.html
-%%DOC%%share/gtk-doc/html/ibus/ibus.devhelp2
-%%DOC%%share/gtk-doc/html/ibus/index.html
-%%DOC%%share/gtk-doc/html/ibus/index.sgml
-%%DOC%%share/gtk-doc/html/ibus/left.png
-%%DOC%%share/gtk-doc/html/ibus/right.png
-%%DOC%%share/gtk-doc/html/ibus/style.css
-%%DOC%%share/gtk-doc/html/ibus/up.png
man/man1/ibus-daemon.1.gz
man/man1/ibus-setup.1.gz
man/man1/ibus.1.gz
+share/applications/ibus-setup.desktop
+%%PORTDOCS%%%%DOCSDIR%%/IBusAttrList.html
+%%PORTDOCS%%%%DOCSDIR%%/IBusAttribute.html
+%%PORTDOCS%%%%DOCSDIR%%/IBusBus.html
+%%PORTDOCS%%%%DOCSDIR%%/IBusComponent.html
+%%PORTDOCS%%%%DOCSDIR%%/IBusConfig.html
+%%PORTDOCS%%%%DOCSDIR%%/IBusConfigService.html
+%%PORTDOCS%%%%DOCSDIR%%/IBusEngine.html
+%%PORTDOCS%%%%DOCSDIR%%/IBusEngineDesc.html
+%%PORTDOCS%%%%DOCSDIR%%/IBusFactory.html
+%%PORTDOCS%%%%DOCSDIR%%/IBusHotkeyProfile.html
+%%PORTDOCS%%%%DOCSDIR%%/IBusInputContext.html
+%%PORTDOCS%%%%DOCSDIR%%/IBusKeymap.html
+%%PORTDOCS%%%%DOCSDIR%%/IBusLookupTable.html
+%%PORTDOCS%%%%DOCSDIR%%/IBusObject.html
+%%PORTDOCS%%%%DOCSDIR%%/IBusObservedPath.html
+%%PORTDOCS%%%%DOCSDIR%%/IBusPanelService.html
+%%PORTDOCS%%%%DOCSDIR%%/IBusPropList.html
+%%PORTDOCS%%%%DOCSDIR%%/IBusProperty.html
+%%PORTDOCS%%%%DOCSDIR%%/IBusProxy.html
+%%PORTDOCS%%%%DOCSDIR%%/IBusRegistry.html
+%%PORTDOCS%%%%DOCSDIR%%/IBusSerializable.html
+%%PORTDOCS%%%%DOCSDIR%%/IBusService.html
+%%PORTDOCS%%%%DOCSDIR%%/IBusText.html
+%%PORTDOCS%%%%DOCSDIR%%/ch01.html
+%%PORTDOCS%%%%DOCSDIR%%/ch02.html
+%%PORTDOCS%%%%DOCSDIR%%/ch03.html
+%%PORTDOCS%%%%DOCSDIR%%/ch04.html
+%%PORTDOCS%%%%DOCSDIR%%/ch05.html
+%%PORTDOCS%%%%DOCSDIR%%/ch06.html
+%%PORTDOCS%%%%DOCSDIR%%/home.png
+%%PORTDOCS%%%%DOCSDIR%%/ibus-IBusKeysyms.html
+%%PORTDOCS%%%%DOCSDIR%%/ibus-ibusdebug.html
+%%PORTDOCS%%%%DOCSDIR%%/ibus-ibuserror.html
+%%PORTDOCS%%%%DOCSDIR%%/ibus-ibusshare.html
+%%PORTDOCS%%%%DOCSDIR%%/ibus-ibustypes.html
+%%PORTDOCS%%%%DOCSDIR%%/ibus-ibusversion.html
+%%PORTDOCS%%%%DOCSDIR%%/ibus-ibusxml.html
+%%PORTDOCS%%%%DOCSDIR%%/ibus-IBusEngineSimple.html
+%%PORTDOCS%%%%DOCSDIR%%/ibus-ibuskeys.html
+%%PORTDOCS%%%%DOCSDIR%%/ibus-ibuskeysyms-compat.html
+%%PORTDOCS%%%%DOCSDIR%%/ibus-ibusutil.html
+%%PORTDOCS%%%%DOCSDIR%%/annotation-glossary.html
+%%PORTDOCS%%%%DOCSDIR%%/api-index-deprecated.html
+%%PORTDOCS%%%%DOCSDIR%%/api-index-full.html
+%%PORTDOCS%%%%DOCSDIR%%/ibus.devhelp2
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/index.sgml
+%%PORTDOCS%%%%DOCSDIR%%/left.png
+%%PORTDOCS%%%%DOCSDIR%%/right.png
+%%PORTDOCS%%%%DOCSDIR%%/style.css
+%%PORTDOCS%%%%DOCSDIR%%/up.png
%%GTK3%%%%DATADIR%%/component/gtkpanel.xml
%%GCONF%%%%DATADIR%%/component/gconf.xml
%%DCONF%%%%DATADIR%%/component/dconf.xml
@@ -312,9 +310,7 @@ share/bash-completion/completions/ibus.bash
@dirrmtry %%DATADIR%%/engine
%%COMPDIR%%@dirrmtry %%DATADIR%%/component
@dirrmtry %%DATADIR%%
-@dirrm share/gtk-doc/html/ibus
-@dirrmtry share/gtk-doc/html
-@dirrmtry share/gtk-doc
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
%%GINTRO%%@dirrmtry share/gir-1.0
%%PYTHON_LIB%%@dirrm %%PYTHON_SITELIBDIR%%/ibus/interface
%%PYTHON_LIB%%@dirrm %%PYTHON_SITELIBDIR%%/ibus