1 files changed, 28 insertions, 8 deletions

diff --git a/mail/cone/Makefile b/mail/cone/Makefile
index 4e7dd2c89c11..70bb69ab9e78 100644
--- a/mail/cone/Makefile
+++ b/mail/cone/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cone
 PORTVERSION=	0.69
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
 # This is for beta versions, leave it in please:
 #MASTER_SITES=	http://www.courier-mta.org/beta/${PORTNAME}/ \
@@ -31,15 +31,41 @@ USE_GNOME=	libxml2
 USE_BZIP2=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
+CPPFLAGS=	-I${LOCALBASE}/include
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	-C --without-db --with-certdb --prefix=${PREFIX} --exec-prefix=${PREFIX}
 
 CONFIGURE_ENV=	REHASH="${PERL} ${SCRIPTDIR}/c_rehash" LDFLAGS=-L${LOCALBASE}/lib \
-		CPPFLAGS=-I${LOCALBASE}/include
+		CPPFLAGS="${CPPFLAGS}"
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 MAN1=		cone.1 leaf.1 mailtool.1
 INSTALL_TARGET=	install-strip
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 502010
+IGNORE=		not supported on FreeBSD versions before 5.2.1-RELEASE
+.endif
+
+.if exists(${LOCALBASE}/include/ncurses/ncurses.h) || defined(WITH_NCURSESW)
+CPPFLAGS+=	-I${WRKDIR} -D_XOPEN_SOURCE_EXTENDED
+LIB_DEPENDS+=	ncursesw.5:${PORTSDIR}/devel/ncurses
+
+post-extract:
+		${MKDIR} ${WRKDIR}/ncursesw
+		${LN} -s ${LOCALBASE}/include/ncurses/ncurses.h ${WRKDIR}/ncursesw/curses.h
+.else
+
+CONFIGURE_ARGS+=      --disable-unicode
+
+pre-everything::
+	 @${ECHO_CMD} ""
+	 @${ECHO_CMD} "to use multilanguage ( unicode ) MUA, please set WITH_NCURSESW"
+	 @${ECHO_CMD} "or install devel/ncurses first"
+	 @${ECHO_CMD} ""
+
+.endif
+
 post-install:
 		${INSTALL_SCRIPT} ${WRKSRC}/sysconftool ${PREFIX}/sbin/cone-sysconftool
 		PKG_PREFIX=${PREFIX} ${SH} pkg-install ${PORTNAME} POST-INSTALL
@@ -49,10 +75,4 @@ post-install:
 		${INSTALL_MAN} ${WRKSRC}/ChangeLog ${DOCSDIR}
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 502010
-IGNORE=		not supported on FreeBSD versions before 5.2.1-RELEASE
-.endif
-
 .include <bsd.port.post.mk>