Attachment #81989 for bug #117329

View | Details | Raw Unified | Return to bug 117329
Collapse All | Expand All




#

PORTNAME=	m17n-lib
PORTVERSION=	1.4.0
CATEGORIES=	devel
MASTER_SITES=	http://www.m17n.org/m17n-lib-download/

MAINTAINER=	ports@FreeBSD.org
COMMENT=	A library for the multilingual text handling

BUILD_DEPENDS=	m17n-db>=1.4.0:${PORTSDIR}/devel/m17n-db
LIB_DEPENDS=	fribidi.0:${PORTSDIR}/converters/fribidi \
		gd.4:${PORTSDIR}/graphics/gd \
		otf.0:${PORTSDIR}/print/libotf
RUN_DEPENDS=	m17n-db>=1.4.0:${PORTSDIR}/devel/m17n-db
RUN_DEPENDS=	${LOCALBASE}/share/m17n/mdb.dir:${PORTSDIR}/devel/m17n-db

USE_XORG=	xaw xft xt
USE_XLIB=	yes
USE_GNOME=	gnometarget libxml2 pkgconfig
USE_AUTOTOOLS=	autoconf:261 libtool:15
CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
		LDFLAGS="-L${LOCALBASE}/lib"
USE_LDCONFIG=	yes

OPTIONS=	ANTHY	"With Anthy support" off \
		ISPELL	"With Ispell support" off \
		THAI	"With libThai support" off

.include <bsd.port.pre.mk>

.if defined(WITH_ANTHY)
LIB_DEPENDS+=	anthy.1:${PORTSDIR}/japanese/anthy
.else
CONFIGURE_ARGS+=	--without-anthy
.endif

.if defined(WITH_ISPELL)

CONFIGURE_ENV+=	HAVE_ISPELL=no
.endif

.if defined(WITH_THAI)
LIB_DEPENDS+=	thai.0:${PORTSDIR}/devel/libthai
.else
CONFIGURE_ARGS+=	--without-libthai
.endif

post-patch:
	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
		's|$${libdir}/pkgconfig|$${prefix}/libdata/pkgconfig|g ; \
		 s|-ldl||g'
	@${REINPLACE_CMD} -e '/if test/s|==|=|g' ${WRKSRC}/configure

.include <bsd.port.post.mk>

Lines 1-3 Link Here

(-)devel/m17n-lib/distinfo (-3 / +3 lines)
1	MD5 (m17n-lib-1.3.4.tar.gz) = 2941f70281baaaced75fc2715476cfa9	1	MD5 (m17n-lib-1.4.0.tar.gz) = 195b16500349f874dd094fa7cccd7a6c
2	SHA256 (m17n-lib-1.3.4.tar.gz) = fc6ffc8615db261a6d57951d445b41a72fa33bc5f19bbce1009d639e4a769e5f	2	SHA256 (m17n-lib-1.4.0.tar.gz) = 0fc31f26f87e909a63fa957c4b7c968721789fe2cf7afb0be43745014b216e27
3	SIZE (m17n-lib-1.3.4.tar.gz) = 965402	3	SIZE (m17n-lib-1.4.0.tar.gz) = 969682




--- configure.ac.orig	Thu May 24 21:42:48 2007
+++ configure.ac	Mon Oct 15 03:04:55 2007
@@ -324,6 +324,10 @@
 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 @@
   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 @@
 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
   AC_DEFINE(HAVE_THAI_WORDSEG, 1,
             [Define if you have some Thai word-segmentation library])
+fi
+
 fi
 AC_SUBST(THAI_WORDSEG_LD_FLAGS)
 




lib/libm17n-X.a
lib/libm17n-X.la
lib/libm17n-X.so
lib/libm17n-X.so.2
lib/libm17n-core.a
lib/libm17n-core.la
lib/libm17n-core.so
lib/libm17n-core.so.2
lib/libm17n-gd.a
lib/libm17n-gd.la
lib/libm17n-gd.so
lib/libm17n-gd.so.2
lib/libm17n-gui.a
lib/libm17n-gui.la
lib/libm17n-gui.so
lib/libm17n-gui.so.2
lib/libm17n.a
lib/libm17n.la
lib/libm17n.so
lib/libm17n.so.2
lib/libmimx-anthy.a
lib/libmimx-anthy.la
lib/libmimx-anthy.so
lib/libmimx-anthy.so.2
lib/libmimx-ispell.a
lib/libmimx-ispell.la
lib/libmimx-ispell.so
lib/libmimx-ispell.so.2
libdata/pkgconfig/m17n-core.pc
libdata/pkgconfig/m17n-gui.pc
libdata/pkgconfig/m17n-shell.pc

Return to bug 117329

Lines 6-41 Link Here

(-)devel/m17n-lib/Makefile (-10 / +15 lines)
6	#	6	#
7		7
8	PORTNAME= m17n-lib	8	PORTNAME= m17n-lib
9	PORTVERSION= 1.3.4	9	PORTVERSION= 1.4.0
10	CATEGORIES= devel	10	CATEGORIES= devel
11	MASTER_SITES= http://www.m17n.org/m17n-lib-download/	11	MASTER_SITES= http://www.m17n.org/m17n-lib-download/
12		12
13	MAINTAINER= ports@FreeBSD.org	13	MAINTAINER= ports@FreeBSD.org
14	COMMENT= A library for the multilingual text handling	14	COMMENT= A library for the multilingual text handling
15		15
16	BUILD_DEPENDS= ${LOCALBASE}/share/m17n/mdb.dir:${PORTSDIR}/devel/m17n-db	16	BUILD_DEPENDS= m17n-db>=1.4.0:${PORTSDIR}/devel/m17n-db
17	LIB_DEPENDS= fribidi.0:${PORTSDIR}/converters/fribidi \	17	LIB_DEPENDS= fribidi.0:${PORTSDIR}/converters/fribidi \
18	gd.4:${PORTSDIR}/graphics/gd \	18	gd.4:${PORTSDIR}/graphics/gd \
19	otf.0:${PORTSDIR}/print/libotf \	19	otf.0:${PORTSDIR}/print/libotf
20	Xft.2:${PORTSDIR}/x11-fonts/libXft	20	RUN_DEPENDS= m17n-db>=1.4.0:${PORTSDIR}/devel/m17n-db
21	RUN_DEPENDS= ${LOCALBASE}/share/m17n/mdb.dir:${PORTSDIR}/devel/m17n-db
22		21
23	USE_AUTOTOOLS= libtool:15	22	USE_XORG= xaw xft xt
24	USE_XLIB= yes
25	USE_GNOME= gnometarget libxml2 pkgconfig	23	USE_GNOME= gnometarget libxml2 pkgconfig
		24	USE_AUTOTOOLS= autoconf:261 libtool:15
26	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \	25	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
27	LDFLAGS="-L${LOCALBASE}/lib"	26	LDFLAGS="-L${LOCALBASE}/lib"
28	USE_LDCONFIG= yes	27	USE_LDCONFIG= yes
29		28
30	OPTIONS= ANTHY "With Anthy support" off \	29	OPTIONS= ANTHY "With Anthy support" off \
31	ISPELL "With Ispell support" off	30	ISPELL "With Ispell support" off \
		31	THAI "With libThai support" off
32		32
33	.include <bsd.port.pre.mk>	33	.include <bsd.port.pre.mk>
34		34
35	.if defined(WITH_ANTHY)	35	.if defined(WITH_ANTHY)
36	LIB_DEPENDS+= anthy.1:${PORTSDIR}/japanese/anthy	36	LIB_DEPENDS+= anthy.1:${PORTSDIR}/japanese/anthy
37	.else	37	.else
38	CONFIGURE_ENV+= ac_cv_lib_anthydic_anthy_init_sessions=no	38	CONFIGURE_ARGS+= --without-anthy
39	.endif	39	.endif
40		40
41	.if defined(WITH_ISPELL)	41	.if defined(WITH_ISPELL)
Lines 45-54 Link Here
45	CONFIGURE_ENV+= HAVE_ISPELL=no	45	CONFIGURE_ENV+= HAVE_ISPELL=no
46	.endif	46	.endif
47		47
		48	.if defined(WITH_THAI)
		49	LIB_DEPENDS+= thai.0:${PORTSDIR}/devel/libthai
		50	.else
		51	CONFIGURE_ARGS+= --without-libthai
		52	.endif
		53
48	post-patch:	54	post-patch:
49	@${FIND} ${WRKSRC} -name "Makefile.in" \| ${XARGS} ${REINPLACE_CMD} -e \	55	@${FIND} ${WRKSRC} -name "Makefile.in" \| ${XARGS} ${REINPLACE_CMD} -e \
50	's\|$${libdir}/pkgconfig\|$${prefix}/libdata/pkgconfig\|g ; \	56	's\|$${libdir}/pkgconfig\|$${prefix}/libdata/pkgconfig\|g ; \
51	s\|-ldl\|\|g'	57	s\|-ldl\|\|g'
52	@${REINPLACE_CMD} -e '/if test/s\|==\|=\|g' ${WRKSRC}/configure
53		58
54	.include <bsd.port.post.mk>	59	.include <bsd.port.post.mk>

Line 0 Link Here

(-)devel/m17n-lib/files/patch-configure.ac (+48 lines)
	1	--- configure.ac.orig Thu May 24 21:42:48 2007
	2	+++ configure.ac Mon Oct 15 03:04:55 2007
	3	@@ -324,6 +324,10 @@
	4	AC_SUBST(XML2_LD_FLAGS)
	5
	6	dnl Check for Anthy usability.
	7	+AC_ARG_WITH(anthy,
	8	+ AC_HELP_STRING([--with-anthy],
	9	+ [with Anthy library (default is YES)]))
	10	+if test "x$with_anthy" != "xno"; then
	11
	12	PKG_CHECK_MODULES(ANTHY, anthy, HAVE_ANTHY=yes, HAVE_ANTHY=no)
	13	if test "x$HAVE_ANTHY" = "xyes"; then
	14	@@ -333,6 +337,8 @@
	15	ANTHY_LD_FLAGS="$ANTHY_LIBS"
	16	CONFIG_FLAGS="$CONFIG_FLAGS -DHAVE_ANTHY"
	17	fi
	18	+
	19	+fi
	20	AC_SUBST(ANTHY_LD_FLAGS)
	21
	22	dnl Check for Ispell usability.
	23	@@ -347,11 +353,15 @@
	24	dnl If we have one, define HAVE_THAI_WORDSEG and one of these:
	25	dnl HAVE_LIBTHAI, HAVE_WORDCUT, or HAVE_WORDCUT_OLD
	26	dnl In addition, set THAI_WORDSEG_LD_FLAGS to a proper value.
	27	+AC_ARG_WITH(libthai,
	28	+ AC_HELP_STRING([--with-libthai],
	29	+ [with libThai library (default is YES)]))
	30	+if test "x$with_libthai" != "xno"; then
	31
	32	PKG_CHECK_MODULES(LIBTHAI, libthai, HAVE_LIBTHAI=yes, HAVE_LIBTHAI=no)
	33	PKG_CHECK_MODULES(WORDCUT, wordcut, HAVE_WORDCUT=yes, HAVE_WORDCUT=no)
	34
	35	-if test "x$HAVE_LIBTHAI" == "xyes"; then
	36	+if test "x$HAVE_LIBTHAI" = "xyes"; then
	37
	38	AC_DEFINE(HAVE_LIBTHAI, 1, [Define if you have libthai])
	39	THAI_WORDSEG_LD_FLAGS="$LIBTHAI_LIBS"
	40	@@ -406,6 +416,8 @@
	41	if test "x$HAVE_THAI_WORDSEG" = "xyes"; then
	42	AC_DEFINE(HAVE_THAI_WORDSEG, 1,
	43	[Define if you have some Thai word-segmentation library])
	44	+fi
	45	+
	46	fi
	47	AC_SUBST(THAI_WORDSEG_LD_FLAGS)
	48

Lines 12-42 Link Here

(-)devel/m17n-lib/pkg-plist (-7 / +7 lines)
12	lib/libm17n-X.a	12	lib/libm17n-X.a
13	lib/libm17n-X.la	13	lib/libm17n-X.la
14	lib/libm17n-X.so	14	lib/libm17n-X.so
15	lib/libm17n-X.so.1	15	lib/libm17n-X.so.2
16	lib/libm17n-core.a	16	lib/libm17n-core.a
17	lib/libm17n-core.la	17	lib/libm17n-core.la
18	lib/libm17n-core.so	18	lib/libm17n-core.so
19	lib/libm17n-core.so.1	19	lib/libm17n-core.so.2
20	lib/libm17n-gd.a	20	lib/libm17n-gd.a
21	lib/libm17n-gd.la	21	lib/libm17n-gd.la
22	lib/libm17n-gd.so	22	lib/libm17n-gd.so
23	lib/libm17n-gd.so.1	23	lib/libm17n-gd.so.2
24	lib/libm17n-gui.a	24	lib/libm17n-gui.a
25	lib/libm17n-gui.la	25	lib/libm17n-gui.la
26	lib/libm17n-gui.so	26	lib/libm17n-gui.so
27	lib/libm17n-gui.so.1	27	lib/libm17n-gui.so.2
28	lib/libm17n.a	28	lib/libm17n.a
29	lib/libm17n.la	29	lib/libm17n.la
30	lib/libm17n.so	30	lib/libm17n.so
31	lib/libm17n.so.1	31	lib/libm17n.so.2
32	lib/libmimx-anthy.a	32	lib/libmimx-anthy.a
33	lib/libmimx-anthy.la	33	lib/libmimx-anthy.la
34	lib/libmimx-anthy.so	34	lib/libmimx-anthy.so
35	lib/libmimx-anthy.so.1	35	lib/libmimx-anthy.so.2
36	lib/libmimx-ispell.a	36	lib/libmimx-ispell.a
37	lib/libmimx-ispell.la	37	lib/libmimx-ispell.la
38	lib/libmimx-ispell.so	38	lib/libmimx-ispell.so
39	lib/libmimx-ispell.so.1	39	lib/libmimx-ispell.so.2
40	libdata/pkgconfig/m17n-core.pc	40	libdata/pkgconfig/m17n-core.pc
41	libdata/pkgconfig/m17n-gui.pc	41	libdata/pkgconfig/m17n-gui.pc
42	libdata/pkgconfig/m17n-shell.pc	42	libdata/pkgconfig/m17n-shell.pc