From ea4a307e1ab9a67245891ccc33b8ff1c7745aeed Mon Sep 17 00:00:00 2001 From: lx Date: Sun, 3 Dec 2006 08:11:38 +0000 Subject: - Update to 0.5.7 - Honor PREFIX Approved by: edwin (mentor) --- japanese/scim-tables/Makefile | 13 +++++++++---- japanese/scim-tables/distinfo | 6 +++--- japanese/scim-tables/files/patch-Makefile.in | 15 ++++++++++++--- japanese/scim-tables/files/patch-configure | 21 ++++++++++++++++----- japanese/scim-tables/files/patch-icons-Makefile.in | 15 +++++++++------ 5 files changed, 49 insertions(+), 21 deletions(-) (limited to 'japanese') diff --git a/japanese/scim-tables/Makefile b/japanese/scim-tables/Makefile index 5fe3b598c6de..e0a8f4eaa826 100644 --- a/japanese/scim-tables/Makefile +++ b/japanese/scim-tables/Makefile @@ -6,19 +6,17 @@ # PORTNAME= scim-tables -PORTVERSION= 0.5.4 -PORTREVISION= 2 +PORTVERSION= 0.5.7 CATEGORIES= japanese MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR=scim -MAINTAINER= lx@redundancy.redundancy.org +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} -USE_X_LIB= yes USE_GMAKE= yes GNU_CONFIGURE= yes @@ -28,6 +26,13 @@ GNU_CONFIGURE= yes BROKEN= No working scim-make-table command on 4.x. Install textproc/scim-table-imengine for details .endif +CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \ + LDFLAGS="-L${LOCALBASE}/lib -lintl" \ + SCIM_DATADIR=${PREFIX}/share/scim \ + SCIM_ICONDIR=${PREFIX}/share/scim/icons + +CONFIGURE_ARGS+= --disable-skim-support + post-extract: @${CP} ${FILESDIR}/T-Code.txt.in ${WRKSRC}/tables/ja/ @${CP} ${FILESDIR}/TUT-Code.txt.in ${WRKSRC}/tables/ja/ diff --git a/japanese/scim-tables/distinfo b/japanese/scim-tables/distinfo index d2e41de89c63..81da83f7141b 100644 --- a/japanese/scim-tables/distinfo +++ b/japanese/scim-tables/distinfo @@ -1,3 +1,3 @@ -MD5 (scim-tables-0.5.4.tar.gz) = 69ce8f1945ba2ab4bf820386e76c2cd9 -SHA256 (scim-tables-0.5.4.tar.gz) = 784cbdecb40a42dee50c2d4ef0614ebd58728c8ee15ac0f2d08acfeef73ec4ad -SIZE (scim-tables-0.5.4.tar.gz) = 5608023 +MD5 (scim-tables-0.5.7.tar.gz) = 58d7f7dd231d73ef179e072b3124ebac +SHA256 (scim-tables-0.5.7.tar.gz) = a2d3620fff8fd8964f31bcc4e8b609418d9cbd0a102eaad5e31ff48620d34c14 +SIZE (scim-tables-0.5.7.tar.gz) = 6979417 diff --git a/japanese/scim-tables/files/patch-Makefile.in b/japanese/scim-tables/files/patch-Makefile.in index 33129911c117..9a368d827cfb 100644 --- a/japanese/scim-tables/files/patch-Makefile.in +++ b/japanese/scim-tables/files/patch-Makefile.in @@ -1,10 +1,19 @@ ---- Makefile.in.orig Sun Oct 30 22:07:39 2005 -+++ Makefile.in Tue Nov 1 22:46:36 2005 +--- 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 + ETAGS = etags + CTAGS = ctags +-DIST_SUBDIRS = docs intl icons m4 po src tables skim ++DIST_SUBDIRS = icons tables + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + distdir = $(PACKAGE)-$(VERSION) + top_distdir = $(distdir) @@ -260,7 +260,7 @@ EXTRA_DIST = config.rpath mkinstalldirs bootstrap scim-tables.spec AUTOMAKE_OPTIONS = gnu @SCIM_TABLES_ENABLE_SKIM_SUPPORT_TRUE@SKIM_SUBDIR = skim --SUBDIRS = intl icons m4 po src tables $(SKIM_SUBDIR) +-SUBDIRS = docs intl icons m4 po src tables $(SKIM_SUBDIR) +SUBDIRS = icons tables MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure $(AUX_DIST) CLEANFILES = *.bak diff --git a/japanese/scim-tables/files/patch-configure b/japanese/scim-tables/files/patch-configure index fc7c2491769f..46fbe5ad5800 100644 --- a/japanese/scim-tables/files/patch-configure +++ b/japanese/scim-tables/files/patch-configure @@ -1,11 +1,22 @@ ---- configure.orig Sun Oct 30 19:07:30 2005 -+++ configure Thu Nov 3 10:57:04 2005 -@@ -31256,7 +31256,7 @@ +--- configure.orig Sat Dec 2 21:31:40 2006 ++++ configure Sat Dec 2 21:32:37 2006 +@@ -30244,10 +30244,6 @@ + CXXFLAGS="$CXXFLAGS -g" + fi +-SCIM_ICONDIR=`$PKG_CONFIG --variable=icondir scim` +-SCIM_MODULEDIR=`$PKG_CONFIG --variable=moduledir scim` +-SCIM_DATADIR=`$PKG_CONFIG --variable=scimdatadir scim` +- + if test "x$SCIM_ICONDIR" = "x"; then + SCIM_ICONDIR=${datadir}/scim/icons + fi +@@ -30268,7 +30264,7 @@ -- ac_config_files="$ac_config_files Makefile intl/Makefile po/Makefile.in m4/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/Cantonese.txt tables/zh/CantonHK.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.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/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/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 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/Cantonese.txt tables/zh/CantonHK.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.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/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/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/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" if test "$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 131440986eb5..7b983e5d3281 100644 --- a/japanese/scim-tables/files/patch-icons-Makefile.in +++ b/japanese/scim-tables/files/patch-icons-Makefile.in @@ -1,6 +1,6 @@ ---- icons/Makefile.in.orig Sun Oct 30 22:07:35 2005 -+++ icons/Makefile.in Tue Nov 1 22:48:23 2005 -@@ -234,52 +234,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@ MAINTAINERCLEANFILES = Makefile.in @@ -14,6 +14,7 @@ - CangJie3.png \ - Cantonese.png \ - CantonHK.png \ +- CNS11643.png \ - Quick.png \ - Stroke5.png \ - Dayi.png \ @@ -28,8 +29,7 @@ - Hindi-phonetic.png \ - HIRAGANA.png \ - Jyutping.png \ -+INST_ICONS = HIRAGANA.png \ - KATAKANA.png \ +- KATAKANA.png \ - Kannada-inscript.png \ - Kannada-kgp.png \ - LaTeX.png \ @@ -42,6 +42,7 @@ - Simplex.png \ - Tamil-inscript.png \ - Tamil-phonetic.png \ +- Tamil-remington.png \ - Telugu-inscript.png \ - Thai.png \ - Viqr.png \ @@ -51,7 +52,9 @@ - ZhuYin.png \ - Ziranma.png \ - IPA-X-SAMPA.png -+ Nippon.png ++INST_ICONS = HIRAGANA.png \ ++ KATAKANA.png \ ++ Nippon.png EXTRA_DIST = $(INST_ICONS) icondir = $(SCIM_ICONDIR) -- cgit