diff --git a/japanese/ebview-gtk2/Makefile b/japanese/ebview-gtk2/Makefile
index 4bea062bfb1d..5718f5dbd2f3 100644
--- a/japanese/ebview-gtk2/Makefile
+++ b/japanese/ebview-gtk2/Makefile
@@ -1,45 +1,51 @@
 PORTNAME=	ebview
 PORTVERSION=	0.3.6
 PORTREVISION=	20
 CATEGORIES=	japanese
 MASTER_SITES=	SF
 PKGNAMESUFFIX=	-gtk2
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Electronic Book Viewer
 WWW=		http://ebview.sourceforge.net/
 
 LICENSE=	GPLv2+
 
 LIB_DEPENDS=	libeb.so:japanese/eb
 
-CONFLICTS=	ja-ebview
-
-USES=		gettext gmake gnome pkgconfig
-USE_GNOME=	gtk20 pangox-compat
+USES=		gettext gmake gnome localbase:ldflags pkgconfig
 USE_CSTD=	gnu89
+USE_GNOME=	gtk20 pangox-compat
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-eb-conf=${LOCALBASE}/etc/eb.conf
 
-SUB_FILES=	ebview.desktop
+CONFLICTS=	ja-ebview
 
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+SUB_FILES=	ebview.desktop
 
 OPTIONS_DEFINE=	DOCS
 
+.include <bsd.port.pre.mk>
+
+.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+CFLAGS+=	-Wno-error=int-conversion
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|#define GTK_DISABLE_DEPRECATED 1||g' \
 		${WRKSRC}/src/ebview.c
 
 post-install:
 	(cd ${WRKDIR} && ${INSTALL_DATA} ${SUB_FILES} \
 		${STAGEDIR}${DESKTOPDIR})
 	(cd ${WRKSRC}/pixmaps && ${INSTALL_DATA} ebview.xpm \
 		${STAGEDIR}${PREFIX}/share/pixmaps)
+
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ChangeLog README
 	(cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${STAGEDIR}${DOCSDIR})
 .endfor
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>