Date: Wed, 28 Oct 2020 10:38:49 +0000 (UTC) From: Mateusz Piotrowski <0mp@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r553532 - head/news/rntrack Message-ID: <202010281038.09SAcnCd047818@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: 0mp Date: Wed Oct 28 10:38:49 2020 New Revision: 553532 URL: https://svnweb.freebsd.org/changeset/ports/553532 Log: Simplify makefile handling By defining BUILD_WRKSRC, it's possible to remove MAKEFILE, pre-patch, and pre-configure. While here, remove unnecessary ALL_TARGET and clean up the do-install target. Approved by: portmgr blanket Modified: head/news/rntrack/Makefile Modified: head/news/rntrack/Makefile ============================================================================== --- head/news/rntrack/Makefile Wed Oct 28 10:25:25 2020 (r553531) +++ head/news/rntrack/Makefile Wed Oct 28 10:38:49 2020 (r553532) @@ -16,15 +16,14 @@ LICENSE_FILE= ${WRKSRC}/COPYING USES= tar:bzip2 -MAKEFILE= ${WRKSRC}/MakeFiles/FreeBSD/Makefile MAKE_ENV= CONFIG=${ETCDIR}/rntrack.cfg -ALL_TARGET= ${PORTNAME} ETCDIR= ${PREFIX}/etc/fido NO_WRKSUBDIR= yes +BUILD_WRKSRC= ${WRKSRC}/MakeFiles/FreeBSD -_DOCS= FAQ_en FAQ_ru report.err report.err.ru +_DOCS= FAQ_en FAQ_ru report.err report.err.ru OPTIONS_DEFINE= DOCS EXAMPLES LOG_PID SCRIPTS SYSLOG_FORMAT @@ -37,16 +36,9 @@ SCRIPTS_USES= perl5 SCRIPTS_MAKE_ARGS= ENABLE_SCRIPTS=1 SYSLOG_FORMAT_MAKE_ARGS= ENABLE_SYSLOG_LOG_FORMAT=1 -pre-patch: - ${REINPLACE_CMD} -e "s@\.\./\.\./@@g" ${WRKSRC}/MakeFiles/FreeBSD/Makefile - -pre-configure: - ${CP} ${WRKSRC}/MakeFiles/FreeBSD/Makefile ${WRKSRC} - do-install: - ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/rntrack ${STAGEDIR}${PREFIX}/sbin ${MKDIR} ${STAGEDIR}${ETCDIR} - ${INSTALL_PROGRAM} ${WRKSRC}/rntrack ${STAGEDIR}${PREFIX}/sbin ${MKDIR} ${STAGEDIR}${ETCDIR}/tpl ${INSTALL_DATA} ${WRKSRC}/samples/node.cfg ${STAGEDIR}${ETCDIR}/rntrack.cfg-dist ${INSTALL_DATA} ${WRKSRC}/samples/test.pl ${STAGEDIR}${ETCDIR} @@ -56,11 +48,17 @@ do-install: .for f in alt2koi.tbl koi2alt.tbl ${INSTALL_DATA} ${WRKSRC}/samples/${f} ${STAGEDIR}${ETCDIR}/tbl .endfor -.for f in bignode.zip bignode2.zip node1042.zip node1157.zip node.cfg node2.cfg node3.cfg perl-test.cfg point.cfg point2.cfg traflog.tpl - ${INSTALL_DATA} ${WRKSRC}/samples/${f} ${STAGEDIR}${EXAMPLESDIR} -.endfor + +post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} .for f in ${_DOCS} ${INSTALL_DATA} ${WRKSRC}/doc/${f} ${STAGEDIR}${DOCSDIR} .endfor + +post-install-EXAMPLES-on: + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} +.for f in bignode.zip bignode2.zip node1042.zip node1157.zip node.cfg node2.cfg node3.cfg perl-test.cfg point.cfg point2.cfg traflog.tpl + ${INSTALL_DATA} ${WRKSRC}/samples/${f} ${STAGEDIR}${EXAMPLESDIR} +.endfor + .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202010281038.09SAcnCd047818>