Date: Tue, 1 Oct 2013 06:58:45 +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: r328924 - in head/devel/combat: . files Message-ID: <201310010658.r916wjKg053240@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gahr Date: Tue Oct 1 06:58:44 2013 New Revision: 328924 URL: http://svnweb.freebsd.org/changeset/ports/328924 Log: - Convert to USES+=tcl - Convert to OPTIONSng - STAGE-clean Added: head/devel/combat/files/patch-bin_iordump (contents, props changed) Modified: head/devel/combat/Makefile head/devel/combat/files/patch-bin_idl2tcl (contents, props changed) Modified: head/devel/combat/Makefile ============================================================================== --- head/devel/combat/Makefile Tue Oct 1 05:54:24 2013 (r328923) +++ head/devel/combat/Makefile Tue Oct 1 06:58:44 2013 (r328924) @@ -11,33 +11,40 @@ COMMENT= A CORBA ORB implementation in T LICENSE= BSD -LIB_DEPENDS= itcl.3:${PORTSDIR}/lang/itcl +LIB_DEPENDS= libitcl.so:${PORTSDIR}/lang/itcl RUN_DEPENDS= idl:${PORTSDIR}/devel/mico -USE_TCL= yes +OPTIONS_DEFINE= DOCS EXAMPLES + +USES+= tcl:run NO_BUILD= yes PORTDOCS= * PORTEXAMPLES= * -NO_STAGE= yes -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> + +post-patch: + ${FIND} ${WRKSRC} -name dotest | ${XARGS} \ + ${REINPLACE_CMD} -i '' -e 's|tclsh8.5|${TCLSH}|g' + ${REINPLACE_CMD} -e 's|%%TCLSH%%|${TCLSH}|' \ + ${WRKSRC}/bin/idl2tcl ${WRKSRC}/bin/iordump do-install: - cd ${WRKSRC}/orb && ${COPYTREE_SHARE} \* ${PREFIX}/lib/combat - ${MKDIR} ${PREFIX}/bin/combat - ${INSTALL_SCRIPT} ${WRKSRC}/bin/idl2tcl ${PREFIX}/bin/combat - ${INSTALL_SCRIPT} ${WRKSRC}/bin/iordump ${PREFIX}/bin/combat -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/doc/combat.pdf ${DOCSDIR} + cd ${WRKSRC}/orb && ${COPYTREE_SHARE} \* ${STAGEDIR}${PREFIX}/lib/combat + ${MKDIR} ${STAGEDIR}${PREFIX}/bin/combat + ${INSTALL_SCRIPT} ${WRKSRC}/bin/idl2tcl ${STAGEDIR}${PREFIX}/bin/combat + ${INSTALL_SCRIPT} ${WRKSRC}/bin/iordump ${STAGEDIR}${PREFIX}/bin/combat +.if ${PORT_OPTIONS:MDOCS} + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/doc/combat.pdf ${STAGEDIR}${DOCSDIR} .endif -.if !defined(NOPORTEXAMPLES) - ${MKDIR} ${EXAMPLESDIR} - cd ${WRKSRC}/demo && ${COPYTREE_SHARE} \* ${EXAMPLESDIR} +.if ${PORT_OPTIONS:MEXAMPLES} + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + cd ${WRKSRC}/demo && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR} .endif -test: +regression-test: cd ${WRKSRC}/test && ${MAKE} test -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/devel/combat/files/patch-bin_idl2tcl ============================================================================== --- head/devel/combat/files/patch-bin_idl2tcl Tue Oct 1 05:54:24 2013 (r328923) +++ head/devel/combat/files/patch-bin_idl2tcl Tue Oct 1 06:58:44 2013 (r328924) @@ -1,6 +1,22 @@ ---- bin/idl2tcl.orig 2012-02-24 16:14:22.000000000 +0100 -+++ bin/idl2tcl 2012-02-24 16:14:42.000000000 +0100 -@@ -35,8 +35,9 @@ +--- bin/idl2tcl.orig 2011-08-01 20:00:08.000000000 +0200 ++++ bin/idl2tcl 2013-09-30 17:49:12.000000000 +0200 +@@ -1,14 +1,4 @@ +-#! /bin/sh +-# $Id: idl2tcl,v 1.2 2011-08-01 18:00:08 fp Exp $ \ +-# \ +-# the next line restarts using tclsh8.5 on unix \ +-if type tclsh8.5 > /dev/null 2>&1 ; then exec tclsh8.5 "$0" ${1+"$@"} ; fi +-# the next line restarts using tclsh85 on Windows using Cygwin \ +-if type tclsh85 > /dev/null 2>&1 ; then exec tclsh85 "`cygpath --windows $0`" ${1+"$@"} ; fi +-# the next line complains about a missing tclsh \ +-echo "This software requires Tcl 8.5 to run." ; \ +-echo "Make sure that \"tclsh8.5\" or \"tclsh85\" is in your \$PATH" ; \ +-exit 1 ++#!%%TCLSH%% + + # + # ---------------------------------------------------------------------- +@@ -35,8 +25,9 @@ } if {[catch {package require kill} oops]} { Added: head/devel/combat/files/patch-bin_iordump ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/combat/files/patch-bin_iordump Tue Oct 1 06:58:44 2013 (r328924) @@ -0,0 +1,18 @@ +--- bin/iordump.orig 2013-09-30 17:50:30.000000000 +0200 ++++ bin/iordump 2013-09-30 17:50:41.000000000 +0200 +@@ -1,14 +1,4 @@ +-#! /bin/sh +-# $Id: iordump,v 1.1 2008-11-14 02:12:35 Owner Exp $ \ +-# \ +-# the next line restarts using tclsh8.5 on unix \ +-if type tclsh8.5 > /dev/null 2>&1 ; then exec tclsh8.5 "$0" ${1+"$@"} ; fi +-# the next line restarts using tclsh85 on Windows using Cygwin \ +-if type tclsh85 > /dev/null 2>&1 ; then exec tclsh85 "`cygpath --windows $0`" ${1+"$@"} ; fi +-# the next line complains about a missing tclsh \ +-echo "This software requires Tcl 8.5 to run." ; \ +-echo "Make sure that \"tclsh8.5\" or \"tclsh85\" is in your \$PATH" ; \ +-exit 1 ++#!%%TCLSH%% + + # + # ----------------------------------------------------------------------
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310010658.r916wjKg053240>