diff --git a/devel/newt/Makefile b/devel/newt/Makefile index c34849b7f261..572b1c645763 100644 --- a/devel/newt/Makefile +++ b/devel/newt/Makefile @@ -11,7 +11,7 @@ COMMENT= Not Eriks Windowing Toolkit: console I/O handling library 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 diff --git a/devel/newt/files/setup.py.in b/devel/newt/files/setup.py.in deleted file mode 100644 index a9b64f6a1f31..000000000000 --- a/devel/newt/files/setup.py.in +++ /dev/null @@ -1,30 +0,0 @@ -# $FreeBSD: /tmp/pcvs/ports/devel/newt/files/setup.py.in,v 1.1 2010-01-10 23:40:05 pgollucci Exp $ -import os -from distutils.core import setup, Extension - -setup ( name = 'newt', - version = '%%VERSION%%', - description = 'Python interface to Newt module', - py_modules = ['snack'], - ext_modules = [ Extension( - name='_snack', - sources=['snackmodule.c'], - include_dirs=['.', '%%LOCALBASE%%'+'/include', '%%PREFIX%%'+'/include'], - library_dirs=['.', '%%LOCALBASE%%'+'/lib', '%%PREFIX%%'+'/lib'], - libraries=['newt', 'popt', 'slang', 'ncurses'] - )]) -# $FreeBSD: /tmp/pcvs/ports/devel/newt/files/setup.py.in,v 1.1 2010-01-10 23:40:05 pgollucci Exp $ -import os -from distutils.core import setup, Extension - -setup ( name = 'newt', - version = '%%VERSION%%', - description = 'Python interface to Newt module', - py_modules = ['snack'], - ext_modules = [ Extension( - name='_snack', - sources=['snackmodule.c'], - include_dirs=['.', '%%LOCALBASE%%'+'/include', '%%PREFIX%%'+'/include'], - library_dirs=['.', '%%LOCALBASE%%'+'/lib', '%%PREFIX%%'+'/lib'], - libraries=['newt', 'popt', 'slang', 'ncurses'] - )]) diff --git a/devel/newt/pkg-plist b/devel/newt/pkg-plist index a89208dd8b83..1bfcd233cabe 100644 --- a/devel/newt/pkg-plist +++ b/devel/newt/pkg-plist @@ -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%%