From owner-svn-ports-all@freebsd.org Wed Oct 28 10:38:49 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E37594420AE; Wed, 28 Oct 2020 10:38:49 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CLlRY5ntLz3f7Q; Wed, 28 Oct 2020 10:38:49 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A77FB1AD32; Wed, 28 Oct 2020 10:38:49 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 09SAcnXw047819; Wed, 28 Oct 2020 10:38:49 GMT (envelope-from 0mp@FreeBSD.org) Received: (from 0mp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 09SAcnCd047818; Wed, 28 Oct 2020 10:38:49 GMT (envelope-from 0mp@FreeBSD.org) Message-Id: <202010281038.09SAcnCd047818@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: 0mp set sender to 0mp@FreeBSD.org using -f From: Mateusz Piotrowski <0mp@FreeBSD.org> Date: Wed, 28 Oct 2020 10:38:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r553532 - head/news/rntrack X-SVN-Group: ports-head X-SVN-Commit-Author: 0mp X-SVN-Commit-Paths: head/news/rntrack X-SVN-Commit-Revision: 553532 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Oct 2020 10:38:50 -0000 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