From owner-svn-ports-all@FreeBSD.ORG Fri Feb 1 11:32:04 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 2D54010F; Fri, 1 Feb 2013 11:32:04 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id E33ADE2F; Fri, 1 Feb 2013 11:32:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r11BW3ip088856; Fri, 1 Feb 2013 11:32:03 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r11BW3RW088855; Fri, 1 Feb 2013 11:32:03 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201302011132.r11BW3RW088855@svn.freebsd.org> From: Alexey Dokuchaev Date: Fri, 1 Feb 2013 11:32:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r311369 - head/devel/m17n-lib X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Feb 2013 11:32:04 -0000 Author: danfe Date: Fri Feb 1 11:32:02 2013 New Revision: 311369 URL: http://svnweb.freebsd.org/changeset/ports/311369 Log: - In preparation to libthai update, drop ABI version numbers from LIB_DEPENDS - Cleanup Makefile a bit while here: trim header, convert to OptionsNG, etc. Modified: head/devel/m17n-lib/Makefile Modified: head/devel/m17n-lib/Makefile ============================================================================== --- head/devel/m17n-lib/Makefile Fri Feb 1 11:18:55 2013 (r311368) +++ head/devel/m17n-lib/Makefile Fri Feb 1 11:32:02 2013 (r311369) @@ -1,9 +1,5 @@ -# New ports collection makefile for: m17n-lib -# Date created: 29 May 2004 -# Whom: Kimura Fuyuki -# +# Created by: Kimura Fuyuki # $FreeBSD$ -# PORTNAME= m17n-lib PORTVERSION= 1.6.3 @@ -13,15 +9,15 @@ MASTER_SITES= http://www.m17n.org/m17n-l http://anthesphoria.net/FreeBSD/ports/distfiles/ MAINTAINER= nikola.lecic@anthesphoria.net -COMMENT= A library for the multilingual text handling +COMMENT= Library for the multilingual text handling BUILD_DEPENDS= bison:${PORTSDIR}/devel/bison \ m17n-db>=1.6.2:${PORTSDIR}/devel/m17n-db -LIB_DEPENDS= fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \ - freetype.9:${PORTSDIR}/print/freetype2 \ - fribidi.3:${PORTSDIR}/converters/fribidi \ - gd.4:${PORTSDIR}/graphics/gd \ - otf.0:${PORTSDIR}/print/libotf +LIB_DEPENDS= fontconfig:${PORTSDIR}/x11-fonts/fontconfig \ + freetype:${PORTSDIR}/print/freetype2 \ + fribidi:${PORTSDIR}/converters/fribidi \ + gd:${PORTSDIR}/graphics/gd \ + otf:${PORTSDIR}/print/libotf RUN_DEPENDS= m17n-db>=1.6.2:${PORTSDIR}/devel/m17n-db MAKE_JOBS_UNSAFE= yes @@ -31,29 +27,31 @@ USE_GNOME= libxml2 pkgconfig USE_AUTOTOOLS= autoconf libtool USE_LDCONFIG= yes -OPTIONS= ANTHY "With Anthy support" off \ - ISPELL "With Ispell support" off \ - THAI "With libThai support" off +CONFIGURE_ARGS= --disable-nls -.include +OPTIONS_DEFINE= ANTHY ISPELL THAI -CONFIGURE_ARGS+= --disable-nls +ANTHY_DESC= Kana-Kanji conversion support via Anthy +ISPELL_DESC= Spell checking support via Ispell +THAI_DESC= Thai language support via libThai -.if defined(WITH_ANTHY) -LIB_DEPENDS+= anthy.1:${PORTSDIR}/japanese/anthy +.include + +.if ${PORT_OPTIONS:MANTHY} +LIB_DEPENDS+= anthy:${PORTSDIR}/japanese/anthy .else CONFIGURE_ARGS+= --without-anthy .endif -.if defined(WITH_ISPELL) +.if ${PORT_OPTIONS:MISPELL} BUILD_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell RUN_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell .else CONFIGURE_ENV+= HAVE_ISPELL=no .endif -.if defined(WITH_THAI) -LIB_DEPENDS+= thai.0:${PORTSDIR}/devel/libthai +.if ${PORT_OPTIONS:MTHAI} +LIB_DEPENDS+= thai:${PORTSDIR}/devel/libthai .else CONFIGURE_ARGS+= --without-libthai .endif @@ -63,4 +61,4 @@ post-patch: 's|$${libdir}/pkgconfig|$${prefix}/libdata/pkgconfig|g ; \ s|-ldl||g' -.include +.include