diff --git a/chinese/gcin/Makefile b/chinese/gcin/Makefile index 34ff78f478ec..19956ccc6f0c 100644 --- a/chinese/gcin/Makefile +++ b/chinese/gcin/Makefile @@ -1,73 +1,74 @@ PORTNAME= gcin PORTVERSION= 2.9.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= chinese textproc gnome MASTER_SITES= http://hyperrate.com/gcin-source/ EXTRACT_ONLY= gcin-${PORTVERSION}.tar.xz MAINTAINER= vanilla@FreeBSD.org COMMENT= Traditional Chinese input utility in X WWW= https://hyperrate.com/dir.php?eid=67 LICENSE= LGPL21 BROKEN_powerpc64= fails to build: gmake[3]: *** [Makefile:30: en-american] Error 255 LIB_DEPENDS= libcurl.so:ftp/curl USES= gmake gnome pkgconfig tar:xz xorg HAS_CONFIGURE= YES CONFIGURE_ARGS+= --use_gtk3=N --use_qt5=N USE_GNOME= gtk30 USE_XORG= x11 xtst xext USE_LDCONFIG= ${PREFIX}/lib/gcin OPTIONS_DEFINE= ANTHY OPTIONS_SUB= yes ANTHY_DESC= Japanese anthy IM module -ANTHY_BUILD_DEPENDS= ${LOCALBASE}/include/anthy/anthy.h:japanese/anthy -ANTHY_LIB_DEPENDS= libanthy.so:japanese/anthy +ANTHY_BUILD_DEPENDS= ${LOCALBASE}/include/anthy-unicode-1.0/anthy/anthy.h:japanese/anthy-unicode +ANTHY_LIB_DEPENDS= libanthy-unicode.so:japanese/anthy-unicode ANTHY_CONFIGURE_OFF= --use_anthy=N +ANTHY_MAKE_ENV= ANTHY_CFLAGS=-I${LOCALBASE}/include/anthy-unicode-1.0 post-patch: @${REINPLACE_CMD} -e 's,&,,; 1 s,##!/bin/bash,#!/bin/sh,; \ s,-ldl,,; \ s,/usr/share,$$prefix/share,; \ 1, 300 s,gcc,$$CC,; s,gcin-$$GCIN_VERSION,gcin,; \ /GCIN_DEBUG/ d' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's,\/usr\/share,$$(prefix)\/share,; \ s,%%PREFIX%%,${PREFIX},;' \ ${WRKSRC}/Makefile @${REINPLACE_CMD} -e 's,/usr/local,/usr,g' \ ${WRKSRC}/menu/Makefile @${REINPLACE_CMD} -e 's,modify-XIM ,,; 8,10 d' \ ${WRKSRC}/scripts/Makefile @${REINPLACE_CMD} -e 's,bash,sh,; s/&//; s,/opt/gnome,${LOCALBASE},;' \ ${WRKSRC}/scripts/utf8-edit ${WRKSRC}/scripts/gcin-user-setup \ ${WRKSRC}/scripts/gtab.append_prepare \ ${WRKSRC}/scripts/tsin-gtab-import \ ${WRKSRC}/scripts/tsin-gtab-edit @${REINPLACE_CMD} -e 's,bash,sh,; s/&//; 12,13 s/=/ /; \ s/export/setenv/; s/$$UTF8ED/xdg-open/' \ ${WRKSRC}/scripts/html-browser @${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},' \ ${WRKSRC}/IMdkit/lib/Makefile ${WRKSRC}/Makefile \ ${WRKSRC}/qt-im/Makefile ${WRKSRC}/scripts/modify-XIM \ ${WRKSRC}/scripts/utf8-edit @${REINPLACE_CMD} -e '/make/ d' ${WRKSRC}/IMdkit/lib/Makefile @${REINPLACE_CMD} -e 's,/usr/X11R6/lib,${LOCALBASE}/lib,' ${WRKSRC}/im-client/Makefile post-build: .if !defined(DEBUG_FLAGS) @${FIND} ${WRKSRC} -name "*.so*" | ${XARGS} ${STRIP_CMD} .endif post-install: .if !defined(DEBUG_FLAGS) .for f in gcin* gtab-merge juyin-learn phoa2* sim2trad trad2sim ts-edit tsa2d32 tsd2a32 tsin2gtab-phrase tslearn @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${f} .endfor .endif .include diff --git a/chinese/gcin/files/patch-configure b/chinese/gcin/files/patch-configure index 7f53aeac8d32..b695f7f0a88a 100644 --- a/chinese/gcin/files/patch-configure +++ b/chinese/gcin/files/patch-configure @@ -1,112 +1,121 @@ --- configure.orig 2019-09-05 05:24:10 UTC +++ configure @@ -1,4 +1,4 @@ -##!/bin/bash +#!/bin/sh if [ "$1" = "-h" -o "$1" = "--help" -o "$1" = "-help" ]; then @@ -16,7 +16,7 @@ if [ "$1" = "-h" -o "$1" = "--help" -o "$1" = "-help" echo " --use_qt5=N : disable Qt5 immodule" echo " --use_gtk3=N : disable GTK+ 3.x immodule" echo " --gcinlibdir=dir : runtime path of gcin's *.so" - echo " --doc_version_dir=N : doc path use /usr/share/doc/gcin instead of /doc/gcin-x.x.x" + echo " --doc_version_dir=N : doc path use $prefix/share/doc/gcin instead of /doc/gcin-x.x.x" exit fi +@@ -172,7 +172,7 @@ echo -n ".... Testing anthy : " + fi + + echo -n ".... Testing anthy : " +-USE_ANTHY=`pkg-config --libs anthy` ++USE_ANTHY=`pkg-config --libs anthy-unicode` + if [ $? != 0 ]; then + USE_ANTHY=N + echo "Not found. It's ok if you don't want anthy support." @@ -232,7 +232,7 @@ QT4_IM='N' QT4_IM='N' -QT4_IM_DIR=/usr/$LIB/qt4/plugins/inputmethods +QT4_IM_DIR=$prefix/$LIB/qt4/plugins/inputmethods echo "testing if you have qt4 support" pkg-config --libs QtCore QtGui > /dev/null 2> /dev/null if [ $? = 0 ]; then @@ -306,9 +306,9 @@ else mv gcin.spec gcin.spec.tmp grep -v qt3/plugins/inputmethods gcin.spec.tmp > gcin.spec else - for i in /usr/share/qt/bin/moc /usr/lib/qt/bin/moc /usr/lib64/qt/bin/moc /usr/lib/qt3/bin/moc /usr/share/qt3/bin/moc /usr/lib64/qt3/bin/moc + for i in $prefix/share/qt/bin/moc /usr/lib/qt/bin/moc /usr/lib64/qt/bin/moc /usr/lib/qt3/bin/moc $prefix/share/qt3/bin/moc /usr/lib64/qt3/bin/moc do - [ ! -x $i ] && continue + [ ! -x $i ] continue QT_MOC=$i echo "QT_MOC=$QT_MOC" break; @@ -322,9 +322,9 @@ else mv gcin.spec gcin.spec.tmp grep -v qt4/plugins/inputmethods gcin.spec.tmp > gcin.spec else - for i in /usr/share/qt4/bin/moc /usr/lib/qt4/bin/moc /usr/lib64/qt4/bin/moc /usr/bin/moc + for i in %%MOC%% $prefix/share/qt4/bin/moc /usr/lib/qt4/bin/moc /usr/lib64/qt4/bin/moc /usr/bin/moc do - [ ! -x $i ] && continue + [ ! -x $i ] continue QT4_MOC=$i echo "QT4_MOC=$QT4_MOC" break @@ -351,9 +351,9 @@ else cp gcin-qt5.h.in gcin-qt5.h fi cd .. - for i in /usr/share/qt5/bin/moc /usr/lib/qt5/bin/moc /usr/lib/x86_64-linux-gnu/qt5/bin/moc /usr/lib/i386-linux-gnu/qt5/bin/moc /usr/lib64/qt5/bin/moc /usr/bin/moc + for i in $prefix/share/qt6/bin/moc /usr/lib/qt5/bin/moc /usr/lib/x86_64-linux-gnu/qt5/bin/moc /usr/lib/i386-linux-gnu/qt5/bin/moc /usr/lib64/qt5/bin/moc /usr/bin/moc do - [ ! -x $i ] && continue + [ ! -x $i ] continue QT5_MOC=$i echo "QT5_MOC=$QT5_MOC" break @@ -362,7 +362,7 @@ BUILD_MODULE='Y' BUILD_MODULE='Y' -if [ $USE_ANTHY = 'Y' ] || [ $USE_CHEWING = 'Y' ]; then +if [ $USE_ANTHY = 'Y' ]; then BUILD_MODULE='Y' fi @@ -388,7 +388,7 @@ echo "includedir=\$(DESTDIR)$includedir" >> config.mak echo "libdir=\$(DESTDIR)$libdir" >> config.mak echo "gcinlibdir=\$(DESTDIR)$gcinlibdir" >> config.mak echo "includedir=\$(DESTDIR)$includedir" >> config.mak -echo "LDFLAGS=-Wl,--as-needed $GTKLDFLAGS -lX11 -ldl -lm" >> config.mak +echo "LDFLAGS=-Wl,--as-needed $GTKLDFLAGS -lX11 -lm" >> config.mak echo "GCIN_VERSION=$GCIN_VERSION" >> config.mak echo "GCIN_TABLE_DIR=\$(datadir_r)/gcin/table" >> config.mak echo "GCIN_OGG_DIR=\$(datadir_r)/gcin/ogg" >> config.mak @@ -406,8 +406,8 @@ else echo "DOC_DIR=\$(datadir_r)/doc/gcin" >> config.mak echo "DOC_DIR_i=\$(datadir)/doc/gcin" >> config.mak else - echo "DOC_DIR=\$(datadir_r)/doc/gcin-$GCIN_VERSION" >> config.mak - echo "DOC_DIR_i=\$(datadir)/doc/gcin-$GCIN_VERSION" >> config.mak + echo "DOC_DIR=\$(datadir_r)/doc/gcin" >> config.mak + echo "DOC_DIR_i=\$(datadir)/doc/gcin" >> config.mak fi echo "GCIN_ICON_DIR=\$(datadir_r)/icons/gcin" >> config.mak @@ -435,11 +435,16 @@ echo "GTK_QUERY_IM_64=$GTK_QUERY_IM_64" >> config.mak echo "USE_GCB=$use_gcb" >> config.mak echo "BUILD_MODULE=$BUILD_MODULE" >> config.mak echo "GTK_QUERY_IM_64=$GTK_QUERY_IM_64" >> config.mak -[ $QT5_IM = 'Y' ] && echo "QT5_MOC=$QT5_MOC" >> config.mak -[ $QT4_IM = 'Y' ] && echo "QT4_MOC=$QT4_MOC" >> config.mak -[ $QT_IM = 'Y' ] && echo "QT_MOC=$QT_MOC" >> config.mak +if [ $QT5_IM = 'Y' ]; then + echo "QT5_MOC=$QT5_MOC" >> config.mak +fi +if [ $QT4_IM = 'Y' ]; then + echo "QT4_MOC=$QT4_MOC" >> config.mak +fi +if [ $QT_IM = 'Y' ]; then + echo "QT_MOC=$QT_MOC" >> config.mak +fi -echo "GCIN_DEBUG=0" >> config.mak if [ $prefix = /usr/local ]; then echo "gcin_ld_run_path=$PWD:$PWD/im-client:\$(gcinlibdir)" >> config.mak else diff --git a/chinese/gcin/files/patch-modules__Makefile b/chinese/gcin/files/patch-modules__Makefile index 3c8125ece097..e4192fc04dc4 100644 --- a/chinese/gcin/files/patch-modules__Makefile +++ b/chinese/gcin/files/patch-modules__Makefile @@ -1,8 +1,26 @@ --- modules/Makefile.orig 2013-10-05 03:31:52 UTC +++ modules/Makefile +@@ -6,7 +6,7 @@ GCIN_MODULE+=anthy-module.so + + ifeq ($(USE_ANTHY),Y) + GCIN_MODULE+=anthy-module.so +-CFLAGS+=-DGCIN_MODULE=1 ++CFLAGS+=-DGCIN_MODULE=1 $(ANTHY_CFLAGS) + endif + + ifeq ($(USE_CHEWING),Y) +@@ -19,7 +19,7 @@ anthy-module.so: $(anthy_module_so) + + anthy_module_so = anthy.pico + anthy-module.so: $(anthy_module_so) +- $(CCLD) $(SO_FLAGS) -o $@ $(anthy_module_so) $(LDFLAGS) -lanthy ++ $(CCLD) $(SO_FLAGS) -o $@ $(anthy_module_so) $(LDFLAGS) -lanthy-unicode + + intcode_module_so = intcode.pico win-int.pico + intcode-module.so: $(intcode_module_so) @@ -38,4 +38,4 @@ clean: .depend: $(CCX) $(CFLAGS) -MM *.cpp > $@ -include .depend +#include .depend diff --git a/deskutils/maliit-keyboard/Makefile b/deskutils/maliit-keyboard/Makefile index b680083dad91..298821e4cddd 100644 --- a/deskutils/maliit-keyboard/Makefile +++ b/deskutils/maliit-keyboard/Makefile @@ -1,40 +1,41 @@ PORTNAME= keyboard DISTVERSION= 2.3.1 +PORTREVISION= 1 CATEGORIES= deskutils kde PKGNAMEPREFIX= maliit- MAINTAINER= kde@FreeBSD.org COMMENT= Virtual keyboard based on Maliit framework WWW= https://maliit.github.io/ BUILD_DEPENDS= hunspell:textproc/hunspell LIB_DEPENDS= libmaliit-plugins.so:deskutils/maliit-framework \ libpresage.so:deskutils/presage \ libQt5Feedback.so:deskutils/qtfeedback \ libhunspell-1.7.so:textproc/hunspell USES= cmake gettext gnome pkgconfig qt:5 USE_GITHUB= yes GH_ACCOUNT= maliit USE_GNOME= glib20 GLIB_SCHEMAS= org.maliit.keyboard.maliit.gschema.xml USE_QT= core dbus declarative gui multimedia network quickcontrols2 \ buildtools:build qmake:build CMAKE_OFF= enable-tests CMAKE_ARGS= -DHUNSPELL_DICT_PATH=${PREFIX}/share/hunspell OPTIONS_DEFINE= ANTHY CHEWING PINYIN OPTIONS_SUB= yes ANTHY_DESC= Japanese language support CHEWING_DESC= Chinese language support via chewing PINYIN_DESC= Chinese language support via pinyin -ANTHY_LIB_DEPENDS= libanthy.so:japanese/anthy +ANTHY_LIB_DEPENDS= libanthy-unicode.so:japanese/anthy-unicode ANTHY_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_Anthy CHEWING_LIB_DEPENDS= libchewing.so:chinese/libchewing CHEWING_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_Chewing PINYIN_LIB_DEPENDS= libpinyin.so:chinese/libpinyin PINYIN_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_Pinyin .include diff --git a/devel/m17n-lib/Makefile b/devel/m17n-lib/Makefile index 74584830f5bd..c82b40fbc303 100644 --- a/devel/m17n-lib/Makefile +++ b/devel/m17n-lib/Makefile @@ -1,59 +1,59 @@ PORTNAME= m17n-lib PORTVERSION= 1.8.5 PORTREVISION= 1 CATEGORIES= devel textproc MASTER_SITES= SAVANNAH/m17n MAINTAINER= nikola.lecic@anthesphoria.net COMMENT= Library for the multilingual text handling WWW= https://www.nongnu.org/m17n/ LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= m17n-db>=1.8.10:devel/m17n-db LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libfribidi.so:converters/fribidi \ libgd.so:graphics/gd \ libotf.so:print/libotf RUN_DEPENDS= m17n-db>=1.8.10:devel/m17n-db MAKE_JOBS_UNSAFE= yes USES= autoreconf bison:alias gettext-tools gnome libtool \ localbase pathfix pkgconfig xorg USE_XORG= ice sm x11 xaw xft xmu xrender xt USE_GNOME= libxml2 USE_LDCONFIG= yes GNU_CONFIGURE= yes INSTALL_TARGET= install-strip NLS_LIB_DEPENDS= libiconv.so:converters/libiconv NLS_USES= gettext-runtime iconv NLS_LDFLAGS= -liconv -lintl NLS_CONFIGURE_OFF= --disable-nls NLS_CONFIGURE_WITH= libintl-prefix=${LOCALBASE} BINARY_ALIAS= freetype-config=true OPTIONS_DEFINE= ANTHY ISPELL NLS THAI OPTIONS_DEFAULT=NLS ANTHY_DESC= Kana-Kanji conversion support via Anthy THAI_DESC= Thai language support via libThai -ANTHY_LIB_DEPENDS= libanthy.so:japanese/anthy +ANTHY_LIB_DEPENDS= libanthy-unicode.so:japanese/anthy-unicode ANTHY_CONFIGURE_OFF= --without-anthy ISPELL_BUILD_DEPENDS= ispell:textproc/aspell-ispell ISPELL_RUN_DEPENDS= ispell:textproc/aspell-ispell ISPELL_CONFIGURE_OFF= HAVE_ISPELL=no THAI_LIB_DEPENDS= libthai.so:devel/libthai THAI_CONFIGURE_OFF= --without-libthai pre-configure: @${FIND} ${WRKSRC} -name "Makefile.am" | ${XARGS} ${REINPLACE_CMD} -e 's|-ldl||g' .include