diff -urN /usr/ports/devel/newt/Makefile devel/newt/Makefile
--- /usr/ports/devel/newt/Makefile	2015-08-24 03:52:17.454840000 +0900
+++ devel/newt/Makefile	2016-01-15 00:00:00.000000000 +0900
@@ -1,13 +1,16 @@
 # $FreeBSD: head/devel/newt/Makefile 379211 2015-02-18 15:16:43Z amdmi3 $
 
 PORTNAME=	newt
-PORTVERSION=	0.52.17
+PORTVERSION=	0.52.18
 CATEGORIES=	devel
 MASTER_SITES=	https://fedorahosted.org/releases/n/e/newt/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Not Eriks Windowing Toolkit: console I/O handling library
 
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 LIB_DEPENDS=	libslang.so:${PORTSDIR}/devel/libslang2 \
 		libpopt.so:${PORTSDIR}/devel/popt
 
@@ -26,11 +29,14 @@
 SUB_FILES=	pkgIndex.tcl
 SUB_LIST=	VERSION="${PORTVERSION}"
 
-OPTIONS_DEFINE=		NLS TCL
+OPTIONS_DEFINE=		NLS PYTHON TCL
+OPTIONS_DEFAULT=	PYTHON
 OPTIONS_SUB=		yes
 
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
+PYTHON_USES=		python
+PYTHON_CONFIGURE_WITH=	python
 TCL_USES=		tcl
 TCL_CONFIGURE_ENV=	ac_cv_c_tclconfig=${TCL_LIBDIR:Q}
 TCL_CONFIGURE_WITH=	tcl
@@ -38,8 +44,6 @@
 
 SOVERSION=	${PORTVERSION:R:E}
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e \
 		'/^SONAME/s|=.*|=${SOVERSION}| ; \
@@ -52,20 +56,26 @@
 		 /make -C/s|^|#| ; \
 		 /whiptcl.$$(SOEXT)/s|install|${TRUE}|' ${WRKSRC}/Makefile.in
 
+post-patch-PYTHON-on:
+	@${REINPLACE_CMD} -e \
+		'/PYTHONVERS/s|=.*|=${PYTHON_VERSION}|' ${WRKSRC}/configure
+
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/whiptail
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libnewt.so
-.if ${PORT_OPTIONS:MNLS}
-	@(cd ${WRKSRC}/po && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
-		${MAKEFILE} ${MAKE_ARGS} datadir=${STAGEDIR}${PREFIX}/share \
-		${INSTALL_TARGET})
-.endif
-.if ${PORT_OPTIONS:MTCL}
+
+post-install-NLS-on:
+	@(cd ${WRKSRC}/po && ${DO_MAKE_BUILD} ${MAKE_ARGS} \
+		datadir=${STAGEDIR}${PREFIX}/share ${INSTALL_TARGET})
+
+post-install-PYTHON-on:
+	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/_snack.so
+
+post-install-TCL-on:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/whip${PORTVERSION}
 	(cd ${WRKSRC} && ${INSTALL_LIB} whiptcl.so \
 		${STAGEDIR}${PREFIX}/lib/whip${PORTVERSION})
 	(cd ${WRKDIR} && ${INSTALL_DATA} pkgIndex.tcl \
 		${STAGEDIR}${PREFIX}/lib/whip${PORTVERSION})
-.endif
 
 .include <bsd.port.mk>
diff -urN /usr/ports/devel/newt/distinfo devel/newt/distinfo
--- /usr/ports/devel/newt/distinfo	2015-08-24 03:52:17.455455000 +0900
+++ devel/newt/distinfo	2016-01-15 00:00:00.000000000 +0900
@@ -1,2 +1,2 @@
-SHA256 (newt-0.52.17.tar.gz) = 69837973ef2ee2fa644426f1c3e48d2b18785ebcd382ef7fd01eb2e67d2d632b
-SIZE (newt-0.52.17.tar.gz) = 178920
+SHA256 (newt-0.52.18.tar.gz) = 771b0e634ede56ae6a6acd910728bb5832ac13ddb0d1d27919d2498dab70c91e
+SIZE (newt-0.52.18.tar.gz) = 180425
diff -urN /usr/ports/devel/newt/files/patch-form.c devel/newt/files/patch-form.c
--- /usr/ports/devel/newt/files/patch-form.c	2015-08-24 03:52:17.480824000 +0900
+++ devel/newt/files/patch-form.c	2016-01-15 00:00:00.000000000 +0900
@@ -1,5 +1,5 @@
---- form.c.orig	Tue Jun 11 22:15:33 2002
-+++ form.c	Sat Jun 22 06:36:12 2002
+--- form.c.orig	2014-10-23 08:34:37 UTC
++++ form.c
 @@ -10,7 +10,6 @@
  #endif
  #include <sys/time.h>
diff -urN /usr/ports/devel/newt/files/patch-newt.c devel/newt/files/patch-newt.c
--- /usr/ports/devel/newt/files/patch-newt.c	2015-08-24 03:52:17.497965000 +0900
+++ devel/newt/files/patch-newt.c	2016-01-15 00:00:00.000000000 +0900
@@ -1,9 +1,11 @@
---- newt.c	2009-09-24 11:03:09.000000000 -0400
-+++ newt.c	2010-01-06 01:04:01.000000000 -0500
-@@ -99,4 +99,6 @@
+--- newt.c.orig	2014-10-23 08:34:37 UTC
++++ newt.c
+@@ -98,6 +98,8 @@ static const struct keymap keymap[] = {
+ 	{ "\033[6~",		NEWT_KEY_PGDN,		"kN" },
  	{ "\033V",		NEWT_KEY_PGUP, 		NULL },
  	{ "\033v",		NEWT_KEY_PGUP, 		NULL },
 +	{ "\033[G",             NEWT_KEY_PGDN,          NULL },
 +	{ "\033[I",             NEWT_KEY_PGUP,          NULL },
          { "\026",		NEWT_KEY_PGDN,		NULL },
  
+ 	{ "\033[[A",		NEWT_KEY_F1,		NULL },
diff -urN /usr/ports/devel/newt/files/patch-whiptcl.c devel/newt/files/patch-whiptcl.c
--- /usr/ports/devel/newt/files/patch-whiptcl.c	2015-08-24 03:52:17.493264000 +0900
+++ devel/newt/files/patch-whiptcl.c	2016-01-15 00:00:00.000000000 +0900
@@ -1,6 +1,6 @@
---- whiptcl.c.orig
+--- whiptcl.c.orig	2014-10-23 08:34:37 UTC
 +++ whiptcl.c
-@@ -137,45 +137,45 @@
+@@ -137,45 +137,45 @@ static int wtCmd(ClientData clientData, 
      
      if (arg < -1) {
  	/* this could buffer oveflow, bug we're not setuid so I don't care */
@@ -56,7 +56,7 @@
  	return TCL_ERROR;
      }
  
-@@ -196,33 +196,30 @@
+@@ -196,33 +196,30 @@ static int wtCmd(ClientData clientData, 
        case MODE_YESNO:
  	rc = messageBox(text, height, width, MSGBOX_YESNO, flags);
  	if (rc == DLG_OKAY)
@@ -95,7 +95,7 @@
  
  	    free(selections);
  	}
-@@ -247,7 +244,7 @@
+@@ -247,7 +244,7 @@ static int wtCmd(ClientData clientData, 
      newtPopWindow();
  
      if (rc == DLG_ERROR) {
diff -urN /usr/ports/devel/newt/pkg-plist devel/newt/pkg-plist
--- /usr/ports/devel/newt/pkg-plist	2015-08-24 03:52:17.446767000 +0900
+++ devel/newt/pkg-plist	2016-01-15 00:00:00.000000000 +0900
@@ -4,6 +4,8 @@
 lib/libnewt.so
 lib/libnewt.so.%%SOVERSION%%
 lib/libnewt.so.%%VERSION%%
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/_snack.so
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/snack.py
 %%TCL%%lib/whip%%VERSION%%/pkgIndex.tcl
 %%TCL%%lib/whip%%VERSION%%/whiptcl.so
 libdata/pkgconfig/libnewt.pc