diff --git a/devel/m17n-lib/Makefile b/devel/m17n-lib/Makefile index 9e5342b672b1..04142bca9adb 100644 --- a/devel/m17n-lib/Makefile +++ b/devel/m17n-lib/Makefile @@ -1,54 +1,53 @@ # Created by: Kimura Fuyuki # $FreeBSD$ PORTNAME= m17n-lib -PORTVERSION= 1.6.4 -PORTREVISION= 6 +PORTVERSION= 1.7.0 CATEGORIES= devel textproc MASTER_SITES= SAVANNAH/m17n MAINTAINER= nikola.lecic@anthesphoria.net COMMENT= Library for the multilingual text handling BUILD_DEPENDS= bison:devel/bison \ m17n-db>=1.6.4: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.6.4:devel/m17n-db MAKE_JOBS_UNSAFE= yes -USES= libtool pkgconfig +USES= autoreconf gettext-tools libtool pkgconfig USE_XORG= ice sm x11 xaw xft xt USE_GNOME= libxml2 -USE_AUTOTOOLS= autoconf USE_LDCONFIG= yes +GNU_CONFIGURE= yes INSTALL_TARGET= install-strip CONFIGURE_ARGS= --disable-nls OPTIONS_DEFINE= ANTHY ISPELL THAI ANTHY_DESC= Kana-Kanji conversion support via Anthy ISPELL_DESC= Spell checking support via Ispell THAI_DESC= Thai language support via libThai ANTHY_LIB_DEPENDS= libanthy.so:japanese/anthy -ANTHY_CONFIGURE_OFF+= --without-anthy +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 post-patch: - @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \ - 's|$${libdir}/pkgconfig|$${prefix}/libdata/pkgconfig|g ; \ + @${FIND} ${WRKSRC} -name "Makefile.am" | ${XARGS} ${REINPLACE_CMD} -e \ + 's|libdir}/pkgconfig|prefix}/libdata/pkgconfig|g ; \ s|-ldl||g' .include diff --git a/devel/m17n-lib/distinfo b/devel/m17n-lib/distinfo index 09b51d26c5f9..348d56ac627a 100644 --- a/devel/m17n-lib/distinfo +++ b/devel/m17n-lib/distinfo @@ -1,2 +1,2 @@ -SHA256 (m17n-lib-1.6.4.tar.gz) = 0370fda16bce321acad96b623dbbead0d797d86f5d5fa43d0cde8ff3b01555a4 -SIZE (m17n-lib-1.6.4.tar.gz) = 1034422 +SHA256 (m17n-lib-1.7.0.tar.gz) = 8eb853e1e0c86a70a09871f3264f950e5d62bba98960b3ffcde11511c138db83 +SIZE (m17n-lib-1.7.0.tar.gz) = 1063169 diff --git a/devel/m17n-lib/files/patch-configure.ac b/devel/m17n-lib/files/patch-configure.ac index 78fc419f3da5..0b32d968e5e0 100644 --- a/devel/m17n-lib/files/patch-configure.ac +++ b/devel/m17n-lib/files/patch-configure.ac @@ -1,48 +1,57 @@ ---- configure.ac.orig Thu May 24 21:42:48 2007 -+++ configure.ac Mon Oct 15 03:04:55 2007 -@@ -324,6 +324,10 @@ +--- configure.ac.orig 2014-12-10 14:22:52 UTC ++++ configure.ac +@@ -106,7 +106,7 @@ if test x$with_gui != xno; then + + dnl Checks if dlopen exists, and if it's in libc or libdl. + +-AC_SEARCH_LIBS(dlopen, dl, ++AC_SEARCH_LIBS(dlopen, , + AC_DEFINE(HAVE_DLOPEN, 1, + [Define to 1 if you have the function dlopen.])) + +@@ -342,6 +342,10 @@ LIBS="$save_LIBS" AC_SUBST(XML2_LD_FLAGS) dnl Check for Anthy usability. +AC_ARG_WITH(anthy, + AC_HELP_STRING([--with-anthy], + [with Anthy library (default is YES)])) +if test "x$with_anthy" != "xno"; then PKG_CHECK_MODULES(ANTHY, anthy, HAVE_ANTHY=yes, HAVE_ANTHY=no) if test "x$HAVE_ANTHY" = "xyes"; then -@@ -333,6 +337,8 @@ +@@ -351,6 +355,8 @@ if test "x$HAVE_ANTHY" = "xyes"; then ANTHY_LD_FLAGS="$ANTHY_LIBS" CONFIG_FLAGS="$CONFIG_FLAGS -DHAVE_ANTHY" fi + +fi AC_SUBST(ANTHY_LD_FLAGS) dnl Check for Ispell usability. -@@ -347,11 +353,15 @@ +@@ -365,11 +371,15 @@ dnl Check for Thai word-segmentation lib dnl If we have one, define HAVE_THAI_WORDSEG and one of these: dnl HAVE_LIBTHAI, HAVE_WORDCUT, or HAVE_WORDCUT_OLD dnl In addition, set THAI_WORDSEG_LD_FLAGS to a proper value. +AC_ARG_WITH(libthai, + AC_HELP_STRING([--with-libthai], + [with libThai library (default is YES)])) +if test "x$with_libthai" != "xno"; then PKG_CHECK_MODULES(LIBTHAI, libthai, HAVE_LIBTHAI=yes, HAVE_LIBTHAI=no) PKG_CHECK_MODULES(WORDCUT, wordcut, HAVE_WORDCUT=yes, HAVE_WORDCUT=no) -if test "x$HAVE_LIBTHAI" == "xyes"; then +if test "x$HAVE_LIBTHAI" = "xyes"; then AC_DEFINE(HAVE_LIBTHAI, 1, [Define if you have libthai]) THAI_WORDSEG_LD_FLAGS="$LIBTHAI_LIBS" -@@ -406,6 +416,8 @@ - if test "x$HAVE_THAI_WORDSEG" = "xyes"; then +@@ -425,6 +435,8 @@ if test "x$HAVE_THAI_WORDSEG" = "xyes"; AC_DEFINE(HAVE_THAI_WORDSEG, 1, [Define if you have some Thai word-segmentation library]) -+fi -+ fi ++ ++fi AC_SUBST(THAI_WORDSEG_LD_FLAGS) + AC_SUBST(CONFIG_FLAGS) diff --git a/devel/m17n-lib/pkg-plist b/devel/m17n-lib/pkg-plist index 39e73e323536..7311e7f31160 100644 --- a/devel/m17n-lib/pkg-plist +++ b/devel/m17n-lib/pkg-plist @@ -1,40 +1,40 @@ bin/m17n-config bin/m17n-conv bin/m17n-date bin/m17n-dump bin/m17n-edit bin/m17n-view include/m17n-X.h include/m17n-core.h include/m17n-flt.h include/m17n-gui.h include/m17n-misc.h include/m17n.h lib/libm17n-core.a lib/libm17n-core.so lib/libm17n-core.so.0 -lib/libm17n-core.so.0.4.0 +lib/libm17n-core.so.0.4.1 lib/libm17n-flt.a lib/libm17n-flt.so lib/libm17n-flt.so.0 -lib/libm17n-flt.so.0.4.0 +lib/libm17n-flt.so.0.4.1 lib/libm17n-gui.a lib/libm17n-gui.so lib/libm17n-gui.so.0 -lib/libm17n-gui.so.0.4.0 +lib/libm17n-gui.so.0.4.1 lib/libm17n.a lib/libm17n.so lib/libm17n.so.0 -lib/libm17n.so.0.4.0 +lib/libm17n.so.0.4.1 lib/m17n/1.0/libm17n-X.a lib/m17n/1.0/libm17n-X.so lib/m17n/1.0/libm17n-gd.a lib/m17n/1.0/libm17n-gd.so lib/m17n/1.0/libmimx-anthy.a lib/m17n/1.0/libmimx-anthy.so lib/m17n/1.0/libmimx-ispell.a lib/m17n/1.0/libmimx-ispell.so libdata/pkgconfig/m17n-core.pc libdata/pkgconfig/m17n-flt.pc libdata/pkgconfig/m17n-gui.pc libdata/pkgconfig/m17n-shell.pc