From owner-svn-ports-all@FreeBSD.ORG Wed Dec 18 18:57:49 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 001E455C; Wed, 18 Dec 2013 18:57:48 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id DF6ED18E9; Wed, 18 Dec 2013 18:57:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBIIvmvT025480; Wed, 18 Dec 2013 18:57:48 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBIIvm1v025478; Wed, 18 Dec 2013 18:57:48 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201312181857.rBIIvm1v025478@svn.freebsd.org> From: William Grzybowski Date: Wed, 18 Dec 2013 18:57:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336856 - in head/devel/newt: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Dec 2013 18:57:49 -0000 Author: wg Date: Wed Dec 18 18:57:48 2013 New Revision: 336856 URL: http://svnweb.freebsd.org/changeset/ports/336856 Log: devel/newt: remove python option The python bindings are now available at devel/py-snack. Deleted: head/devel/newt/files/setup.py.in Modified: head/devel/newt/Makefile head/devel/newt/pkg-plist Modified: head/devel/newt/Makefile ============================================================================== --- head/devel/newt/Makefile Wed Dec 18 18:50:29 2013 (r336855) +++ head/devel/newt/Makefile Wed Dec 18 18:57:48 2013 (r336856) @@ -11,7 +11,7 @@ COMMENT= Not Eriks Windowing Toolkit: co LIB_DEPENDS= libslang.so:${PORTSDIR}/devel/libslang2 \ libpopt.so:${PORTSDIR}/devel/popt -OPTIONS_DEFINE= PYTHON TCL NLS +OPTIONS_DEFINE= TCL NLS USES+= gmake GNU_CONFIGURE= yes @@ -39,15 +39,6 @@ CONFIGURE_ARGS+=--disable-nls PLIST_SUB+= NLS="@comment " .endif -.if ${PORT_OPTIONS:MPYTHON} -USE_PYTHON= -2.7 -INSTALLS_EGGINFO= yes -PLIST_SUB+= PYTHONOPT="" -SUB_FILES+= setup.py -.else -PLIST_SUB+= PYTHONOPT="@comment " -.endif - .if ${PORT_OPTIONS:MTCL} USES+= tcl MAKE_ENV+= TCL_LIBDIR=${TCL_LIBDIR:Q} @@ -65,18 +56,12 @@ post-patch: @${REINPLACE_CMD} -e \ 's|@CPP@|@CC@ -E| ; \ s|-I/usr/include/slang|| ; \ - /^PYTHONVERS/s|=.*|=${PYTHON_VERSION}| ; \ /^pkgconfigdir/s|=.*|=${PREFIX}/libdata/pkgconfig| ; \ s| -g | |g ; \ /make -C/s|^|#| ; \ /whiptcl.$$(SOEXT)/s|install|${TRUE}|' ${WRKSRC}/Makefile.in post-build: apply-slist -.if ${PORT_OPTIONS:MPYTHON} - @${LN} -sf libnewt.so.${SOVERSION} ${WRKSRC}/libnewt.so - @(cd ${WRKSRC} && ${MAKE_ENV} ${PYTHON_CMD} ${WRKDIR}/setup.py \ - build) -.endif post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/whiptail @@ -85,18 +70,10 @@ post-install: ${MAKEFILE} ${MAKE_ARGS} datadir=${STAGEDIR}${PREFIX}/share \ ${INSTALL_TARGET}) .endif -.if ${PORT_OPTIONS:MPYTHON} - @(cd ${WRKSRC} && ${MAKE_ENV} ${PYTHON_CMD} ${WRKDIR}/setup.py \ - install --prefix=${STAGEDIR}${PREFIX}) -.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}) .endif -.if ${PORT_OPTIONS:MEXAMPLES} - @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - (cd ${WRKSRC} && ${INSTALL_SCRIPT} peanuts.py popcorn.py ${STAGEDIR}${EXAMPLESDIR}) -.endif .include Modified: head/devel/newt/pkg-plist ============================================================================== --- head/devel/newt/pkg-plist Wed Dec 18 18:50:29 2013 (r336855) +++ head/devel/newt/pkg-plist Wed Dec 18 18:57:48 2013 (r336856) @@ -5,15 +5,9 @@ lib/libnewt.so lib/libnewt.so.%%SOVERSION%% lib/libnewt.so.%%VERSION%% man/man1/whiptail.1.gz -%%PYTHONOPT%%%%PYTHON_SITELIBDIR%%/_snack.so -%%PYTHONOPT%%%%PYTHON_SITELIBDIR%%/_snackmodule.so -%%PYTHONOPT%%%%PYTHON_SITELIBDIR%%/snack.py -%%PYTHONOPT%%%%PYTHON_SITELIBDIR%%/snack.pyc %%TCLOPT%%lib/whip%%VERSION%%/pkgIndex.tcl %%TCLOPT%%lib/whip%%VERSION%%/whiptcl.so libdata/pkgconfig/libnewt.pc -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/peanuts.py -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/popcorn.py %%NLS%%share/locale/ar/LC_MESSAGES/newt.mo %%NLS%%share/locale/as/LC_MESSAGES/newt.mo %%NLS%%share/locale/ast/LC_MESSAGES/newt.mo @@ -121,5 +115,4 @@ libdata/pkgconfig/libnewt.pc %%NLS%%@dirrmtry share/locale/ast %%NLS%%@dirrmtry share/locale/as/LC_MESSAGES %%NLS%%@dirrmtry share/locale/as -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% %%TCLOPT%%@dirrm lib/whip%%VERSION%%