sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make sure we use system hunspell and look in the right location where to

Browse source 
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@
This commit is contained in:
Koop Mast 2013-09-20 12:15:57 +00:00
parent 6a1bfebdef
commit dbf9cc73e2
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=327695
2 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
textproc/enchant/Makefile
View file

@ -12,10 +12,9 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org MAINTAINER= gnome@FreeBSD.org
COMMENT= Dictionary/spellchecking framework COMMENT= Dictionary/spellchecking framework
USE_GMAKE= yes
USE_AUTOTOOLS= libtool USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes USE_LDCONFIG= yes
USES= pathfix pkgconfig USES= gmake pathfix pkgconfig
USE_GNOME= glib20 ltverhack USE_GNOME= glib20 ltverhack
CONFIGURE_ARGS= --disable-uspell \ CONFIGURE_ARGS= --disable-uspell \
--disable-voikko --disable-voikko
@ -34,7 +33,7 @@ ZEMBEREK_DESC= Spell checking via Zemberek
.include <bsd.port.options.mk> .include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MASPELL} .if ${PORT_OPTIONS:MASPELL}
LIB_DEPENDS+= pspell:${PORTSDIR}/textproc/aspell LIB_DEPENDS+= libaspell.so:${PORTSDIR}/textproc/aspell
CONFIGURE_ARGS+=--enable-aspell \ CONFIGURE_ARGS+=--enable-aspell \
--with-aspell-prefix=${LOCALBASE} --with-aspell-prefix=${LOCALBASE}
PLIST_SUB+= ASPELL="" PLIST_SUB+= ASPELL=""
@ -45,7 +44,8 @@ PLIST_SUB+= ASPELL="@comment "
.if ${PORT_OPTIONS:MHSPELL} .if ${PORT_OPTIONS:MHSPELL}
BUILD_DEPENDS+= ${LOCALBASE}/lib/libhspell.a:${PORTSDIR}/hebrew/hspell BUILD_DEPENDS+= ${LOCALBASE}/lib/libhspell.a:${PORTSDIR}/hebrew/hspell
CONFIGURE_ARGS+=--enable-hspell CONFIGURE_ARGS+=--enable-hspell \
--with-hspell-prefix=${LOCALBASE}
PLIST_SUB+= HSPELL="" PLIST_SUB+= HSPELL=""
.else .else
CONFIGURE_ARGS+=--disable-hspell CONFIGURE_ARGS+=--disable-hspell
@ -53,8 +53,9 @@ PLIST_SUB+= HSPELL="@comment "
.endif .endif
.if ${PORT_OPTIONS:MHUNSPELL} .if ${PORT_OPTIONS:MHUNSPELL}
LIB_DEPENDS+= hunspell-1.3:${PORTSDIR}/textproc/hunspell LIB_DEPENDS+= libhunspell-1.3.so:${PORTSDIR}/textproc/hunspell
CONFIGURE_ARGS+=--enable-myspell CONFIGURE_ARGS+=--enable-myspell --with-system-myspell=yes \
--with-myspell-dir=${LOCALBASE}
PLIST_SUB+= HUNSPELL="" PLIST_SUB+= HUNSPELL=""
.else .else
CONFIGURE_ARGS+=--disable-myspell CONFIGURE_ARGS+=--disable-myspell
@ -63,7 +64,8 @@ PLIST_SUB+= HUNSPELL="@comment "
.if ${PORT_OPTIONS:MISPELL} .if ${PORT_OPTIONS:MISPELL}
RUN_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell RUN_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell
CONFIGURE_ARGS+=--enable-ispell CONFIGURE_ARGS+=--enable-ispell \
--with-ispell-dir=${LOCALBASE}
PLIST_SUB+= ISPELL="" PLIST_SUB+= ISPELL=""
.else .else
CONFIGURE_ARGS+=--disable-ispell CONFIGURE_ARGS+=--disable-ispell
@ -71,7 +73,7 @@ PLIST_SUB+= ISPELL="@comment "
.endif .endif
.if ${PORT_OPTIONS:MZEMBEREK} .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 CONFIGURE_ARGS+=--enable-zemberek
PLIST_SUB+= ZEMBEREK="" PLIST_SUB+= ZEMBEREK=""
.else .else

11
textproc/enchant/files/patch-configure Normal file
View file

@ -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; }