pkg/43872: inputmethod/uim: UPDATE to uim-1.6.0

[yamajun%ofug.net@localhost]

>Number:         43872
>Category:       pkg
>Synopsis:       inputmethod/uim: UPDATE to uim-1.6.0
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sun Sep 12 17:40:00 +0000 2010
>Originator:     YAMASHIRO, Jun
>Release:        NetBSD/amd64 5.99.38
>Organization:
Okinawa FreeBSD Users Group
>Environment:
NetBSD yamajun 5.99.38 NetBSD 5.99.38 (GENERIC) #25: Wed Aug 18 20:37:56 JST 
2010  yamajun@local:/usr/src/sys/arch/amd64/compile/GENERIC amd64
>Description:
uim-1.6.0 released in August 2010.  This is very improved release.

uim Changelog:
  - New IM uim-social-ime
  - New IM uim-ajax-ime
  - New IM uim-yahoo-jp
  - Support Wubi86 and ZhengMa tables with Generic IM
  - Improved uim-tutcode with many nice features with table style
    candidate window
  - Stable Qt4 bridge
  - Annotation system
  - Internal plugin system reorganization
  - uim-elatin enhancement
  - Japanese multiple-segment IM enhancement

>How-To-Repeat:

>Fix:
Apply this patch to pkgsrc/inputmethod/uim

# cd pkgsrc/inputmethod
# patch -p0 < /path/to/this_mail


diff -Nru uim.orig/Makefile uim/Makefile
--- uim.orig/Makefile   2010-07-05 17:13:01.000000000 +0900
+++ uim/Makefile        2010-09-01 17:30:47.000000000 +0900
@@ -3,8 +3,6 @@
 
 .include "../../inputmethod/uim/Makefile.common"
 
-PKGREVISION=           1
-
 COMMENT=               Multilingual input method library
 
 CONFLICTS+=            uim-qt4-immodule-[0-9]*
diff -Nru uim.orig/Makefile.common uim/Makefile.common
--- uim.orig/Makefile.common    2010-05-17 13:19:59.000000000 +0900
+++ uim/Makefile.common 2010-09-01 17:28:32.000000000 +0900
@@ -3,7 +3,7 @@
 # used by inputmethod/uim/Makefile
 # used by inputmethod/uim-elisp/Makefile
 
-UIM_VERSION=           1.5.7
+UIM_VERSION=           1.6.0
 DISTNAME=              uim-${UIM_VERSION}
 CATEGORIES=            inputmethod
 MASTER_SITES=          http://uim.googlecode.com/files/
diff -Nru uim.orig/PLIST uim/PLIST
--- uim.orig/PLIST      2010-08-17 10:51:05.000000000 +0900
+++ uim/PLIST   2010-09-12 19:27:00.000000000 +0900
@@ -4,6 +4,7 @@
 ${PLIST.uim-dict-gtk}bin/uim-dict-gtk
 ${PLIST.fep}bin/uim-fep
 ${PLIST.fep}bin/uim-fep-tick
+bin/uim-help
 ${PLIST.gtk}bin/uim-im-switcher-gtk
 ${PLIST.qt3}bin/uim-im-switcher-qt
 ${PLIST.qt}bin/uim-im-switcher-qt4
@@ -19,7 +20,7 @@
 ${PLIST.qt3}bin/uim-toolbar-qt
 ${PLIST.qt}bin/uim-toolbar-qt4
 ${PLIST.xim}bin/uim-xim
-include/uim/plugin.h
+include/uim/dynlib.h
 include/uim/uim-custom.h
 include/uim/uim-helper.h
 include/uim/uim-im-switcher.h
@@ -39,18 +40,24 @@
 lib/pkgconfig/uim.pc
 ${PLIST.anthy}lib/uim/plugin/libuim-anthy.la
 ${PLIST.anthy}lib/uim/plugin/libuim-anthy-utf8.la
-${PLIST.canna}lib/uim/plugin/libuim-canna.la
 lib/uim/plugin/libuim-custom-enabler.la
+${PLIST.eb}lib/uim/plugin/libuim-eb.la
 ${PLIST.editline}lib/uim/plugin/libuim-editline.la
+${PLIST.ffi}lib/uim/plugin/libuim-ffi.la
+lib/uim/plugin/libuim-fileio.la
 lib/uim/plugin/libuim-look.la
 ${PLIST.m17nlib}lib/uim/plugin/libuim-m17nlib.la
-${PLIST.prime}lib/uim/plugin/libuim-prime.la
-${PLIST.sj3}lib/uim/plugin/libuim-sj3.la
+${PLIST.openssl}lib/uim/plugin/libuim-openssl.la
+${PLIST.sqlite3}lib/uim/plugin/libuim-sqlite3.la
+lib/uim/plugin/libuim-lolevel.la
+lib/uim/plugin/libuim-process.la
 lib/uim/plugin/libuim-skk.la
+lib/uim/plugin/libuim-socket.la
 ${PLIST.wnn}lib/uim/plugin/libuim-wnn.la
 ${PLIST.gtk}libexec/uim-candwin-gtk
 ${PLIST.qt3}libexec/uim-candwin-qt
 ${PLIST.qt}libexec/uim-candwin-qt4
+libexec/uim-candwin-tbl-gtk
 libexec/uim-helper-server
 ${PLIST.gnome}libexec/uim-toolbar-applet
 ${PLIST.xim}man/man1/uim-xim.1
@@ -76,6 +83,13 @@
 ${PLIST.qt}share/locale/ja/LC_MESSAGES/uim-chardict-qt4.mo
 share/locale/ko/LC_MESSAGES/uim.mo
 share/uim/action.scm
+share/uim/ajax-ime-custom.scm
+share/uim/ajax-ime-key-custom.scm
+share/uim/ajax-ime.scm
+share/uim/annotation-dict.scm
+share/uim/annotation-eb.scm
+share/uim/annotation-filter.scm
+share/uim/annotation.scm
 share/uim/anthy-custom.scm
 share/uim/anthy-key-custom.scm
 share/uim/anthy-utf8-custom.scm
@@ -89,34 +103,48 @@
 share/uim/canna-custom.scm
 share/uim/canna-key-custom.scm
 share/uim/canna.scm
+share/uim/cannav3-socket.scm
+share/uim/composer.scm
+share/uim/ct.scm
 share/uim/custom-rt.scm
 share/uim/custom.scm
 share/uim/default.scm
 share/uim/deprecated-util.scm
+share/uim/dict-socket.scm
 share/uim/direct.scm
+share/uim/dynlib.scm
 share/uim/editline.scm
 share/uim/elatin-custom.scm
 share/uim/elatin-rules.scm
 share/uim/elatin.scm
+share/uim/event.scm
+share/uim/fileio.scm
 share/uim/generic-custom.scm
 share/uim/generic-key-custom.scm
+share/uim/generic-predict.scm
 share/uim/generic.scm
 share/uim/hangul.scm
 share/uim/hangul2.scm
 share/uim/hangul3.scm
 ${PLIST.helperdata}share/uim/helperdata/bushu.t
 ${PLIST.uim-dict-gtk}share/uim/helperdata/uim-dict-ui.xml
+share/uim/http-client.scm
+share/uim/http-server.scm
 share/uim/i18n.scm
 share/uim/ichar.scm
 share/uim/im-custom.scm
 share/uim/im-switcher.scm
 share/uim/im.scm
 share/uim/init.scm
+share/uim/input-parse.scm
 share/uim/installed-modules.scm
 share/uim/ipa-x-sampa.scm
 share/uim/iso-639-1.scm
+share/uim/japanese-act.scm
 share/uim/japanese-azik.scm
+share/uim/japanese-custom.scm
 share/uim/japanese-kana.scm
+share/uim/japanese-kzik.scm
 share/uim/japanese.scm
 share/uim/key.scm
 share/uim/latin.scm
@@ -130,15 +158,23 @@
 share/uim/lib/srfi-9.scm
 share/uim/lib/srfi-95.scm
 share/uim/lib/unittest.scm
+share/uim/light-record.scm
 share/uim/load-action.scm
 share/uim/loader.scm
+share/uim/lolevel.scm
 share/uim/look-custom.scm
 share/uim/look.scm
 share/uim/m17nlib.scm
+share/uim/match.scm
 share/uim/mana-custom.scm
 share/uim/mana-key-custom.scm
 share/uim/mana.scm
+share/uim/ng-action.scm
+share/uim/ng-key.scm
+share/uim/openssl.scm
 share/uim/pinyin-big5.scm
+share/uim/pixmaps/ajax-ime.png
+share/uim/pixmaps/ajax-ime.svg
 share/uim/pixmaps/anthy.png
 ${PLIST.anthy}share/uim/pixmaps/anthy-utf8.png
 share/uim/pixmaps/byeoru.png
@@ -146,8 +182,12 @@
 share/uim/pixmaps/canna.png
 share/uim/pixmaps/direct.png
 share/uim/pixmaps/direct.svg
+share/uim/pixmaps/direct_dark_background.png
+share/uim/pixmaps/direct_dark_background.svg
 share/uim/pixmaps/direct_input.png
 share/uim/pixmaps/direct_input.svg
+share/uim/pixmaps/direct_input_dark_background.png
+share/uim/pixmaps/direct_input_dark_background.svg
 share/uim/pixmaps/elatin.png
 share/uim/pixmaps/elatin.svg
 share/uim/pixmaps/hangul2.png
@@ -159,34 +199,66 @@
 share/uim/pixmaps/im_switcher.svg
 share/uim/pixmaps/ipa-x-sampa.png
 share/uim/pixmaps/ipa-x-sampa.svg
+share/uim/pixmaps/ja_act.png
+share/uim/pixmaps/ja_act.svg
+share/uim/pixmaps/ja_act_dark_background.png
+share/uim/pixmaps/ja_act_dark_background.svg
 share/uim/pixmaps/ja_azik.png
 share/uim/pixmaps/ja_azik.svg
+share/uim/pixmaps/ja_azik_dark_background.png
+share/uim/pixmaps/ja_azik_dark_background.svg
 share/uim/pixmaps/ja_direct.png
 share/uim/pixmaps/ja_direct.svg
+share/uim/pixmaps/ja_direct_dark_background.png
+share/uim/pixmaps/ja_direct_dark_background.svg
 share/uim/pixmaps/ja_fullwidth_alnum.png
 share/uim/pixmaps/ja_fullwidth_alnum.svg
+share/uim/pixmaps/ja_fullwidth_alnum_dark_background.png
+share/uim/pixmaps/ja_fullwidth_alnum_dark_background.svg
 share/uim/pixmaps/ja_halfkana.png
 share/uim/pixmaps/ja_halfkana.svg
+share/uim/pixmaps/ja_halfkana_dark_background.png
+share/uim/pixmaps/ja_halfkana_dark_background.svg
 share/uim/pixmaps/ja_halfwidth_alnum.png
 share/uim/pixmaps/ja_halfwidth_alnum.svg
+share/uim/pixmaps/ja_halfwidth_alnum_dark_background.png
+share/uim/pixmaps/ja_halfwidth_alnum_dark_background.svg
 share/uim/pixmaps/ja_hiragana.png
 share/uim/pixmaps/ja_hiragana.svg
+share/uim/pixmaps/ja_hiragana_dark_background.png
+share/uim/pixmaps/ja_hiragana_dark_background.svg
 share/uim/pixmaps/ja_kana.png
 share/uim/pixmaps/ja_kana.svg
+share/uim/pixmaps/ja_kana_dark_background.png
+share/uim/pixmaps/ja_kana_dark_background.svg
 share/uim/pixmaps/ja_katakana.png
 share/uim/pixmaps/ja_katakana.svg
+share/uim/pixmaps/ja_katakana_dark_background.png
+share/uim/pixmaps/ja_katakana_dark_background.svg
+share/uim/pixmaps/ja_kzik.png
+share/uim/pixmaps/ja_kzik.svg
+share/uim/pixmaps/ja_kzik_dark_background.png
+share/uim/pixmaps/ja_kzik_dark_background.svg
 share/uim/pixmaps/ja_nicola.png
 share/uim/pixmaps/ja_nicola.svg
 share/uim/pixmaps/ja_pocketbell.png
 share/uim/pixmaps/ja_pocketbell.svg
 share/uim/pixmaps/ja_romaji.png
 share/uim/pixmaps/ja_romaji.svg
+share/uim/pixmaps/ja_romaji_dark_background.png
+share/uim/pixmaps/ja_romaji_dark_background.svg
 share/uim/pixmaps/ko_direct.png
 share/uim/pixmaps/ko_direct.svg
+share/uim/pixmaps/ko_direct_dark_background.png
+share/uim/pixmaps/ko_direct_dark_background.svg
 share/uim/pixmaps/ko_hangulchar.png
 share/uim/pixmaps/ko_hangulchar.svg
+share/uim/pixmaps/ko_hangulchar_dark_background.png
+share/uim/pixmaps/ko_hangulchar_dark_background.svg
 share/uim/pixmaps/ko_hangulword.png
 share/uim/pixmaps/ko_hangulword.svg
+share/uim/pixmaps/ko_hangulword_dark_background.png
+share/uim/pixmaps/ko_hangulword_dark_background.svg
 share/uim/pixmaps/latin.png
 share/uim/pixmaps/latin.svg
 share/uim/pixmaps/look.png
@@ -196,13 +268,19 @@
 share/uim/pixmaps/null.png
 share/uim/pixmaps/off.png
 share/uim/pixmaps/off.svg
+share/uim/pixmaps/off_dark_background.png
+share/uim/pixmaps/off_dark_background.svg
 share/uim/pixmaps/on.png
 share/uim/pixmaps/on.svg
+share/uim/pixmaps/on_dark_background.png
+share/uim/pixmaps/on_dark_background.svg
 share/uim/pixmaps/pinyin-big5.png
 share/uim/pixmaps/pinyin-big5.svg
 share/uim/pixmaps/prime.png
 share/uim/pixmaps/prime_mode_application.png
 share/uim/pixmaps/prime_mode_application.svg
+share/uim/pixmaps/prime_mode_application_dark_background.png
+share/uim/pixmaps/prime_mode_application_dark_background.svg
 share/uim/pixmaps/py.png
 share/uim/pixmaps/py.svg
 share/uim/pixmaps/pyunihan.png
@@ -215,12 +293,22 @@
 share/uim/pixmaps/sj3.svg
 share/uim/pixmaps/skk.png
 share/uim/pixmaps/skk.svg
+share/uim/pixmaps/skk_dark_background.png
+share/uim/pixmaps/skk_dark_background.svg
+share/uim/pixmaps/social-ime.png
+share/uim/pixmaps/social-ime.svg
 share/uim/pixmaps/tcode.png
 share/uim/pixmaps/tcode.svg
+share/uim/pixmaps/tcode_dark_background.png
+share/uim/pixmaps/tcode_dark_background.svg
 share/uim/pixmaps/trycode.png
 share/uim/pixmaps/trycode.svg
+share/uim/pixmaps/trycode_dark_background.png
+share/uim/pixmaps/trycode_dark_background.svg
 share/uim/pixmaps/tutcode.png
 share/uim/pixmaps/tutcode.svg
+share/uim/pixmaps/tutcode_dark_background.png
+share/uim/pixmaps/tutcode_dark_background.svg
 share/uim/pixmaps/uim-dict.png
 share/uim/pixmaps/uim-dict.svg
 share/uim/pixmaps/uim-gray.png
@@ -229,14 +317,32 @@
 share/uim/pixmaps/uim-icon64.png
 share/uim/pixmaps/unknown.png
 share/uim/pixmaps/unknown.svg
+share/uim/pixmaps/unknown_dark_background.png
+share/uim/pixmaps/unknown_dark_background.svg
 share/uim/pixmaps/viqr.png
 share/uim/pixmaps/viqr.svg
+share/uim/pixmaps/wb86.png
+share/uim/pixmaps/wb86.svg
+share/uim/pixmaps/wb86_dark_background.png
+share/uim/pixmaps/wb86_dark_background.svg
 share/uim/pixmaps/wnn.png
 share/uim/pixmaps/wnn.svg
+share/uim/pixmaps/yahoo-jp.png
+share/uim/pixmaps/yahoo-jp.svg
+share/uim/pixmaps/zm.png
+share/uim/pixmaps/zm.svg
+share/uim/pixmaps/zm_dark_background.png
+share/uim/pixmaps/zm_dark_background.svg
 share/uim/plugin.scm
+share/uim/predict-custom.scm
+share/uim/predict-look-skk.scm
+share/uim/predict-look.scm
+share/uim/predict-sqlite3.scm
+share/uim/pregexp.scm
 share/uim/prime-custom.scm
 share/uim/prime-key-custom.scm
 share/uim/prime.scm
+share/uim/process.scm
 share/uim/py.scm
 share/uim/pyload.scm
 share/uim/pyunihan.scm
@@ -246,26 +352,45 @@
 share/uim/sj3-custom.scm
 share/uim/sj3-key-custom.scm
 share/uim/sj3.scm
+share/uim/sj3v2-socket.scm
 share/uim/skk-custom.scm
 share/uim/skk-dialog.scm
 share/uim/skk-editor.scm
 share/uim/skk-key-custom.scm
 share/uim/skk.scm
+share/uim/social-ime-custom.scm
+share/uim/social-ime-key-custom.scm
+share/uim/social-ime.scm
+share/uim/socket.scm
+share/uim/sqlite3.scm
+share/uim/sxml-tools.scm
+share/uim/sxpathlib.scm
+share/uim/tables/wb86.table
+share/uim/tables/zm.table
 share/uim/tcode.scm
+share/uim/trec.scm
 share/uim/trycode.scm
 share/uim/tutcode-bushudic.scm
 share/uim/tutcode-custom.scm
+share/uim/tutcode-dialog.scm
+share/uim/tutcode-editor.scm
 share/uim/tutcode-key-custom.scm
 share/uim/tutcode-kigoudic.scm
 share/uim/tutcode-rule.scm
 share/uim/tutcode.scm
+share/uim/uim-help.scm
 share/uim/uim-module-manager.scm
 share/uim/uim-sh.scm
 share/uim/ustr.scm
 share/uim/util.scm
 share/uim/viqr.scm
+share/uim/wlos.scm
 share/uim/wnn-custom.scm
 share/uim/wnn-key-custom.scm
 share/uim/wnn.scm
+share/uim/xmload.scm
+share/uim/yahoo-jp-custom.scm
+share/uim/yahoo-jp-key-custom.scm
+share/uim/yahoo-jp.scm
 share/uim/zaurus.scm
 @pkgdir lib/uim/notify
diff -Nru uim.orig/distinfo uim/distinfo
--- uim.orig/distinfo   2010-01-23 23:39:14.000000000 +0900
+++ uim/distinfo        2010-09-12 23:24:26.000000000 +0900
@@ -1,7 +1,7 @@
 $NetBSD: distinfo,v 1.16 2010/01/20 11:06:07 obache Exp $
 
-SHA1 (uim-1.5.7.tar.bz2) = fbea2590286ddc857a7824d8544cb08842f4299f
-RMD160 (uim-1.5.7.tar.bz2) = 037677cd583c2b69293fbbc1c0393756d7c7adac
-Size (uim-1.5.7.tar.bz2) = 3330555 bytes
-SHA1 (patch-ab) = 81693dd1b62bec4deb99b469a0b8e53ff11e86a8
+SHA1 (uim-1.6.0.tar.bz2) = d27f2ca8136da0702c82f0522911d06b2b8f8ea7
+RMD160 (uim-1.6.0.tar.bz2) = 14881fe9ff1af64cee1317d0b51af69294377e47
+Size (uim-1.6.0.tar.bz2) = 6154925 bytes
+SHA1 (patch-ab) = a604128aa3bb690f371feae4e2e317ff5f7641e2
 SHA1 (patch-ac) = 3b3dfd09ed84c9d228836783e18df747ecaa5791
diff -Nru uim.orig/options.mk uim/options.mk
--- uim.orig/options.mk 2010-05-17 13:19:59.000000000 +0900
+++ uim/options.mk      2010-09-12 19:27:22.000000000 +0900
@@ -1,8 +1,8 @@
 # $NetBSD: options.mk,v 1.20 2010/05/15 07:05:57 obache Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.uim
-#PKG_SUPPORTED_OPTIONS=        anthy canna eb gnome gtk m17nlib prime sj3 
uim-fep wnn xim
-PKG_SUPPORTED_OPTIONS= anthy canna eb gnome gtk m17nlib prime sj3 uim-fep xim
+#PKG_SUPPORTED_OPTIONS=        anthy canna eb ffi gnome gtk m17nlib openssl 
prime sj3 sqlite3 uim-fep wnn xim
+PKG_SUPPORTED_OPTIONS= anthy canna eb ffi gnome gtk m17nlib openssl prime sj3 
sqlite3 uim-fep xim
 PKG_OPTIONS_OPTIONAL_GROUPS=   kde qt
 PKG_OPTIONS_GROUP.kde= kde kde3
 PKG_OPTIONS_GROUP.qt=  qt qt3
@@ -22,7 +22,7 @@
 .endif
 
 PLIST_VARS+=           helperdata uim-dict-gtk fep
-PLIST_VARS+=           anthy canna gnome gtk kde kde3 m17nlib prime qt qt3 sj3 
wnn xim
+PLIST_VARS+=           anthy eb ffi gnome gtk kde kde3 m17nlib openssl qt qt3 
sqlite3 wnn xim
 
 .if !empty(PKG_OPTIONS:Mxim)
 .include "../../x11/libX11/buildlink3.mk"
@@ -68,13 +68,19 @@
 .if !empty(PKG_OPTIONS:Mcanna)
 .  include "../../inputmethod/canna-lib/buildlink3.mk"
 CONFIGURE_ARGS+=       --with-canna
-PLIST.canna=           yes
 .endif
 
 .if !empty(PKG_OPTIONS:Meb)
 .include "../../textproc/eb/buildlink3.mk"
 CONFIGURE_ARGS+=       --with-eb
 CONFIGURE_ARGS+=       --with-eb-conf=${PKG_SYSCONFDIR}/eb.conf
+PLIST.eb=              yes
+.endif
+
+.if !empty(PKG_OPTIONS:Mffi)
+.  include "../../devel/libffi/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-ffi
+PLIST.ffi=             yes
 .endif
 
 .if !empty(PKG_OPTIONS:Mgnome)
@@ -138,10 +144,15 @@
 PLIST.qt=              yes
 .endif
 
+.if !empty(PKG_OPTIONS:Mopenssl)
+.  include "../../security/openssl/buildlink3.mk"
+CONFIGURE_ARGS+=       --enable-openssl
+PLIST.openssl=         yes
+.endif
+
 .if !empty(PKG_OPTIONS:Mprime)
 .  include "../../inputmethod/prime/buildlink3.mk"
 CONFIGURE_ARGS+=       --with-prime
-PLIST.prime=           yes
 .endif
 
 .if !empty(PKG_OPTIONS:Msj3)
@@ -149,7 +160,13 @@
 CONFIGURE_ARGS+=       --with-sj3
 CONFIGURE_ARGS+=       SJ3_CFLAGS=-I${BUILDLINK_PREFIX.sj3-lib}/includes
 CONFIGURE_ARGS+=       SJ3_LIBS="-L${BUILDLINK_PREFIX.sj3-lib}/lib -lsj3lib"
-PLIST.sj3=             yes
+.endif
+
+# For input prediction
+.if !empty(PKG_OPTIONS:Msqlite3)
+.  include "../../databases/sqlite3/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-sqlite3
+PLIST.sqlite3=         yes
 .endif
 
 #.if !empty(PKG_OPTIONS:Mwnn)
diff -Nru uim.orig/patches/patch-ab uim/patches/patch-ab
--- uim.orig/patches/patch-ab   2010-01-23 23:39:14.000000000 +0900
+++ uim/patches/patch-ab        2010-09-12 23:24:00.000000000 +0900
@@ -1,15 +1,15 @@
-$NetBSD: patch-ab,v 1.2 2009/01/23 13:40:32 obache Exp $
+$NetBSD$
 
 Avoid to install of header files of sigscheme, conflict with lang/sigscheme.
 
---- sigscheme/src/Makefile.in.orig     2009-01-21 11:48:58.000000000 +0000
-+++ sigscheme/src/Makefile.in
-@@ -22,7 +22,7 @@
+--- sigscheme/Makefile.in.orig 2010-09-12 23:23:09.000000000 +0900
++++ sigscheme/Makefile.in      2010-09-12 23:23:30.000000000 +0900
+@@ -17,7 +17,7 @@
+ 
  VPATH = @srcdir@
  pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
 -pkgincludedir = $(includedir)/@PACKAGE@
 +pkgincludedir = 
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkglibexecdir = $(libexecdir)/@PACKAGE@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c