Index: head/japanese/estraier/Makefile
===================================================================
--- head/japanese/estraier/Makefile	(revision 123431)
+++ head/japanese/estraier/Makefile	(revision 123432)
@@ -1,58 +1,61 @@
 # New ports collection makefile for:	estraier
 # Date created:		2004-08-28
 # Whom:			Michael Johnson <ahze@ahze.net>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	estraier
 PORTVERSION=	1.2.25
+PORTREVISION=	1
 CATEGORIES=	japanese textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ahze@FreeBSD.org
 COMMENT=	A full-text search system for personal use
 
-LIB_DEPENDS=	qdbm.3:${PORTSDIR}/databases/qdbm
+LIB_DEPENDS=	qdbm.4:${PORTSDIR}/databases/qdbm
 
 USE_ICONV=	yes
 
 GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 
 CONFIGURE_ARGS=	--with-sysqdbm \
 		--enable-dlfilter \
 		--enable-devel
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="-L${LOCALBASE}/include ${PTHREAD_LIBS}"
 
 OPTIONS=	CHASEN "Japanese Morphological Analysis Support" On \
-		MECAB "Part-of-Speech and Morphological Analyzer" On \
+		MECAB "Part-of-Speech and Morphological Analyzer" Off \
 		KAKASI "Language processing filter/converter" On
 
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_CHASEN)
 LIB_DEPENDS+=	chasen.0:${PORTSDIR}/japanese/chasen-base
 
 CONFIGURE_ARGS+=	--enable-chasen
 .endif
 
-.if ${ARCH} == i386 && !defined(WITHOUT_MECAB)
+.if ${OSVERSION} > 500000
+.if ${ARCH} == i386 && defined(WITH_MECAB)
 LIB_DEPENDS+=	mecab.0:${PORTSDIR}/japanese/mecab
 
 CONFIGURE_ARGS+=	--enable-mecab
+.endif
 .endif
 
 .if !defined(WITHOUT_KAKASI)
 LIB_DEPENDS+=	kakasi.3:${PORTSDIR}/japanese/kakasi
 
 CONFIGURE_ARGS+=	--enable-kakasi
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-O2|${CFLAGS}|' ${WRKSRC}/configure ${WRKSRC}/Makefile.in
 
 .include <bsd.port.post.mk>

Property changes on: head/japanese/estraier/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.5
\ No newline at end of property
+1.6
\ No newline at end of property
Index: head/textproc/estraier/Makefile
===================================================================
--- head/textproc/estraier/Makefile	(revision 123431)
+++ head/textproc/estraier/Makefile	(revision 123432)
@@ -1,58 +1,61 @@
 # New ports collection makefile for:	estraier
 # Date created:		2004-08-28
 # Whom:			Michael Johnson <ahze@ahze.net>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	estraier
 PORTVERSION=	1.2.25
+PORTREVISION=	1
 CATEGORIES=	japanese textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ahze@FreeBSD.org
 COMMENT=	A full-text search system for personal use
 
-LIB_DEPENDS=	qdbm.3:${PORTSDIR}/databases/qdbm
+LIB_DEPENDS=	qdbm.4:${PORTSDIR}/databases/qdbm
 
 USE_ICONV=	yes
 
 GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 
 CONFIGURE_ARGS=	--with-sysqdbm \
 		--enable-dlfilter \
 		--enable-devel
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="-L${LOCALBASE}/include ${PTHREAD_LIBS}"
 
 OPTIONS=	CHASEN "Japanese Morphological Analysis Support" On \
-		MECAB "Part-of-Speech and Morphological Analyzer" On \
+		MECAB "Part-of-Speech and Morphological Analyzer" Off \
 		KAKASI "Language processing filter/converter" On
 
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_CHASEN)
 LIB_DEPENDS+=	chasen.0:${PORTSDIR}/japanese/chasen-base
 
 CONFIGURE_ARGS+=	--enable-chasen
 .endif
 
-.if ${ARCH} == i386 && !defined(WITHOUT_MECAB)
+.if ${OSVERSION} > 500000
+.if ${ARCH} == i386 && defined(WITH_MECAB)
 LIB_DEPENDS+=	mecab.0:${PORTSDIR}/japanese/mecab
 
 CONFIGURE_ARGS+=	--enable-mecab
+.endif
 .endif
 
 .if !defined(WITHOUT_KAKASI)
 LIB_DEPENDS+=	kakasi.3:${PORTSDIR}/japanese/kakasi
 
 CONFIGURE_ARGS+=	--enable-kakasi
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-O2|${CFLAGS}|' ${WRKSRC}/configure ${WRKSRC}/Makefile.in
 
 .include <bsd.port.post.mk>

Property changes on: head/textproc/estraier/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.5
\ No newline at end of property
+1.6
\ No newline at end of property