From 2b06b64a29cf26e47dde4b4596d98c16140283a3 Mon Sep 17 00:00:00 2001
From: Florent Thoumie <flz@FreeBSD.org>
Date: Thu, 3 Mar 2005 12:51:48 +0000
Subject: [PATCH] - Update to 1.2.0.

PR:		ports/78310
Submitted by:	Ports Fury
Approved by:	pav (mentor)
---
 devel/m17n-lib/Makefile  | 25 ++++++++++++++-----------
 devel/m17n-lib/distinfo  |  4 ++--
 devel/m17n-lib/pkg-plist | 13 ++++++++-----
 3 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/devel/m17n-lib/Makefile b/devel/m17n-lib/Makefile
index fa410f3b4231..5e24c6b3a91b 100644
--- a/devel/m17n-lib/Makefile
+++ b/devel/m17n-lib/Makefile
@@ -6,25 +6,26 @@
 #
 
 PORTNAME=	m17n-lib
-PORTVERSION=	1.1.0
+PORTVERSION=	1.2.0
 CATEGORIES=	devel
 MASTER_SITES=	http://www.m17n.org/m17n-lib/download/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A library for the multilingual text handling
 
-LIB_DEPENDS=	fribidi.0:${PORTSDIR}/converters/fribidi \
-		otf.0:${PORTSDIR}/print/libotf \
-		Xft.2:${PORTSDIR}/x11-fonts/libXft \
-		gd.4:${PORTSDIR}/graphics/gd
 BUILD_DEPENDS=	${LOCALBASE}/share/m17n/mdb.dir:${PORTSDIR}/devel/m17n-db
+LIB_DEPENDS=	fribidi.0:${PORTSDIR}/converters/fribidi \
+		gd.4:${PORTSDIR}/graphics/gd \
+		otf.0:${PORTSDIR}/print/libotf \
+		Xft.2:${PORTSDIR}/x11-fonts/libXft
 RUN_DEPENDS=	${LOCALBASE}/share/m17n/mdb.dir:${PORTSDIR}/devel/m17n-db
 
-USE_REINPLACE=	yes
 USE_XLIB=	yes
-USE_GNOME=	libxml2
+USE_GNOME=	gnometarget libxml2 pkgconfig
+USE_REINPLACE=	yes
 USE_LIBTOOL_VER=	15
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 INSTALLS_SHLIB=	yes
 
 OPTIONS=	ANTHY	"With Anthy support" off \
@@ -32,13 +33,13 @@ OPTIONS=	ANTHY	"With Anthy support" off \
 
 .include <bsd.port.pre.mk>
 
-.ifdef WITH_ANTHY
+.if defined(WITH_ANTHY)
 LIB_DEPENDS+=	anthy.1:${PORTSDIR}/japanese/anthy
 .else
 CONFIGURE_ENV+=	ac_cv_lib_anthydic_anthy_init_sessions=no
 .endif
 
-.ifdef WITH_ISPELL
+.if defined(WITH_ISPELL)
 BUILD_DEPENDS+=	ispell:${PORTSDIR}/textproc/ispell
 RUN_DEPENDS+=	ispell:${PORTSDIR}/textproc/ispell
 .else
@@ -46,6 +47,8 @@ CONFIGURE_ENV+=	HAVE_ISPELL=no
 .endif
 
 post-patch:
-	${REINPLACE_CMD} -e 's/-ldl//' ${WRKSRC}/*/Makefile.in
+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
+		's|$${libdir}/pkgconfig|$${prefix}/libdata/pkgconfig|g ; \
+		 s|-ldl||g'
 
 .include <bsd.port.post.mk>
diff --git a/devel/m17n-lib/distinfo b/devel/m17n-lib/distinfo
index c2f9e606fe28..61e4d800d259 100644
--- a/devel/m17n-lib/distinfo
+++ b/devel/m17n-lib/distinfo
@@ -1,2 +1,2 @@
-MD5 (m17n-lib-1.1.0.tar.gz) = 7ee402c37e1a459b274f1ccb2a4d90f3
-SIZE (m17n-lib-1.1.0.tar.gz) = 657484
+MD5 (m17n-lib-1.2.0.tar.gz) = 215242775c67930e20597b2c7703acef
+SIZE (m17n-lib-1.2.0.tar.gz) = 675191
diff --git a/devel/m17n-lib/pkg-plist b/devel/m17n-lib/pkg-plist
index af4970174f41..570064aec88d 100644
--- a/devel/m17n-lib/pkg-plist
+++ b/devel/m17n-lib/pkg-plist
@@ -1,9 +1,9 @@
 bin/m17n-config
-bin/mconv
-bin/mdate
-bin/mdump
-bin/medit
-bin/mview
+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-gui.h
@@ -26,3 +26,6 @@ lib/libmimx-anthy.so
 lib/libmimx-anthy.so.1
 lib/libmimx-ispell.so
 lib/libmimx-ispell.so.1
+libdata/pkgconfig/m17n-core.pc
+libdata/pkgconfig/m17n-gui.pc
+libdata/pkgconfig/m17n-shell.pc