svn commit: r406148 - in head/devel/newt: . files

[Martin Wilke]

Author: miwi
Date: Fri Jan 15 09:28:53 2016
New Revision: 406148
URL: https://svnweb.freebsd.org/changeset/ports/406148

Log:
  - Update to 0.52.18
  - Add new python option
  
  PR:		206245
  Submitted by:	ports fury

Modified:
  head/devel/newt/Makefile
  head/devel/newt/distinfo
  head/devel/newt/files/patch-newt.c
  head/devel/newt/pkg-plist

Modified: head/devel/newt/Makefile
==============================================================================
--- head/devel/newt/Makefile	Fri Jan 15 09:27:50 2016	(r406147)
+++ head/devel/newt/Makefile	Fri Jan 15 09:28:53 2016	(r406148)
@@ -1,13 +1,16 @@
 # $FreeBSD$
 
 PORTNAME=	newt
-PORTVERSION=	0.52.17
+PORTVERSION=	0.52.18
 CATEGORIES=	devel
 MASTER_SITES=	https://fedorahosted.org/releases/n/e/newt/
 
 MAINTAINER=	ports at 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 @@ PLIST_SUB=	SOVERSION="${SOVERSION}" \
 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 @@ TCL_CPPFLAGS=		-I${TCL_INCLUDEDIR:Q}
 
 SOVERSION=	${PORTVERSION:R:E}
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e \
 		'/^SONAME/s|=.*|=${SOVERSION}| ; \
@@ -52,20 +56,26 @@ post-patch:
 		 /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>

Modified: head/devel/newt/distinfo
==============================================================================
--- head/devel/newt/distinfo	Fri Jan 15 09:27:50 2016	(r406147)
+++ head/devel/newt/distinfo	Fri Jan 15 09:28:53 2016	(r406148)
@@ -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

Modified: head/devel/newt/files/patch-newt.c
==============================================================================
--- head/devel/newt/files/patch-newt.c	Fri Jan 15 09:27:50 2016	(r406147)
+++ head/devel/newt/files/patch-newt.c	Fri Jan 15 09:28:53 2016	(r406148)
@@ -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 },

Modified: head/devel/newt/pkg-plist
==============================================================================
--- head/devel/newt/pkg-plist	Fri Jan 15 09:27:50 2016	(r406147)
+++ head/devel/newt/pkg-plist	Fri Jan 15 09:28:53 2016	(r406148)
@@ -4,6 +4,8 @@ lib/libnewt.a
 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