Date: Sun, 17 Nov 2013 16:52:37 +0000 (UTC) From: Koop Mast <kwm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r334105 - head/textproc/enchant Message-ID: <201311171652.rAHGqbp6074532@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <bsd.port.options.mk> .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 <bsd.port.mk> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311171652.rAHGqbp6074532>