1 files changed, 21 insertions, 30 deletions
diff --git a/devel/newt/Makefile b/devel/newt/Makefile
index 572b1c645763..fb17fc150ff6 100644
--- a/devel/newt/Makefile
+++ b/devel/newt/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	newt
-PORTVERSION=	0.52.16
+PORTVERSION=	0.52.17
 CATEGORIES=	devel
 MASTER_SITES=	https://fedorahosted.org/releases/n/e/newt/
 
@@ -11,11 +11,9 @@ COMMENT=	Not Eriks Windowing Toolkit: console I/O handling library
 LIB_DEPENDS=	libslang.so:${PORTSDIR}/devel/libslang2 \
 		libpopt.so:${PORTSDIR}/devel/popt
 
-OPTIONS_DEFINE=	TCL NLS
-
-USES+=		gmake
+USES=		gmake
 GNU_CONFIGURE=	yes
-MAKE_ENV=	PCFLAGS="${CFLAGS}" TCLVERSION="tcl${TCL_VER}"
+MAKE_ENV=	PCFLAGS="${CFLAGS}"
 USE_LDCONFIG=	yes
 MAKE_JOBS_UNSAFE=	yes
 
@@ -25,34 +23,27 @@ LDFLAGS+=	-L${LOCALBASE}/lib -lcurses
 PLIST_SUB=	SOVERSION="${SOVERSION}" \
 		VERSION="${PORTVERSION}"
 
+SUB_FILES=	pkgIndex.tcl
 SUB_LIST=	VERSION="${PORTVERSION}"
 
-SOVERSION=	${PORTVERSION:R:E}
+OPTIONS_DEFINE=		NLS TCL
+OPTIONS_SUB=		yes
 
-.include <bsd.port.options.mk>
+NLS_USES=		gettext
+NLS_CONFIGURE_ENABLE=	nls
+TCL_USES=		tcl
+TCL_CONFIGURE_ENV=	ac_cv_c_tclconfig=${TCL_LIBDIR:Q}
+TCL_CONFIGURE_WITH=	tcl
+TCL_CPPFLAGS=		-I${TCL_INCLUDEDIR:Q}
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
+SOVERSION=	${PORTVERSION:R:E}
 
-.if ${PORT_OPTIONS:MTCL}
-USES+=		tcl
-MAKE_ENV+=	TCL_LIBDIR=${TCL_LIBDIR:Q}
-CPPFLAGS+=	-I${TCL_INCLUDEDIR:Q}
-SUB_FILES+=	pkgIndex.tcl
-PLIST_SUB+=	TCLOPT="" TCL_LIBDIR=${TCL_LIBDIR:S,${PREFIX}/,,}
-.else
-CONFIGURE_ARGS+=--without-tcl
-PLIST_SUB+=	TCLOPT="@comment "
-.endif
+.include <bsd.port.options.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e \
-		'/^SONAME/s|=.*|=${SOVERSION}|' ${WRKSRC}/configure
+		'/^SONAME/s|=.*|=${SOVERSION}| ; \
+		 s|-DUSE_INTERP_RESULT||' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e \
 		's|@CPP@|@CC@ -E| ; \
 		 s|-I/usr/include/slang|| ; \
@@ -61,19 +52,19 @@ post-patch:
 		 /make -C/s|^|#| ; \
 		 /whiptcl.$$(SOEXT)/s|install|${TRUE}|' ${WRKSRC}/Makefile.in
 
-post-build:	apply-slist
-
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/whiptail
 .if ${PORT_OPTIONS:MNLS}
-	@(cd ${WRKSRC}/po && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
+	@(cd ${WRKSRC}/po && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
 		${MAKEFILE} ${MAKE_ARGS} datadir=${STAGEDIR}${PREFIX}/share \
 		${INSTALL_TARGET})
 .endif
 .if ${PORT_OPTIONS:MTCL}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/whip${PORTVERSION}
-	(cd ${WRKSRC} && ${INSTALL_DATA} whiptcl.so ${STAGEDIR}${PREFIX}/lib/whip${PORTVERSION})
-	(cd ${WRKDIR} && ${INSTALL_DATA} pkgIndex.tcl ${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>