Date: Sat, 7 Jan 2012 21:28:55 +0100 (CET) From: Nikola Lecic <nikola.lecic@anthesphoria.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/163901: [Maintainer] textproc/ibus-table: Update to 1.3.9.20110827, adjust for ibus-1.4.0 Message-ID: <201201072028.q07KStkW089125@anthesphoria.net> Resent-Message-ID: <201201072150.q07Lo7ds005945@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 163901
>Category: ports
>Synopsis: [Maintainer] textproc/ibus-table: Update to 1.3.9.20110827, adjust for ibus-1.4.0
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sat Jan 07 21:50:07 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Nikola Lecic
>Release: FreeBSD 8.0-STABLE amd64
>Organization:
>Environment:
System: FreeBSD tundra 8.0-STABLE FreeBSD 8.0-STABLE #0: Fri Feb 26 10:23:40 UTC 2010 nikola@tundra...:/usr/obj/usr/src/sys/GENERIC amd64
>Description:
This PR depends on ports/163791 (update ibus to 1.4.0).
A note to the committer:
This version of the port depends on sqlite3 compiled with extensions
enabled (WITH_EXTENSIONS). This option is turned on by default, but it
wasn't so in the past so there should be users with it still turned
off. So I guess some attention is needed here. I saw 3 options:
1. to create a slave port;
2. to check ${PORT_DBDIR}/sqlite3/options
3. to check objdump -t libsqlite3.so
I thinks it's not worth creating the slave port. The package will be
normally built because of new default options for sqlite3. I saw no
port grepping options in ${PORT_DBDIR} of other ports, so I decided
to implement (3).
If this check is not necessary, please simply delete pre-configure
section. If this has to be dome differently, please let me know.
Log:
* Update textproc/ibus-table to 1.3.9.20110827.
* Adjust for ibus-1.4.0.
* Check whether sqlite3 is compiled WITH_EXTENSIONS.
* New file added: files/patch-engine-table.xml.in.in.
* Minor portlint fixes.
>How-To-Repeat:
>Fix:
--- ibus-table-1.3.9.20110827.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/textproc/ibus-table/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- Makefile 4 Aug 2010 13:47:32 -0000 1.6
+++ Makefile 7 Jan 2012 21:50:29 -0000
@@ -6,7 +6,7 @@
#
PORTNAME= ibus-table
-PORTVERSION= 1.3.0.20100621
+PORTVERSION= 1.3.9.20110827
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \
http://anthesphoria.net/FreeBSD/ports/distfiles/
@@ -15,8 +15,8 @@
COMMENT= Table based input method framework for IBus
BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3
-LIB_DEPENDS= ibus.2:${PORTSDIR}/textproc/ibus
-RUN_DEPENDS= ${BUILD_DEPENDS}
+LIB_DEPENDS= ibus-1.0.400:${PORTSDIR}/textproc/ibus
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3
USE_PYTHON= 2.5+
USE_GNOME= pkgconfig pygtk2
@@ -38,6 +38,16 @@
@${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
${WRKSRC}/Makefile.in
@${REINPLACE_CMD} -e "s|/usr/|${PREFIX}/|g" ${WRKSRC}/engine/*.py
- @${CHMOD} ${BINMODE} ${WRKSRC}/install-sh
+
+pre-configure:
+ @(if [ -e ${LOCALBASE}/lib/libsqlite3.so -a \
+ -z `/usr/bin/objdump -t ${LOCALBASE}/lib/libsqlite3.so \
+ | ${GREP} loadExt > /dev/null 2>&1 && ${ECHO_CMD} 'yes' || \
+ ${TRUE}` ] ; then \
+ ${ECHO_MSG} "==> ${PKGNAME} needs sqlite3 with extensions" ; \
+ ${ECHO_MSG} "==> support. Please rebuild databases/sqlite3" ; \
+ ${ECHO_MSG} "==> with WITH_EXTENSION." ; \
+ exit 1; \
+ fi)
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/textproc/ibus-table/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo 3 Jul 2011 14:38:54 -0000 1.3
+++ distinfo 6 Jan 2012 10:34:52 -0000
@@ -1,2 +1,2 @@
-SHA256 (ibus-table-1.3.0.20100621.tar.gz) = c2c9604082bd3c50e76c2cd8494855485845147a6b9fe05d4fa1c4a2f6fd3324
-SIZE (ibus-table-1.3.0.20100621.tar.gz) = 421845
+SHA256 (ibus-table-1.3.9.20110827.tar.gz) = 99c5eee5175233d8ee5678d3a16ef3ed76c029eaeb9792d811345a02652f0401
+SIZE (ibus-table-1.3.9.20110827.tar.gz) = 428810
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/textproc/ibus-table/pkg-plist,v
retrieving revision 1.2
diff -u -r1.2 pkg-plist
--- pkg-plist 4 Aug 2010 13:47:32 -0000 1.2
+++ pkg-plist 6 Jan 2012 15:29:37 -0000
@@ -34,7 +34,7 @@
%%DATADIR%%/icons/half-letter.svg
%%DATADIR%%/icons/half-punct.svg
%%DATADIR%%/icons/ibus-table.svg
-%%DATADIR%%/icons/latex.svg
+%%DATADIR%%/icons/latex.png
%%DATADIR%%/icons/ncommit.svg
%%DATADIR%%/icons/onechar.svg
%%DATADIR%%/icons/phrase.svg
Index: files/patch-engine-table.xml.in.in
===================================================================
RCS file: files/patch-engine-table.xml.in.in
diff -N files/patch-engine-table.xml.in.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-engine-table.xml.in.in 6 Jan 2012 15:55:35 -0000
@@ -0,0 +1,10 @@
+--- engine/table.xml.in.in 2011-08-26 20:30:42.000000000 +0400
++++ engine/table.xml.in.in 2012-01-06 18:52:28.000000000 +0300
+@@ -11,6 +11,7 @@
+ <textdomain>ibus-table</textdomain>
+ <observed-paths>
+ <path>${pkgdatadir}/tables/</path>
++ <path>~/.ibus/tables/</path>
+ </observed-paths>
+ <engines exec='${libexecdir}/ibus-engine-table --xml'/>
+ </component>
--- ibus-table-1.3.9.20110827.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201201072028.q07KStkW089125>