From owner-svn-ports-all@FreeBSD.ORG Sun Nov 17 16:52:38 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1C533912; Sun, 17 Nov 2013 16:52:38 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E606F277F; Sun, 17 Nov 2013 16:52:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAHGqbbk074537; Sun, 17 Nov 2013 16:52:37 GMT (envelope-from kwm@svn.freebsd.org) Received: (from kwm@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAHGqbp6074532; Sun, 17 Nov 2013 16:52:37 GMT (envelope-from kwm@svn.freebsd.org) Message-Id: <201311171652.rAHGqbp6074532@svn.freebsd.org> From: Koop Mast Date: Sun, 17 Nov 2013 16:52:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r334105 - head/textproc/enchant 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.16 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: Sun, 17 Nov 2013 16:52:38 -0000 Author: kwm Date: Sun Nov 17 16:52:37 2013 New Revision: 334105 URL: http://svnweb.freebsd.org/changeset/ports/334105 Log: Fix myspell (hunspell) and ispell backends. It needs to known the exact directory where the dictonaries are located. Use MULTI options. A spellcheck library without any spell check backends is useless. Switch default to HUNSPELL, it beter maintained. Stageify. Modified: head/textproc/enchant/Makefile head/textproc/enchant/pkg-plist Modified: head/textproc/enchant/Makefile ============================================================================== --- head/textproc/enchant/Makefile Sun Nov 17 16:45:44 2013 (r334104) +++ head/textproc/enchant/Makefile Sun Nov 17 16:52:37 2013 (r334105) @@ -4,7 +4,7 @@ PORTNAME= enchant PORTVERSION= 1.6.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc gnome MASTER_SITES= http://www.abisource.com/downloads/${PORTNAME}/${PORTVERSION}/ DIST_SUBDIR= gnome2 @@ -22,15 +22,13 @@ CONFIGURE_ARGS= --disable-uspell \ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -MAN1= enchant.1 - -OPTIONS_DEFINE= ASPELL HSPELL HUNSPELL ISPELL ZEMBEREK -OPTIONS_DEFAULT=ASPELL +OPTIONS_MULTI= SPELL +OPTIONS_MULTI_SPELL=ASPELL HSPELL HUNSPELL ISPELL ZEMBEREK +OPTIONS_DEFAULT=HUNSPELL HSPELL_DESC= Spell checking via Hspell HUNSPELL_DESC= Spell checking via Hunspell ZEMBEREK_DESC= Spell checking via Zemberek -NO_STAGE= yes .include .if ${PORT_OPTIONS:MASPELL} @@ -56,7 +54,7 @@ PLIST_SUB+= HSPELL="@comment " .if ${PORT_OPTIONS:MHUNSPELL} LIB_DEPENDS+= libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell CONFIGURE_ARGS+=--enable-myspell --with-system-myspell=yes \ - --with-myspell-dir=${LOCALBASE} + --with-myspell-dir=${LOCALBASE}/share/hunspell PLIST_SUB+= HUNSPELL="" .else CONFIGURE_ARGS+=--disable-myspell @@ -66,7 +64,7 @@ PLIST_SUB+= HUNSPELL="@comment " .if ${PORT_OPTIONS:MISPELL} RUN_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell CONFIGURE_ARGS+=--enable-ispell \ - --with-ispell-dir=${LOCALBASE} + --with-ispell-dir=${LOCALBASE}/share/ispell PLIST_SUB+= ISPELL="" .else CONFIGURE_ARGS+=--disable-ispell @@ -86,4 +84,8 @@ post-patch: @${REINPLACE_CMD} -e 's|MKDIRPROG-mkdir|MKDIRPROG-mkdir -p|g' \ ${WRKSRC}/install-sh +post-install: + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libenchant.so.1 \ + ${STAGEDIR}${PREFIX}/lib/enchant/libenchant_*.so + .include Modified: head/textproc/enchant/pkg-plist ============================================================================== --- head/textproc/enchant/pkg-plist Sun Nov 17 16:45:44 2013 (r334104) +++ head/textproc/enchant/pkg-plist Sun Nov 17 16:52:37 2013 (r334105) @@ -23,6 +23,7 @@ lib/libenchant.la lib/libenchant.so lib/libenchant.so.1 libdata/pkgconfig/enchant.pc +man/man1/enchant.1.gz %%DATADIR%%/enchant.ordering @dirrm %%DATADIR%% @dirrm lib/enchant