1 files changed, 49 insertions, 24 deletions

diff --git a/devel/newt/Makefile b/devel/newt/Makefile
index 302990251dd0..911df01a3b3d 100644
--- a/devel/newt/Makefile
+++ b/devel/newt/Makefile
@@ -6,70 +6,95 @@
 #
 
 PORTNAME=	newt
-PORTVERSION=	0.51.0
-PORTREVISION=	8
+PORTVERSION=	0.52.11
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_LOCAL} \
-		# ftp://ftp.redhat.com/pub/redhat/linux/rawhide/SRPMS/SRPMS/
-MASTER_SITE_SUBDIR=	perky
+MASTER_SITES=	https://fedorahosted.org/releases/n/e/newt/
 PKGNAMESUFFIX=	${PYTHONSUFFIX}${TCLSUFFIX}
 
 MAINTAINER=	pgollucci@FreeBSD.org
 COMMENT=	Not Erik's Windowing Toolkit:  console I/O handling library#'
 
-LIB_DEPENDS=	slang.2:${PORTSDIR}/devel/libslang2 \
-		popt.0:${PORTSDIR}/devel/popt
+LIB_DEPENDS=	slang:${PORTSDIR}/devel/libslang2 \
+		popt:${PORTSDIR}/devel/popt
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-SOVERSION=	51
-TCL_VERSION?=	tcl8.3
-TCL_NODOT=	${TCL_VERSION:S/.//}
-MAKE_ENV+=	PCFLAGS="${CFLAGS}" TCLVERSION="${TCL_VERSION}"
+SOVERSION=	${PORTVERSION:R:E}
+TCL_NODOT=	tcl${TCL_VER:S/.//}
+CFLAGS+=	-Werror
+MAKE_ENV+=	PCFLAGS="${CFLAGS}" TCLVERSION="tcl${TCL_VER}"
 PLIST_SUB+=	SOVERSION=${SOVERSION} \
+		VERSION=${PORTVERSION}	\
 		EXAMPLESDIR="${EXAMPLESDIR:S,${PREFIX}/,,}"
+SUB_LIST=	VERSION=${PORTVERSION}
 
+USE_GMAKE=	yes
+MAKE_JOBS_SAFE=	yes
+
+.if defined(WITHOUT_NLS)
+CONFIGURE_ARGS+=--disable-nls
+.else
+USE_GETTEXT=	yes
+.endif
 .if defined(WITH_PYTHON)
 PYTHONSUFFIX=	-${PYTHON_PKGNAMEPREFIX:S/-//}
 BUILD_DEPENDS+=	${PYDISTUTILS}
 USE_PYTHON=	yes
 MAKE_ENV+=	WITH_PYTHON=yes
-PLIST_SUB+=	PYTHONOPT=""
+PLIST_SUB+=	PYTHONOPT=""	\
+		PYNUM=${PYTHON_VERSION:S/python//}
+SUB_FILES+=	setup.py
 .else
 PLIST_SUB+=	PYTHONOPT="@comment "
 .endif
 
 .if defined(WITH_TCL)
+USE_TCL=	84+
 TCLSUFFIX=	-${TCL_NODOT}
-LIB_DEPENDS+=	${TCL_NODOT}:${PORTSDIR}/lang/${TCL_NODOT}
+MAKE_ENV+=	WITH_TCL=yes TCL_LIBDIR=${TCL_LIBDIR:Q}
+PLIST_SUB+=	TCLOPT="" TCL_VER=${TCL_VER}${_TCL_THREADS_SUFFIX}
+CONFIGURE_ENV+=	CPPFLAGS=-I${TCL_INCLUDEDIR:Q}
+SUB_FILES+=	pkgIndex.tcl
+
+pre-su-install:
+	${MKDIR} ${TCL_LIBDIR}/whip
 
-MAKE_JOBS_SAFE=  yes
-MAKE_ENV+=	WITH_TCL=yes
-PLIST_SUB+=	TCLOPT=""
 .else
 PLIST_SUB+=	TCLOPT="@comment "
+CONFIGURE_ARGS+=--without-tcl
 .endif
 
+MAN1=	whiptail.1
+
 .include <bsd.port.pre.mk>
 
 post-patch:
 	${REINPLACE_CMD} -e 's,^\(SONAME=\).*,\1${SOVERSION},g' \
 		${WRKSRC}/configure
+	${REINPLACE_CMD} -e 's|/usr/include/slang|${LOCALBASE:Q}/include|' \
+		-e 's|-lslang|-lcurses -L${LOCALBASE:Q}/lib -lslang|'	\
+		-e 's|-ltcl8.4||'	\
+		-e 's|^pkgconfigdir.*|pkgconfigdir=${LOCALBASE:Q}/libdata/pkgconfig|'	\
+		-e 's,PYTHONVERS =.*,PYTHONVERS=${PYTHON_VER},' \
+		${WRKSRC}/Makefile.in
 	${REINPLACE_CMD} -e 's,PyMem_DEL,PyObject_DEL,g' \
 		${WRKSRC}/snackmodule.c
 
 .if defined(WITH_PYTHON)
-post-build:
+pre-install:
 	@${LN} -sf ${WRKSRC}/libnewt.so.${SOVERSION} ${WRKSRC}/libnewt.so
-	@cd ${WRKSRC} && ${MAKE_ENV} ${PYTHON_CMD} ${FILESDIR}/setup.py build
+	@cd ${WRKSRC} && ${MAKE_ENV} ${PYTHON_CMD} ${WRKDIR}/setup.py build
+.endif
 
 post-install:
-	@cd ${WRKSRC} && ${MAKE_ENV} ${PYTHON_CMD} ${FILESDIR}/setup.py \
-		install --prefix=${PREFIX}
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/peanuts.py ${WRKSRC}/popcorn.py \
-		${EXAMPLESDIR}
+.if defined(WITH_TCL)
+	${INSTALL_DATA} ${WRKDIR}/pkgIndex.tcl ${TCL_LIBDIR}/whip/
+.endif
+.if defined(WITH_PYTHON)
+	@cd ${WRKSRC} && ${MAKE_ENV} ${PYTHON_CMD} ${WRKDIR}/setup.py install --prefix=${PREFIX}
+.if !defined(NOPORTEXAMPLES)
+	${MKDIR} ${EXAMPLESDIR}/
+	${INSTALL_SCRIPT} ${WRKSRC}/peanuts.py ${WRKSRC}/popcorn.py ${EXAMPLESDIR}/
 .endif
 .endif