diff --git a/devel/libtecla/Makefile b/devel/libtecla/Makefile
index 4b3d87a9efb7..b4e39cb06772 100644
--- a/devel/libtecla/Makefile
+++ b/devel/libtecla/Makefile
@@ -1,50 +1,60 @@
 PORTNAME=	libtecla
 PORTVERSION=	1.6.3
 CATEGORIES=	devel
 MASTER_SITES=	http://www.astro.caltech.edu/~mcs/tecla/
 
 MAINTAINER=	k@stereochro.me
 COMMENT=	Interactive command line editing facilities
 WWW=		https://www.astro.caltech.edu/~mcs/tecla/
 
 LICENSE=	MIT
 
-WRKSRC=		${WRKDIR}/${PORTNAME}
-GNU_CONFIGURE=	yes
-USE_SUBMAKE=	yes
-ALL_TARGET=	default
 USE_LDCONFIG=	yes
+USE_SUBMAKE=	yes
+
+GNU_CONFIGURE=	yes
+
 MAKE_JOBS_UNSAFE=	yes
-SSP_UNSAFE=	yes
+ALL_TARGET=	default
+
 LLD_UNSAFE=	yes
+SSP_UNSAFE=	yes
+
+WRKSRC=		${WRKDIR}/${PORTNAME}
+
+.include <bsd.port.pre.mk>
+
+.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400079
+CFLAGS+=       -Wno-error=int-conversion
+.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,^OPT = -O,OPT =,' \
 		${WRKSRC}/Makefile.in
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/enhance ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/libtecla.h ${STAGEDIR}${PREFIX}/include
 .for l in libtecla libtecla_r
 	${INSTALL_LIB} ${WRKSRC}/${l}.so.1 ${STAGEDIR}${PREFIX}/lib
 	${INSTALL_DATA} ${WRKSRC}/${l}.a ${STAGEDIR}${PREFIX}/lib
 	(cd ${STAGEDIR}${PREFIX}/lib; ${LN} -sf ${l}.so.1 ${l}.so)
 .endfor
 	for n in ${WRKSRC}/man/prog/*.in; do \
 		d=$${n##*/}; \
 		${INSTALL_MAN} $${n%.in} ${STAGEDIR}${PREFIX}/man/man1/$${d%.in}.1; \
 	done
 	for n in ${WRKSRC}/man/libr/*.in ${WRKSRC}/man/func/*.in; do \
 		d=$${n##*/}; \
 		${INSTALL_MAN} $${n%.in} ${STAGEDIR}${PREFIX}/man/man3/$${d%.in}.3; \
 	done
 	for n in ${WRKSRC}/man/file/*.in; do \
 		d=$${n##*/}; \
 		${INSTALL_MAN} $${n%.in} ${STAGEDIR}${PREFIX}/man/man5/$${d%.in}.5; \
 	done
 	for n in ${WRKSRC}/man/misc/*.in; do \
 		d=$${n##*/}; \
 		${INSTALL_MAN} $${n%.in} ${STAGEDIR}${PREFIX}/man/man7/$${d%.in}.7; \
 	done
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/devel/libtecla/files/patch-demo3.c b/devel/libtecla/files/patch-demo3.c
index f569deb50d0a..343b70af7613 100644
--- a/devel/libtecla/files/patch-demo3.c
+++ b/devel/libtecla/files/patch-demo3.c
@@ -1,26 +1,26 @@
---- demo3.c.orig	Sat Aug 12 19:31:16 2006
-+++ demo3.c	Sat Aug 12 19:31:29 2006
+--- demo3.c.orig	2012-06-12 02:35:49 UTC
++++ demo3.c
 @@ -37,17 +37,17 @@
  #include <locale.h>
  #include <setjmp.h>
  
 -#ifdef HAVE_SELECT
 -#ifdef HAVE_SYS_SELECT_H
 -#include <sys/select.h>
 -#endif
 -#endif
 -
  #include <unistd.h>
  #include <sys/stat.h>
  #include <sys/time.h>    
  #include <sys/types.h>
  #include <signal.h>
 +
 +#ifdef HAVE_SELECT
 +#ifdef HAVE_SYS_SELECT_H
 +#include <sys/select.h>
 +#endif
 +#endif
  
  #include "libtecla.h"
  
diff --git a/devel/libtecla/files/patch-getline.c b/devel/libtecla/files/patch-getline.c
index bb05e2e739ea..ce184e392ef4 100644
--- a/devel/libtecla/files/patch-getline.c
+++ b/devel/libtecla/files/patch-getline.c
@@ -1,12 +1,12 @@
---- getline.c.orig	Sun Jul 18 13:44:44 2004
-+++ getline.c	Sun Jul 18 13:44:49 2004
-@@ -9045,8 +9045,8 @@
+--- getline.c.orig	2013-09-12 07:04:00 UTC
++++ getline.c
+@@ -9062,8 +9062,8 @@ static int gl_event_handler(GetLine *gl, int fd)
        return 1;
    };
    return 0;
 -}
  #endif
 +}
  
  #if defined(HAVE_SELECT)
  /*.......................................................................