Date: Sat, 8 Feb 2020 19:01:45 +0000 (UTC) From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r525569 - in head/devel/tmake: . files Message-ID: <202002081901.018J1juo069824@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sunpoet Date: Sat Feb 8 19:01:45 2020 New Revision: 525569 URL: https://svnweb.freebsd.org/changeset/ports/525569 Log: Convert REINPLACE_CMD to patch file - Use COPYTREE_SHARE argument instead of REINPLACE_ARGS Added: head/devel/tmake/files/patch-lib-freebsd-g++-tmake.conf (contents, props changed) Modified: head/devel/tmake/Makefile Modified: head/devel/tmake/Makefile ============================================================================== --- head/devel/tmake/Makefile Sat Feb 8 19:01:40 2020 (r525568) +++ head/devel/tmake/Makefile Sat Feb 8 19:01:45 2020 (r525569) @@ -13,28 +13,22 @@ COMMENT= Extremely portable perl-based make utility LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE +USES= perl5 shebangfix zip + NO_ARCH= yes NO_BUILD= yes -REINPLACE_ARGS= -i '' -USES= perl5 shebangfix zip SHEBANG_FILES= bin/progen bin/tmake post-patch: - @${RM} ${WRKSRC}/lib/make/generic.t.orig - @${REINPLACE_CMD} \ - -e 's|/usr/local|${LOCALBASE}|' \ - -e 's|/usr/X11R6|${LOCALBASE}|' \ - -e '/^TMAKE_CFLAGS_RELEASE/ s| -O[0-9]||' \ - ${WRKSRC}/lib/freebsd-g++/tmake.conf + @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/lib/freebsd-g++/tmake.conf do-install: ${MKDIR} ${STAGEDIR}${DATADIR}/ cd ${WRKSRC}/bin/ && ${INSTALL_SCRIPT} progen tmake ${STAGEDIR}${PREFIX}/bin/ - cd ${WRKSRC}/lib/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/ + cd ${WRKSRC}/lib/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/ '! -name *.bak -and ! -name *.orig' @${ECHO_MSG} - @${ECHO_MSG} "Make sure to set your TMAKEPATH environment variable" - @${ECHO_MSG} "to ${DATADIR}/freebsd-g++." + @${ECHO_MSG} "Make sure to set your TMAKEPATH environment variable to ${DATADIR}/freebsd-g++" @${ECHO_MSG} .include <bsd.port.mk> Added: head/devel/tmake/files/patch-lib-freebsd-g++-tmake.conf ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/tmake/files/patch-lib-freebsd-g++-tmake.conf Sat Feb 8 19:01:45 2020 (r525569) @@ -0,0 +1,28 @@ +--- lib/freebsd-g++/tmake.conf.orig 2004-02-29 18:20:42 UTC ++++ lib/freebsd-g++/tmake.conf +@@ -11,7 +11,7 @@ TMAKE_CC = gcc + TMAKE_CFLAGS = -pipe -fno-exceptions + TMAKE_CFLAGS_WARN_ON = -Wall -W + TMAKE_CFLAGS_WARN_OFF = -w +-TMAKE_CFLAGS_RELEASE = -O2 ++TMAKE_CFLAGS_RELEASE = + TMAKE_CFLAGS_DEBUG = -g + TMAKE_CFLAGS_SHLIB = -fPIC + TMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses +@@ -29,12 +29,12 @@ TMAKE_CXXFLAGS_THREAD = $$TMAKE_CFLAGS_THREAD + + TMAKE_INCDIR = /usr/local/include + TMAKE_LIBDIR = /usr/local/lib +-TMAKE_INCDIR_X11 = /usr/X11R6/include +-TMAKE_LIBDIR_X11 = /usr/X11R6/lib ++TMAKE_INCDIR_X11 = /usr/local/include ++TMAKE_LIBDIR_X11 = /usr/local/lib + TMAKE_INCDIR_QT = $(QTDIR)/include + TMAKE_LIBDIR_QT = $(QTDIR)/lib +-TMAKE_INCDIR_OPENGL = /usr/X11R6/include +-TMAKE_LIBDIR_OPENGL = /usr/X11R6/lib ++TMAKE_INCDIR_OPENGL = /usr/local/include ++TMAKE_LIBDIR_OPENGL = /usr/local/lib + + TMAKE_LINK = g++ + TMAKE_LINK_SHLIB = g++
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002081901.018J1juo069824>