mirror of https://git.FreeBSD.org/ports.git
*/*: Change dependency from japanese/anthy to japanese/anthy-unicode
It should have been done at the removal of japanese/anthy. Reported by: thierry
This commit is contained in:
parent
80608cce64
commit
da328cb32d
|
@ -1,6 +1,6 @@
|
|||
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
|
||||
|
@ -26,9 +26,10 @@ 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,; \
|
||||
|
|
|
@ -15,6 +15,15 @@
|
|||
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'
|
||||
|
||||
|
||||
|
|
|
@ -1,5 +1,23 @@
|
|||
--- 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 > $@
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
PORTNAME= keyboard
|
||||
DISTVERSION= 2.3.1
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= deskutils kde
|
||||
PKGNAMEPREFIX= maliit-
|
||||
|
||||
|
@ -30,7 +31,7 @@ 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
|
||||
|
|
|
@ -43,7 +43,7 @@ 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
|
||||
|
|
Loading…
Reference in New Issue