Date: Thu, 7 Nov 2013 13:00:23 +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: r333086 - in head: lang/tcl-wrapper lang/tcl-wrapper/files x11-toolkits/tk-wrapper Message-ID: <201311071300.rA7D0NU8081415@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gahr Date: Thu Nov 7 13:00:22 2013 New Revision: 333086 URL: http://svnweb.freebsd.org/changeset/ports/333086 Log: - Convert to USES+=tl and USES+=tk - STAGE-clean - Simplify by not installing / deinstalling the user configuration file Deleted: head/lang/tcl-wrapper/files/pkg-deinstall.in head/lang/tcl-wrapper/files/pkg-install.in Modified: head/lang/tcl-wrapper/Makefile head/lang/tcl-wrapper/files/conf.sample.in head/lang/tcl-wrapper/files/wrapper.in head/x11-toolkits/tk-wrapper/Makefile Modified: head/lang/tcl-wrapper/Makefile ============================================================================== --- head/lang/tcl-wrapper/Makefile Thu Nov 7 12:45:47 2013 (r333085) +++ head/lang/tcl-wrapper/Makefile Thu Nov 7 13:00:22 2013 (r333086) @@ -13,11 +13,11 @@ EXTRACT_ONLY= # empty MAINTAINER= tcltk@FreeBSD.org COMMENT= Shell wrapper for ${TX_SHELL} (${TX_PORT_U}) -BUILD_DEPENDS= shc:${PORTSDIR}/misc/shc - LICENSE= BSD -SUB_FILES= wrapper conf.sample pkg-message pkg-install pkg-deinstall +BUILD_DEPENDS= shc:${PORTSDIR}/misc/shc + +SUB_FILES= wrapper conf.sample pkg-message PKGINSTALL= ${WRKDIR}/pkg-install PKGDEINSTALL= ${WRKDIR}/pkg-deinstall @@ -32,10 +32,10 @@ TX_SHELL= wish TX_PORT= tk TX_PORT_U= Tk TX_CAT= x11-toolkits -USE_TK_RUN= 84+ +USES+= tk:run CATEGORIES= x11-toolkits tk .else -USE_TCL_RUN= 84+ +USES+= tcl:run .endif TX_CONF= ${TX_SHELL}.conf @@ -43,9 +43,6 @@ TX_CONF_FULL= ${PREFIX}/etc/${TX_CONF} PLIST_FILES= bin/${TX_SHELL} etc/${TX_CONF}.sample -NO_STAGE= yes -.include <bsd.port.pre.mk> - .if defined(TK_VER) TX_VER=${TK_VER} .else @@ -57,19 +54,13 @@ SUB_LIST+= ECHO_CMD="${ECHO_CMD}" GREP=" TX_SHELL="${TX_SHELL}" TX_SHELL_U="${TX_SHELL:U}" \ TX_PORT="${TX_PORT}" TX_PORT_U="${TX_PORT_U}" \ TX_CAT="${TX_CAT}" TX_VER="${TX_VER}" TX_CONF="${TX_CONF}" \ - TX_CONF_FULL="${TX_CONF_FULL}" + TX_CONF_FULL="${TX_CONF_FULL:S/${STAGEDIR}//}" do-build: apply-slist ${MAKE_ENV} ${LOCALBASE}/bin/shc -r -T -f ${WRKDIR}/wrapper do-install: - ${INSTALL_PROGRAM} ${WRKDIR}/wrapper.x ${PREFIX}/bin/${TX_SHELL} - ${INSTALL_DATA} ${WRKDIR}/conf.sample ${PREFIX}/etc/${TX_CONF}.sample - -post-install: - @MD5SUM=`${MD5} -q ${WRKDIR}/conf.sample` && \ - ${REINPLACE_CMD} -e "s|^MD5SUM=.*$$|MD5SUM=$${MD5SUM}|g" ${WRKDIR}/pkg-deinstall - @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL - @${CAT} ${PKGMESSAGE} + ${INSTALL_PROGRAM} ${WRKDIR}/wrapper.x ${STAGEDIR}${PREFIX}/bin/${TX_SHELL} + ${INSTALL_DATA} ${WRKDIR}/conf.sample ${STAGEDIR}${PREFIX}/etc/${TX_CONF}.sample -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/lang/tcl-wrapper/files/conf.sample.in ============================================================================== --- head/lang/tcl-wrapper/files/conf.sample.in Thu Nov 7 12:45:47 2013 (r333085) +++ head/lang/tcl-wrapper/files/conf.sample.in Thu Nov 7 13:00:22 2013 (r333086) @@ -3,4 +3,3 @@ # # %%TX_SHELL_U%%= full path to your %%TX_SHELL%% shell %%TX_SHELL_U%%=%%PREFIX%%/bin/%%TX_SHELL%%%%TX_VER%% -#%%TX_SHELL_U%%=%%PREFIX%%/bin/%%TX_SHELL%%%%TX_VER%%-threads Modified: head/lang/tcl-wrapper/files/wrapper.in ============================================================================== --- head/lang/tcl-wrapper/files/wrapper.in Thu Nov 7 12:45:47 2013 (r333085) +++ head/lang/tcl-wrapper/files/wrapper.in Thu Nov 7 13:00:22 2013 (r333086) @@ -17,12 +17,12 @@ if [ -f "${%%TX_SHELL_U%%_CONF}" ]; then fi else %%ECHO_CMD%% "You do not have set path to default %%TX_SHELL%% in the configuration file:" - %%ECHO_CMD%% "%%TX_CONF%%" + %%ECHO_CMD%% "%%TX_CONF_FULL%%" %%ECHO_CMD%% "Please see the sample configuration file for details:" - %%ECHO_CMD%% "%%TX_CONF%%.sample" + %%ECHO_CMD%% "%%TX_CONF_FULL%%.sample" fi else - %%ECHO_CMD%% "Configuration file not found: %%TX_CONF%%" + %%ECHO_CMD%% "Configuration file not found: %%TX_CONF_FULL%%" %%ECHO_CMD%% "Please see the sample configuration file for details:" - %%ECHO_CMD%% "%%TX_CONF%%.sample" + %%ECHO_CMD%% "%%TX_CONF_FULL%%.sample" fi Modified: head/x11-toolkits/tk-wrapper/Makefile ============================================================================== --- head/x11-toolkits/tk-wrapper/Makefile Thu Nov 7 12:45:47 2013 (r333085) +++ head/x11-toolkits/tk-wrapper/Makefile Thu Nov 7 13:00:22 2013 (r333086) @@ -7,5 +7,4 @@ BUILDING_TK_WRAPPER= yes MASTERDIR= ${.CURDIR}/../../lang/tcl-wrapper -NO_STAGE= yes .include "${MASTERDIR}/Makefile"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311071300.rA7D0NU8081415>