From d76eebb14a0f0560062fe8a0e0c5baf1bd17b96a Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Sun, 17 May 2009 18:32:04 +0000 Subject: [PATCH] - add enchant support ; should fix spell checking reported on ports@ by punosevac72 at gmail dot com - regen WANTLIB and PLIST while here --- editors/abiword/Makefile | 23 ++++++++++++----------- editors/abiword/pkg/PLIST | 8 +++----- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile index 2fa49e2ca39..ac73010a5cf 100644 --- a/editors/abiword/Makefile +++ b/editors/abiword/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.68 2008/06/15 00:06:52 sthen Exp $ +# $OpenBSD: Makefile,v 1.69 2009/05/17 18:32:04 ajacoutot Exp $ COMMENT= free cross-platform WYSIWYG word processor VERSION= 2.4.6 MAJORVER= ${VERSION:C/..$//} DISTNAME= abiword-${VERSION} -PKGNAME= ${DISTNAME}p5 +PKGNAME= ${DISTNAME}p6 CATEGORIES= editors HOMEPAGE= http://www.abisource.com/ @@ -24,13 +24,13 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= ICE SM X11 Xext Xft Xrender art_lgpl_2 atk-1.0 c Xrandr \ - Xau Xcomposite Xcursor Xdamage Xdmcp Xfixes Xi Xinerama \ - expat fontconfig freetype gailutil glade-2.0 glib-2.0 \ - gmodule-2.0 gnomecanvas-2 gnomeprint-2-2 gobject-2.0 glitz \ - gthread-2.0 m pango-1.0 pangocairo-1.0 cairo \ - pangoft2-1.0 pangoxft-1.0 pixman-1 png pthread stdc++ \ - xml2.>=9 z +WANTLIB += ICE SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext +WANTLIB += Xfixes Xft Xi Xinerama Xrandr Xrender art_lgpl_2 atk-1.0 +WANTLIB += c cairo expat fontconfig freetype gio-2.0 glade-2.0 +WANTLIB += glib-2.0 glitz gmodule-2.0 gnomecanvas-2 gnomeprint-2-2 +WANTLIB += gobject-2.0 gthread-2.0 m pango-1.0 pangocairo-1.0 +WANTLIB += pangoft2-1.0 pangoxft-1.0 pixman-1 png pthread stdc++ +WANTLIB += xml2 z MASTER_SITES= ${HOMEPAGE}/downloads/abiword/${VERSION}/source/ @@ -38,7 +38,7 @@ USE_GMAKE= Yes USE_X11= Yes CONFIGURE_STYLE= gnu -CONFIGURE_ARGS= --disable-gucharmap --disable-enchant --without-pspell +CONFIGURE_ARGS= --disable-gucharmap --enable-enchant --without-pspell CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -DMAXSTRINGCHARS=512" \ LDFLAGS="-L${LOCALBASE}/lib" @@ -47,7 +47,8 @@ FLAVOR?= .if ${FLAVOR:L:Mgnome} LIB_DEPENDS+= gnomeui-2::x11/gnome/libgnomeui \ - ORBit-2::devel/ORBit2 + ORBit-2::devel/ORBit2 \ + enchant.>=5::textproc/enchant WANTLIB+= ORBit-2 bonobo-2 bonobo-activation bonoboui-2 \ gconf-2 gnome-2 gnomeui-2 gnomevfs-2 CONFIGURE_ARGS+= --enable-gnome diff --git a/editors/abiword/pkg/PLIST b/editors/abiword/pkg/PLIST index 2af86bff325..453f841b8b9 100644 --- a/editors/abiword/pkg/PLIST +++ b/editors/abiword/pkg/PLIST @@ -1,8 +1,8 @@ -@comment $OpenBSD: PLIST,v 1.20 2008/02/20 01:17:53 merdely Exp $ -bin/AbiWord-${MAJORVER} +@comment $OpenBSD: PLIST,v 1.21 2009/05/17 18:32:04 ajacoutot Exp $ +@bin bin/AbiWord-${MAJORVER} bin/abiword bin/ttfadmin.sh -bin/ttftool +@bin bin/ttftool lib/bonobo/ lib/bonobo/servers/ @man man/man1/abiword.1 @@ -210,8 +210,6 @@ share/AbiSuite-${MAJORVER}/clipart/tux_bordelais.png share/AbiSuite-${MAJORVER}/clipart/weather.png share/AbiSuite-${MAJORVER}/clipart/write.png share/AbiSuite-${MAJORVER}/dictionary/ -@comment share/AbiSuite-${MAJORVER}/dictionary/american.hash -share/AbiSuite-${MAJORVER}/dictionary/ispell_dictionary_list.xml share/AbiSuite-${MAJORVER}/icons/ share/AbiSuite-${MAJORVER}/icons/abiword_16.xpm share/AbiSuite-${MAJORVER}/icons/abiword_48.png