Index: Mk/Uses/spelling.mk =================================================================== --- /dev/null +++ Mk/Uses/spelling.mk @@ -0,0 +1,48 @@ +# $FreeBSD$ +# +# Handle dependency on spellchecker engines +# +# Feature: spelling +# Usage: USES=spelling:ARGS +# Valid ARGS: aspell,hunspell,ispell +# +# MAINTAINER: kde@FreeBSD.org +# + +.if ! defined(_INCLUDE_USES_SPELLING_MK) +_INCLUDE_USES_SPELLING_MK= yes + +_SUPPORTED_ENGINES= aspell hunspell ispell + +. if empty(spelling_ARGS) +IGNORE= spelling requires an argument: ${_SUPPORTED_ENGINES} +. else + +aspell_PORT= textproc/aspell +aspell_LIB= libaspell.so + +ispell_PORT= textproc/aspell-ispell +ispell_BIN= ispell + +hunspell_PORT= textproc/hunspell +hunspell_LIB= libhunspell-1.5.so + +_SELECTED= # +. for engine in ${_SUPPORTED_ENGINES} +. if ${spelling_ARGS:M${engine}} +. if defined(${engine}_LIB) +LIB_DEPENDS+= ${${engine}_LIB}:${${engine}_PORT} +_SELECTED+= ${engine} +. else +BUILD_DEPENDS+= ${${engine}_BIN}:${${engine}_PORT} +RUN_DEPENDS+= ${${engine}_BIN}:${${engine}_PORT} +_SELECTED+= ${engine} +. endif +. endif +. endfor + +. if empty(_SELECTED) +IGNORE= spelling:${spelling_ARGS} does not include any of ${_SUPPORTED_ENGINES} +. endif +. endif +.endif Index: deskutils/recoll/Makefile =================================================================== --- deskutils/recoll/Makefile +++ deskutils/recoll/Makefile @@ -35,7 +35,7 @@ OPTIONS_DEFAULT= ASPELL IMAGE PDF PS PYTHON SOUND QT4 X11MON OPTIONS_SUB= yes -ASPELL_LIB_DEPENDS= libaspell.so:textproc/aspell +ASPELL_USES= spelling:aspell ASPELL_CONFIGURE_WITH= aspell CHM_DESC= CHM via CHMLIB CHM_RUN_DEPENDS= pychm>0:textproc/pychm Index: deskutils/treeline/Makefile =================================================================== --- deskutils/treeline/Makefile +++ deskutils/treeline/Makefile @@ -17,11 +17,8 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/doc/LICENSE -BUILD_DEPENDS= aspell:textproc/aspell -RUN_DEPENDS= aspell:textproc/aspell - -USES= python:2 pyqt:4 -USE_PYQT= gui network sip_build +USES= python:2 pyqt:4 spelling:aspell +USE_PYQT= gui network sip_build NO_BUILD= yes NO_ARCH= yes Index: deskutils/xneur/Makefile =================================================================== --- deskutils/xneur/Makefile +++ deskutils/xneur/Makefile @@ -40,7 +40,7 @@ X11_USE= XORG=x11 X11_CONFIGURE_WITH= x -ASPELL_LIB_DEPENDS= libaspell.so:textproc/aspell +ASPELL_USES= spelling:aspell ASPELL_CONFIGURE_ON= --with-spell=aspell ASPELL_CONFIGURE_OFF= --with-spell=no --without-aspell Index: devel/codeblocks/Makefile =================================================================== --- devel/codeblocks/Makefile +++ devel/codeblocks/Makefile @@ -17,11 +17,11 @@ BUILD_DEPENDS= zip:archivers/zip LIB_DEPENDS= libboost_system.so:devel/boost-libs \ libfontconfig.so:x11-fonts/fontconfig \ - libfreetype.so:print/freetype2 \ - libhunspell-1.5.so:textproc/hunspell + libfreetype.so:print/freetype2 USES= autoreconf compiler desktop-file-utils fam:gamin localbase \ - gettext-runtime libtool pathfix pkgconfig shared-mime-info + gettext-runtime libtool pathfix pkgconfig shared-mime-info \ + spelling:hunspell USE_WX= 2.8 USE_GNOME= gtk20 cairo USE_XORG= x11 Index: devel/librcc/Makefile =================================================================== --- devel/librcc/Makefile +++ devel/librcc/Makefile @@ -15,12 +15,11 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= librcd.so:devel/librcd \ - libenca.so:converters/enca \ - libaspell.so:textproc/aspell + libenca.so:converters/enca GNU_CONFIGURE= yes USE_GNOME= libxml2 -USES= gmake iconv libtool pathfix pkgconfig tar:bzip2 +USES= gmake iconv libtool pathfix pkgconfig spelling:aspell tar:bzip2 USE_LDCONFIG= yes INSTALL_TARGET= install-strip Index: devel/lokalize/Makefile =================================================================== --- devel/lokalize/Makefile +++ devel/lokalize/Makefile @@ -8,9 +8,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Computer-aided translation system -LIB_DEPENDS= libhunspell-1.5.so:textproc/hunspell -USES= cmake:outsource kde:4 tar:xz +USES= cmake:outsource kde:4 spelling:hunspell tar:xz USE_KDE= kdelibs automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build \ sql Index: devel/m17n-lib/Makefile =================================================================== --- devel/m17n-lib/Makefile +++ devel/m17n-lib/Makefile @@ -42,8 +42,7 @@ ANTHY_LIB_DEPENDS= libanthy.so:japanese/anthy ANTHY_CONFIGURE_OFF= --without-anthy -ISPELL_BUILD_DEPENDS= ispell:textproc/aspell-ispell -ISPELL_RUN_DEPENDS= ispell:textproc/aspell-ispell +ISPELL_USES= spelling:ispell ISPELL_CONFIGURE_OFF= HAVE_ISPELL=no THAI_LIB_DEPENDS= libthai.so:devel/libthai Index: editors/codelite/Makefile =================================================================== --- editors/codelite/Makefile +++ editors/codelite/Makefile @@ -12,13 +12,12 @@ LICENSE= GPLv2+ RUN_DEPENDS= xterm:x11/xterm -LIB_DEPENDS+= libhunspell-1.5.so:textproc/hunspell USE_GITHUB= yes GH_ACCOUNT= eranif USES= cmake:outsource compiler:c++11-lib dos2unix execinfo gettext \ - pathfix shebangfix sqlite + pathfix shebangfix spelling:hunspell sqlite USE_GNOME+= cairo gtk20 DOS2UNIX_GLOB= *.cpp *.txt SHEBANG_FILES= Runtime/codelite_xterm Index: editors/focuswriter/Makefile =================================================================== --- editors/focuswriter/Makefile +++ editors/focuswriter/Makefile @@ -14,12 +14,11 @@ LICENSE_FILE_GPLv3= ${WRKSRC}/COPYING LICENSE_FILE_LGPL3= ${WRKSRC}/resources/images/icons/oxygen/COPYING -LIB_DEPENDS= libhunspell-1.5.so:textproc/hunspell - USE_GITHUB= yes GH_ACCOUNT= gottcode -USES= compiler:c++11-lib desktop-file-utils pkgconfig qmake +USES= compiler:c++11-lib desktop-file-utils pkgconfig qmake \ + spelling:hunspell USE_GL= gl USE_QT5= concurrent core gui multimedia network printsupport widgets \ buildtools_build linguisttools_build Index: editors/gate/Makefile =================================================================== --- editors/gate/Makefile +++ editors/gate/Makefile @@ -10,10 +10,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Simple and unobtrusive line-oriented text editor -BUILD_DEPENDS= aspell:textproc/aspell -RUN_DEPENDS= aspell:textproc/aspell - -USES= ncurses +USES= ncurses spelling:aspell GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-aspell=${LOCALBASE}/bin/aspell Index: editors/joe/Makefile =================================================================== --- editors/joe/Makefile +++ editors/joe/Makefile @@ -28,7 +28,7 @@ .include .if ${PORT_OPTIONS:MASPELL} -RUN_DEPENDS= aspell:textproc/aspell +USES+= spelling:aspell .endif post-patch: Index: editors/joe2/Makefile =================================================================== --- editors/joe2/Makefile +++ editors/joe2/Makefile @@ -14,7 +14,7 @@ OPTIONS_DEFINE= DOCS ISPELL OPTIONS_DEFAULT= DOCS ISPELL -ISPELL_RUN_DEPENDS= ispell:textproc/aspell-ispell +ISPELL_USES= spelling:ispell CONFLICTS= joe-3* Index: editors/libreoffice/Makefile =================================================================== --- editors/libreoffice/Makefile +++ editors/libreoffice/Makefile @@ -54,7 +54,6 @@ libnss3.so:security/nss \ libclucene-core.so:textproc/clucene \ libexpat.so:textproc/expat2 \ - libhunspell-1.5.so:textproc/hunspell \ libhyphen.so:textproc/hyphen \ libabw-0.1.so:textproc/libabw \ libe-book-0.1.so:textproc/libe-book \ @@ -96,7 +95,7 @@ USE_QT4= # empty but required USE_XORG= xaw xrandr USES= autoreconf:build bison compiler:c++11-lib cpe firebird gmake jpeg perl5 pkgconfig \ - python shared-mime-info tar:xz + python shared-mime-info spelling:hunspell tar:xz WANT_GNOME= yes OPTIONS_DEFINE= CUPS GNOME GTK2 GTK3 JAVA KDE4 MMEDIA PGSQL SDK SYSTRAY \ Index: editors/libreoffice4/Makefile =================================================================== --- editors/libreoffice4/Makefile +++ editors/libreoffice4/Makefile @@ -55,7 +55,6 @@ libnss3.so:security/nss \ libclucene-core.so:textproc/clucene \ libexpat.so:textproc/expat2 \ - libhunspell-1.5.so:textproc/hunspell \ libhyphen.so:textproc/hyphen \ libabw-0.1.so:textproc/libabw \ libe-book-0.1.so:textproc/libe-book \ @@ -90,7 +89,8 @@ USE_PERL5= build USE_QT4= # empty but required USE_XORG= xaw xrandr -USES= bison compiler:c++11-lang cpe gmake jpeg perl5 pkgconfig python shared-mime-info tar:xz +USES= bison compiler:c++11-lang cpe gmake jpeg perl5 pkgconfig \ + python shared-mime-info spelling:hunspell tar:xz WANT_GNOME= yes LOVERSION= ${PORTVERSION}.${RCVER} Index: editors/openoffice-4/Makefile =================================================================== --- editors/openoffice-4/Makefile +++ editors/openoffice-4/Makefile @@ -82,7 +82,6 @@ libfreetype.so:print/freetype2 \ libnss3.so:security/nss \ libexpat.so:textproc/expat2 \ - libhunspell-1.5.so:textproc/hunspell \ libhyphen.so:textproc/hyphen \ libtextcat.so:textproc/libtextcat \ libmythes-1.2.so:textproc/mythes \ @@ -133,7 +132,7 @@ USES= autoreconf:autoconf bison compiler:c++11-lib cpe \ desktop-file-utils \ gettext-runtime gmake iconv jpeg perl5 pkgconfig python \ - shared-mime-info ssl tar:bzip2 + shared-mime-info spelling:hunspell ssl tar:bzip2 INSTALLS_ICONS= yes WITHOUT_CPU_CFLAGS= true CPE_PRODUCT= ${PORTNAME:S|apache-||} Index: editors/openoffice-devel/Makefile =================================================================== --- editors/openoffice-devel/Makefile +++ editors/openoffice-devel/Makefile @@ -82,7 +82,6 @@ libfreetype.so:print/freetype2 \ libnss3.so:security/nss \ libexpat.so:textproc/expat2 \ - libhunspell-1.5.so:textproc/hunspell \ libhyphen.so:textproc/hyphen \ libtextcat.so:textproc/libtextcat \ libmythes-1.2.so:textproc/mythes \ @@ -143,7 +142,7 @@ USES= autoreconf:autoconf bison compiler:c++11-lib cpe \ desktop-file-utils \ gettext-runtime gmake iconv jpeg perl5 pkgconfig python \ - shared-mime-info ssl tar:${TARTYPE} + shared-mime-info spelling:hunspell ssl tar:${TARTYPE} INSTALLS_ICONS= yes WITHOUT_CPU_CFLAGS= true CPE_PRODUCT= ${PORTNAME:S|apache-||} Index: editors/tea/Makefile =================================================================== --- editors/tea/Makefile +++ editors/tea/Makefile @@ -30,10 +30,10 @@ DESKTOP_ENTRIES="TEA" "" "${PREFIX}/share/pixmaps/tea_icon_v2.png" \ "${PORTNAME}" "" "" -ASPELL_LIB_DEPENDS= libaspell.so:textproc/aspell +ASPELL_USES= spelling:aspell ASPELL_QMAKE_ON= CONFIG+=nohunspell -HUNSPELL_LIB_DEPENDS= libhunspell-1.5.so:textproc/hunspell +HUNSPELL_USES= spelling:hunspell HUNSPELL_QMAKE_ON= CONFIG+=noaspell post-patch: Index: editors/texmacs/Makefile =================================================================== --- editors/texmacs/Makefile +++ editors/texmacs/Makefile @@ -38,7 +38,7 @@ OPTIONS_DEFAULT=ASPELL FREETYPE GHOSTSCRIPT IMLIB2 PDF QT4 SQLITE OPTIONS_SUB= yes -ASPELL_RUN_DEPENDS= aspell:textproc/aspell +ASPELL_USES= spelling:aspell FREETYPE_LIB_DEPENDS= libfreetype.so:print/freetype2 FREETYPE_CONFIGURE_ENABLE= freetype FREETYPE_CONFIGURE_ENV_OFF= FREETYPE_CFLAGS=" " FREETYPE_LDFLAGS=" " \ Index: editors/texmaker/Makefile =================================================================== --- editors/texmaker/Makefile +++ editors/texmaker/Makefile @@ -13,10 +13,10 @@ LICENSE= GPLv2 -LIB_DEPENDS= libhunspell-1.5.so:textproc/hunspell \ - libpoppler.so:graphics/poppler +LIB_DEPENDS= libpoppler.so:graphics/poppler -USES= desktop-file-utils ghostscript:x11,run pkgconfig qmake tar:bzip2 +USES= desktop-file-utils ghostscript:x11,run pkgconfig qmake \ + spelling:hunspell tar:bzip2 _USE_QT4= gui network xml webkit \ moc_build rcc_build uic_build _USE_QT5= concurrent network printsupport script webkit widgets \ Index: editors/texstudio/Makefile =================================================================== --- editors/texstudio/Makefile +++ editors/texstudio/Makefile @@ -9,11 +9,10 @@ MAINTAINER= abiliojr@gmail.com COMMENT= Integrated writing environment for LaTeX documents -LIB_DEPENDS= libhunspell-1.5.so:textproc/hunspell \ - libpoppler.so:graphics/poppler +LIB_DEPENDS= libpoppler.so:graphics/poppler USES= desktop-file-utils dos2unix execinfo ghostscript:run \ - pkgconfig qmake + pkgconfig qmake spelling:hunspell DOS2UNIX_FILES= ${PORTNAME}.pro _USE_QT4= corelib gui network script svg xml \ Index: editors/textroom/Makefile =================================================================== --- editors/textroom/Makefile +++ editors/textroom/Makefile @@ -13,10 +13,9 @@ LICENSE= GPLv3 LIB_DEPENDS= libcurl.so:ftp/curl \ - libhunspell-1.5.so:textproc/hunspell \ libxml++-2.6.so:textproc/libxml++26 -USES= desktop-file-utils pkgconfig qmake +USES= desktop-file-utils pkgconfig qmake spelling:hunspell USE_GL= gl USE_SDL= mixer USE_QT4= moc_build rcc_build uic_build \ Index: german/hunspell/Makefile =================================================================== --- german/hunspell/Makefile +++ german/hunspell/Makefile @@ -14,10 +14,9 @@ LICENSE= GPLv2 GPLv3 LICENSE_COMB= dual -BUILD_DEPENDS= aspell:textproc/aspell \ - hunspell:textproc/hunspell +BUILD_DEPENDS= aspell:textproc/aspell -USES= gmake perl5 shebangfix tar:bzip2 +USES= gmake perl5 shebangfix spelling:hunspell tar:bzip2 ALL_TARGET= hunspell-all MAKE_ENV= LANG=C LC_ALL=C NO_ARCH= yes Index: german/steak/Makefile =================================================================== --- german/steak/Makefile +++ german/steak/Makefile @@ -12,9 +12,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= English <-> German dictionary under the GPL -RUN_DEPENDS= ispell:textproc/aspell-ispell - -USES= tar:bzip2 +USES= spelling:ispell tar:bzip2 MAKE_JOBS_UNSAFE= yes WRKSRC= ${WRKDIR}/Steak OPTIONS_DEFINE= GTK1 Index: graphics/ocre/Makefile =================================================================== --- graphics/ocre/Makefile +++ graphics/ocre/Makefile @@ -12,15 +12,13 @@ LICENSE= GPLv3 -LIB_DEPENDS= libaspell.so:textproc/aspell RUN_DEPENDS= display:graphics/ImageMagick \ - gnuplot:math/gnuplot \ - ispell:textproc/aspell-ispell + gnuplot:math/gnuplot WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/${PORTNAME} USE_GNOME= gtk20 -USES= gettext gmake pkgconfig tar:tgz +USES= gettext gmake pkgconfig spelling:aspell,ispell tar:tgz MAKE_ARGS= CC="${CC}" CFLAGS1="${CFLAGS}" post-extract: Index: graphics/yagf/Makefile =================================================================== --- graphics/yagf/Makefile +++ graphics/yagf/Makefile @@ -12,8 +12,6 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libaspell.so:textproc/aspell - ONLY_FOR_ARCHS= i386 amd64 OPTIONS_MULTI= OCRENGINE @@ -25,7 +23,7 @@ OPTIONS_DEFAULT= CUNEIFORM -USES= cmake desktop-file-utils pkgconfig +USES= cmake desktop-file-utils pkgconfig spelling:aspell USE_LDCONFIG= yes INSTALLS_ICONS= yes USE_QT4= corelib gui imageformats linguist_build \ Index: irc/weechat/Makefile =================================================================== --- irc/weechat/Makefile +++ irc/weechat/Makefile @@ -42,7 +42,7 @@ RUBY_DESC= Ruby script support ASPELL_CMAKE_BOOLL= ENABLE_ASPELL -ASPELL_LIB_DEPENDS= libaspell.so:textproc/aspell +ASPELL_USES= spelling:aspell BACKTRACE_CMAKE_BOOL= ENABLE_BACKTRACE BACKTRACE_USES= execinfo Index: mail/alpine/Makefile =================================================================== --- mail/alpine/Makefile +++ mail/alpine/Makefile @@ -89,12 +89,10 @@ .if ! ${PORT_OPTIONS:MNOSPELL} .if ! ${PORT_OPTIONS:MISPELL} CONFIGURE_ARGS+=--with-interactive-spellcheck=${LOCALBASE}/bin/aspell -BUILD_DEPENDS+= aspell:textproc/aspell -RUN_DEPENDS+= aspell:textproc/aspell +USES+= spelling:aspell .else CONFIGURE_ARGS+= --with-interactive-spellcheck=${LOCALBASE}/bin/ispell -BUILD_DEPENDS+= ispell:textproc/aspell-ispell -RUN_DEPENDS+= ispell:textproc/aspell-ispell +USES+= spelling:ispell .endif .else CONFIGURE_ARGS+=--without-simple-spellcheck --without-interactive-spellcheck Index: mail/cone/Makefile =================================================================== --- mail/cone/Makefile +++ mail/cone/Makefile @@ -15,12 +15,12 @@ LICENSE= GPLv3 -LIB_DEPENDS= libaspell.so:textproc/aspell \ - libcourier-unicode.so:devel/courier-unicode +LIB_DEPENDS= libcourier-unicode.so:devel/courier-unicode BUILD_DEPENDS= gpgv:security/gnupg1 RUN_DEPENDS:= ${BUILD_DEPENDS} -USES= fam gettext gmake iconv ncurses perl5 shebangfix tar:bzip2 +USES= fam gettext gmake iconv ncurses perl5 shebangfix \ + spelling:aspell tar:bzip2 USE_GNOME= libxml2 SHEBANG_FILES= sysconftool Index: mail/courier/Makefile =================================================================== --- mail/courier/Makefile +++ mail/courier/Makefile @@ -172,12 +172,10 @@ .endif .if ${PORT_OPTIONS:MASPELL} -BUILD_DEPENDS+= aspell:textproc/aspell -RUN_DEPENDS+= aspell:textproc/aspell +USES+= spelling:aspell CONFIGURE_ARGS+=--with-ispell=${LOCALBASE}/bin/aspell .elif ${PORT_OPTIONS:MISPELL} -BUILD_DEPENDS+= ispell:textproc/aspell-ispell -RUN_DEPENDS+= ispell:textproc/aspell-ispell +USES+= spelling:ispell CONFIGURE_ARGS+=--with-ispell=${LOCALBASE}/bin/ispell .else CONFIGURE_ARGS+=--without-ispell Index: mail/elm/Makefile =================================================================== --- mail/elm/Makefile +++ mail/elm/Makefile @@ -16,12 +16,10 @@ LICENSE_FILE= ${WRKSRC}/NOTICE LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -BUILD_DEPENDS= ispell:textproc/aspell-ispell - CFLAGS+= -D_SIZE_T WRKSRC= ${WRKDIR}/elm${PORTVERSION} -USES= gettext ncurses +USES= gettext ncurses spelling:ispell HAS_CONFIGURE= yes CONFIGURE_SCRIPT= Configure CONFIGURE_ENV= PREFIX="${PREFIX}" Index: mail/mutt/Makefile =================================================================== --- mail/mutt/Makefile +++ mail/mutt/Makefile @@ -112,10 +112,8 @@ RUN_DEPENDS+= ${LOCALBASE}/etc/mime.types:misc/mime-support .if !defined (MUTT_LITE) -ASPELL_BUILD_DEPENDS= aspell:textproc/aspell -ASPELL_RUN_DEPENDS= aspell:textproc/aspell -ISPELL_BUILD_DEPENDS= ispell:textproc/aspell-ispell -ISPELL_RUN_DEPENDS= ispell:textproc/aspell-ispell +ASPELL_USES= spelling:aspell +ISPELL_USES= spelling:ispell URLVIEW_RUN_DEPENDS= urlview:textproc/urlview .endif Index: mail/mutt14/Makefile =================================================================== --- mail/mutt14/Makefile +++ mail/mutt14/Makefile @@ -54,9 +54,8 @@ RUN_DEPENDS= ${LOCALBASE}/etc/mime.types:misc/mime-support .if defined(PACKAGE_BUILDING) && !defined (MUTT_LITE) WITH_SLANG= yes -BUILD_DEPENDS= ispell:textproc/aspell-ispell -RUN_DEPENDS+= ispell:textproc/aspell-ispell \ - urlview:textproc/urlview +USES+= spelling:ispell +RUN_DEPENDS+= urlview:textproc/urlview .endif .if ${PORT_OPTIONS:MNLS} Index: mail/openwebmail/Makefile =================================================================== --- mail/openwebmail/Makefile +++ mail/openwebmail/Makefile @@ -37,7 +37,7 @@ ANTIWORD_DESC= AntiWord ANTIWORD_RUN_DEPENDS= antiword:textproc/antiword ISPELL_DESC= ISpell -ISPELL_RUN_DEPENDS= ispell:textproc/aspell-ispell +ISPELL_USES= spelling:ispell LEARNSPAM_DESC= Learn HAM/SPAM LEARNSPAM_IMPLIES= SPAMCHECK LSOF_DESC= lsof Index: mail/sqwebmail/Makefile =================================================================== --- mail/sqwebmail/Makefile +++ mail/sqwebmail/Makefile @@ -116,8 +116,7 @@ .endif .if ${PORT_OPTIONS:MISPELL} -BUILD_DEPENDS+= ${LOCALBASE}/bin/ispell:textproc/aspell-ispell -RUN_DEPENDS+= ${LOCALBASE}/bin/ispell:textproc/aspell-ispell +USES+= spelling:ispell CONFIGURE_ARGS+= --with-ispell=${LOCALBASE}/bin/ispell .else CONFIGURE_ARGS+= --without-ispell Index: multimedia/aegisub/Makefile =================================================================== --- multimedia/aegisub/Makefile +++ multimedia/aegisub/Makefile @@ -53,7 +53,7 @@ FFMPEG_CONFIGURE_OFF= --without-ffms FFTW_LIB_DEPENDS= libfftw3.so:math/fftw3 FFTW_CONFIGURE_OFF= --without-fftw3 -HUNSPELL_LIB_DEPENDS= libhunspell-1.5.so:textproc/hunspell +HUNSPELL_USES= spelling:hunspell HUNSPELL_CONFIGURE_OFF= --without-hunspell OPENAL_USES= openal OPENAL_CONFIGURE_OFF= --without-openal Index: net-im/licq-qt-gui/Makefile =================================================================== --- net-im/licq-qt-gui/Makefile +++ net-im/licq-qt-gui/Makefile @@ -25,7 +25,7 @@ LICQ_PORT?= net-im/licq -HUNSPELL_LIB_DEPENDS= libhunspell-1.5.so:textproc/hunspell +HUNSPELL_USES= spelling:hunspell HUNSPELL_CMAKE_ON= -DHUNSPELL_INCLUDE_DIRS=${LOCALBASE}/include/hunspell \ -DHUNSPELL_LIBRARIES=${LOCALBASE}/lib/libhunspell-1.5.so \ -DHUNSPELL_FOUND:BOOL=ON Index: net-im/mcabber/Makefile =================================================================== --- net-im/mcabber/Makefile +++ net-im/mcabber/Makefile @@ -31,7 +31,7 @@ OPTIONS_SUB= yes -ASPELL_LIB_DEPENDS= libaspell.so:textproc/aspell +ASPELL_USES= spelling:aspell ASPELL_CONFIGURE_ENABLE=aspell ENCHANT_LIB_DEPENDS= libenchant.so:textproc/enchant Index: net-im/psi/Makefile =================================================================== --- net-im/psi/Makefile +++ net-im/psi/Makefile @@ -35,8 +35,8 @@ DBUS_USE= QT4=dbus DBUS_CONFIGURE_OFF= --disable-qdbus -ASPELL_DESC= Use aspell for spell checking -ASPELL_LIB_DEPENDS= libaspell.so:textproc/aspell +ASPELL_DESC= Use aspell for spell checking +ASPELL_USES= spelling:aspell ASPELL_CONFIGURE_ON= --with-aspell-inc=${LOCALBASE}/include \ --with-aspell-lib=${LOCALBASE}/lib ASPELL_CONFIGURE_OFF= --disable-aspell Index: net-p2p/eiskaltdcpp-qt/Makefile =================================================================== --- net-p2p/eiskaltdcpp-qt/Makefile +++ net-p2p/eiskaltdcpp-qt/Makefile @@ -37,7 +37,7 @@ BUILD_WRKSRC= ${WRKSRC}/${PORTNAME}${PKGNAMESUFFIX} INSTALL_WRKSRC= ${WRKSRC}/${PORTNAME}${PKGNAMESUFFIX} -ASPELL_LIB_DEPENDS= libaspell.so:textproc/aspell +ASPELL_USES= spelling:aspell ASPELL_CMAKE_BOOL= USE_ASPELL FREE_SPACE_CMAKE_BOOL= FREE_SPACE_BAR_C Index: news/tin/Makefile =================================================================== --- news/tin/Makefile +++ news/tin/Makefile @@ -44,7 +44,7 @@ GNUPG_CONFIGURE_ON= --with-gpg=${PREFIX}/bin/gpg \ --without-pgp --without-pgpk GNUPG_CONFIGURE_OFF= --disable-pgp-gpg -ISPELL_RUN_DEPENDS= ispell:textproc/aspell-ispell +ISPELL_USES= spelling:ispell ISPELL_CONFIGURE_ARGS= --with-ispell=${PREFIX}/bin/ispell METAMAIL_DESC?= Use metamail to handle MIME attachments METAMAIL_RUN_DEPENDS= metamail:mail/metamail Index: polish/ekg/Makefile =================================================================== --- polish/ekg/Makefile +++ polish/ekg/Makefile @@ -28,7 +28,7 @@ OPTIONS_DEFAULT= OPENSSL ASPELL_CONFIGURE_ON= --enable-aspell -ASPELL_LIB_DEPENDS= libaspell.so:textproc/aspell +ASPELL_USES= spelling:aspell ASPELL_RUN_DEPENDS= pl-aspell>0:polish/aspell OPENSSL_CONFIGURE_OFF= --without-openssl Index: polish/ekg2/Makefile =================================================================== --- polish/ekg2/Makefile +++ polish/ekg2/Makefile @@ -49,7 +49,7 @@ XOSD_DESC= Xosd plugin ASPELL_CONFIGURE_WITH= aspell -ASPELL_LIB_DEPENDS= libaspell.so:textproc/aspell +ASPELL_USES= spelling:aspell ASPELL_RUN_DEPENDS= ${LOCALBASE}/share/aspell/pl.rws:polish/aspell GPG_CONFIGURE_WITH= gpg Index: print/lyx/Makefile =================================================================== --- print/lyx/Makefile +++ print/lyx/Makefile @@ -42,11 +42,11 @@ ENCHANT_DESC= Spell checking using Enchant ASPELL_CONFIGURE_OFF= --without-aspell -ASPELL_LIB_DEPENDS= libaspell.so:textproc/aspell +ASPELL_USES= spelling:aspell ENCHANT_CONFIGURE_OFF= --without-enchant ENCHANT_LIB_DEPENDS= libenchant.so:textproc/enchant HUNSPELL_CONFIGURE_OFF= --without-hunspell -HUNSPELL_LIB_DEPENDS= libhunspell-1.5.so:textproc/hunspell +HUNSPELL_USES= spelling:hunspell NLS_CONFIGURE_OFF= --disable-nls NLS_USES= gettext Index: print/scribus/Makefile =================================================================== --- print/scribus/Makefile +++ print/scribus/Makefile @@ -18,7 +18,6 @@ libfreetype.so:print/freetype2 \ libpodofo.so:graphics/podofo \ libboost_thread.so:devel/boost-libs \ - libhunspell-1.5.so:textproc/hunspell \ libcairo.so:graphics/cairo \ libhyphen.so:textproc/hyphen \ libfontconfig.so:x11-fonts/fontconfig @@ -28,7 +27,7 @@ USE_QT4= gui linguist_build moc_build qmake_build rcc_build uic_build xml network USE_GNOME= libartlgpl2 libxml2 USES= cmake:outsource desktop-file-utils execinfo ghostscript:run jpeg \ - pkgconfig python shared-mime-info tar:xz + pkgconfig python shared-mime-info spelling:hunspell tar:xz USE_LDCONFIG= yes CMAKE_ARGS+= -DWANT_HUNSPELL=YES -Wno-ferror-limit Index: security/p5-dicewaregen/Makefile =================================================================== --- security/p5-dicewaregen/Makefile +++ security/p5-dicewaregen/Makefile @@ -13,10 +13,9 @@ GH_ACCOUNT= graudeejs GH_PROJECT= dicewaregen.pl -LIB_DEPENDS+= libaspell.so:textproc/aspell RUN_DEPENDS+= p5-List-MoreUtils>=0:lang/p5-List-MoreUtils -USES= perl5 +USES= perl5 spelling:aspell USE_PERL5= run PLIST_FILES= bin/${PORTNAME} Index: textproc/aspell-ispell/Makefile =================================================================== --- textproc/aspell-ispell/Makefile +++ textproc/aspell-ispell/Makefile @@ -13,7 +13,7 @@ CONFLICTS+= ispell* ??-ispell* -RUN_DEPENDS= aspell:textproc/aspell +USES= spelling:aspell NO_BUILD= yes PLIST_FILES= bin/ispell \ Index: textproc/aspell/Makefile.inc =================================================================== --- textproc/aspell/Makefile.inc +++ textproc/aspell/Makefile.inc @@ -5,9 +5,7 @@ DISTNAME?= aspell${DISTVERSION} PORTVERSION?= ${DISTVERSION:tl:C/cvs/0_/:C/pt_../p/:C/[0-9]?-?[a-z]+-//g:C/([0-9])([a-z])/\1.\2/g:C/:(.)/\1/g:C/[^a-z0-9+]+/./g} -LIB_DEPENDS= libaspell.so:textproc/aspell - -USES+= gmake tar:bzip2 +USES+= gmake tar:bzip2 spelling:aspell HAS_CONFIGURE= yes PLIST_SUB= VER=${VER} Index: textproc/enchant/Makefile =================================================================== --- textproc/enchant/Makefile +++ textproc/enchant/Makefile @@ -31,7 +31,7 @@ HUNSPELL_DESC= Spell checking via Hunspell ZEMBEREK_DESC= Spell checking via Zemberek -ASPELL_LIB_DEPENDS= libaspell.so:textproc/aspell +ASPELL_USES= spelling:aspell ASPELL_CONFIGURE_ENABLE= aspell ASPELL_CONFIGURE_ON= --with-aspell-prefix=${LOCALBASE} @@ -39,12 +39,12 @@ HSPELL_CONFIGURE_ENABLE= hspell HSPELL_CONFIGURE_ON= --with-hspell-prefix=${LOCALBASE} -HUNSPELL_LIB_DEPENDS= libhunspell-1.5.so:textproc/hunspell +HUNSPELL_USES= spelling:hunspell HUNSPELL_CONFIGURE_ENABLE= myspell HUNSPELL_CONFIGURE_ON= --with-system-myspell=yes \ --with-myspell-dir=${LOCALBASE}/share/hunspell -ISPELL_RUN_DEPENDS= ispell:textproc/aspell-ispell +ISPELL_USES= spelling:ispell ISPELL_CONFIGURE_ENABLE= ispell ZEMBEREK_LIb_DEPENDS= libdbus-glib-1.so:devel/dbus-glib Index: textproc/gnome-spell/Makefile =================================================================== --- textproc/gnome-spell/Makefile +++ textproc/gnome-spell/Makefile @@ -12,10 +12,8 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= GNOME/Bonobo component for spell checking -LIB_DEPENDS= libaspell.so:textproc/aspell - USE_GNOME= gnomeprefix intlhack libgnomeui -USES= gettext gmake libtool pathfix pkgconfig perl5 tar:bzip2 +USES= gettext gmake libtool pathfix pkgconfig perl5 spelling:aspell tar:bzip2 GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib Index: textproc/goldendict/Makefile =================================================================== --- textproc/goldendict/Makefile +++ textproc/goldendict/Makefile @@ -13,11 +13,11 @@ LICENSE= GPLv3 -LIB_DEPENDS= libhunspell-1.5.so:textproc/hunspell \ - libvorbis.so:audio/libvorbis +LIB_DEPENDS= libvorbis.so:audio/libvorbis NO_WRKSUBDIR= yes -USES= dos2unix execinfo iconv pkgconfig qmake tar:bzip2 +USES= dos2unix execinfo iconv pkgconfig qmake spelling:hunspell \ + tar:bzip2 DOS2UNIX_FILES= processwrapper.cc USE_XORG= xtst USE_QT4= corelib gui webkit phonon \ Index: textproc/kf5-sonnet/Makefile =================================================================== --- textproc/kf5-sonnet/Makefile +++ textproc/kf5-sonnet/Makefile @@ -8,10 +8,8 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KF5 plugin-based spell checking library -LIB_DEPENDS= libaspell.so:textproc/aspell \ - libhunspell-1.5.so:textproc/hunspell - -USES= cmake:outsource compiler:c++11-lib kde:5 tar:xz +USES= cmake:outsource compiler:c++11-lib kde:5 \ + spelling:aspell,hunspell tar:xz USE_KDE= ecm USE_QT5= buildtools_build core gui linguisttools qmake_build \ testlib widgets Index: textproc/link-grammar/Makefile =================================================================== --- textproc/link-grammar/Makefile +++ textproc/link-grammar/Makefile @@ -9,11 +9,9 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Grammar checking library -LIB_DEPENDS= libaspell.so:textproc/aspell - OPTIONS_DEFINE= DOCS -USES= dos2unix gmake libtool pathfix +USES= dos2unix gmake libtool pathfix spelling:aspell USE_LDCONFIG= yes USE_CSTD= gnu99 CPPFLAGS+= -I${LOCALBASE}/include Index: textproc/mythes/Makefile =================================================================== --- textproc/mythes/Makefile +++ textproc/mythes/Makefile @@ -13,9 +13,7 @@ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libhunspell-1.5.so:textproc/hunspell - -USES= libtool pathfix perl5 pkgconfig shebangfix +USES= libtool pathfix perl5 pkgconfig shebangfix spelling:hunspell USE_LDCONFIG= yes USE_PERL5= run SHEBANG_FILES= th_gen_idx.pl Index: textproc/p5-Lingua-Ispell/Makefile =================================================================== --- textproc/p5-Lingua-Ispell/Makefile +++ textproc/p5-Lingua-Ispell/Makefile @@ -14,13 +14,10 @@ LICENSE= ART10 GPLv1 LICENSE_COMB= dual -BUILD_DEPENDS= ispell:textproc/aspell-ispell -RUN_DEPENDS:= ${BUILD_DEPENDS} - NO_ARCH= yes REINPLACE_ARGS= -i '' USE_PERL5= configure -USES= perl5 +USES= perl5 spelling:ispell post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/lib/Lingua/Ispell.pm Index: textproc/p5-Text-Aspell/Makefile =================================================================== --- textproc/p5-Text-Aspell/Makefile +++ textproc/p5-Text-Aspell/Makefile @@ -11,9 +11,7 @@ MAINTAINER= perl@FreeBSD.org COMMENT= Perl interface to the GNU Aspell library -LIB_DEPENDS= libaspell.so:textproc/aspell - -USES= perl5 +USES= perl5 spelling:aspell USE_PERL5= configure CONFIGURE_ARGS+=INC=-I${LOCALBASE}/include \ "LIBS=-L${LOCALBASE}/lib -laspell" Index: textproc/py-hunspell/Makefile =================================================================== --- textproc/py-hunspell/Makefile +++ textproc/py-hunspell/Makefile @@ -12,10 +12,8 @@ LICENSE= LGPL3 -LIB_DEPENDS= libhunspell-${HSPLVER}.so:textproc/hunspell - USES?= python -USES+= localbase +USES+= localbase spelling:hunspell USE_PYTHON= distutils HSPLVER= 1.5 Index: textproc/sigil/Makefile =================================================================== --- textproc/sigil/Makefile +++ textproc/sigil/Makefile @@ -12,8 +12,7 @@ LICENSE= GPLv3+ LIB_DEPENDS= libminizip.so:archivers/minizip \ - libpcre.so:devel/pcre \ - libhunspell-1.5.so:textproc/hunspell + libpcre.so:devel/pcre RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py3-lxml USE_GITHUB= yes @@ -21,7 +20,7 @@ GH_PROJECT= Sigil USES= cmake:outsource compiler:c++11-lib desktop-file-utils \ - pkgconfig python:3 shebangfix + pkgconfig python:3 shebangfix spelling:hunspell SHEBANG_FILES= src/Resource_Files/plugin_launchers/python/*.py \ src/Resource_Files/python3lib/*.py USE_QT5= concurrent core gui network printsupport svg webkit \ Index: textproc/te-hunspell/Makefile =================================================================== --- textproc/te-hunspell/Makefile +++ textproc/te-hunspell/Makefile @@ -14,11 +14,10 @@ LICENSE= GPLv2 -BUILD_DEPENDS= prezip-bin:textproc/aspell \ - wordlist2hunspell:textproc/hunspell +BUILD_DEPENDS= prezip-bin:textproc/aspell NO_ARCH= yes -USES= tar:bzip2 +USES= spelling:hunspell tar:bzip2 PLIST_FILES= %%DATADIR%%/te_IN.aff \ %%DATADIR%%/te_IN.dic Index: www/otrs/Makefile =================================================================== --- www/otrs/Makefile +++ www/otrs/Makefile @@ -117,9 +117,9 @@ PDF_RUN_DEPENDS+= p5-PDF-API2>=0.57:textproc/p5-PDF-API2 -ISPELL_RUN_DEPENDS+= ispell:textproc/aspell-ispell +ISPELL_USES+= spelling:ispell -ASPELL_RUN_DEPENDS+= aspell:textproc/aspell +ASPELL_USES+= spelling:aspell GNUPG_RUN_DEPENDS+= gpg:security/gnupg1 Index: www/qupzilla-qt4/Makefile =================================================================== --- www/qupzilla-qt4/Makefile +++ www/qupzilla-qt4/Makefile @@ -13,11 +13,10 @@ LICENSE= GPLv3 -LIB_DEPENDS= libhunspell-1.5.so:textproc/hunspell - CONFLICTS_INSTALL= ${PORTNAME}-qt5* -USES= desktop-file-utils execinfo pkgconfig qmake ssl tar:xz +USES= desktop-file-utils execinfo pkgconfig qmake ssl \ + spelling:hunspell tar:xz USE_QT4= corelib gui network script sql webkit xml \ linguisttools_build moc_build rcc_build uic_build \ imageformats_run sql-sqlite3_run Index: www/qupzilla-qt5/Makefile =================================================================== --- www/qupzilla-qt5/Makefile +++ www/qupzilla-qt5/Makefile @@ -13,11 +13,10 @@ LICENSE= GPLv3 -LIB_DEPENDS= libhunspell-1.5.so:textproc/hunspell - CONFLICTS_INSTALL= ${PORTNAME}-qt4* -USES= desktop-file-utils execinfo pkgconfig qmake ssl tar:xz +USES= desktop-file-utils execinfo pkgconfig qmake ssl \ + spelling:hunspell tar:xz USE_QT5= core concurrent gui network printsupport script sql webkit \ widgets x11extras xml imageformats_run sql-sqlite3_run \ buildtools_build linguisttools_build Index: x11-toolkits/gnustep-gui/Makefile =================================================================== --- x11-toolkits/gnustep-gui/Makefile +++ x11-toolkits/gnustep-gui/Makefile @@ -50,7 +50,7 @@ CUPS_CONFIGURE_ENABLE= cups CUPS_LIB_DEPENDS+= libcups.so:print/cups -ASPELL_LIB_DEPENDS= libaspell.so:textproc/aspell +ASPELL_USES= spelling:aspell ASPELL_CONFIGURE_ENABLE= aspell USE_LDCONFIG= ${GNUSTEP_SYSTEM_LIBRARIES} Index: x11/leechcraft/Makefile =================================================================== --- x11/leechcraft/Makefile +++ x11/leechcraft/Makefile @@ -287,7 +287,7 @@ ROSENTHAL_DESC= Spellchecking support ROSENTHAL_CMAKE_ON= -DENABLE_ROSENTHAL:BOOL=true ROSENTHAL_CMAKE_OFF= -DENABLE_ROSENTHAL:BOOL=false -ROSENTHAL_LIB_DEPENDS= libhunspell-1.5.so:textproc/hunspell +ROSENTHAL_USES= spelling:hunspell SB2_DESC= Sidebar for LeechCraft with combined launcher and tab switcher SB2_CMAKE_ON= -DENABLE_SB2:BOOL=true