diff options
23 files changed, 187 insertions, 160 deletions
diff --git a/chinese/scim-tables/Makefile b/chinese/scim-tables/Makefile index e00e1fb84300..c293e9ce8a90 100644 --- a/chinese/scim-tables/Makefile +++ b/chinese/scim-tables/Makefile @@ -6,8 +6,7 @@ # PORTNAME= scim-tables -PORTVERSION= 0.5.7 -PORTREVISION= 5 +PORTVERSION= 0.5.10 CATEGORIES= chinese MASTER_SITES= SF/scim/${PORTNAME}/${PORTVERSION} @@ -15,15 +14,16 @@ MAINTAINER= lx@FreeBSD.org COMMENT= SCIM table based Chinese input methods BUILD_DEPENDS= scim-make-table:${PORTSDIR}/textproc/scim-table-imengine -RUN_DEPENDS= ${BUILD_DEPENDS} +RUN_DEPENDS= scim-make-table:${PORTSDIR}/textproc/scim-table-imengine USE_GMAKE= yes GNU_CONFIGURE= yes .include <bsd.port.pre.mk> -CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \ - LDFLAGS="-L${LOCALBASE}/lib -lintl" \ +CPPFLAGS+= -I${LOCALBASE}/include -D__STDC_ISO_10646__ + +CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib -lintl" \ SCIM_DATADIR=${PREFIX}/share/scim \ SCIM_ICONDIR=${PREFIX}/share/scim/icons diff --git a/chinese/scim-tables/distinfo b/chinese/scim-tables/distinfo index b3f4ed0236d3..cd1300a4240c 100644 --- a/chinese/scim-tables/distinfo +++ b/chinese/scim-tables/distinfo @@ -1,2 +1,2 @@ -SHA256 (scim-tables-0.5.7.tar.gz) = a2d3620fff8fd8964f31bcc4e8b609418d9cbd0a102eaad5e31ff48620d34c14 -SIZE (scim-tables-0.5.7.tar.gz) = 6979417 +SHA256 (scim-tables-0.5.10.tar.gz) = 0931414996585c5433b5492d5e40e3a0d6f322bebc547c6b10914d103aea2aea +SIZE (scim-tables-0.5.10.tar.gz) = 8101380 diff --git a/chinese/scim-tables/files/patch-icons-Makefile.in b/chinese/scim-tables/files/patch-icons-Makefile.in index 2fbdbb4444be..c58091eda67a 100644 --- a/chinese/scim-tables/files/patch-icons-Makefile.in +++ b/chinese/scim-tables/files/patch-icons-Makefile.in @@ -1,8 +1,8 @@ ---- icons/Makefile.in.orig Mon Apr 30 09:52:23 2007 -+++ icons/Makefile.in Mon Apr 30 09:54:19 2007 -@@ -234,12 +234,7 @@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ +--- icons/Makefile.in.orig 2011-05-17 11:57:00.000000000 -0700 ++++ icons/Makefile.in 2011-07-19 09:46:30.763917600 -0700 +@@ -273,12 +273,7 @@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ MAINTAINERCLEANFILES = Makefile.in -INST_ICONS = table.png \ - Amharic.png \ @@ -14,7 +14,7 @@ CangJie.png \ CangJie3.png \ Cantonese.png \ -@@ -251,37 +246,12 @@ +@@ -288,47 +283,13 @@ Erbi.png \ Erbi-QS.png \ EZ.png \ @@ -24,32 +24,41 @@ - Hanja.png \ - Hindi-inscript.png \ - Hindi-phonetic.png \ +- Hindi-remington.png \ - HIRAGANA.png \ +- IPA-X-SAMPA.png \ Jyutping.png \ - KATAKANA.png \ - Kannada-inscript.png \ - Kannada-kgp.png \ - LaTeX.png \ - Malayalam-inscript.png \ +- Malayalam-phonetic.png \ +- Marathi-remington.png \ - Nepali.png \ - Nippon.png \ - Punjabi-inscript.png \ - Punjabi-jhelum.png \ - Punjabi-phonetic.png \ +- Punjabi-remington.png \ + Quick.png \ +- RussianTraditional.png \ Simplex.png \ + SmartCangJie6.png \ + Stroke5.png \ - Tamil-inscript.png \ - Tamil-phonetic.png \ - Tamil-remington.png \ - Telugu-inscript.png \ +- Tamil-tamil99.png \ - Thai.png \ +- Translit.png \ +- Ukrainian-Translit.png \ +- Uyghur.png \ - Viqr.png \ Wu.png \ Wubi.png \ - Yawerty.png \ ZhuYin.png \ -- Ziranma.png \ -- IPA-X-SAMPA.png -+ Ziranma.png + Ziranma.png - EXTRA_DIST = $(INST_ICONS) - icondir = $(SCIM_ICONDIR) diff --git a/chinese/scim-tables/files/patch-tables-Makefile.in b/chinese/scim-tables/files/patch-tables-Makefile.in index 4f15efcdc4e7..ed50c1a106f8 100644 --- a/chinese/scim-tables/files/patch-tables-Makefile.in +++ b/chinese/scim-tables/files/patch-tables-Makefile.in @@ -1,10 +1,10 @@ ---- tables/Makefile.in.orig Mon Apr 30 09:55:09 2007 -+++ tables/Makefile.in Mon Apr 30 09:55:31 2007 -@@ -234,7 +234,7 @@ - target_alias = @target_alias@ +--- tables/Makefile.in.orig 2011-05-17 11:57:01.000000000 -0700 ++++ tables/Makefile.in 2011-07-19 09:49:34.052939809 -0700 +@@ -290,7 +290,7 @@ + top_srcdir = @top_srcdir@ MAINTAINERCLEANFILES = Makefile.in CLEANFILES = *.bak --SUBDIRS = additional am ar bn gu hi ja kn ko ml ne pa ru ta te th vi zh +-SUBDIRS = additional am ar bn gr gu he hi ja kn ko ml mr ne pa ru ta te th vi zh ug uk +SUBDIRS = zh all: all-recursive diff --git a/chinese/scim-tables/files/patch-tables-zh-Makefile.in b/chinese/scim-tables/files/patch-tables-zh-Makefile.in index 9c23ba16c8f0..ff3803c454b1 100644 --- a/chinese/scim-tables/files/patch-tables-zh-Makefile.in +++ b/chinese/scim-tables/files/patch-tables-zh-Makefile.in @@ -1,9 +1,9 @@ ---- tables/zh/Makefile.in.old Mon Apr 30 09:56:00 2007 -+++ tables/zh/Makefile.in Mon Apr 30 09:56:30 2007 -@@ -247,7 +247,7 @@ - subdirs = @subdirs@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ +--- tables/zh/Makefile.in.orig 2011-05-17 11:57:03.000000000 -0700 ++++ tables/zh/Makefile.in 2011-07-19 09:51:34.062955257 -0700 +@@ -287,7 +287,7 @@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ -SCIM_MAKE_TABLE = $(top_builddir)/src/scim-make-table +SCIM_MAKE_TABLE = scim-make-table scim_tables_source = \ diff --git a/chinese/scim-tables/pkg-plist b/chinese/scim-tables/pkg-plist index cb6b1bce844d..598ec549b25f 100644 --- a/chinese/scim-tables/pkg-plist +++ b/chinese/scim-tables/pkg-plist @@ -1,3 +1,22 @@ +share/scim/icons/Array30.png +share/scim/icons/CangJie.png +share/scim/icons/CangJie3.png +share/scim/icons/CantonHK.png +share/scim/icons/Cantonese.png +share/scim/icons/CNS11643.png +share/scim/icons/Dayi.png +share/scim/icons/EZ.png +share/scim/icons/Erbi-QS.png +share/scim/icons/Erbi.png +share/scim/icons/Jyutping.png +share/scim/icons/Quick.png +share/scim/icons/Simplex.png +share/scim/icons/SmartCangJie6.png +share/scim/icons/Stroke5.png +share/scim/icons/Wu.png +share/scim/icons/Wubi.png +share/scim/icons/ZhuYin.png +share/scim/icons/Ziranma.png share/scim/tables/Array30.bin share/scim/tables/CangJie.bin share/scim/tables/CangJie3.bin @@ -12,28 +31,12 @@ share/scim/tables/Erbi.bin share/scim/tables/Jyutping.bin share/scim/tables/Quick.bin share/scim/tables/Simplex.bin +share/scim/tables/SmartCangJie6.bin share/scim/tables/Stroke5.bin share/scim/tables/Wu.bin share/scim/tables/Wubi.bin share/scim/tables/ZhuYin.bin share/scim/tables/ZhuYin-Big.bin share/scim/tables/Ziranma.bin -share/scim/icons/Array30.png -share/scim/icons/CangJie.png -share/scim/icons/CangJie3.png -share/scim/icons/CantonHK.png -share/scim/icons/Cantonese.png -share/scim/icons/CNS11643.png -share/scim/icons/Dayi.png -share/scim/icons/EZ.png -share/scim/icons/Erbi-QS.png -share/scim/icons/Erbi.png -share/scim/icons/Jyutping.png -share/scim/icons/Quick.png -share/scim/icons/Simplex.png -share/scim/icons/Stroke5.png -share/scim/icons/Wu.png -share/scim/icons/Wubi.png -share/scim/icons/ZhuYin.png -share/scim/icons/Ziranma.png +@dirrmtry share/scim/icons @dirrmtry share/scim/tables diff --git a/japanese/scim-tables/Makefile b/japanese/scim-tables/Makefile index c244d7a77b9e..5100fc39c4e9 100644 --- a/japanese/scim-tables/Makefile +++ b/japanese/scim-tables/Makefile @@ -6,8 +6,7 @@ # PORTNAME= scim-tables -PORTVERSION= 0.5.7 -PORTREVISION= 5 +PORTVERSION= 0.5.10 CATEGORIES= japanese MASTER_SITES= SF/scim/${PORTNAME}/${PORTVERSION} @@ -15,15 +14,16 @@ MAINTAINER= lx@FreeBSD.org COMMENT= SCIM table based Japanese input methods BUILD_DEPENDS= scim-make-table:${PORTSDIR}/textproc/scim-table-imengine -RUN_DEPENDS= ${BUILD_DEPENDS} +RUN_DEPENDS= scim-make-table:${PORTSDIR}/textproc/scim-table-imengine USE_GMAKE= yes GNU_CONFIGURE= yes .include <bsd.port.pre.mk> -CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \ - LDFLAGS="-L${LOCALBASE}/lib -lintl" \ +CPPFLAGS+= -I${LOCALBASE}/include -D__STDC_ISO_10646__ + +CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib -lintl" \ SCIM_DATADIR=${PREFIX}/share/scim \ SCIM_ICONDIR=${PREFIX}/share/scim/icons diff --git a/japanese/scim-tables/distinfo b/japanese/scim-tables/distinfo index b3f4ed0236d3..cd1300a4240c 100644 --- a/japanese/scim-tables/distinfo +++ b/japanese/scim-tables/distinfo @@ -1,2 +1,2 @@ -SHA256 (scim-tables-0.5.7.tar.gz) = a2d3620fff8fd8964f31bcc4e8b609418d9cbd0a102eaad5e31ff48620d34c14 -SIZE (scim-tables-0.5.7.tar.gz) = 6979417 +SHA256 (scim-tables-0.5.10.tar.gz) = 0931414996585c5433b5492d5e40e3a0d6f322bebc547c6b10914d103aea2aea +SIZE (scim-tables-0.5.10.tar.gz) = 8101380 diff --git a/japanese/scim-tables/files/patch-Makefile.in b/japanese/scim-tables/files/patch-Makefile.in index 9a368d827cfb..800c7453409e 100644 --- a/japanese/scim-tables/files/patch-Makefile.in +++ b/japanese/scim-tables/files/patch-Makefile.in @@ -1,7 +1,7 @@ ---- Makefile.in.orig Sat Dec 2 20:13:42 2006 -+++ Makefile.in Sat Dec 2 20:13:57 2006 -@@ -75,7 +75,7 @@ - uninstall-recursive +--- Makefile.in.orig 2011-05-17 11:57:03.000000000 -0700 ++++ Makefile.in 2011-07-18 15:42:37.605486476 -0700 +@@ -84,7 +84,7 @@ + distdir dist dist-all distcheck ETAGS = etags CTAGS = ctags -DIST_SUBDIRS = docs intl icons m4 po src tables skim @@ -9,12 +9,12 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) -@@ -260,7 +260,7 @@ +@@ -316,7 +316,7 @@ EXTRA_DIST = config.rpath mkinstalldirs bootstrap scim-tables.spec AUTOMAKE_OPTIONS = gnu @SCIM_TABLES_ENABLE_SKIM_SUPPORT_TRUE@SKIM_SUBDIR = skim -SUBDIRS = docs intl icons m4 po src tables $(SKIM_SUBDIR) -+SUBDIRS = icons tables ++SUBDIRS = icons tables $(SKIM_SUBDIR) MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure $(AUX_DIST) CLEANFILES = *.bak ACLOCAL_AMFLAGS = -I m4 diff --git a/japanese/scim-tables/files/patch-configure b/japanese/scim-tables/files/patch-configure index 46fbe5ad5800..a3a3af412301 100644 --- a/japanese/scim-tables/files/patch-configure +++ b/japanese/scim-tables/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Sat Dec 2 21:31:40 2006 -+++ configure Sat Dec 2 21:32:37 2006 -@@ -30244,10 +30244,6 @@ +--- configure.orig 2011-07-18 15:43:06.384488835 -0700 ++++ configure 2011-07-18 15:44:39.098506120 -0700 +@@ -21014,10 +21014,6 @@ CXXFLAGS="$CXXFLAGS -g" fi @@ -11,12 +11,12 @@ if test "x$SCIM_ICONDIR" = "x"; then SCIM_ICONDIR=${datadir}/scim/icons fi -@@ -30268,7 +30264,7 @@ +@@ -21038,7 +21034,7 @@ -- ac_config_files="$ac_config_files Makefile intl/Makefile po/Makefile.in m4/Makefile docs/Makefile icons/Makefile src/Makefile scim-tables.spec tables/Makefile tables/zh/Makefile tables/zh/Array30.txt tables/zh/CangJie.txt tables/zh/CangJie3.txt tables/zh/CangJie5.txt tables/zh/Cantonese.txt tables/zh/CantonHK.txt tables/zh/CNS11643.txt tables/zh/Quick.txt tables/zh/Stroke5.txt tables/zh/Dayi3.txt tables/zh/Erbi.txt tables/zh/Erbi-QS.txt tables/zh/EZ-Big.txt tables/zh/Jyutping.txt tables/zh/Simplex.txt tables/zh/Wu.txt tables/zh/Wubi.txt tables/zh/Ziranma.txt tables/zh/ZhuYin.txt tables/zh/ZhuYin-Big.txt tables/ja/Makefile tables/ja/HIRAGANA.txt tables/ja/KATAKANA.txt tables/ja/Nippon.txt tables/ko/Makefile tables/ko/Hangul.txt tables/ko/HangulRomaja.txt tables/ko/Hanja.txt tables/bn/Makefile tables/bn/Bengali-inscript.txt tables/bn/Bengali-probhat.txt tables/gu/Makefile tables/gu/Gujarati-inscript.txt tables/gu/Gujarati-phonetic.txt tables/hi/Makefile tables/hi/Hindi-inscript.txt tables/hi/Hindi-phonetic.txt tables/kn/Makefile tables/kn/Kannada-inscript.txt tables/kn/Kannada-kgp.txt tables/ml/Makefile tables/ml/Malayalam-inscript.txt tables/ne/Makefile tables/ne/Nepali_Rom.txt tables/ne/Nepali_Trad.txt tables/pa/Makefile tables/pa/Punjabi-inscript.txt tables/pa/Punjabi-jhelum.txt tables/pa/Punjabi-phonetic.txt tables/ta/Makefile tables/ta/Tamil-inscript.txt tables/ta/Tamil-phonetic.txt tables/ta/Tamil-remington.txt tables/te/Makefile tables/te/Telugu-inscript.txt tables/am/Makefile tables/am/Amharic.txt tables/ar/Makefile tables/ar/Arabic.txt tables/th/Makefile tables/th/Thai.txt tables/vi/Makefile tables/vi/Viqr.txt tables/ru/Makefile tables/ru/Yawerty.txt tables/additional/Makefile tables/additional/LaTeX.txt tables/additional/IPA-X-SAMPA.txt" -+ ac_config_files="$ac_config_files Makefile intl/Makefile po/Makefile.in m4/Makefile docs/Makefile icons/Makefile src/Makefile scim-tables.spec tables/Makefile tables/zh/Makefile tables/zh/Array30.txt tables/zh/CangJie.txt tables/zh/CangJie3.txt tables/zh/CangJie5.txt tables/zh/Cantonese.txt tables/zh/CantonHK.txt tables/zh/CNS11643.txt tables/zh/Quick.txt tables/zh/Stroke5.txt tables/zh/Dayi3.txt tables/zh/Erbi.txt tables/zh/Erbi-QS.txt tables/zh/EZ-Big.txt tables/zh/Jyutping.txt tables/zh/Simplex.txt tables/zh/Wu.txt tables/zh/Wubi.txt tables/zh/Ziranma.txt tables/zh/ZhuYin.txt tables/zh/ZhuYin-Big.txt tables/ja/Makefile tables/ja/HIRAGANA.txt tables/ja/KATAKANA.txt tables/ja/Nippon.txt tables/ja/T-Code.txt tables/ja/TUT-Code.txt tables/ko/Makefile tables/ko/Hangul.txt tables/ko/HangulRomaja.txt tables/ko/Hanja.txt tables/bn/Makefile tables/bn/Bengali-inscript.txt tables/bn/Bengali-probhat.txt tables/gu/Makefile tables/gu/Gujarati-inscript.txt tables/gu/Gujarati-phonetic.txt tables/hi/Makefile tables/hi/Hindi-inscript.txt tables/hi/Hindi-phonetic.txt tables/kn/Makefile tables/kn/Kannada-inscript.txt tables/kn/Kannada-kgp.txt tables/ml/Makefile tables/ml/Malayalam-inscript.txt tables/ne/Makefile tables/ne/Nepali_Rom.txt tables/ne/Nepali_Trad.txt tables/pa/Makefile tables/pa/Punjabi-inscript.txt tables/pa/Punjabi-jhelum.txt tables/pa/Punjabi-phonetic.txt tables/ta/Makefile tables/ta/Tamil-inscript.txt tables/ta/Tamil-phonetic.txt tables/ta/Tamil-remington.txt tables/te/Makefile tables/te/Telugu-inscript.txt tables/am/Makefile tables/am/Amharic.txt tables/ar/Makefile tables/ar/Arabic.txt tables/th/Makefile tables/th/Thai.txt tables/vi/Makefile tables/vi/Viqr.txt tables/ru/Makefile tables/ru/Yawerty.txt tables/additional/Makefile tables/additional/LaTeX.txt tables/additional/IPA-X-SAMPA.txt" +-ac_config_files="$ac_config_files Makefile intl/Makefile po/Makefile.in m4/Makefile docs/Makefile icons/Makefile src/Makefile scim-tables.spec tables/Makefile tables/additional/IPA-Kirshenbaum.txt tables/additional/IPA-X-SAMPA.txt tables/additional/LaTeX.txt tables/additional/Makefile tables/am/Amharic.txt tables/am/Makefile tables/ar/Arabic.txt tables/ar/Makefile tables/bn/Bengali-inscript.txt tables/bn/Bengali-probhat.txt tables/bn/Makefile tables/gr/Makefile tables/gr/greekpoly.txt tables/gu/Gujarati-inscript.txt tables/gu/Gujarati-phonetic.txt tables/gu/Makefile tables/he/Makefile tables/he/classicalhebrew.txt tables/hi/Hindi-inscript.txt tables/hi/Hindi-phonetic.txt tables/hi/Hindi-remington.txt tables/hi/Makefile tables/ja/HIRAGANA.txt tables/ja/KATAKANA.txt tables/ja/Makefile tables/ja/Nippon.txt tables/kn/Kannada-inscript.txt tables/kn/Kannada-kgp.txt tables/kn/Makefile tables/ko/Hangul.txt tables/ko/HangulRomaja.txt tables/ko/Hanja.txt tables/ko/Makefile tables/ml/Makefile tables/ml/Malayalam-inscript.txt tables/ml/Malayalam-phonetic.txt tables/mr/Makefile tables/mr/Marathi-remington.txt tables/ne/Makefile tables/ne/Nepali_Rom.txt tables/ne/Nepali_Trad.txt tables/pa/Makefile tables/pa/Punjabi-inscript.txt tables/pa/Punjabi-jhelum.txt tables/pa/Punjabi-phonetic.txt tables/pa/Punjabi-remington.txt tables/ru/Makefile tables/ru/RussianTraditional.txt tables/ru/Translit.txt tables/ru/Yawerty.txt tables/ta/Makefile tables/ta/Tamil-inscript.txt tables/ta/Tamil-phonetic.txt tables/ta/Tamil-remington.txt tables/ta/Tamil-tamil99.txt tables/te/Makefile tables/te/Telugu-inscript.txt tables/th/Makefile tables/th/Thai.txt tables/ug/Makefile tables/ug/Uyghur-Romanized.txt tables/ug/Uyghur-Standard.txt tables/uk/Makefile tables/uk/Ukrainian-Translit.txt tables/vi/Makefile tables/vi/Viqr.txt tables/zh/Array30.txt tables/zh/CNS11643.txt tables/zh/CangJie.txt tables/zh/CangJie3.txt tables/zh/CangJie5.txt tables/zh/CantonHK.txt tables/zh/Cantonese.txt tables/zh/Dayi3.txt tables/zh/EZ-Big.txt tables/zh/Erbi-QS.txt tables/zh/Erbi.txt tables/zh/Jyutping.txt tables/zh/Makefile tables/zh/Quick.txt tables/zh/Simplex.txt tables/zh/SmartCangJie6.txt tables/zh/Stroke5.txt tables/zh/Wu.txt tables/zh/Wubi.txt tables/zh/ZhuYin-Big.txt tables/zh/ZhuYin.txt tables/zh/Ziranma.txt" ++ac_config_files="$ac_config_files Makefile intl/Makefile po/Makefile.in m4/Makefile docs/Makefile icons/Makefile src/Makefile scim-tables.spec tables/Makefile tables/additional/IPA-Kirshenbaum.txt tables/additional/IPA-X-SAMPA.txt tables/additional/LaTeX.txt tables/additional/Makefile tables/am/Amharic.txt tables/am/Makefile tables/ar/Arabic.txt tables/ar/Makefile tables/bn/Bengali-inscript.txt tables/bn/Bengali-probhat.txt tables/bn/Makefile tables/gr/Makefile tables/gr/greekpoly.txt tables/gu/Gujarati-inscript.txt tables/gu/Gujarati-phonetic.txt tables/gu/Makefile tables/he/Makefile tables/he/classicalhebrew.txt tables/hi/Hindi-inscript.txt tables/hi/Hindi-phonetic.txt tables/hi/Hindi-remington.txt tables/hi/Makefile tables/ja/HIRAGANA.txt tables/ja/KATAKANA.txt tables/ja/Makefile tables/ja/Nippon.txt tables/ja/T-Code.txt tables/ja/TUT-Code.txt tables/kn/Kannada-inscript.txt tables/kn/Kannada-kgp.txt tables/kn/Makefile tables/ko/Hangul.txt tables/ko/HangulRomaja.txt tables/ko/Hanja.txt tables/ko/Makefile tables/ml/Makefile tables/ml/Malayalam-inscript.txt tables/ml/Malayalam-phonetic.txt tables/mr/Makefile tables/mr/Marathi-remington.txt tables/ne/Makefile tables/ne/Nepali_Rom.txt tables/ne/Nepali_Trad.txt tables/pa/Makefile tables/pa/Punjabi-inscript.txt tables/pa/Punjabi-jhelum.txt tables/pa/Punjabi-phonetic.txt tables/pa/Punjabi-remington.txt tables/ru/Makefile tables/ru/RussianTraditional.txt tables/ru/Translit.txt tables/ru/Yawerty.txt tables/ta/Makefile tables/ta/Tamil-inscript.txt tables/ta/Tamil-phonetic.txt tables/ta/Tamil-remington.txt tables/ta/Tamil-tamil99.txt tables/te/Makefile tables/te/Telugu-inscript.txt tables/th/Makefile tables/th/Thai.txt tables/ug/Makefile tables/ug/Uyghur-Romanized.txt tables/ug/Uyghur-Standard.txt tables/uk/Makefile tables/uk/Ukrainian-Translit.txt tables/vi/Makefile tables/vi/Viqr.txt tables/zh/Array30.txt tables/zh/CNS11643.txt tables/zh/CangJie.txt tables/zh/CangJie3.txt tables/zh/CangJie5.txt tables/zh/CantonHK.txt tables/zh/Cantonese.txt tables/zh/Dayi3.txt tables/zh/EZ-Big.txt tables/zh/Erbi-QS.txt tables/zh/Erbi.txt tables/zh/Jyutping.txt tables/zh/Makefile tables/zh/Quick.txt tables/zh/Simplex.txt tables/zh/SmartCangJie6.txt tables/zh/Stroke5.txt tables/zh/Wu.txt tables/zh/Wubi.txt tables/zh/ZhuYin-Big.txt tables/zh/ZhuYin.txt tables/zh/Ziranma.txt" - if test "$skim_support" = "yes"; then + if test "$enable_skim_support" = "yes"; then diff --git a/japanese/scim-tables/files/patch-icons-Makefile.in b/japanese/scim-tables/files/patch-icons-Makefile.in index 7b983e5d3281..b88045e281de 100644 --- a/japanese/scim-tables/files/patch-icons-Makefile.in +++ b/japanese/scim-tables/files/patch-icons-Makefile.in @@ -1,10 +1,9 @@ ---- icons/Makefile.in.orig Wed Oct 11 08:55:05 2006 -+++ icons/Makefile.in Sun Nov 26 12:00:00 2006 -@@ -234,54 +234,9 @@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ +--- icons/Makefile.in.orig 2011-05-17 11:57:00.000000000 -0700 ++++ icons/Makefile.in 2011-07-18 15:46:13.144512805 -0700 +@@ -274,63 +274,9 @@ + top_srcdir = @top_srcdir@ MAINTAINERCLEANFILES = Makefile.in --INST_ICONS = table.png \ + INST_ICONS = table.png \ - Amharic.png \ - Arabic.png \ - Array30.png \ @@ -15,8 +14,6 @@ - Cantonese.png \ - CantonHK.png \ - CNS11643.png \ -- Quick.png \ -- Stroke5.png \ - Dayi.png \ - Erbi.png \ - Erbi-QS.png \ @@ -27,34 +24,44 @@ - Hanja.png \ - Hindi-inscript.png \ - Hindi-phonetic.png \ -- HIRAGANA.png \ +- Hindi-remington.png \ + HIRAGANA.png \ +- IPA-X-SAMPA.png \ - Jyutping.png \ -- KATAKANA.png \ + KATAKANA.png \ - Kannada-inscript.png \ - Kannada-kgp.png \ - LaTeX.png \ - Malayalam-inscript.png \ +- Malayalam-phonetic.png \ +- Marathi-remington.png \ - Nepali.png \ - Nippon.png \ - Punjabi-inscript.png \ - Punjabi-jhelum.png \ - Punjabi-phonetic.png \ +- Punjabi-remington.png \ +- Quick.png \ +- RussianTraditional.png \ - Simplex.png \ +- SmartCangJie6.png \ +- Stroke5.png \ - Tamil-inscript.png \ - Tamil-phonetic.png \ - Tamil-remington.png \ - Telugu-inscript.png \ +- Tamil-tamil99.png \ - Thai.png \ +- Translit.png \ +- Ukrainian-Translit.png \ +- Uyghur.png \ - Viqr.png \ - Wu.png \ - Wubi.png \ - Yawerty.png \ - ZhuYin.png \ -- Ziranma.png \ -- IPA-X-SAMPA.png -+INST_ICONS = HIRAGANA.png \ -+ KATAKANA.png \ -+ Nippon.png +- Ziranma.png ++ Nippon.png EXTRA_DIST = $(INST_ICONS) icondir = $(SCIM_ICONDIR) diff --git a/japanese/scim-tables/files/patch-tables-Makefile.in b/japanese/scim-tables/files/patch-tables-Makefile.in index c8eed713a732..64eace75d3d5 100644 --- a/japanese/scim-tables/files/patch-tables-Makefile.in +++ b/japanese/scim-tables/files/patch-tables-Makefile.in @@ -1,10 +1,10 @@ ---- tables/Makefile.in.orig Sun Oct 30 22:07:36 2005 -+++ tables/Makefile.in Tue Nov 1 22:49:16 2005 -@@ -234,7 +234,7 @@ - target_alias = @target_alias@ +--- tables/Makefile.in.orig 2011-05-17 11:57:01.000000000 -0700 ++++ tables/Makefile.in 2011-07-18 15:48:48.530532257 -0700 +@@ -290,7 +290,7 @@ + top_srcdir = @top_srcdir@ MAINTAINERCLEANFILES = Makefile.in CLEANFILES = *.bak --SUBDIRS = additional am ar bn gu hi ja kn ko ml ne pa ru ta te th vi zh +-SUBDIRS = additional am ar bn gr gu he hi ja kn ko ml mr ne pa ru ta te th vi zh ug uk +SUBDIRS = ja all: all-recursive diff --git a/japanese/scim-tables/files/patch-tables-ja-Makefile.in b/japanese/scim-tables/files/patch-tables-ja-Makefile.in index f3a77743c94e..79cb50fadd47 100644 --- a/japanese/scim-tables/files/patch-tables-ja-Makefile.in +++ b/japanese/scim-tables/files/patch-tables-ja-Makefile.in @@ -1,6 +1,6 @@ ---- tables/ja/Makefile.in.orig Sun Oct 30 22:07:37 2005 -+++ tables/ja/Makefile.in Thu Nov 3 10:56:01 2005 -@@ -39,7 +39,8 @@ +--- tables/ja/Makefile.in.orig 2011-05-17 11:57:02.000000000 -0700 ++++ tables/ja/Makefile.in 2011-07-20 14:07:01.621337612 -0700 +@@ -37,7 +37,8 @@ subdir = tables/ja DIST_COMMON = $(srcdir)/HIRAGANA.txt.in $(srcdir)/KATAKANA.txt.in \ $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ @@ -8,41 +8,29 @@ + $(srcdir)/Nippon.txt.in \ + $(srcdir)/T-Code.txt.in $(srcdir)/TUT-Code.txt.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ - $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glibc21.m4 \ -@@ -60,7 +61,7 @@ + am__aclocal_m4_deps = $(top_srcdir)/m4/argz.m4 \ + $(top_srcdir)/m4/codeset.m4 $(top_srcdir)/m4/gettext.m4 \ +@@ -62,7 +63,7 @@ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = HIRAGANA.txt KATAKANA.txt Nippon.txt +CONFIG_CLEAN_FILES = HIRAGANA.txt KATAKANA.txt Nippon.txt T-Code.txt TUT-Code.txt + CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = - am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -@@ -235,11 +236,11 @@ - subdirs = @subdirs@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ +@@ -274,11 +275,11 @@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ -SCIM_MAKE_TABLE = $(top_builddir)/src/scim-make-table -scim_tables_source = HIRAGANA.txt.in KATAKANA.txt.in Nippon.txt.in --scim_tables = HIRAGANA.txt KATAKANA.txt Nippon.txt +SCIM_MAKE_TABLE = scim-make-table +scim_tables_source = HIRAGANA.txt.in KATAKANA.txt.in Nippon.txt.in T-Code.txt.in TUT-Code.txt.in -+scim_tables = HIRAGANA.txt KATAKANA.txt Nippon.txt T-Code.txt TUT-Code.txt + scim_tables = HIRAGANA.txt KATAKANA.txt Nippon.txt scim_tables_bindir = $(SCIM_TABLEDIR) -scim_tables_bin_DATA = HIRAGANA.bin KATAKANA.bin Nippon.bin +scim_tables_bin_DATA = HIRAGANA.bin KATAKANA.bin Nippon.bin T-Code.bin TUT-Code.bin EXTRA_DIST = $(scim_tables_source) kanjidic_doc.html kanjidic_licence.html kanjidic-permission-to-use-for-scim CLEANFILES = $(scim_tables_bin_DATA) *.bak DISTCLEANFILES = $(scim_tables) -@@ -281,6 +282,10 @@ - KATAKANA.txt: $(top_builddir)/config.status $(srcdir)/KATAKANA.txt.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ - Nippon.txt: $(top_builddir)/config.status $(srcdir)/Nippon.txt.in -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ -+T-Code.txt: $(top_builddir)/config.status $(srcdir)/T-Code.txt.in -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ -+TUT-Code.txt: $(top_builddir)/config.status $(srcdir)/TUT-Code.txt.in - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ - - mostlyclean-libtool: diff --git a/japanese/scim-tables/pkg-plist b/japanese/scim-tables/pkg-plist index d20718525dbd..d7252f892dd2 100644 --- a/japanese/scim-tables/pkg-plist +++ b/japanese/scim-tables/pkg-plist @@ -1,9 +1,10 @@ +share/scim/icons/HIRAGANA.png +share/scim/icons/KATAKANA.png +share/scim/icons/Nippon.png share/scim/tables/HIRAGANA.bin share/scim/tables/KATAKANA.bin share/scim/tables/Nippon.bin share/scim/tables/T-Code.bin share/scim/tables/TUT-Code.bin -share/scim/icons/HIRAGANA.png -share/scim/icons/KATAKANA.png -share/scim/icons/Nippon.png +@dirrmtry share/scim/icons @dirrmtry share/scim/tables diff --git a/korean/scim-tables/Makefile b/korean/scim-tables/Makefile index 718f6276eadd..32df7c8f7b8d 100644 --- a/korean/scim-tables/Makefile +++ b/korean/scim-tables/Makefile @@ -6,8 +6,7 @@ # $MCom: ports/korean/scim-tables/Makefile,v 1.1 2006/09/30 03:44:11 ahze Exp $ PORTNAME= scim-tables -PORTVERSION= 0.5.7 -PORTREVISION= 5 +PORTVERSION= 0.5.10 CATEGORIES= korean MASTER_SITES= SF/scim/${PORTNAME}/${PORTVERSION} @@ -15,7 +14,7 @@ MAINTAINER= lx@FreeBSD.org COMMENT= SCIM table based Korean input methods BUILD_DEPENDS= scim-make-table:${PORTSDIR}/textproc/scim-table-imengine -RUN_DEPENDS= ${BUILD_DEPENDS} +RUN_DEPENDS= scim-make-table:${PORTSDIR}/textproc/scim-table-imengine USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/korean/scim-tables/distinfo b/korean/scim-tables/distinfo index b3f4ed0236d3..cd1300a4240c 100644 --- a/korean/scim-tables/distinfo +++ b/korean/scim-tables/distinfo @@ -1,2 +1,2 @@ -SHA256 (scim-tables-0.5.7.tar.gz) = a2d3620fff8fd8964f31bcc4e8b609418d9cbd0a102eaad5e31ff48620d34c14 -SIZE (scim-tables-0.5.7.tar.gz) = 6979417 +SHA256 (scim-tables-0.5.10.tar.gz) = 0931414996585c5433b5492d5e40e3a0d6f322bebc547c6b10914d103aea2aea +SIZE (scim-tables-0.5.10.tar.gz) = 8101380 diff --git a/korean/scim-tables/files/patch-icons-Makefile.in b/korean/scim-tables/files/patch-icons-Makefile.in index 6518eff406f1..daa5c81d7f3f 100644 --- a/korean/scim-tables/files/patch-icons-Makefile.in +++ b/korean/scim-tables/files/patch-icons-Makefile.in @@ -1,8 +1,8 @@ ---- icons/Makefile.in.orig Sat Apr 28 18:05:33 2007 -+++ icons/Makefile.in Sat Apr 28 18:06:16 2007 -@@ -234,54 +234,8 @@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ +--- icons/Makefile.in.orig 2011-05-17 11:57:00.000000000 -0700 ++++ icons/Makefile.in 2011-07-19 09:26:22.859764349 -0700 +@@ -273,64 +273,8 @@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ MAINTAINERCLEANFILES = Makefile.in -INST_ICONS = table.png \ - Amharic.png \ @@ -15,8 +15,6 @@ - Cantonese.png \ - CantonHK.png \ - CNS11643.png \ -- Quick.png \ -- Stroke5.png \ - Dayi.png \ - Erbi.png \ - Erbi-QS.png \ @@ -27,33 +25,45 @@ - Hanja.png \ - Hindi-inscript.png \ - Hindi-phonetic.png \ +- Hindi-remington.png \ - HIRAGANA.png \ +- IPA-X-SAMPA.png \ - Jyutping.png \ - KATAKANA.png \ - Kannada-inscript.png \ - Kannada-kgp.png \ - LaTeX.png \ - Malayalam-inscript.png \ +- Malayalam-phonetic.png \ +- Marathi-remington.png \ - Nepali.png \ - Nippon.png \ - Punjabi-inscript.png \ - Punjabi-jhelum.png \ - Punjabi-phonetic.png \ +- Punjabi-remington.png \ +- Quick.png \ +- RussianTraditional.png \ - Simplex.png \ +- SmartCangJie6.png \ +- Stroke5.png \ - Tamil-inscript.png \ - Tamil-phonetic.png \ - Tamil-remington.png \ - Telugu-inscript.png \ +- Tamil-tamil99.png \ - Thai.png \ +- Translit.png \ +- Ukrainian-Translit.png \ +- Uyghur.png \ - Viqr.png \ - Wu.png \ - Wubi.png \ - Yawerty.png \ - ZhuYin.png \ -- Ziranma.png \ -- IPA-X-SAMPA.png +- Ziranma.png +INST_ICONS = Hangul.png \ -+ Hanja.png ++ Hanja.png EXTRA_DIST = $(INST_ICONS) icondir = $(SCIM_ICONDIR) diff --git a/korean/scim-tables/files/patch-tables-Makefile.in b/korean/scim-tables/files/patch-tables-Makefile.in index 6ddb563c2770..3748721f78d5 100644 --- a/korean/scim-tables/files/patch-tables-Makefile.in +++ b/korean/scim-tables/files/patch-tables-Makefile.in @@ -1,10 +1,10 @@ ---- tables/Makefile.in.orig Sun Oct 30 22:07:36 2005 -+++ tables/Makefile.in Tue Nov 1 22:49:16 2005 -@@ -234,7 +234,7 @@ - target_alias = @target_alias@ +--- tables/Makefile.in.orig 2011-05-17 11:57:01.000000000 -0700 ++++ tables/Makefile.in 2011-07-19 09:28:25.428780034 -0700 +@@ -290,7 +290,7 @@ + top_srcdir = @top_srcdir@ MAINTAINERCLEANFILES = Makefile.in CLEANFILES = *.bak --SUBDIRS = additional am ar bn gu hi ja kn ko ml ne pa ru ta te th vi zh +-SUBDIRS = additional am ar bn gr gu he hi ja kn ko ml mr ne pa ru ta te th vi zh ug uk +SUBDIRS = ko all: all-recursive diff --git a/korean/scim-tables/files/patch-tables-ko-Makefile.in b/korean/scim-tables/files/patch-tables-ko-Makefile.in index 4e569e095803..1698907ded86 100644 --- a/korean/scim-tables/files/patch-tables-ko-Makefile.in +++ b/korean/scim-tables/files/patch-tables-ko-Makefile.in @@ -1,9 +1,9 @@ ---- tables/ko/Makefile.in.orig Sun Oct 30 22:07:37 2005 -+++ tables/ko/Makefile.in Tue Nov 1 23:11:58 2005 -@@ -235,7 +235,7 @@ - subdirs = @subdirs@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ +--- tables/ko/Makefile.in.orig 2011-05-17 11:57:02.000000000 -0700 ++++ tables/ko/Makefile.in 2011-07-19 09:30:04.292794874 -0700 +@@ -274,7 +274,7 @@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ -SCIM_MAKE_TABLE = $(top_builddir)/src/scim-make-table +SCIM_MAKE_TABLE = scim-make-table scim_tables_source = Hangul.txt.in HangulRomaja.txt.in Hanja.txt.in diff --git a/korean/scim-tables/pkg-plist b/korean/scim-tables/pkg-plist index 9987e4d27a18..96a16a86d501 100644 --- a/korean/scim-tables/pkg-plist +++ b/korean/scim-tables/pkg-plist @@ -1,6 +1,7 @@ +share/scim/icons/Hangul.png +share/scim/icons/Hanja.png share/scim/tables/Hangul.bin share/scim/tables/HangulRomaja.bin share/scim/tables/Hanja.bin -share/scim/icons/Hangul.png -share/scim/icons/Hanja.png +@dirrmtry share/scim/icons @dirrmtry share/scim/tables diff --git a/textproc/scim-table-imengine/Makefile b/textproc/scim-table-imengine/Makefile index fe1d0c7017a0..48d330a2c8ac 100644 --- a/textproc/scim-table-imengine/Makefile +++ b/textproc/scim-table-imengine/Makefile @@ -6,8 +6,7 @@ # PORTNAME= scim-table-imengine -PORTVERSION= 0.5.7 -PORTREVISION= 7 +PORTVERSION= 0.5.10 CATEGORIES= textproc MASTER_SITES= SF/scim/scim-tables/${PORTVERSION} DISTNAME= scim-tables-${PORTVERSION} @@ -16,7 +15,7 @@ MAINTAINER= lx@FreeBSD.org COMMENT= SCIM table based input method engine BUILD_DEPENDS= scim:${PORTSDIR}/textproc/scim -RUN_DEPENDS= ${BUILD_DEPENDS} +RUN_DEPENDS= scim:${PORTSDIR}/textproc/scim USE_AUTOTOOLS= libtool USE_GMAKE= yes @@ -28,8 +27,9 @@ MAN1= scim-make-table.1 .include <bsd.port.pre.mk> -CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \ - LDFLAGS="-L${LOCALBASE}/lib -lintl" \ +CPPFLAGS= -I${LOCALBASE}/include -D__STDC_ISO_10646__ + +CONFIGURE_ENV+= LDFLAGS="-L${LOCALBASE}/lib -lintl" \ PREFIX="${PREFIX}" PLIST_SUB= SKIM="@comment " diff --git a/textproc/scim-table-imengine/distinfo b/textproc/scim-table-imengine/distinfo index b3f4ed0236d3..cd1300a4240c 100644 --- a/textproc/scim-table-imengine/distinfo +++ b/textproc/scim-table-imengine/distinfo @@ -1,2 +1,2 @@ -SHA256 (scim-tables-0.5.7.tar.gz) = a2d3620fff8fd8964f31bcc4e8b609418d9cbd0a102eaad5e31ff48620d34c14 -SIZE (scim-tables-0.5.7.tar.gz) = 6979417 +SHA256 (scim-tables-0.5.10.tar.gz) = 0931414996585c5433b5492d5e40e3a0d6f322bebc547c6b10914d103aea2aea +SIZE (scim-tables-0.5.10.tar.gz) = 8101380 diff --git a/textproc/scim-table-imengine/files/patch-icons-Makefile.in b/textproc/scim-table-imengine/files/patch-icons-Makefile.in index ed0eff865766..78d41ba3cd79 100644 --- a/textproc/scim-table-imengine/files/patch-icons-Makefile.in +++ b/textproc/scim-table-imengine/files/patch-icons-Makefile.in @@ -1,8 +1,8 @@ ---- icons/Makefile.in.orig Wed Oct 11 08:55:05 2006 -+++ icons/Makefile.in Sat Apr 28 19:12:01 2007 -@@ -234,55 +234,7 @@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ +--- icons/Makefile.in.orig 2011-05-17 11:57:00.000000000 -0700 ++++ icons/Makefile.in 2011-07-19 09:33:14.162816483 -0700 +@@ -273,64 +273,7 @@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ MAINTAINERCLEANFILES = Makefile.in -INST_ICONS = table.png \ - Amharic.png \ @@ -15,8 +15,6 @@ - Cantonese.png \ - CantonHK.png \ - CNS11643.png \ -- Quick.png \ -- Stroke5.png \ - Dayi.png \ - Erbi.png \ - Erbi-QS.png \ @@ -27,33 +25,44 @@ - Hanja.png \ - Hindi-inscript.png \ - Hindi-phonetic.png \ +- Hindi-remington.png \ - HIRAGANA.png \ +- IPA-X-SAMPA.png \ - Jyutping.png \ - KATAKANA.png \ - Kannada-inscript.png \ - Kannada-kgp.png \ - LaTeX.png \ - Malayalam-inscript.png \ +- Malayalam-phonetic.png \ +- Marathi-remington.png \ - Nepali.png \ - Nippon.png \ - Punjabi-inscript.png \ - Punjabi-jhelum.png \ - Punjabi-phonetic.png \ +- Punjabi-remington.png \ +- Quick.png \ +- RussianTraditional.png \ - Simplex.png \ +- SmartCangJie6.png \ +- Stroke5.png \ - Tamil-inscript.png \ - Tamil-phonetic.png \ - Tamil-remington.png \ - Telugu-inscript.png \ +- Tamil-tamil99.png \ - Thai.png \ +- Translit.png \ +- Ukrainian-Translit.png \ +- Uyghur.png \ - Viqr.png \ - Wu.png \ - Wubi.png \ - Yawerty.png \ - ZhuYin.png \ -- Ziranma.png \ -- IPA-X-SAMPA.png -- +- Ziranma.png +INST_ICONS = table.png + EXTRA_DIST = $(INST_ICONS) icondir = $(SCIM_ICONDIR) - icon_DATA = $(INST_ICONS) |