Attachment 159003 Details for Bug 201708 – patch

[patch] patch

m17n-lib-1.7.0.patch (text/plain), 4.04 KB, created by Yuri Victorovich on 2015-07-20 04:40:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yuri Victorovich

Created: 2015-07-20 04:40:21 UTC

Size: 4.04 KB

patch

obsolete

>Index: devel/m17n-lib/Makefile
>===================================================================
>--- devel/m17n-lib/Makefile	(revision 392505)
>+++ devel/m17n-lib/Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	m17n-lib
>-PORTVERSION=	1.6.4
>-PORTREVISION=	6
>+PORTVERSION=	1.7.0
> CATEGORIES=	devel textproc
> MASTER_SITES=	SAVANNAH/m17n
> 
>@@ -21,11 +20,11 @@
> 
> MAKE_JOBS_UNSAFE=	yes
> 
>-USES=		libtool pkgconfig
>+USES=		autoreconf gettext 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
>@@ -47,8 +46,8 @@
> 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 <bsd.port.mk>
>Index: devel/m17n-lib/distinfo
>===================================================================
>--- devel/m17n-lib/distinfo	(revision 392505)
>+++ devel/m17n-lib/distinfo	(working copy)
>@@ -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
>Index: devel/m17n-lib/files/patch-configure.ac
>===================================================================
>--- devel/m17n-lib/files/patch-configure.ac	(revision 392505)
>+++ devel/m17n-lib/files/patch-configure.ac	(working copy)
>@@ -1,6 +1,15 @@
>---- 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.
>@@ -11,7 +20,7 @@
>  
>  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
>@@ -20,7 +29,7 @@
>  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.
>@@ -37,12 +46,12 @@
>  
>    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)
>Index: devel/m17n-lib/pkg-plist
>===================================================================
>--- devel/m17n-lib/pkg-plist	(revision 392505)
>+++ devel/m17n-lib/pkg-plist	(working copy)
>@@ -13,19 +13,19 @@
> 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

Actions: View | Diff

Attachments on bug 201708: 159003 | 159006