Date: Fri, 27 Sep 2013 09:29:20 +0000 (UTC) From: Pietro Cerutti <gahr@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r328446 - head/devel/newt Message-ID: <201309270929.r8R9TKDt070674@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gahr Date: Fri Sep 27 09:29:19 2013 New Revision: 328446 URL: http://svnweb.freebsd.org/changeset/ports/328446 Log: - Convert to USES+= tcl - Install the Tcl extension under ${PREFIX}/lib instad of ${TCLLIB} - STAGE-clean Modified: head/devel/newt/Makefile head/devel/newt/pkg-plist Modified: head/devel/newt/Makefile ============================================================================== --- head/devel/newt/Makefile Fri Sep 27 09:12:09 2013 (r328445) +++ head/devel/newt/Makefile Fri Sep 27 09:29:19 2013 (r328446) @@ -6,14 +6,14 @@ CATEGORIES= devel MASTER_SITES= https://fedorahosted.org/releases/n/e/newt/ MAINTAINER= ports@FreeBSD.org -COMMENT= Not Erik's Windowing Toolkit: console I/O handling library +COMMENT= Not Eriks Windowing Toolkit: console I/O handling library -LIB_DEPENDS= slang:${PORTSDIR}/devel/libslang2 \ - popt:${PORTSDIR}/devel/popt +LIB_DEPENDS= libslang.so:${PORTSDIR}/devel/libslang2 \ + libpopt.so:${PORTSDIR}/devel/popt OPTIONS_DEFINE= PYTHON TCL NLS -USE_GMAKE= yes +USES+= gmake GNU_CONFIGURE= yes MAKE_ENV= PCFLAGS="${CFLAGS}" TCLVERSION="tcl${TCL_VER}" USE_LDCONFIG= yes @@ -27,11 +27,8 @@ PLIST_SUB= SOVERSION="${SOVERSION}" \ SUB_LIST= VERSION="${PORTVERSION}" -MAN1= whiptail.1 - SOVERSION= ${PORTVERSION:R:E} -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MNLS} @@ -52,7 +49,7 @@ PLIST_SUB+= PYTHONOPT="@comment " .endif .if ${PORT_OPTIONS:MTCL} -USE_TCL= 84+ +USES+= tcl MAKE_ENV+= TCL_LIBDIR=${TCL_LIBDIR:Q} CPPFLAGS+= -I${TCL_INCLUDEDIR:Q} SUB_FILES+= pkgIndex.tcl @@ -72,7 +69,7 @@ post-patch: /^pkgconfigdir/s|=.*|=${PREFIX}/libdata/pkgconfig| ; \ s| -g | |g ; \ /make -C/s|^|#| ; \ - /whiptcl.so/s|install|${TRUE}|' ${WRKSRC}/Makefile.in + /whiptcl.$$(SOEXT)/s|install|${TRUE}|' ${WRKSRC}/Makefile.in post-build: apply-slist .if ${PORT_OPTIONS:MPYTHON} @@ -82,24 +79,24 @@ post-build: apply-slist .endif post-install: - @${STRIP_CMD} ${PREFIX}/bin/whiptail + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/whiptail .if ${PORT_OPTIONS:MNLS} @(cd ${WRKSRC}/po && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \ - ${MAKEFILE} ${MAKE_ARGS} datadir=${PREFIX}/share \ + ${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=${PREFIX}) + install --prefix=${STAGEDIR}${PREFIX}) .endif .if ${PORT_OPTIONS:MTCL} - @${MKDIR} ${TCL_LIBDIR}/whip - (cd ${WRKSRC} && ${INSTALL_DATA} whiptcl.so ${TCL_LIBDIR}/whip) - (cd ${WRKDIR} && ${INSTALL_DATA} pkgIndex.tcl ${TCL_LIBDIR}/whip) + @${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} ${EXAMPLESDIR} - (cd ${WRKSRC} && ${INSTALL_SCRIPT} peanuts.py popcorn.py ${EXAMPLESDIR}) + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + (cd ${WRKSRC} && ${INSTALL_SCRIPT} peanuts.py popcorn.py ${STAGEDIR}${EXAMPLESDIR}) .endif .include <bsd.port.mk> Modified: head/devel/newt/pkg-plist ============================================================================== --- head/devel/newt/pkg-plist Fri Sep 27 09:12:09 2013 (r328445) +++ head/devel/newt/pkg-plist Fri Sep 27 09:29:19 2013 (r328446) @@ -4,12 +4,13 @@ lib/libnewt.a 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%%%%TCL_LIBDIR%%/whip/pkgIndex.tcl -%%TCLOPT%%%%TCL_LIBDIR%%/whip/whiptcl.so +%%TCLOPT%%lib/whip%%VERSION%%/pkgIndex.tcl +%%TCLOPT%%lib/whip%%VERSION%%/whiptcl.so libdata/pkgconfig/libnewt.pc %%PORTEXAMPLES%%%%EXAMPLESDIR%%/peanuts.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/popcorn.py @@ -121,4 +122,4 @@ libdata/pkgconfig/libnewt.pc %%NLS%%@dirrmtry share/locale/as/LC_MESSAGES %%NLS%%@dirrmtry share/locale/as %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% -%%TCLOPT%%@dirrm %%TCL_LIBDIR%%/whip +%%TCLOPT%%@dirrm lib/whip%%VERSION%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309270929.r8R9TKDt070674>