From owner-svn-ports-all@FreeBSD.ORG Fri Sep 20 12:15:58 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 ESMTP id BC3824E7; Fri, 20 Sep 2013 12:15:58 +0000 (UTC) (envelope-from kwm@FreeBSD.org) 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 A9F5E234D; Fri, 20 Sep 2013 12:15:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8KCFwMF018357; Fri, 20 Sep 2013 12:15:58 GMT (envelope-from kwm@svn.freebsd.org) Received: (from kwm@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8KCFw53018354; Fri, 20 Sep 2013 12:15:58 GMT (envelope-from kwm@svn.freebsd.org) Message-Id: <201309201215.r8KCFw53018354@svn.freebsd.org> From: Koop Mast Date: Fri, 20 Sep 2013 12:15:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r327695 - in head/textproc/enchant: . files 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, 20 Sep 2013 12:15:58 -0000 Author: kwm Date: Fri Sep 20 12:15:57 2013 New Revision: 327695 URL: http://svnweb.freebsd.org/changeset/ports/327695 Log: Make sure we use system hunspell and look in the right location where to find the dictionaries. [1] Do the same for hspell and ispell, and use new lib_depend syntax. USE_GMAKE => USES=gmake and fix bug in configure script. PR: ports/180660 Submitted by: tijl@ Added: head/textproc/enchant/files/ head/textproc/enchant/files/patch-configure (contents, props changed) Modified: head/textproc/enchant/Makefile Modified: head/textproc/enchant/Makefile ============================================================================== --- head/textproc/enchant/Makefile Fri Sep 20 12:13:54 2013 (r327694) +++ head/textproc/enchant/Makefile Fri Sep 20 12:15:57 2013 (r327695) @@ -12,10 +12,9 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Dictionary/spellchecking framework -USE_GMAKE= yes USE_AUTOTOOLS= libtool USE_LDCONFIG= yes -USES= pathfix pkgconfig +USES= gmake pathfix pkgconfig USE_GNOME= glib20 ltverhack CONFIGURE_ARGS= --disable-uspell \ --disable-voikko @@ -34,7 +33,7 @@ ZEMBEREK_DESC= Spell checking via Zember .include .if ${PORT_OPTIONS:MASPELL} -LIB_DEPENDS+= pspell:${PORTSDIR}/textproc/aspell +LIB_DEPENDS+= libaspell.so:${PORTSDIR}/textproc/aspell CONFIGURE_ARGS+=--enable-aspell \ --with-aspell-prefix=${LOCALBASE} PLIST_SUB+= ASPELL="" @@ -45,7 +44,8 @@ PLIST_SUB+= ASPELL="@comment " .if ${PORT_OPTIONS:MHSPELL} BUILD_DEPENDS+= ${LOCALBASE}/lib/libhspell.a:${PORTSDIR}/hebrew/hspell -CONFIGURE_ARGS+=--enable-hspell +CONFIGURE_ARGS+=--enable-hspell \ + --with-hspell-prefix=${LOCALBASE} PLIST_SUB+= HSPELL="" .else CONFIGURE_ARGS+=--disable-hspell @@ -53,8 +53,9 @@ PLIST_SUB+= HSPELL="@comment " .endif .if ${PORT_OPTIONS:MHUNSPELL} -LIB_DEPENDS+= hunspell-1.3:${PORTSDIR}/textproc/hunspell -CONFIGURE_ARGS+=--enable-myspell +LIB_DEPENDS+= libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell +CONFIGURE_ARGS+=--enable-myspell --with-system-myspell=yes \ + --with-myspell-dir=${LOCALBASE} PLIST_SUB+= HUNSPELL="" .else CONFIGURE_ARGS+=--disable-myspell @@ -63,7 +64,8 @@ PLIST_SUB+= HUNSPELL="@comment " .if ${PORT_OPTIONS:MISPELL} RUN_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell -CONFIGURE_ARGS+=--enable-ispell +CONFIGURE_ARGS+=--enable-ispell \ + --with-ispell-dir=${LOCALBASE} PLIST_SUB+= ISPELL="" .else CONFIGURE_ARGS+=--disable-ispell @@ -71,7 +73,7 @@ PLIST_SUB+= ISPELL="@comment " .endif .if ${PORT_OPTIONS:MZEMBEREK} -LIB_DEPENDS+= dbus-glib-1:${PORTSDIR}/devel/dbus-glib +LIB_DEPENDS+= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib CONFIGURE_ARGS+=--enable-zemberek PLIST_SUB+= ZEMBEREK="" .else Added: head/textproc/enchant/files/patch-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/enchant/files/patch-configure Fri Sep 20 12:15:57 2013 (r327695) @@ -0,0 +1,11 @@ +--- configure.orig 2013-08-16 18:30:56.000000000 +0200 ++++ configure 2013-08-16 18:31:33.000000000 +0200 +@@ -18213,7 +18213,7 @@ + fi + + +- ASPELL_CFLAGS+=" -DHAVE_PSPELL_H" ++ ASPELL_CFLAGS="${ASPELL_CFLAGS} -DHAVE_PSPELL_H" + elif test -f "$aspell_prefix/include/aspell.h"; then + { $as_echo "$as_me:$LINENO: result: yes (aspell)" >&5 + $as_echo "yes (aspell)" >&6; }