From owner-svn-ports-head@FreeBSD.ORG Tue Jan 28 14:07:36 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AFE8E360; Tue, 28 Jan 2014 14:07:36 +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 9BF7C10B6; Tue, 28 Jan 2014 14:07:36 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0SE7aFS002881; Tue, 28 Jan 2014 14:07:36 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0SE7aSI002880; Tue, 28 Jan 2014 14:07:36 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201401281407.s0SE7aSI002880@svn.freebsd.org> From: Baptiste Daroussin Date: Tue, 28 Jan 2014 14:07:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r341567 - 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-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 Jan 2014 14:07:36 -0000 Author: bapt Date: Tue Jan 28 14:07:36 2014 New Revision: 341567 URL: http://svnweb.freebsd.org/changeset/ports/341567 QAT: https://qat.redports.org/buildarchive/r341567/ Log: Use options helpers Use install-strip target to strip binaries (it respect DONTSTRIP which is passed to env in case we do build WITH_DEBUG) Switch ispell -> aspell-ispell Approved by: kwm (gnome) Modified: head/textproc/enchant/Makefile Modified: head/textproc/enchant/Makefile ============================================================================== --- head/textproc/enchant/Makefile Tue Jan 28 14:06:16 2014 (r341566) +++ head/textproc/enchant/Makefile Tue Jan 28 14:07:36 2014 (r341567) @@ -22,70 +22,37 @@ CONFIGURE_ARGS= --disable-uspell \ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib +INSTALL_TARGET= install-strip + OPTIONS_MULTI= SPELL OPTIONS_MULTI_SPELL=ASPELL HSPELL HUNSPELL ISPELL ZEMBEREK OPTIONS_DEFAULT=HUNSPELL +OPTIONS_SUB= yes HSPELL_DESC= Spell checking via Hspell HUNSPELL_DESC= Spell checking via Hunspell ZEMBEREK_DESC= Spell checking via Zemberek -.include +ASPELL_LIB_DEPENDS= libaspell.so:${PORTSDIR}/textproc/aspell +ASPELL_CONFIGURE_ENABLE= aspell +ASPELL_CONFIGURE_ON= --with-aspell-prefix=${LOCALBASE} + +HSPELL_BUILD_DEPENDS= ${LOCALBASE}/lib/libhspell.a:${PORTSDIR}/hebrew/hspell +HSPELL_CONFIGURE_ENABLE= hspell +HSPELL_CONFIGURE_ON= --with-hspell-prefix=${LOCALBASE} + +HUNSPELL_LIB_DEPENDS= libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell +HUNSPELL_CONFIGURE_ENABLE= myspell +HUNSPELL_CONFIGURE_ON= --with-system-myspell=yes \ + --with-myspell-dir=${LOCALBASE}/share/hunspell + +ISPELL_RUN_DEPENDS= ispell:${PORTSDIR}/textproc/aspell-ispell +ISPELL_CONFIGURE_ENABLE= ispell -.if ${PORT_OPTIONS:MASPELL} -LIB_DEPENDS+= libaspell.so:${PORTSDIR}/textproc/aspell -CONFIGURE_ARGS+=--enable-aspell \ - --with-aspell-prefix=${LOCALBASE} -PLIST_SUB+= ASPELL="" -.else -CONFIGURE_ARGS+=--disable-aspell -PLIST_SUB+= ASPELL="@comment " -.endif - -.if ${PORT_OPTIONS:MHSPELL} -BUILD_DEPENDS+= ${LOCALBASE}/lib/libhspell.a:${PORTSDIR}/hebrew/hspell -CONFIGURE_ARGS+=--enable-hspell \ - --with-hspell-prefix=${LOCALBASE} -PLIST_SUB+= HSPELL="" -.else -CONFIGURE_ARGS+=--disable-hspell -PLIST_SUB+= HSPELL="@comment " -.endif - -.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}/share/hunspell -PLIST_SUB+= HUNSPELL="" -.else -CONFIGURE_ARGS+=--disable-myspell -PLIST_SUB+= HUNSPELL="@comment " -.endif - -.if ${PORT_OPTIONS:MISPELL} -RUN_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell -CONFIGURE_ARGS+=--enable-ispell \ - --with-ispell-dir=${LOCALBASE}/share/ispell -PLIST_SUB+= ISPELL="" -.else -CONFIGURE_ARGS+=--disable-ispell -PLIST_SUB+= ISPELL="@comment " -.endif - -.if ${PORT_OPTIONS:MZEMBEREK} -LIB_DEPENDS+= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib -CONFIGURE_ARGS+=--enable-zemberek -PLIST_SUB+= ZEMBEREK="" -.else -PLIST_SUB+= ZEMBEREK="@comment " -CONFIGURE_ARGS+=--disable-zemberek -.endif +ZEMBEREK_LIb_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib +ZEMBEREK_CONFIGURE_ENABLE= zemberek 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