diff options
author | Pietro Cerutti <gahr@FreeBSD.org> | 2013-11-07 13:00:22 +0000 |
---|---|---|
committer | Pietro Cerutti <gahr@FreeBSD.org> | 2013-11-07 13:00:22 +0000 |
commit | eba7b1f11b1d920da114b8146f46e432a0be46fe (patch) | |
tree | 3b50b75801c1fc83566181a602232addf1c0c219 /lang/tcl-wrapper | |
parent | cbf85e81627467ee413af6717deb5e6f5d97854e (diff) | |
download | ports-eba7b1f11b1d920da114b8146f46e432a0be46fe.tar.gz ports-eba7b1f11b1d920da114b8146f46e432a0be46fe.zip |
Notes
Diffstat (limited to 'lang/tcl-wrapper')
-rw-r--r-- | lang/tcl-wrapper/Makefile | 27 | ||||
-rw-r--r-- | lang/tcl-wrapper/files/conf.sample.in | 1 | ||||
-rw-r--r-- | lang/tcl-wrapper/files/pkg-deinstall.in | 17 | ||||
-rw-r--r-- | lang/tcl-wrapper/files/pkg-install.in | 12 | ||||
-rw-r--r-- | lang/tcl-wrapper/files/wrapper.in | 8 |
5 files changed, 13 insertions, 52 deletions
diff --git a/lang/tcl-wrapper/Makefile b/lang/tcl-wrapper/Makefile index 0c6ee1a4e2b8..f7f184dee265 100644 --- a/lang/tcl-wrapper/Makefile +++ b/lang/tcl-wrapper/Makefile @@ -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="${GREP}" LS="${LS}" \ 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> diff --git a/lang/tcl-wrapper/files/conf.sample.in b/lang/tcl-wrapper/files/conf.sample.in index 657ae09aa97e..7c0ae56ea112 100644 --- a/lang/tcl-wrapper/files/conf.sample.in +++ b/lang/tcl-wrapper/files/conf.sample.in @@ -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 diff --git a/lang/tcl-wrapper/files/pkg-deinstall.in b/lang/tcl-wrapper/files/pkg-deinstall.in deleted file mode 100644 index 15e26bb3c31a..000000000000 --- a/lang/tcl-wrapper/files/pkg-deinstall.in +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh -# $FreeBSD$ -# -MD5="%%MD5%%" -MD5SUM= -RM="%%RM%%" -TX_CONF="%%TX_CONF_FULL%%" - -if [ "$2" = "POST-DEINSTALL" ]; then - - if [ -f ${TX_CONF} ]; then - MD5CHECK=`${MD5} ${TX_CONF}` - if [ "x${MD5CHECK}" = "x${MD5SUM}" ]; then - ${RM} ${TX_CONF} - fi - fi -fi diff --git a/lang/tcl-wrapper/files/pkg-install.in b/lang/tcl-wrapper/files/pkg-install.in deleted file mode 100644 index 394220ba2c2d..000000000000 --- a/lang/tcl-wrapper/files/pkg-install.in +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -# $FreeBSD$ -# -CP="%%CP%%" -TX_CONF="%%TX_CONF_FULL%%" - -if [ "$2" = "POST-INSTALL" ]; then - - if [ ! -f "${TX_CONF}" ]; then - ${CP} "${TX_CONF}.sample" "${TX_CONF}" - fi -fi diff --git a/lang/tcl-wrapper/files/wrapper.in b/lang/tcl-wrapper/files/wrapper.in index 1fec088f54d0..45d8054b48c4 100644 --- a/lang/tcl-wrapper/files/wrapper.in +++ b/lang/tcl-wrapper/files/wrapper.in @@ -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 |