[Midnightbsd-cvs] mports [18390] trunk/textproc/enchant: fix build

[laffer1 at midnightbsd.org]

Revision: 18390
          http://svnweb.midnightbsd.org/mports/?rev=18390
Author:   laffer1
Date:     2015-03-27 19:37:39 -0400 (Fri, 27 Mar 2015)
Log Message:
-----------
fix build

Modified Paths:
--------------
    trunk/textproc/enchant/Makefile
    trunk/textproc/enchant/pkg-plist

Added Paths:
-----------
    trunk/textproc/enchant/files/
    trunk/textproc/enchant/files/patch-configure

Modified: trunk/textproc/enchant/Makefile
===================================================================
--- trunk/textproc/enchant/Makefile	2015-03-27 23:35:53 UTC (rev 18389)
+++ trunk/textproc/enchant/Makefile	2015-03-27 23:37:39 UTC (rev 18390)
@@ -2,7 +2,7 @@
 
 PORTNAME=	enchant
 PORTVERSION=	1.6.0
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	textproc gnome
 MASTER_SITES=	http://www.abisource.com/downloads/${PORTNAME}/${PORTVERSION}/
 DIST_SUBDIR=	gnome2
@@ -9,85 +9,50 @@
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Dictionary/spellchecking framework
+
 LICENSE=	lgpl
 
-USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool
+GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-USE_PKGCONFIG=	yes
-USE_PATHFIX=	yes
-USE_GNOME=	glib20 ltverhack
+USES=		gmake libtool:keepla pathfix pkgconfig
+USE_GNOME=	glib20
 CONFIGURE_ARGS=	--disable-uspell \
 		--disable-voikko
-MAKE_JOBS_SAFE=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-MAN1=		enchant.1
+INSTALL_TARGET=	install-strip
 
-OPTIONS_DEFINE=	ASPELL HSPELL HUNSPELL ISPELL ZEMBEREK
-OPTIONS_DEFAULT=ASPELL
+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 <bsd.mport.options.mk>
+ASPELL_LIB_DEPENDS=	libaspell.so:${PORTSDIR}/textproc/aspell
+ASPELL_CONFIGURE_ENABLE=	aspell
+ASPELL_CONFIGURE_ON=	--with-aspell-prefix=${LOCALBASE}
 
-.if ${PORT_OPTIONS:MASPELL}
-LIB_DEPENDS+=	pspell:${PORTSDIR}/textproc/aspell
-CONFIGURE_ARGS+=--enable-aspell \
-		--with-aspell-prefix=${LOCALBASE}
-PLIST_SUB+=	ASPELL=""
-.else
-CONFIGURE_ARGS+=--disable-aspell
-PLIST_SUB+=	ASPELL="@comment "
-.endif
+HSPELL_BUILD_DEPENDS=	${LOCALBASE}/lib/libhspell.a:${PORTSDIR}/hebrew/hspell
+HSPELL_CONFIGURE_ENABLE=	hspell
+HSPELL_CONFIGURE_ON=	--with-hspell-prefix=${LOCALBASE}
 
-.if ${PORT_OPTIONS:MHSPELL}
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libhspell.a:${PORTSDIR}/hebrew/hspell
-CONFIGURE_ARGS+=--enable-hspell
-PLIST_SUB+=	HSPELL=""
-.else
-CONFIGURE_ARGS+=--disable-hspell
-PLIST_SUB+=	HSPELL="@comment "
-.endif
+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
 
-.if ${PORT_OPTIONS:MHUNSPELL}
-LIB_DEPENDS+=	hunspell-1.3:${PORTSDIR}/textproc/hunspell
-CONFIGURE_ARGS+=--enable-myspell
-PLIST_SUB+=	HUNSPELL=""
-.else
-CONFIGURE_ARGS+=--disable-myspell
-PLIST_SUB+=	HUNSPELL="@comment "
-.endif
+ISPELL_RUN_DEPENDS=	ispell:${PORTSDIR}/textproc/aspell-ispell
+ISPELL_CONFIGURE_ENABLE=	ispell
 
-.if ${PORT_OPTIONS:MISPELL}
-RUN_DEPENDS+=	ispell:${PORTSDIR}/textproc/ispell
-CONFIGURE_ARGS+=--enable-ispell
-PLIST_SUB+=	ISPELL=""
-.else
-CONFIGURE_ARGS+=--disable-ispell
-PLIST_SUB+=	ISPELL="@comment "
-.endif
+ZEMBEREK_LIb_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
+ZEMBEREK_CONFIGURE_ENABLE=	zemberek
 
-.if ${PORT_OPTIONS:MZEMBEREK}
-LIB_DEPENDS+=	dbus-glib-1:${PORTSDIR}/devel/dbus-glib
-CONFIGURE_ARGS+=--enable-zemberek
-PLIST_SUB+=	ZEMBEREK=""
-.else
-PLIST_SUB+=	ZEMBEREK="@comment "
-CONFIGURE_ARGS+=--disable-zemberek
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|MKDIRPROG-mkdir|MKDIRPROG-mkdir -p|g' \
 		${WRKSRC}/install-sh
-.if ${OSVERSION} < 4015
-	@${REINPLACE_CMD} -E -e "s|-Wunsafe-loop-optimizations ||g" \
-		-e "s|-Wno-missing-field-initializers ||g" \
-		-e "s|-Wno-attributes ||g" \
-			${WRKSRC}/configure
-.endif
 
 .include <bsd.port.mk>

Added: trunk/textproc/enchant/files/patch-configure
===================================================================
--- trunk/textproc/enchant/files/patch-configure	                        (rev 0)
+++ trunk/textproc/enchant/files/patch-configure	2015-03-27 23:37:39 UTC (rev 18390)
@@ -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; }


Property changes on: trunk/textproc/enchant/files/patch-configure
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/textproc/enchant/pkg-plist
===================================================================
--- trunk/textproc/enchant/pkg-plist	2015-03-27 23:35:53 UTC (rev 18389)
+++ trunk/textproc/enchant/pkg-plist	2015-03-27 23:37:39 UTC (rev 18390)
@@ -22,8 +22,7 @@
 lib/libenchant.la
 lib/libenchant.so
 lib/libenchant.so.1
+lib/libenchant.so.1.6.0
 libdata/pkgconfig/enchant.pc
+man/man1/enchant.1.gz
 %%DATADIR%%/enchant.ordering
- at dirrm %%DATADIR%%
- at dirrm lib/enchant
- at dirrm include/enchant