From owner-svn-ports-head@FreeBSD.ORG Sat Nov 30 21:07:48 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9968AE32; Sat, 30 Nov 2013 21:07:48 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6AB5019C9; Sat, 30 Nov 2013 21:07:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAUL7mWd013439; Sat, 30 Nov 2013 21:07:48 GMT (envelope-from sunpoet@svn.freebsd.org) Received: (from sunpoet@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAUL7mGs013436; Sat, 30 Nov 2013 21:07:48 GMT (envelope-from sunpoet@svn.freebsd.org) Message-Id: <201311302107.rAUL7mGs013436@svn.freebsd.org> From: Sunpoet Po-Chuan Hsieh Date: Sat, 30 Nov 2013 21:07:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r335348 - in head/devel/tmake: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Nov 2013 21:07:48 -0000 Author: sunpoet Date: Sat Nov 30 21:07:47 2013 New Revision: 335348 URL: http://svnweb.freebsd.org/changeset/ports/335348 Log: - Fix shebang - Merge post-install: to do-install: - Rename patch file - Support STAGEDIR Added: - copied unchanged from r333784, head/devel/tmake/files/patch-aa Directory Properties: head/devel/tmake/files/patch-lib-unix-generic.t (props changed) Deleted: head/devel/tmake/files/patch-aa Modified: head/devel/tmake/Makefile Modified: head/devel/tmake/Makefile ============================================================================== --- head/devel/tmake/Makefile Sat Nov 30 20:54:30 2013 (r335347) +++ head/devel/tmake/Makefile Sat Nov 30 21:07:47 2013 (r335348) @@ -12,9 +12,10 @@ COMMENT= Extremely portable perl-based m NO_BUILD= yes REINPLACE_ARGS= -i '' -USES= perl5 +USES= perl5 shebangfix + +SHEBANG_FILES= bin/progen bin/tmake -NO_STAGE= yes post-patch: @${RM} -f ${WRKSRC}/bin/tmake.orig ${WRKSRC}/lib/unix/generic.t.orig @${REINPLACE_CMD} \ @@ -24,11 +25,9 @@ post-patch: ${WRKSRC}/lib/freebsd-g++/tmake.conf do-install: - ${MKDIR} ${DATADIR}/ - cd ${WRKSRC}/lib/ && ${COPYTREE_SHARE} . ${DATADIR}/ - cd ${WRKSRC}/bin/ && ${INSTALL_SCRIPT} progen tmake ${PREFIX}/bin/ - -post-install: + ${MKDIR} ${STAGEDIR}${DATADIR}/ + cd ${WRKSRC}/bin/ && ${INSTALL_SCRIPT} progen tmake ${STAGEDIR}${PREFIX}/bin/ + cd ${WRKSRC}/lib/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/ @${ECHO_MSG} @${ECHO_MSG} "Make sure to set your TMAKEPATH environment variable" @${ECHO_MSG} "to ${DATADIR}/freebsd-g++." Copied: head/devel/tmake/files/patch-lib-unix-generic.t (from r333784, head/devel/tmake/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/tmake/files/patch-lib-unix-generic.t Sat Nov 30 21:07:47 2013 (r335348, copy of r333784, head/devel/tmake/files/patch-aa) @@ -0,0 +1,21 @@ +--- lib/unix/generic.t.orig 2000-12-04 04:26:06.000000000 +0200 ++++ lib/unix/generic.t 2010-08-27 22:54:27.797820407 +0300 +@@ -205,13 +205,13 @@ + + ####### Compiler, tools and options + +-CC = #$ Expand("TMAKE_CC"); +-CXX = #$ Expand("TMAKE_CXX"); +-CFLAGS = #$ Expand("TMAKE_CFLAGS"); ExpandGlue("DEFINES","-D"," -D",""); +-CXXFLAGS= #$ Expand("TMAKE_CXXFLAGS"); ExpandGlue("DEFINES","-D"," -D",""); ++CC ?= #$ Expand("TMAKE_CC"); ++CXX ?= #$ Expand("TMAKE_CXX"); ++CFLAGS += #$ Expand("TMAKE_CFLAGS"); ExpandGlue("DEFINES","-D"," -D",""); ++CXXFLAGS+= #$ Expand("TMAKE_CXXFLAGS"); ExpandGlue("DEFINES","-D"," -D",""); + INCPATH = #$ ExpandPath("INCPATH","-I"," -I",""); + #$ Config("staticlib") && DisableOutput(); +-LINK = #$ Expand("TMAKE_LINK"); ++LINK = $(CXX) + LFLAGS = #$ Expand("TMAKE_LFLAGS"); + LIBS = $(SUBLIBS) #$ Expand("TMAKE_LIBDIR_FLAGS"); Expand("TMAKE_LIBS"); + #$ Config("staticlib") && EnableOutput();