diff options
Diffstat (limited to 'textproc')
71 files changed, 309 insertions, 180 deletions
diff --git a/textproc/Makefile b/textproc/Makefile index ea1e5af14694..20ef83c5a2d7 100644 --- a/textproc/Makefile +++ b/textproc/Makefile @@ -498,8 +498,8 @@ SUBDIR += mxml SUBDIR += mythes SUBDIR += nb-aspell - SUBDIR += nerdlog SUBDIR += nds-aspell + SUBDIR += nerdlog SUBDIR += nl-aspell SUBDIR += nl-hunspell SUBDIR += nl-hyphen @@ -1321,6 +1321,7 @@ SUBDIR += py-awesome-slugify SUBDIR += py-backrefs SUBDIR += py-bibtexparser + SUBDIR += py-bistring SUBDIR += py-bracex SUBDIR += py-cchardet SUBDIR += py-chameleon @@ -1808,6 +1809,7 @@ SUBDIR += rubygem-elasticsearch-api SUBDIR += rubygem-elasticsearch-api-gitlab SUBDIR += rubygem-elasticsearch-api7 + SUBDIR += rubygem-elasticsearch-api8 SUBDIR += rubygem-elasticsearch-dsl SUBDIR += rubygem-elasticsearch-gitlab SUBDIR += rubygem-elasticsearch-model @@ -1819,6 +1821,7 @@ SUBDIR += rubygem-elasticsearch-transport-gitlab SUBDIR += rubygem-elasticsearch-xpack SUBDIR += rubygem-elasticsearch7 + SUBDIR += rubygem-elasticsearch8 SUBDIR += rubygem-emot SUBDIR += rubygem-escape_utils SUBDIR += rubygem-extended-markdown-filter diff --git a/textproc/codesearch/Makefile b/textproc/codesearch/Makefile index 0ee4589ee2b8..2297a64e37a2 100644 --- a/textproc/codesearch/Makefile +++ b/textproc/codesearch/Makefile @@ -1,25 +1,22 @@ PORTNAME= codesearch DISTVERSIONPREFIX= v -DISTVERSION= 1.1.0 -PORTREVISION= 24 +DISTVERSION= 1.3.0-rc.1 CATEGORIES= textproc -MAINTAINER= eborisch@gmail.com +MAINTAINER= fuz@FreeBSD.org COMMENT= Fast (indexed) text search tool from Google WWW= https://github.com/google/codesearch LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -USES= go +USES= go:modules,1.23 -USE_GITHUB= yes -GH_ACCOUNT= google - -GO_PKGNAME= github.com/google/codesearch +GO_MODULE= github.com/google/codesearch GO_TARGET= ./cmd/cgrep \ ./cmd/cindex \ - ./cmd/csearch + ./cmd/csearch \ + ./cmd/csweb CONFLICTS_INSTALL= hs-cgrep diff --git a/textproc/codesearch/distinfo b/textproc/codesearch/distinfo index a1639aa72c77..5d93e667f468 100644 --- a/textproc/codesearch/distinfo +++ b/textproc/codesearch/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1578920429 -SHA256 (google-codesearch-v1.1.0_GH0.tar.gz) = b177021d1da1ddfc333fcbfc679eadd62c8677a6ae6119f25c4ad6b912bcdd7e -SIZE (google-codesearch-v1.1.0_GH0.tar.gz) = 34076 +TIMESTAMP = 1746484009 +SHA256 (go/textproc_codesearch/codesearch-v1.3.0-rc.1/v1.3.0-rc.1.mod) = 6d44cd220a4066e0b61021d3d0bc7bcb431db29312e5b2f1160a692b8d07574f +SIZE (go/textproc_codesearch/codesearch-v1.3.0-rc.1/v1.3.0-rc.1.mod) = 45 +SHA256 (go/textproc_codesearch/codesearch-v1.3.0-rc.1/v1.3.0-rc.1.zip) = 697c29ada1133f2407209b1ae94579002b7fe7d043a31e3c5e7492653e0e9429 +SIZE (go/textproc_codesearch/codesearch-v1.3.0-rc.1/v1.3.0-rc.1.zip) = 64308 diff --git a/textproc/fzf/Makefile b/textproc/fzf/Makefile index 2f1bc8578a87..81193ac27c5c 100644 --- a/textproc/fzf/Makefile +++ b/textproc/fzf/Makefile @@ -1,6 +1,6 @@ PORTNAME= fzf DISTVERSIONPREFIX= v -DISTVERSION= 0.61.2 +DISTVERSION= 0.62.0 CATEGORIES= textproc MASTER_SITES= https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${DISTVERSIONFULL}/:gomod DISTFILES= go.mod:gomod @@ -21,7 +21,7 @@ GH_PROJECT= fzf GO_MODULE= github.com/junegunn/fzf GO_BUILDFLAGS= -ldflags="-X main.version=${DISTVERSION} -X main.revision=${COMMIT_ID} -s -w" -COMMIT_ID= 90ad1b7 +COMMIT_ID= d226d84 PLIST_FILES= bin/fzf share/man/man1/fzf.1.gz diff --git a/textproc/fzf/distinfo b/textproc/fzf/distinfo index 3c60274ecc1b..2b56ac886d08 100644 --- a/textproc/fzf/distinfo +++ b/textproc/fzf/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1747219243 -SHA256 (go/textproc_fzf/junegunn-fzf-v0.61.2_GH0/go.mod) = d28136ddcb65827d87be980ad5387e4aeee3f01edcb3f0c74aa031b895ae4f55 -SIZE (go/textproc_fzf/junegunn-fzf-v0.61.2_GH0/go.mod) = 527 -SHA256 (go/textproc_fzf/junegunn-fzf-v0.61.2_GH0/junegunn-fzf-v0.61.2_GH0.tar.gz) = 15a2d8b9bcd9cf85219f02f3cf750c45acd3d5901ce69a7dcdb9db3e12f36a90 -SIZE (go/textproc_fzf/junegunn-fzf-v0.61.2_GH0/junegunn-fzf-v0.61.2_GH0.tar.gz) = 331925 +TIMESTAMP = 1747596554 +SHA256 (go/textproc_fzf/junegunn-fzf-v0.62.0_GH0/go.mod) = d28136ddcb65827d87be980ad5387e4aeee3f01edcb3f0c74aa031b895ae4f55 +SIZE (go/textproc_fzf/junegunn-fzf-v0.62.0_GH0/go.mod) = 527 +SHA256 (go/textproc_fzf/junegunn-fzf-v0.62.0_GH0/junegunn-fzf-v0.62.0_GH0.tar.gz) = e5beae86a3d026b2c2cfc165715d45b831b9f337a9e96f711ba3bc3d15e50900 +SIZE (go/textproc_fzf/junegunn-fzf-v0.62.0_GH0/junegunn-fzf-v0.62.0_GH0.tar.gz) = 333078 diff --git a/textproc/goldendict-ng/Makefile b/textproc/goldendict-ng/Makefile index 42b20d1bb43e..a8ca6b9c82ba 100644 --- a/textproc/goldendict-ng/Makefile +++ b/textproc/goldendict-ng/Makefile @@ -1,6 +1,7 @@ PORTNAME= goldendict-ng DISTVERSIONPREFIX= v DISTVERSION= 25.05.0 +PORTREVISION= 1 CATEGORIES= textproc MAINTAINER= mew14930xvi@inbox.lv diff --git a/textproc/p5-Lingua-Ispell/Makefile b/textproc/p5-Lingua-Ispell/Makefile index 5a9551a6e2ef..b2e4837a4af2 100644 --- a/textproc/p5-Lingua-Ispell/Makefile +++ b/textproc/p5-Lingua-Ispell/Makefile @@ -19,7 +19,6 @@ USES= perl5 USE_PERL5= configure NO_ARCH= yes -REINPLACE_ARGS= -i '' post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/lib/Lingua/Ispell.pm diff --git a/textproc/p5-Pod-Simple/Makefile b/textproc/p5-Pod-Simple/Makefile index 99dbf461640c..9812fc65ed2a 100644 --- a/textproc/p5-Pod-Simple/Makefile +++ b/textproc/p5-Pod-Simple/Makefile @@ -1,5 +1,5 @@ PORTNAME= Pod-Simple -PORTVERSION= 3.46 +PORTVERSION= 3.47 CATEGORIES= textproc devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/textproc/p5-Pod-Simple/distinfo b/textproc/p5-Pod-Simple/distinfo index bfcafa14fe39..b372130ed250 100644 --- a/textproc/p5-Pod-Simple/distinfo +++ b/textproc/p5-Pod-Simple/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1747208270 -SHA256 (Pod-Simple-3.46.tar.gz) = 3d2b0e844f14a44d8269b38206abdfc07646af3c0db7dad733dddb84d826b9f0 -SIZE (Pod-Simple-3.46.tar.gz) = 305537 +TIMESTAMP = 1747554419 +SHA256 (Pod-Simple-3.47.tar.gz) = ab3e3845337b78ee14b50fdbc68197c71f5ea66ebdde0870dee4e642c305c514 +SIZE (Pod-Simple-3.47.tar.gz) = 305639 diff --git a/textproc/p5-XML-LibXSLT/Makefile b/textproc/p5-XML-LibXSLT/Makefile index 4f507b757688..a5321b899e22 100644 --- a/textproc/p5-XML-LibXSLT/Makefile +++ b/textproc/p5-XML-LibXSLT/Makefile @@ -12,8 +12,6 @@ LICENSE= ART10 GPLv1+ LICENSE_COMB= dual BUILD_DEPENDS= ${RUN_DEPENDS} -LIB_DEPENDS= libgcrypt.so:security/libgcrypt \ - libgpg-error.so:security/libgpg-error RUN_DEPENDS= p5-XML-LibXML>=1.70:textproc/p5-XML-LibXML USES= gnome perl5 pkgconfig diff --git a/textproc/py-bistring/Makefile b/textproc/py-bistring/Makefile new file mode 100644 index 000000000000..cc532823826d --- /dev/null +++ b/textproc/py-bistring/Makefile @@ -0,0 +1,23 @@ +PORTNAME= bistring +PORTVERSION= 0.5.0 +CATEGORIES= textproc python +MASTER_SITES= PYPI +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} + +MAINTAINER= sunpoet@FreeBSD.org +COMMENT= Bidirectionally transformed strings +WWW= https://bistring.readthedocs.io/en/latest/ \ + https://github.com/microsoft/bistring + +LICENSE= MIT + +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyicu>=0:devel/py-pyicu@${PY_FLAVOR} + +USES= python +USE_PYTHON= autoplist concurrent pep517 + +NO_ARCH= yes + +.include <bsd.port.mk> diff --git a/textproc/py-bistring/distinfo b/textproc/py-bistring/distinfo new file mode 100644 index 000000000000..e8e1a84575d4 --- /dev/null +++ b/textproc/py-bistring/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1745936012 +SHA256 (bistring-0.5.0.tar.gz) = ac3f583d720d41fade1762894fe3b43711b75146d6230b1b9bfe23776774b8e8 +SIZE (bistring-0.5.0.tar.gz) = 19592 diff --git a/textproc/py-bistring/files/patch-setup.py b/textproc/py-bistring/files/patch-setup.py new file mode 100644 index 000000000000..3cada39fcb6b --- /dev/null +++ b/textproc/py-bistring/files/patch-setup.py @@ -0,0 +1,10 @@ +--- setup.py.orig 2022-03-14 19:32:46 UTC ++++ setup.py +@@ -43,7 +43,6 @@ setup( + test_suite='tests', + python_requires='>=3.7', + setup_requires=[ +- 'pytest-runner', + ], + install_requires=[ + 'pyicu', diff --git a/textproc/py-bistring/pkg-descr b/textproc/py-bistring/pkg-descr new file mode 100644 index 000000000000..1246f8e6bd04 --- /dev/null +++ b/textproc/py-bistring/pkg-descr @@ -0,0 +1,4 @@ +The bistring library provides non-destructive versions of common string +processing operations like normalization, case folding, and find/replace. Each +bistring remembers the original string, and how its substrings map to substrings +of the modified version. diff --git a/textproc/py-cyclonedx-python-lib/Makefile b/textproc/py-cyclonedx-python-lib/Makefile index 2e93f6c847f0..9185a5352595 100644 --- a/textproc/py-cyclonedx-python-lib/Makefile +++ b/textproc/py-cyclonedx-python-lib/Makefile @@ -1,5 +1,5 @@ PORTNAME= cyclonedx-python-lib -PORTVERSION= 9.1.0 +PORTVERSION= 10.0.0 CATEGORIES= textproc python MASTER_SITES= PYPI \ https://github.com/CycloneDX/cyclonedx-python-lib/releases/download/v${PORTVERSION}/ diff --git a/textproc/py-cyclonedx-python-lib/distinfo b/textproc/py-cyclonedx-python-lib/distinfo index 773084af85b4..3d84b79605bd 100644 --- a/textproc/py-cyclonedx-python-lib/distinfo +++ b/textproc/py-cyclonedx-python-lib/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1742070472 -SHA256 (cyclonedx_python_lib-9.1.0.tar.gz) = 86935f2c88a7b47a529b93c724dbd3e903bc573f6f8bd977628a7ca1b5dadea1 -SIZE (cyclonedx_python_lib-9.1.0.tar.gz) = 1048735 +TIMESTAMP = 1745936218 +SHA256 (cyclonedx_python_lib-10.0.0.tar.gz) = d0b3deb90659faf3acc909e487af216199c1a0ee976e1601ea13649bd6a070db +SIZE (cyclonedx_python_lib-10.0.0.tar.gz) = 1033605 diff --git a/textproc/py-markdown/Makefile b/textproc/py-markdown/Makefile index c045a6908623..2efa93c29095 100644 --- a/textproc/py-markdown/Makefile +++ b/textproc/py-markdown/Makefile @@ -1,5 +1,5 @@ PORTNAME= markdown -PORTVERSION= 3.7 +PORTVERSION= 3.8 CATEGORIES= textproc python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/textproc/py-markdown/distinfo b/textproc/py-markdown/distinfo index 8d4f23dca218..c45da4229d4d 100644 --- a/textproc/py-markdown/distinfo +++ b/textproc/py-markdown/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1745178094 -SHA256 (markdown-3.7.tar.gz) = 2ae2471477cfd02dbbf038d5d9bc226d40def84b4fe2986e49b59b6b472bbed2 -SIZE (markdown-3.7.tar.gz) = 357086 +TIMESTAMP = 1745936220 +SHA256 (markdown-3.8.tar.gz) = 7df81e63f0df5c4b24b7d156eb81e4690595239b7d70937d0409f1b0de319c6f +SIZE (markdown-3.8.tar.gz) = 360906 diff --git a/textproc/py-markdown/files/patch-pyproject.toml b/textproc/py-markdown/files/patch-pyproject.toml index 2f9653e94718..1d0287e8bad0 100644 --- a/textproc/py-markdown/files/patch-pyproject.toml +++ b/textproc/py-markdown/files/patch-pyproject.toml @@ -1,6 +1,10 @@ ---- pyproject.toml.orig 2023-07-25 15:13:14 UTC +--- pyproject.toml.orig 2025-04-09 17:16:35 UTC +++ pyproject.toml -@@ -4,7 +4,7 @@ requires = ["setuptools>=61.2", "wheel"] +@@ -1,10 +1,10 @@ + [build-system] + # Minimum requirements for the build system to execute. +-requires = ["setuptools>=77.0"] ++requires = ["setuptools>=61.2"] build-backend = "setuptools.build_meta" [project] @@ -9,3 +13,13 @@ dynamic = ['version'] description = "Python implementation of John Gruber's Markdown." readme = {file = 'README.md', content-type='text/markdown'} +@@ -17,8 +17,7 @@ maintainers = [ + {name = 'Waylan Limberg', email = 'python.markdown@gmail.com'}, + {name = 'Isaac Muse'} + ] +-license = "BSD-3-Clause" +-license-files = ["LICENSE.md"] ++license = {file = 'LICENSE.md'} + requires-python = '>=3.9' + dependencies = [ + "importlib-metadata>=4.4;python_version<'3.10'" diff --git a/textproc/py-ocrmypdf/Makefile b/textproc/py-ocrmypdf/Makefile index 343e6dea68f5..be3d1bf2f4b8 100644 --- a/textproc/py-ocrmypdf/Makefile +++ b/textproc/py-ocrmypdf/Makefile @@ -1,5 +1,5 @@ PORTNAME= ocrmypdf -DISTVERSION= 16.10.0 +DISTVERSION= 16.10.1 CATEGORIES= textproc python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/textproc/py-ocrmypdf/distinfo b/textproc/py-ocrmypdf/distinfo index a1de09e864c2..a83e1f16151f 100644 --- a/textproc/py-ocrmypdf/distinfo +++ b/textproc/py-ocrmypdf/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1740819823 -SHA256 (ocrmypdf-16.10.0.tar.gz) = d5b907a7b92951f1f3617f0f5ca002d866143d94fd168546a70e51756bf6412e -SIZE (ocrmypdf-16.10.0.tar.gz) = 6809110 +TIMESTAMP = 1747387056 +SHA256 (ocrmypdf-16.10.1.tar.gz) = 9f32059fc97e25931aaa0a8a4027b8c9faca7d9e1183089f32e0cba5631449f1 +SIZE (ocrmypdf-16.10.1.tar.gz) = 6819366 diff --git a/textproc/py-os-api-ref/Makefile b/textproc/py-os-api-ref/Makefile index 99452e0ad95d..e56927ad41ff 100644 --- a/textproc/py-os-api-ref/Makefile +++ b/textproc/py-os-api-ref/Makefile @@ -1,9 +1,9 @@ PORTNAME= os-api-ref -DISTVERSION= 3.0.1 -PORTREVISION= 1 +DISTVERSION= 3.1.0 CATEGORIES= textproc python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +DISTNAME= os_api_ref-${DISTVERSION} MAINTAINER= kai@FreeBSD.org COMMENT= Sphinx Extensions to support API reference sites in OpenStack @@ -12,14 +12,16 @@ WWW= https://docs.openstack.org/os-api-ref/ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} +BUILD_DEPENDS= ${PY_SETUPTOOLS} \ + ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pbr>=2.0.0:devel/py-pbr@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyyaml>=3.12:devel/py-pyyaml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sphinx>=4.0.0,1:textproc/py-sphinx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}openstackdocstheme>=2.2.1:textproc/py-openstackdocstheme@${PY_FLAVOR} -USES= python:3.9+ -USE_PYTHON= distutils autoplist +USES= python +USE_PYTHON= autoplist pep517 NO_ARCH= yes .include <bsd.port.mk> diff --git a/textproc/py-os-api-ref/distinfo b/textproc/py-os-api-ref/distinfo index fc2a8099e223..9f09ebc09cf3 100644 --- a/textproc/py-os-api-ref/distinfo +++ b/textproc/py-os-api-ref/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1734262269 -SHA256 (os-api-ref-3.0.1.tar.gz) = 1900fe54853fb8b07c3bcec50c306a2fc094c9c91ab71ad3720014bd7b8d2107 -SIZE (os-api-ref-3.0.1.tar.gz) = 93116 +TIMESTAMP = 1747486530 +SHA256 (os_api_ref-3.1.0.tar.gz) = e5be28ef8354f0bd61f83d1f08744bc1b57dd8d0c8549ba6ed96beb5ebc0114b +SIZE (os_api_ref-3.1.0.tar.gz) = 88655 diff --git a/textproc/py-pdfminer.six/Makefile b/textproc/py-pdfminer.six/Makefile index d54f82cbac52..89a52d8bed1a 100644 --- a/textproc/py-pdfminer.six/Makefile +++ b/textproc/py-pdfminer.six/Makefile @@ -1,5 +1,5 @@ PORTNAME= pdfminer.six -DISTVERSION= 20250416 +DISTVERSION= 20250506 CATEGORIES= textproc python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/textproc/py-pdfminer.six/distinfo b/textproc/py-pdfminer.six/distinfo index 45d9f0099c9d..40cbaaff1b14 100644 --- a/textproc/py-pdfminer.six/distinfo +++ b/textproc/py-pdfminer.six/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1745145444 -SHA256 (pdfminer_six-20250416.tar.gz) = 30956a85f9d0add806a4e460ed0d67c2b6a48b53323c7ac87de23174596d3acd -SIZE (pdfminer_six-20250416.tar.gz) = 7384630 +TIMESTAMP = 1747388843 +SHA256 (pdfminer_six-20250506.tar.gz) = b03cc8df09cf3c7aba8246deae52e0bca7ebb112a38895b5e1d4f5dd2b8ca2e7 +SIZE (pdfminer_six-20250506.tar.gz) = 7387678 diff --git a/textproc/py-pymdown-extensions/Makefile b/textproc/py-pymdown-extensions/Makefile index 3dd0ab3da512..fe08f8c4850c 100644 --- a/textproc/py-pymdown-extensions/Makefile +++ b/textproc/py-pymdown-extensions/Makefile @@ -1,5 +1,5 @@ PORTNAME= pymdown-extensions -DISTVERSION= 10.14.3 +DISTVERSION= 10.15 CATEGORIES= textproc python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/textproc/py-pymdown-extensions/distinfo b/textproc/py-pymdown-extensions/distinfo index b7143a4fb4af..751079213745 100644 --- a/textproc/py-pymdown-extensions/distinfo +++ b/textproc/py-pymdown-extensions/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1738478554 -SHA256 (pymdown_extensions-10.14.3.tar.gz) = 41e576ce3f5d650be59e900e4ceff231e0aed2a88cf30acaee41e02f063a061b -SIZE (pymdown_extensions-10.14.3.tar.gz) = 846846 +TIMESTAMP = 1747475056 +SHA256 (pymdown_extensions-10.15.tar.gz) = 0e5994e32155f4b03504f939e501b981d306daf7ec2aa1cd2eb6bd300784f8f7 +SIZE (pymdown_extensions-10.15.tar.gz) = 852320 diff --git a/textproc/rubygem-actionpack-xml_parser-rails52/Makefile b/textproc/rubygem-actionpack-xml_parser-rails52/Makefile index ca26875f83da..7a909d56c544 100644 --- a/textproc/rubygem-actionpack-xml_parser-rails52/Makefile +++ b/textproc/rubygem-actionpack-xml_parser-rails52/Makefile @@ -5,15 +5,16 @@ CATEGORIES= textproc rubygems MASTER_SITES= RG PKGNAMESUFFIX= -rails52 -MAINTAINER= ports@FreeBSD.org +MAINTAINER= sunpoet@FreeBSD.org COMMENT= XML parameters parser for Action Pack -WWW= https://github.com/rails/actionpack-xml_parser +WWW= https://rubyonrails.org/ \ + https://github.com/rails/actionpack-xml_parser LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= rubygem-actionpack52>=5.2:www/rubygem-actionpack52 \ - rubygem-railties52>=5.2:www/rubygem-railties52 +RUN_DEPENDS= rubygem-actionpack52>=5.0:www/rubygem-actionpack52 \ + rubygem-railties52>=5.0:www/rubygem-railties52 USES= gem diff --git a/textproc/rubygem-actionpack-xml_parser-rails52/pkg-descr b/textproc/rubygem-actionpack-xml_parser-rails52/pkg-descr index cb5a499bdf68..632f903caa1b 100644 --- a/textproc/rubygem-actionpack-xml_parser-rails52/pkg-descr +++ b/textproc/rubygem-actionpack-xml_parser-rails52/pkg-descr @@ -1,4 +1,2 @@ actionpack-xml_parser is an XML parameters parser for Action Pack (removed from core in Rails 4.0). - -See also: https://rubyonrails.org/ diff --git a/textproc/rubygem-actionpack-xml_parser-rails61/Makefile b/textproc/rubygem-actionpack-xml_parser-rails61/Makefile index 72a8f7282a85..9869da5191c1 100644 --- a/textproc/rubygem-actionpack-xml_parser-rails61/Makefile +++ b/textproc/rubygem-actionpack-xml_parser-rails61/Makefile @@ -4,15 +4,16 @@ CATEGORIES= textproc rubygems MASTER_SITES= RG PKGNAMESUFFIX= -rails61 -MAINTAINER= ports@FreeBSD.org +MAINTAINER= sunpoet@FreeBSD.org COMMENT= XML parameters parser for Action Pack -WWW= https://github.com/rails/actionpack-xml_parser +WWW= https://rubyonrails.org/ \ + https://github.com/rails/actionpack-xml_parser LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= rubygem-actionpack61>=5.2:www/rubygem-actionpack61 \ - rubygem-railties61>=5.2:www/rubygem-railties61 +RUN_DEPENDS= rubygem-actionpack61>=5.0:www/rubygem-actionpack61 \ + rubygem-railties61>=5.0:www/rubygem-railties61 USES= gem diff --git a/textproc/rubygem-actionpack-xml_parser-rails61/pkg-descr b/textproc/rubygem-actionpack-xml_parser-rails61/pkg-descr index cb5a499bdf68..632f903caa1b 100644 --- a/textproc/rubygem-actionpack-xml_parser-rails61/pkg-descr +++ b/textproc/rubygem-actionpack-xml_parser-rails61/pkg-descr @@ -1,4 +1,2 @@ actionpack-xml_parser is an XML parameters parser for Action Pack (removed from core in Rails 4.0). - -See also: https://rubyonrails.org/ diff --git a/textproc/rubygem-actionpack-xml_parser-rails72/Makefile b/textproc/rubygem-actionpack-xml_parser-rails72/Makefile index c3dcbce85005..c31debd1ae49 100644 --- a/textproc/rubygem-actionpack-xml_parser-rails72/Makefile +++ b/textproc/rubygem-actionpack-xml_parser-rails72/Makefile @@ -4,15 +4,16 @@ CATEGORIES= textproc rubygems MASTER_SITES= RG PKGNAMESUFFIX= -rails72 -MAINTAINER= ports@FreeBSD.org +MAINTAINER= sunpoet@FreeBSD.org COMMENT= XML parameters parser for Action Pack -WWW= https://github.com/rails/actionpack-xml_parser +WWW= https://rubyonrails.org/ \ + https://github.com/rails/actionpack-xml_parser LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= rubygem-actionpack72>=7.2:www/rubygem-actionpack72 \ - rubygem-railties72>=7.2:www/rubygem-railties72 +RUN_DEPENDS= rubygem-actionpack72>=5.0:www/rubygem-actionpack72 \ + rubygem-railties72>=5.0:www/rubygem-railties72 USES= gem diff --git a/textproc/rubygem-actionpack-xml_parser-rails72/pkg-descr b/textproc/rubygem-actionpack-xml_parser-rails72/pkg-descr index cb5a499bdf68..632f903caa1b 100644 --- a/textproc/rubygem-actionpack-xml_parser-rails72/pkg-descr +++ b/textproc/rubygem-actionpack-xml_parser-rails72/pkg-descr @@ -1,4 +1,2 @@ actionpack-xml_parser is an XML parameters parser for Action Pack (removed from core in Rails 4.0). - -See also: https://rubyonrails.org/ diff --git a/textproc/rubygem-chef-gyoku/Makefile b/textproc/rubygem-chef-gyoku/Makefile index a158e9d617a2..44734c2d5315 100644 --- a/textproc/rubygem-chef-gyoku/Makefile +++ b/textproc/rubygem-chef-gyoku/Makefile @@ -1,5 +1,5 @@ PORTNAME= chef-gyoku -PORTVERSION= 1.4.1 +PORTVERSION= 1.5.0 CATEGORIES= textproc rubygems MASTER_SITES= RG @@ -11,7 +11,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/MIT-LICENSE RUN_DEPENDS= rubygem-builder>=2.1.2:devel/rubygem-builder \ - rubygem-rexml>=3.3<4:textproc/rubygem-rexml + rubygem-rexml>=3.4<4:textproc/rubygem-rexml USES= gem diff --git a/textproc/rubygem-chef-gyoku/distinfo b/textproc/rubygem-chef-gyoku/distinfo index 11ea6e9cf0cf..14706c9cbb90 100644 --- a/textproc/rubygem-chef-gyoku/distinfo +++ b/textproc/rubygem-chef-gyoku/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1740022432 -SHA256 (rubygem/chef-gyoku-1.4.1.gem) = 1c5c337fbcc815537de0edfaa0af914bcd096c680dd5493b5906b3e3e5bf9c3c -SIZE (rubygem/chef-gyoku-1.4.1.gem) = 19456 +TIMESTAMP = 1745936420 +SHA256 (rubygem/chef-gyoku-1.5.0.gem) = 7354a3cff8243cc9bbf9ac136e63ecfbf4a7b6f07622f5a092a0f7626fcff836 +SIZE (rubygem/chef-gyoku-1.5.0.gem) = 20480 diff --git a/textproc/rubygem-elasticsearch-api/Makefile b/textproc/rubygem-elasticsearch-api/Makefile index cf4b1b07bf88..5f4a34edbb62 100644 --- a/textproc/rubygem-elasticsearch-api/Makefile +++ b/textproc/rubygem-elasticsearch-api/Makefile @@ -1,5 +1,5 @@ PORTNAME= elasticsearch-api -PORTVERSION= 8.18.0 +PORTVERSION= 9.0.0 CATEGORIES= textproc rubygems MASTER_SITES= RG diff --git a/textproc/rubygem-elasticsearch-api/distinfo b/textproc/rubygem-elasticsearch-api/distinfo index 52c33b2c26b3..07e9b5f96cce 100644 --- a/textproc/rubygem-elasticsearch-api/distinfo +++ b/textproc/rubygem-elasticsearch-api/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1745178236 -SHA256 (rubygem/elasticsearch-api-8.18.0.gem) = 56ea86d763a8dd781374b76eba6b45977e267510c09e979d1ebe018463379666 -SIZE (rubygem/elasticsearch-api-8.18.0.gem) = 209920 +TIMESTAMP = 1745936424 +SHA256 (rubygem/elasticsearch-api-9.0.0.gem) = 00af6b58bd5786d994d12f9899b787789a345a74a9ea887b1926790a432a50c7 +SIZE (rubygem/elasticsearch-api-9.0.0.gem) = 217088 diff --git a/textproc/rubygem-elasticsearch-api8/Makefile b/textproc/rubygem-elasticsearch-api8/Makefile new file mode 100644 index 000000000000..7cf6a33e7765 --- /dev/null +++ b/textproc/rubygem-elasticsearch-api8/Makefile @@ -0,0 +1,22 @@ +PORTNAME= elasticsearch-api +PORTVERSION= 8.18.0 +CATEGORIES= textproc rubygems +MASTER_SITES= RG +PKGNAMESUFFIX= 8 + +MAINTAINER= sunpoet@FreeBSD.org +COMMENT= Ruby API for Elasticsearch +WWW= https://github.com/elastic/elasticsearch-ruby/tree/master/elasticsearch-api + +LICENSE= APACHE20 +LICENSE_FILE= ${WRKSRC}/LICENSE.txt + +RUN_DEPENDS= rubygem-multi_json>=0:devel/rubygem-multi_json + +USES= gem + +NO_ARCH= yes + +PORTSCOUT= limit:^8\. + +.include <bsd.port.mk> diff --git a/textproc/rubygem-elasticsearch-api8/distinfo b/textproc/rubygem-elasticsearch-api8/distinfo new file mode 100644 index 000000000000..52c33b2c26b3 --- /dev/null +++ b/textproc/rubygem-elasticsearch-api8/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1745178236 +SHA256 (rubygem/elasticsearch-api-8.18.0.gem) = 56ea86d763a8dd781374b76eba6b45977e267510c09e979d1ebe018463379666 +SIZE (rubygem/elasticsearch-api-8.18.0.gem) = 209920 diff --git a/textproc/rubygem-elasticsearch-api8/pkg-descr b/textproc/rubygem-elasticsearch-api8/pkg-descr new file mode 100644 index 000000000000..ac4e2f9daa1c --- /dev/null +++ b/textproc/rubygem-elasticsearch-api8/pkg-descr @@ -0,0 +1,2 @@ +Ruby API for Elasticsearch. See textproc/rubygem-elasticsearch for more +details. diff --git a/textproc/rubygem-elasticsearch-model/Makefile b/textproc/rubygem-elasticsearch-model/Makefile index b2e8eda29acb..dfa7fd7adad7 100644 --- a/textproc/rubygem-elasticsearch-model/Makefile +++ b/textproc/rubygem-elasticsearch-model/Makefile @@ -1,5 +1,6 @@ PORTNAME= elasticsearch-model PORTVERSION= 8.0.0 +PORTREVISION= 1 CATEGORIES= textproc rubygems MASTER_SITES= RG @@ -11,7 +12,7 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt RUN_DEPENDS= rubygem-activesupport71>=3:devel/rubygem-activesupport71 \ - rubygem-elasticsearch>=8<9:textproc/rubygem-elasticsearch \ + rubygem-elasticsearch8>=8<9:textproc/rubygem-elasticsearch8 \ rubygem-hashie>=0:devel/rubygem-hashie USES= gem diff --git a/textproc/rubygem-elasticsearch-persistence/Makefile b/textproc/rubygem-elasticsearch-persistence/Makefile index 978c4e86d70d..3d72c7690812 100644 --- a/textproc/rubygem-elasticsearch-persistence/Makefile +++ b/textproc/rubygem-elasticsearch-persistence/Makefile @@ -12,7 +12,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt RUN_DEPENDS= rubygem-activemodel71>=4:databases/rubygem-activemodel71 \ rubygem-activesupport71>=4:devel/rubygem-activesupport71 \ - rubygem-elasticsearch>=8<9:textproc/rubygem-elasticsearch \ + rubygem-elasticsearch8>=8<9:textproc/rubygem-elasticsearch8 \ rubygem-elasticsearch-model>=${PORTVERSION}<${PORTVERSION}_99:textproc/rubygem-elasticsearch-model \ rubygem-hashie>=0:devel/rubygem-hashie diff --git a/textproc/rubygem-elasticsearch/Makefile b/textproc/rubygem-elasticsearch/Makefile index ad2243aeea6f..8f2e578b93ce 100644 --- a/textproc/rubygem-elasticsearch/Makefile +++ b/textproc/rubygem-elasticsearch/Makefile @@ -1,5 +1,5 @@ PORTNAME= elasticsearch -PORTVERSION= 8.18.0 +PORTVERSION= 9.0.0 CATEGORIES= textproc rubygems MASTER_SITES= RG diff --git a/textproc/rubygem-elasticsearch/distinfo b/textproc/rubygem-elasticsearch/distinfo index 625d76138955..e5c6de6ab54f 100644 --- a/textproc/rubygem-elasticsearch/distinfo +++ b/textproc/rubygem-elasticsearch/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1745178234 -SHA256 (rubygem/elasticsearch-8.18.0.gem) = 2bad7699b49dfd3a66b9a2fefa86460d884bbc6600eba189df46822134a45671 -SIZE (rubygem/elasticsearch-8.18.0.gem) = 25088 +TIMESTAMP = 1745936422 +SHA256 (rubygem/elasticsearch-9.0.0.gem) = f5e37ae4256c976dbf38e3b1298e1e32addd936b424c1f16ff89306ce3479329 +SIZE (rubygem/elasticsearch-9.0.0.gem) = 15872 diff --git a/textproc/rubygem-elasticsearch8/Makefile b/textproc/rubygem-elasticsearch8/Makefile new file mode 100644 index 000000000000..ea654f6a006a --- /dev/null +++ b/textproc/rubygem-elasticsearch8/Makefile @@ -0,0 +1,26 @@ +PORTNAME= elasticsearch +PORTVERSION= 8.18.0 +CATEGORIES= textproc rubygems +MASTER_SITES= RG +PKGNAMESUFFIX= 8 + +MAINTAINER= sunpoet@FreeBSD.org +COMMENT= Ruby integrations for Elasticsearch +WWW= https://github.com/elastic/elasticsearch-ruby + +LICENSE= APACHE20 +LICENSE_FILE= ${WRKSRC}/LICENSE.txt + +RUN_DEPENDS= rubygem-elastic-transport>=8.3<9:textproc/rubygem-elastic-transport \ + rubygem-elasticsearch-api8>=${PORTVERSION}<${PORTVERSION}_99:textproc/rubygem-elasticsearch-api8 + +USES= gem + +NO_ARCH= yes + +PORTSCOUT= limit:^8\. + +post-install: + ${RM} ${STAGEDIR}${PREFIX}/bin/elastic_ruby_console + +.include <bsd.port.mk> diff --git a/textproc/rubygem-elasticsearch8/distinfo b/textproc/rubygem-elasticsearch8/distinfo new file mode 100644 index 000000000000..625d76138955 --- /dev/null +++ b/textproc/rubygem-elasticsearch8/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1745178234 +SHA256 (rubygem/elasticsearch-8.18.0.gem) = 2bad7699b49dfd3a66b9a2fefa86460d884bbc6600eba189df46822134a45671 +SIZE (rubygem/elasticsearch-8.18.0.gem) = 25088 diff --git a/textproc/rubygem-elasticsearch8/pkg-descr b/textproc/rubygem-elasticsearch8/pkg-descr new file mode 100644 index 000000000000..858281e80414 --- /dev/null +++ b/textproc/rubygem-elasticsearch8/pkg-descr @@ -0,0 +1,5 @@ +Ruby integrations for Elasticsearch that feature: + +* a client for connecting to an Elasticsearch cluster +* a Ruby API for the Elasticsearch's REST API +* various extensions and utilities diff --git a/textproc/rubygem-rouge/Makefile b/textproc/rubygem-rouge/Makefile index a31290cc20dc..b2abda5acd6a 100644 --- a/textproc/rubygem-rouge/Makefile +++ b/textproc/rubygem-rouge/Makefile @@ -1,5 +1,5 @@ PORTNAME= rouge -PORTVERSION= 4.5.1 +PORTVERSION= 4.5.2 CATEGORIES= textproc rubygems MASTER_SITES= RG diff --git a/textproc/rubygem-rouge/distinfo b/textproc/rubygem-rouge/distinfo index 9acfcc5df495..415beabefcfa 100644 --- a/textproc/rubygem-rouge/distinfo +++ b/textproc/rubygem-rouge/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1731679820 -SHA256 (rubygem/rouge-4.5.1.gem) = 2ac81c6dee7019bbc6600d4c2d641d730d65c165941400ebd924259067e690dd -SIZE (rubygem/rouge-4.5.1.gem) = 555008 +TIMESTAMP = 1745936426 +SHA256 (rubygem/rouge-4.5.2.gem) = 034233fb8a69d0ad0e0476943184e04cb971b68e3c2239724e02f428878b68a3 +SIZE (rubygem/rouge-4.5.2.gem) = 556544 diff --git a/textproc/uim-el/Makefile b/textproc/uim-el/Makefile index f82792bc976f..fcd45f416f37 100644 --- a/textproc/uim-el/Makefile +++ b/textproc/uim-el/Makefile @@ -1,5 +1,5 @@ PORTNAME= uim-el -PORTVERSION= 1.9.3 +PORTVERSION= 1.9.6 CATEGORIES= textproc PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} diff --git a/textproc/uim-el/distinfo b/textproc/uim-el/distinfo index c44b7f345200..63365d31d133 100644 --- a/textproc/uim-el/distinfo +++ b/textproc/uim-el/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1746443050 -SHA256 (uim-uim-1.9.3_GH0.tar.gz) = 314d30101ac83dfbd5b8e3805f065dc34e0b2ed7b356ed6412f611e2d96b9d35 -SIZE (uim-uim-1.9.3_GH0.tar.gz) = 4052603 +TIMESTAMP = 1747554528 +SHA256 (uim-uim-1.9.6_GH0.tar.gz) = b982dc4eb3b3f31799299e1d1dd5b953c617aa13f41781273998584d0a35bf20 +SIZE (uim-uim-1.9.6_GH0.tar.gz) = 4163170 diff --git a/textproc/uim-el/files/patch-emacs_Makefile.am b/textproc/uim-el/files/patch-emacs_Makefile.am index 9edaeaaa6f40..10eacfe8895e 100644 --- a/textproc/uim-el/files/patch-emacs_Makefile.am +++ b/textproc/uim-el/files/patch-emacs_Makefile.am @@ -1,20 +1,22 @@ ---- emacs/Makefile.am.orig 2021-04-29 12:52:58 UTC +--- emacs/Makefile.am.orig 2025-05-18 07:48:51 UTC +++ emacs/Makefile.am -@@ -1,13 +1,11 @@ +@@ -1,6 +1,5 @@ EXTRA_DIST = README.ja uim-version.el.in EXTRA_DIST = README.ja uim-version.el.in -if UIM_EL - - uimel_lispdir = $(UIMEL_LISP_DIR) - dist_uimel_lisp_DATA = uim.el uim-var.el uim-version.el uim-keymap.el \ + AM_CPPFLAGS = \ + -I$(top_builddir)/uim \ + -I$(top_srcdir)/replace \ +@@ -11,8 +10,6 @@ dist_uimel_lisp_DATA = uim.el uim-var.el uim-version.e uim-key.el uim-util.el \ uim-candidate.el uim-preedit.el uim-debug.el uim-leim.el uim-helper.el -bin_PROGRAMS = uim-el-agent uim-el-helper-agent - +- uim_el_agent_SOURCES = uim-el-agent.c debug.c output.c context.c preedit.c \ key.c candidate.c encoding.c im.c callback.c commit.c \ -@@ -27,4 +25,3 @@ uim_el_helper_agent_CPPFLAGS = -I$(top_srcdir) + helper.c prop.c helper-message.c callback.h candidate.h commit.h context.h \ +@@ -31,4 +28,3 @@ uim_el_helper_agent_LDADD = $(top_builddir)/uim/libuim uim_el_helper_agent_LDADD = $(top_builddir)/uim/libuim-scm.la \ $(top_builddir)/uim/libuim.la diff --git a/textproc/uim/Makefile b/textproc/uim/Makefile index 9fa042279485..50051c7a8ed4 100644 --- a/textproc/uim/Makefile +++ b/textproc/uim/Makefile @@ -1,5 +1,5 @@ PORTNAME= uim -PORTVERSION= 1.9.3 +PORTVERSION= 1.9.6 CATEGORIES?= textproc .if !defined(UIM_SLAVE) && defined(WITHOUT_X11) PKGNAMESUFFIX= -nox11 diff --git a/textproc/uim/distinfo b/textproc/uim/distinfo index 50fcefff1b04..427cf96e7581 100644 --- a/textproc/uim/distinfo +++ b/textproc/uim/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1746442886 -SHA256 (uim-uim-1.9.3_GH0.tar.gz) = 314d30101ac83dfbd5b8e3805f065dc34e0b2ed7b356ed6412f611e2d96b9d35 -SIZE (uim-uim-1.9.3_GH0.tar.gz) = 4052603 +TIMESTAMP = 1747549318 +SHA256 (uim-uim-1.9.6_GH0.tar.gz) = b982dc4eb3b3f31799299e1d1dd5b953c617aa13f41781273998584d0a35bf20 +SIZE (uim-uim-1.9.6_GH0.tar.gz) = 4163170 SHA256 (uim-sigscheme-ccf1f92_GH0.tar.gz) = 320e0e9af6c64fb9fa2b58643792b9ed5b66b9add3ed233a391b6a2518a6313f SIZE (uim-sigscheme-ccf1f92_GH0.tar.gz) = 570780 SHA256 (uim-libgcroots-f019129_GH0.tar.gz) = b88a61336ddf230b083f7185eb94aa0f1d3168204a84d35578eccaf0a61c1800 diff --git a/textproc/uim/files/patch-emacs_Makefile.am b/textproc/uim/files/patch-emacs_Makefile.am index 5f49dcd48461..07841fa725c4 100644 --- a/textproc/uim/files/patch-emacs_Makefile.am +++ b/textproc/uim/files/patch-emacs_Makefile.am @@ -1,7 +1,7 @@ ---- emacs/Makefile.am.orig 2021-04-29 07:41:09 UTC +--- emacs/Makefile.am.orig 2025-05-18 06:22:16 UTC +++ emacs/Makefile.am -@@ -3,9 +3,6 @@ EXTRA_DIST = README.ja uim-version.el.in - if UIM_EL +@@ -7,9 +7,6 @@ uimel_lispdir = $(UIMEL_LISP_DIR) + -I$(top_srcdir) uimel_lispdir = $(UIMEL_LISP_DIR) -dist_uimel_lisp_DATA = uim.el uim-var.el uim-version.el uim-keymap.el \ diff --git a/textproc/uim/files/patch-gtk2_candwin_Makefile.am b/textproc/uim/files/patch-gtk2_candwin_Makefile.am index ad5f2e9a3ee3..d1c8ba27c952 100644 --- a/textproc/uim/files/patch-gtk2_candwin_Makefile.am +++ b/textproc/uim/files/patch-gtk2_candwin_Makefile.am @@ -1,13 +1,13 @@ ---- gtk2/candwin/Makefile.am.orig 2021-04-30 14:25:14 UTC +--- gtk2/candwin/Makefile.am.orig 2025-05-18 07:54:29 UTC +++ gtk2/candwin/Makefile.am -@@ -4,24 +4,21 @@ libexec_PROGRAMS = uim-candwin-gtk uim-candwin-tbl-gtk +@@ -9,24 +9,21 @@ uim_candwin_gtk_SOURCES = gtk.c \ uim_candwin_gtk_SOURCES = gtk.c \ ../immodule/caret-state-indicator.c \ ../immodule/caret-state-indicator.h -uim_candwin_gtk_LDADD = @GTK2_LIBS@ $(top_builddir)/uim/libuim-scm.la \ - $(top_builddir)/uim/libuim.la +uim_candwin_gtk_LDADD = @GTK2_LIBS@ -luim-scm -luim - uim_candwin_gtk_CPPFLAGS = -I$(top_srcdir) + uim_candwin_gtk_CPPFLAGS = $(AM_CPPFLAGS) uim_candwin_gtk_CFLAGS = @GTK2_CFLAGS@ uim_candwin_tbl_gtk_SOURCES = tbl-gtk.c \ @@ -16,7 +16,7 @@ -uim_candwin_tbl_gtk_LDADD = @GTK2_LIBS@ $(top_builddir)/uim/libuim-scm.la \ - $(top_builddir)/uim/libuim.la +uim_candwin_tbl_gtk_LDADD = @GTK2_LIBS@ -luim-scm -luim - uim_candwin_tbl_gtk_CPPFLAGS = -I$(top_srcdir) + uim_candwin_tbl_gtk_CPPFLAGS = $(AM_CPPFLAGS) uim_candwin_tbl_gtk_CFLAGS = @GTK2_CFLAGS@ uim_candwin_horizontal_gtk_SOURCES = horizontal-gtk.c \ @@ -25,6 +25,6 @@ -uim_candwin_horizontal_gtk_LDADD = @GTK2_LIBS@ $(top_builddir)/uim/libuim-scm.la \ - $(top_builddir)/uim/libuim.la -lm +uim_candwin_horizontal_gtk_LDADD = @GTK2_LIBS@ -luim-scm -luim -lm - uim_candwin_horizontal_gtk_CPPFLAGS = -I$(top_srcdir) + uim_candwin_horizontal_gtk_CPPFLAGS = $(AM_CPPFLAGS) uim_candwin_horizontal_gtk_CFLAGS = @GTK2_CFLAGS@ endif diff --git a/textproc/uim/files/patch-gtk2_immodule_Makefile.am b/textproc/uim/files/patch-gtk2_immodule_Makefile.am index ef57c8f1640d..19eb55d8de91 100644 --- a/textproc/uim/files/patch-gtk2_immodule_Makefile.am +++ b/textproc/uim/files/patch-gtk2_immodule_Makefile.am @@ -1,6 +1,6 @@ ---- gtk2/immodule/Makefile.am.orig 2021-04-29 16:18:54 UTC +--- gtk2/immodule/Makefile.am.orig 2025-05-18 06:24:43 UTC +++ gtk2/immodule/Makefile.am -@@ -12,9 +12,7 @@ module_LTLIBRARIES = $(im_uim_la) +@@ -17,9 +17,7 @@ im_uim_la_LDFLAGS = -module -avoid-version im_uim_la_SOURCES = $(IM_UIM_SOURCES) im_uim_la_LDFLAGS = -module -avoid-version diff --git a/textproc/uim/files/patch-gtk2_pad_Makefile.am b/textproc/uim/files/patch-gtk2_pad_Makefile.am index bc1e8cd65c93..8d4626e45826 100644 --- a/textproc/uim/files/patch-gtk2_pad_Makefile.am +++ b/textproc/uim/files/patch-gtk2_pad_Makefile.am @@ -1,12 +1,12 @@ ---- gtk2/pad/Makefile.am.orig 2021-04-29 15:53:36 UTC +--- gtk2/pad/Makefile.am.orig 2025-05-18 06:24:43 UTC +++ gtk2/pad/Makefile.am -@@ -2,8 +2,7 @@ if GTK2 +@@ -7,8 +7,7 @@ uim_input_pad_ja_SOURCES = ja.c bin_PROGRAMS = uim-input-pad-ja uim_input_pad_ja_SOURCES = ja.c -uim_input_pad_ja_LDADD = @GTK2_LIBS@ $(top_builddir)/uim/libuim-scm.la \ - $(top_builddir)/uim/libuim.la +uim_input_pad_ja_LDADD = @GTK2_LIBS@ -luim-scm -luim - uim_input_pad_ja_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) + uim_input_pad_ja_CPPFLAGS = $(AM_CPPFLAGS) uim_input_pad_ja_CFLAGS = @GTK2_CFLAGS@ endif diff --git a/textproc/uim/files/patch-gtk2_pref_Makefile.am b/textproc/uim/files/patch-gtk2_pref_Makefile.am index 30164eaf459b..33219942f9d6 100644 --- a/textproc/uim/files/patch-gtk2_pref_Makefile.am +++ b/textproc/uim/files/patch-gtk2_pref_Makefile.am @@ -1,6 +1,14 @@ ---- gtk2/pref/Makefile.am.orig 2021-04-29 15:56:45 UTC +--- gtk2/pref/Makefile.am.orig 2025-05-18 08:33:21 UTC +++ gtk2/pref/Makefile.am -@@ -9,9 +9,7 @@ uim_pref_gtk_SOURCES = gtk.c \ +@@ -1,7 +1,5 @@ helper_defs = -DUIM_DATADIR=\""$(datadir)/@PACKAGE@"\" + helper_defs = -DUIM_DATADIR=\""$(datadir)/@PACKAGE@"\" + +-if PREF +-if GTK2_4 + AM_CPPFLAGS = \ + -I$(top_builddir)/uim \ + -I$(top_srcdir)/replace \ +@@ -14,13 +12,9 @@ uim_pref_gtk_SOURCES = gtk.c \ gtk-keytab.h \ ../immodule/key-util-gtk.c \ ../immodule/key-util-gtk.h @@ -11,3 +19,7 @@ if LIBUIM_X_UTIL uim_pref_gtk_LDADD += $(top_builddir)/uim/libuim-x-util.la endif + uim_pref_gtk_CPPFLAGS = $(helper_defs) $(AM_CPPFLAGS) + uim_pref_gtk_CFLAGS = @GTK2_CFLAGS@ +-endif +-endif diff --git a/textproc/uim/files/patch-gtk2_switcher_Makefile.am b/textproc/uim/files/patch-gtk2_switcher_Makefile.am index f4915bbaa3b5..0e3a8557347e 100644 --- a/textproc/uim/files/patch-gtk2_switcher_Makefile.am +++ b/textproc/uim/files/patch-gtk2_switcher_Makefile.am @@ -1,6 +1,6 @@ ---- gtk2/switcher/Makefile.am.orig 2021-04-29 15:59:54 UTC +--- gtk2/switcher/Makefile.am.orig 2025-05-18 07:34:02 UTC +++ gtk2/switcher/Makefile.am -@@ -2,10 +2,7 @@ if GTK2 +@@ -7,10 +7,7 @@ uim_im_switcher_gtk_SOURCES = gtk.c bin_PROGRAMS = uim-im-switcher-gtk uim_im_switcher_gtk_SOURCES = gtk.c @@ -9,6 +9,6 @@ - $(top_builddir)/uim/libuim-scm.la \ - $(top_builddir)/uim/libuim.la +uim_im_switcher_gtk_LDADD = @GTK2_LIBS@ -luim-scm -luim-custom -luim - uim_im_switcher_gtk_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) + uim_im_switcher_gtk_CPPFLAGS = $(AM_CPPFLAGS) uim_im_switcher_gtk_CFLAGS = @GTK2_CFLAGS@ endif diff --git a/textproc/uim/files/patch-gtk2_toolbar_Makefile.am b/textproc/uim/files/patch-gtk2_toolbar_Makefile.am index 639b1596ee6e..412e7352e752 100644 --- a/textproc/uim/files/patch-gtk2_toolbar_Makefile.am +++ b/textproc/uim/files/patch-gtk2_toolbar_Makefile.am @@ -1,6 +1,6 @@ ---- gtk2/toolbar/Makefile.am.orig 2022-05-04 18:55:24 UTC +--- gtk2/toolbar/Makefile.am.orig 2025-05-18 07:36:36 UTC +++ gtk2/toolbar/Makefile.am -@@ -6,9 +6,7 @@ if GNOME_APPLET +@@ -11,9 +11,7 @@ uim_toolbar_applet_LDADD = @GTK2_LIBS@ @GNOME_APPLET_L libexec_PROGRAMS = uim-toolbar-applet uim_toolbar_applet_LDADD = @GTK2_LIBS@ @GNOME_APPLET_LIBS@ \ @@ -8,10 +8,10 @@ - $(top_builddir)/uim/libuim.la \ - $(top_builddir)/uim/libuim-custom.la + -luim-scm -luim -luim-custom - uim_toolbar_applet_CPPFLAGS = $(helper_defs) -I$(top_srcdir) -I$(top_builddir) + uim_toolbar_applet_CPPFLAGS = $(helper_defs) $(AM_CPPFLAGS) uim_toolbar_applet_CFLAGS = @GTK2_CFLAGS@ @GNOME_APPLET_CFLAGS@ if GCC -@@ -45,9 +43,7 @@ bin_PROGRAMS = uim-toolbar-gtk uim-toolbar-gtk-systray +@@ -50,9 +48,7 @@ uim_toolbar_gtk_SOURCES = standalone-gtk.c common-gtk endif uim_toolbar_gtk_SOURCES = standalone-gtk.c common-gtk.c @@ -19,10 +19,10 @@ - $(top_builddir)/uim/libuim.la \ - $(top_builddir)/uim/libuim-custom.la +uim_toolbar_gtk_LDADD = @GTK2_LIBS@ -luim-scm -luim -luim-custom - uim_toolbar_gtk_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) + uim_toolbar_gtk_CPPFLAGS = $(AM_CPPFLAGS) uim_toolbar_gtk_CFLAGS = @GTK2_CFLAGS@ -@@ -55,8 +51,6 @@ uim_toolbar_gtk_systray_SOURCES = systray-gtk.c commo +@@ -60,8 +56,6 @@ uim_toolbar_gtk_systray_LDADD = @GTK2_LIBS@ \ eggtrayicon.c eggtrayicon.h uim_toolbar_gtk_systray_LDADD = @GTK2_LIBS@ \ @X11_LIBS@ \ @@ -30,5 +30,5 @@ - $(top_builddir)/uim/libuim.la \ - $(top_builddir)/uim/libuim-custom.la + -luim-scm -luim -luim-custom - uim_toolbar_gtk_systray_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) + uim_toolbar_gtk_systray_CPPFLAGS = $(AM_CPPFLAGS) uim_toolbar_gtk_systray_CFLAGS = @GTK2_CFLAGS@ diff --git a/textproc/uim/files/patch-gtk3_dict_Makefile.am b/textproc/uim/files/patch-gtk3_dict_Makefile.am index 2069d023d223..2f75340e9cba 100644 --- a/textproc/uim/files/patch-gtk3_dict_Makefile.am +++ b/textproc/uim/files/patch-gtk3_dict_Makefile.am @@ -1,12 +1,12 @@ ---- gtk3/dict/Makefile.am.orig 2021-04-29 13:55:45 UTC +--- gtk3/dict/Makefile.am.orig 2025-05-18 07:39:28 UTC +++ gtk3/dict/Makefile.am -@@ -19,8 +19,7 @@ uim_dict_gtk3_SOURCES = ../../gtk2/dict/main-gtk.c \ - ../../gtk2/dict/cclass-dialog.c \ - ../../gtk2/dict/cclass-dialog.h - +@@ -26,8 +26,7 @@ uim_dict_gtk3_SOURCES = main-gtk.c \ + cclass-dialog.c \ + cclass-dialog.h + -uim_dict_gtk3_LDADD = @GTK3_LIBS@ $(top_builddir)/uim/libuim-scm.la \ - $(top_builddir)/uim/libuim.la +uim_dict_gtk3_LDADD = @GTK3_LIBS@ -luim-scm -luim - uim_dict_gtk3_CPPFLAGS = $(helper_defs) -I$(top_srcdir) -I$(top_builddir) + uim_dict_gtk3_CPPFLAGS = $(helper_defs) $(AM_CPPFLAGS) uim_dict_gtk3_CFLAGS = @GTK3_CFLAGS@ uim_dict_uidir = $(datadir)/uim/helperdata diff --git a/textproc/uim/files/patch-gtk3_immodule_Makefile.am b/textproc/uim/files/patch-gtk3_immodule_Makefile.am index e9db25d1594f..af7ee1a98c27 100644 --- a/textproc/uim/files/patch-gtk3_immodule_Makefile.am +++ b/textproc/uim/files/patch-gtk3_immodule_Makefile.am @@ -1,6 +1,6 @@ ---- gtk3/immodule/Makefile.am.orig 2021-04-30 14:45:56 UTC +--- gtk3/immodule/Makefile.am.orig 2025-05-18 07:40:15 UTC +++ gtk3/immodule/Makefile.am -@@ -11,9 +11,7 @@ module_LTLIBRARIES = $(im_uim_la) +@@ -16,9 +16,7 @@ im_uim_la_LDFLAGS = -module -avoid-version im_uim_la_SOURCES = $(IM_UIM_SOURCES) im_uim_la_LDFLAGS = -module -avoid-version diff --git a/textproc/uim/files/patch-gtk3_pad_Makefile.am b/textproc/uim/files/patch-gtk3_pad_Makefile.am index eb73f0a1e568..30dda5d8bd34 100644 --- a/textproc/uim/files/patch-gtk3_pad_Makefile.am +++ b/textproc/uim/files/patch-gtk3_pad_Makefile.am @@ -1,12 +1,12 @@ ---- gtk3/pad/Makefile.am.orig 2021-04-30 14:51:47 UTC +--- gtk3/pad/Makefile.am.orig 2025-05-18 07:40:15 UTC +++ gtk3/pad/Makefile.am -@@ -1,8 +1,7 @@ - if GTK3 +@@ -6,8 +6,7 @@ uim_input_pad_ja_gtk3_SOURCES = ja.c + bin_PROGRAMS = uim-input-pad-ja-gtk3 - uim_input_pad_ja_gtk3_SOURCES = ../../gtk2/pad/ja.c + uim_input_pad_ja_gtk3_SOURCES = ja.c -uim_input_pad_ja_gtk3_LDADD = @GTK3_LIBS@ $(top_builddir)/uim/libuim-scm.la \ - $(top_builddir)/uim/libuim.la +uim_input_pad_ja_gtk3_LDADD = @GTK3_LIBS@ -luim-scm -luim - uim_input_pad_ja_gtk3_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) + uim_input_pad_ja_gtk3_CPPFLAGS = $(AM_CPPFLAGS) uim_input_pad_ja_gtk3_CFLAGS = @GTK3_CFLAGS@ diff --git a/textproc/uim/files/patch-gtk3_pref_Makefile.am b/textproc/uim/files/patch-gtk3_pref_Makefile.am index 9203590f85ab..38293b84fbcc 100644 --- a/textproc/uim/files/patch-gtk3_pref_Makefile.am +++ b/textproc/uim/files/patch-gtk3_pref_Makefile.am @@ -1,9 +1,9 @@ ---- gtk3/pref/Makefile.am.orig 2021-04-30 14:54:42 UTC +--- gtk3/pref/Makefile.am.orig 2025-05-18 07:41:20 UTC +++ gtk3/pref/Makefile.am -@@ -10,9 +10,7 @@ uim_pref_gtk3_SOURCES = ../../gtk2/pref/gtk.c \ - ../../gtk2/pref/gtk-keytab.h \ - ../../gtk2/immodule/key-util-gtk.c \ - ../../gtk2/immodule/key-util-gtk.h +@@ -14,9 +14,7 @@ uim_pref_gtk3_SOURCES = gtk.c \ + gtk-keytab.h \ + ../immodule/key-util-gtk.c \ + ../immodule/key-util-gtk.h -uim_pref_gtk3_LDADD = @GTK3_LIBS@ $(top_builddir)/uim/libuim-custom.la \ - $(top_builddir)/uim/libuim-scm.la \ - $(top_builddir)/uim/libuim.la diff --git a/textproc/uim/files/patch-gtk3_switcher_Makefile.am b/textproc/uim/files/patch-gtk3_switcher_Makefile.am index fcab2c96bd00..da5000fcaf1b 100644 --- a/textproc/uim/files/patch-gtk3_switcher_Makefile.am +++ b/textproc/uim/files/patch-gtk3_switcher_Makefile.am @@ -1,14 +1,14 @@ ---- gtk3/switcher/Makefile.am.orig 2021-04-30 14:58:08 UTC +--- gtk3/switcher/Makefile.am.orig 2025-05-18 07:42:28 UTC +++ gtk3/switcher/Makefile.am -@@ -1,10 +1,7 @@ - if GTK3 +@@ -6,10 +6,7 @@ uim_im_switcher_gtk3_SOURCES = gtk.c + bin_PROGRAMS = uim-im-switcher-gtk3 - uim_im_switcher_gtk3_SOURCES = ../../gtk2/switcher/gtk.c + uim_im_switcher_gtk3_SOURCES = gtk.c -uim_im_switcher_gtk3_LDADD = @GTK3_LIBS@ $(top_builddir)/uim/libuim-scm.la \ - $(top_builddir)/uim/libuim-custom.la \ - $(top_builddir)/uim/libuim-scm.la \ - $(top_builddir)/uim/libuim.la +uim_im_switcher_gtk3_LDADD = @GTK3_LIBS@ -luim-scm -luim-custom -luim-scm -luim - uim_im_switcher_gtk3_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) + uim_im_switcher_gtk3_CPPFLAGS = $(AM_CPPFLAGS) uim_im_switcher_gtk3_CFLAGS = @GTK3_CFLAGS@ diff --git a/textproc/uim/files/patch-gtk3_toolbar_Makefile.am b/textproc/uim/files/patch-gtk3_toolbar_Makefile.am index a946771304b2..ccb71767c39d 100644 --- a/textproc/uim/files/patch-gtk3_toolbar_Makefile.am +++ b/textproc/uim/files/patch-gtk3_toolbar_Makefile.am @@ -1,6 +1,6 @@ ---- gtk3/toolbar/Makefile.am.orig 2022-05-04 18:55:24 UTC +--- gtk3/toolbar/Makefile.am.orig 2025-05-18 07:43:25 UTC +++ gtk3/toolbar/Makefile.am -@@ -11,9 +11,7 @@ xmluidir = $(pkgdatadir)/ui +@@ -16,9 +16,7 @@ libuim_toolbar_applet_gnome3_la_LIBADD = @GTK3_LIBS@ @ xmlui_DATA = uim-applet-menu.xml libuim_toolbar_applet_gnome3_la_LIBADD = @GTK3_LIBS@ @GNOME3_APPLET_LIBS@ \ @@ -10,26 +10,26 @@ + -luim-scm -luim -luim-custom libuim_toolbar_applet_gnome3_la_CPPFLAGS = \ -DUIM_UIDATADIR="\"${xmluidir}\"" \ - $(helper_defs) -I$(top_srcdir) -I$(top_builddir) -@@ -52,9 +50,7 @@ if GTK3 + $(helper_defs) $(AM_CPPFLAGS) +@@ -55,9 +53,7 @@ uim_toolbar_gtk3_SOURCES = standalone-gtk.c common-gt + if GTK3 bin_PROGRAMS = uim-toolbar-gtk3 uim-toolbar-gtk3-systray - uim_toolbar_gtk3_SOURCES = ../../gtk2/toolbar/standalone-gtk.c \ - ../../gtk2/toolbar/common-gtk.c + uim_toolbar_gtk3_SOURCES = standalone-gtk.c common-gtk.c -uim_toolbar_gtk3_LDADD = @GTK3_LIBS@ $(top_builddir)/uim/libuim-scm.la \ - $(top_builddir)/uim/libuim.la \ - $(top_builddir)/uim/libuim-custom.la +uim_toolbar_gtk3_LDADD = @GTK3_LIBS@ -luim-scm -luim -luim-custom - uim_toolbar_gtk3_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) + uim_toolbar_gtk3_CPPFLAGS = $(AM_CPPFLAGS) uim_toolbar_gtk3_CFLAGS = @GTK3_CFLAGS@ -@@ -64,9 +60,7 @@ uim_toolbar_gtk3_systray_SOURCES = ../../gtk2/toolbar - ../../gtk2/toolbar/eggtrayicon.h +@@ -67,9 +63,7 @@ uim_toolbar_gtk3_systray_LDADD = @GTK3_LIBS@ \ + eggtrayicon.h uim_toolbar_gtk3_systray_LDADD = @GTK3_LIBS@ \ @X11_LIBS@ \ - $(top_builddir)/uim/libuim-scm.la \ - $(top_builddir)/uim/libuim.la \ - $(top_builddir)/uim/libuim-custom.la + -luim-scm -luim -luim-custom - uim_toolbar_gtk3_systray_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) + uim_toolbar_gtk3_systray_CPPFLAGS = $(AM_CPPFLAGS) uim_toolbar_gtk3_systray_CFLAGS = @GTK3_CFLAGS@ endif diff --git a/textproc/uim/files/patch-qt5_applet_qtquick-plugin_CMakeLists.txt b/textproc/uim/files/patch-qt5_applet_qtquick-plugin_CMakeLists.txt index 03283e10d33e..fedfa33d5735 100644 --- a/textproc/uim/files/patch-qt5_applet_qtquick-plugin_CMakeLists.txt +++ b/textproc/uim/files/patch-qt5_applet_qtquick-plugin_CMakeLists.txt @@ -1,6 +1,6 @@ ---- qt5/applet/qtquick-plugin/CMakeLists.txt.orig 2021-04-30 17:45:18 UTC +--- qt5/applet/qtquick-plugin/CMakeLists.txt.orig 2025-05-16 13:44:13 UTC +++ qt5/applet/qtquick-plugin/CMakeLists.txt -@@ -40,8 +40,8 @@ target_compile_options( +@@ -47,8 +47,8 @@ target_link_libraries( target_link_libraries( uim-qtquick-plugin PRIVATE diff --git a/textproc/uim/files/patch-scm_predict-custom.scm b/textproc/uim/files/patch-scm_predict-custom.scm index c7dd90b79d55..273b1d66a939 100644 --- a/textproc/uim/files/patch-scm_predict-custom.scm +++ b/textproc/uim/files/patch-scm_predict-custom.scm @@ -1,11 +1,11 @@ ---- scm/predict-custom.scm.orig 2025-02-23 08:00:09 UTC +--- scm/predict-custom.scm.orig 2025-05-16 13:44:13 UTC +++ scm/predict-custom.scm @@ -110,7 +110,7 @@ (N_ "Look-SKK prediction") (N_ "long description will be here.")) -(define-custom 'predict-custom-look-skk-jisyo "/usr/share/skk/SKK-JISYO.L" -+(define-custom 'predict-custom-look-skk-jisyo "%PREFIX%/share/skk/SKK-JISYO.L" ++(define-custom 'predict-custom-look-skk-jisyo "/usr/local/share/skk/SKK-JISYO.L" '(predict predict-look-skk) '(pathname regular-file) (N_ "Sorted SKK-JISYO dictionary file") diff --git a/textproc/uim/files/patch-scm_predict-look-skk.scm b/textproc/uim/files/patch-scm_predict-look-skk.scm index 6a7726d76a4b..3c31b9d9774c 100644 --- a/textproc/uim/files/patch-scm_predict-look-skk.scm +++ b/textproc/uim/files/patch-scm_predict-look-skk.scm @@ -1,11 +1,11 @@ ---- scm/predict-look-skk.scm.orig 2025-02-23 08:00:09 UTC +--- scm/predict-look-skk.scm.orig 2025-05-16 13:44:13 UTC +++ scm/predict-look-skk.scm @@ -37,7 +37,7 @@ (define-class predict-look-skk predict '((limit 10) - (jisyo "/usr/share/skk/SKK-JISYO.L")) ;; SKK-JISYO -+ (jisyo "%PREFIX%/share/skk/SKK-JISYO.L")) ;; SKK-JISYO ++ (jisyo "/usr/local/share/skk/SKK-JISYO.L")) ;; SKK-JISYO '(search)) (class-set-method! predict-look-skk search diff --git a/textproc/uim/files/patch-uim_Makefile.am b/textproc/uim/files/patch-uim_Makefile.am index 16bbd52e6da2..2d9fb25b4f06 100644 --- a/textproc/uim/files/patch-uim_Makefile.am +++ b/textproc/uim/files/patch-uim_Makefile.am @@ -1,29 +1,29 @@ ---- uim/Makefile.am.orig 2021-04-29 13:46:21 UTC +--- uim/Makefile.am.orig 2025-05-18 07:54:29 UTC +++ uim/Makefile.am -@@ -81,7 +81,7 @@ libuim_custom_la_SOURCES = uim-custom.c +@@ -86,7 +86,7 @@ if M17NLIB if M17NLIB uim_plugin_LTLIBRARIES += libuim-m17nlib.la libuim_m17nlib_la_SOURCES = m17nlib.c - libuim_m17nlib_la_LIBADD = @M17NLIB_LIBS@ libuim-scm.la libuim.la + libuim_m17nlib_la_LIBADD = @M17NLIB_LIBS@ -luim-scm -luim libuim_m17nlib_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module - libuim_m17nlib_la_CPPFLAGS = -I$(top_srcdir) @M17NLIB_CFLAGS@ + libuim_m17nlib_la_CPPFLAGS = $(AM_CPPFLAGS) @M17NLIB_CFLAGS@ endif -@@ -100,7 +100,7 @@ if ENABLE_ANTHY_STATIC +@@ -105,7 +105,7 @@ else else uim_plugin_LTLIBRARIES += libuim-anthy.la libuim_anthy_la_SOURCES = anthy.c - libuim_anthy_la_LIBADD = @ANTHY_LIBS@ libuim-scm.la libuim.la + libuim_anthy_la_LIBADD = @ANTHY_LIBS@ -luim-scm -luim libuim_anthy_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module - libuim_anthy_la_CPPFLAGS = -I$(top_srcdir) + libuim_anthy_la_CPPFLAGS = $(AM_CPPFLAGS) endif -@@ -112,7 +112,7 @@ if ENABLE_ANTHY_UTF8_STATIC +@@ -117,7 +117,7 @@ else else uim_plugin_LTLIBRARIES += libuim-anthy-utf8.la libuim_anthy_utf8_la_SOURCES = anthy-utf8.c - libuim_anthy_utf8_la_LIBADD = @ANTHY_UTF8_LIBS@ libuim-scm.la libuim.la + libuim_anthy_utf8_la_LIBADD = @ANTHY_UTF8_LIBS@ -luim-scm -luim libuim_anthy_utf8_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module - libuim_anthy_utf8_la_CPPFLAGS = -I$(top_srcdir) @ANTHY_UTF8_CFLAGS@ + libuim_anthy_utf8_la_CPPFLAGS = $(AM_CPPFLAGS) @ANTHY_UTF8_CFLAGS@ endif |