Date: Thu, 7 Nov 2019 18:18:18 +0000 (UTC) From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r516997 - in head: databases/ora2pg devel/pythontidy dns/autotrust dns/djbdns-tools games/py-sgflib japanese/skk-jisyo lang/clips net-mgmt/py-pdagent sysutils/chyves sysutils/dirvish sy... Message-ID: <201911071818.xA7IIIMV070681@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tobik Date: Thu Nov 7 18:18:17 2019 New Revision: 516997 URL: https://svnweb.freebsd.org/changeset/ports/516997 Log: Replace do-patch in ports that override it with more appropriate targets Most ports do not need to override do-patch. It breaks some ports tree features like EXTRA_PATCH_TREE, etc. Modified: head/databases/ora2pg/Makefile head/devel/pythontidy/Makefile head/dns/autotrust/Makefile head/dns/djbdns-tools/Makefile head/games/py-sgflib/Makefile head/japanese/skk-jisyo/Makefile head/lang/clips/Makefile head/net-mgmt/py-pdagent/Makefile head/sysutils/chyves/Makefile head/sysutils/dirvish/Makefile head/sysutils/diskcheckd/Makefile head/sysutils/hfm/Makefile head/sysutils/iohyve/Makefile head/sysutils/mcollective/Makefile head/www/podcastamatic/Makefile head/www/quark/Makefile head/www/yabb/Makefile Modified: head/databases/ora2pg/Makefile ============================================================================== --- head/databases/ora2pg/Makefile Thu Nov 7 18:08:58 2019 (r516996) +++ head/databases/ora2pg/Makefile Thu Nov 7 18:18:17 2019 (r516997) @@ -28,7 +28,7 @@ DOCS= changelog README OPTIONS_DEFINE= DOCS -do-patch: +post-patch: ${REINPLACE_CMD} -e '/install_all :/,/};/s=$$CONFDIR=${STAGEDIR}${ETCDIR}=g' \ -e '/install_all :/,/};/s=$$DOCDIR=${STAGEDIR}${DOCSDIR}=g' \ ${WRKSRC}/Makefile.PL Modified: head/devel/pythontidy/Makefile ============================================================================== --- head/devel/pythontidy/Makefile Thu Nov 7 18:08:58 2019 (r516996) +++ head/devel/pythontidy/Makefile Thu Nov 7 18:18:17 2019 (r516997) @@ -25,7 +25,7 @@ do-extract: @${MKDIR} ${WRKDIR} @${CP} ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} ${WRKDIR} -do-patch: +post-patch: ${REINPLACE_CMD} -e 's,/usr/bin/python,${PYTHON_CMD},' \ ${WRKDIR}/${DISTFILES} Modified: head/dns/autotrust/Makefile ============================================================================== --- head/dns/autotrust/Makefile Thu Nov 7 18:08:58 2019 (r516996) +++ head/dns/autotrust/Makefile Thu Nov 7 18:18:17 2019 (r516997) @@ -22,7 +22,7 @@ LDFLAGS+= -L${LOCALBASE}/lib -pthread PLIST_FILES= sbin/autotrust man/man8/autotrust.8.gz \ etc/autotrust/autotrust.conf.sample -do-patch: +post-patch: ${REINPLACE_CMD} \ '45s!=!\?=!; \ 46s!^\(CFLAGS \)\(= -I.\) @CFLAGS@!\1+\2!' \ Modified: head/dns/djbdns-tools/Makefile ============================================================================== --- head/dns/djbdns-tools/Makefile Thu Nov 7 18:08:58 2019 (r516996) +++ head/dns/djbdns-tools/Makefile Thu Nov 7 18:18:17 2019 (r516997) @@ -25,7 +25,7 @@ MANPAGES= dnsfilter.1 dnsip.1 dnsipq.1 dnsmx.1 dnsname ALL_TARGET= it -do-patch: +do-configure: @${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc @${ECHO_CMD} "${CC} ${STRIP}" > ${WRKSRC}/conf-ld @${ECHO_CMD} "${PREFIX}" > ${WRKSRC}/conf-home Modified: head/games/py-sgflib/Makefile ============================================================================== --- head/games/py-sgflib/Makefile Thu Nov 7 18:08:58 2019 (r516996) +++ head/games/py-sgflib/Makefile Thu Nov 7 18:18:17 2019 (r516997) @@ -22,7 +22,7 @@ NO_BUILD= yes NO_ARCH= yes WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION} -do-patch: +post-patch: @${REINPLACE_CMD} -e 's|/usr/local/bin/python|${python_CMD}|' \ ${WRKSRC}/*.py @${FIND} ${WRKSRC} -name "*.bak" -delete Modified: head/japanese/skk-jisyo/Makefile ============================================================================== --- head/japanese/skk-jisyo/Makefile Thu Nov 7 18:08:58 2019 (r516996) +++ head/japanese/skk-jisyo/Makefile Thu Nov 7 18:18:17 2019 (r516997) @@ -44,10 +44,10 @@ post-extract: .if defined(WITH_SKKJISYO_DELCOMMENTS) # Strip comments in transtation candidates list. -# Candidate list starts with '/', and each candidate is concatinated by +# Candidate list starts with '/', and each candidate is concatenated by # '/' (e.g., "/c1/c2/".) Each candidate may have a comment just after # the candidate, leading a marker character ';' (e.g. /c3;comment/). -do-patch: +post-patch: .for type in ${SKK_JISYO_TYPE} ${REINPLACE_CMD} -e '/^[^;]/s,;[^/]*/,/,g' -e '/^>/d' \ ${WRKSRC}/SKK-JISYO.${type}.${PORTVERSION} Modified: head/lang/clips/Makefile ============================================================================== --- head/lang/clips/Makefile Thu Nov 7 18:08:58 2019 (r516996) +++ head/lang/clips/Makefile Thu Nov 7 18:18:17 2019 (r516997) @@ -23,7 +23,7 @@ PLIST_FILES= bin/clips post-extract: ${CP} ${WRKDIR}/${DISTNAME}/makefiles/${MAKEFILE} ${WRKSRC}/ -do-patch: +post-patch: ${REINPLACE_CMD} -e 's#gcc #${CC} ${CFLAGS} #g' ${WRKSRC}/${MAKEFILE} do-install: Modified: head/net-mgmt/py-pdagent/Makefile ============================================================================== --- head/net-mgmt/py-pdagent/Makefile Thu Nov 7 18:08:58 2019 (r516996) +++ head/net-mgmt/py-pdagent/Makefile Thu Nov 7 18:18:17 2019 (r516997) @@ -29,7 +29,7 @@ BINFILES= pd-queue pd-send pdagentd.py USERS= pdagent GROUPS= pdagent -do-patch: +post-patch: ${REINPLACE_CMD} -e 's|/var/lib/pdagent|/var/db/pdagent| ; s|/etc|${ETCDIR}|' \ ${WRKSRC}/pdagent/confdirs.py Modified: head/sysutils/chyves/Makefile ============================================================================== --- head/sysutils/chyves/Makefile Thu Nov 7 18:08:58 2019 (r516996) +++ head/sysutils/chyves/Makefile Thu Nov 7 18:18:17 2019 (r516997) @@ -18,7 +18,7 @@ NO_ARCH= yes MAKE_ARGS+= -e -do-patch: +post-patch: ${REINPLACE_CMD} 's%\$$(PREFIX)%${STAGEDIR}/$$(PREFIX)%g' ${WRKSRC}/Makefile .include <bsd.port.mk> Modified: head/sysutils/dirvish/Makefile ============================================================================== --- head/sysutils/dirvish/Makefile Thu Nov 7 18:08:58 2019 (r516996) +++ head/sysutils/dirvish/Makefile Thu Nov 7 18:18:17 2019 (r516997) @@ -27,7 +27,7 @@ NO_WRKSUBDIR= yes EXECUTABLES= dirvish dirvish-expire dirvish-locate dirvish-runall -do-patch: +post-patch: @${SED} -e 's:%%CONFDIR%%:${PREFIX}/etc/dirvish:' -e 's:%%PERL%%:${PERL}:' \ ${FILESDIR}/header.pl > ${WRKDIR}/header.pl .for _E in ${EXECUTABLES} Modified: head/sysutils/diskcheckd/Makefile ============================================================================== --- head/sysutils/diskcheckd/Makefile Thu Nov 7 18:08:58 2019 (r516996) +++ head/sysutils/diskcheckd/Makefile Thu Nov 7 18:18:17 2019 (r516997) @@ -24,7 +24,7 @@ do-extract: @(cd ${WRKSRC} ; ${CP} ${FILESDIR}/${f} .) .endfor -do-patch: +post-patch: @${REINPLACE_CMD} -e 's|/usr/local/etc/diskcheckd.conf|${PREFIX}/etc/diskcheckd.conf|g' ${WRKSRC}/diskcheckd.8 do-install: Modified: head/sysutils/hfm/Makefile ============================================================================== --- head/sysutils/hfm/Makefile Thu Nov 7 18:08:58 2019 (r516996) +++ head/sysutils/hfm/Makefile Thu Nov 7 18:18:17 2019 (r516997) @@ -36,7 +36,7 @@ ALL_TARGET= test build OPTIONS_DEFINE= DOCS EXAMPLES -do-patch: +post-patch: (cd ${WRKSRC}; ${PATCH} vendor/src/github.com/mitchellh/go-libucl/libucl.go < vendor/patches/github.com/mitchellh/go-libucl/libucl.go.patch ) do-install: Modified: head/sysutils/iohyve/Makefile ============================================================================== --- head/sysutils/iohyve/Makefile Thu Nov 7 18:08:58 2019 (r516996) +++ head/sysutils/iohyve/Makefile Thu Nov 7 18:18:17 2019 (r516997) @@ -15,7 +15,7 @@ GH_ACCOUNT= pr1ntf NO_ARCH= yes -do-patch: +post-patch: ${REINPLACE_CMD} 's%\$$(PREFIX)%${STAGEDIR}/$$(PREFIX)%g' ${WRKSRC}/Makefile .include <bsd.port.mk> Modified: head/sysutils/mcollective/Makefile ============================================================================== --- head/sysutils/mcollective/Makefile Thu Nov 7 18:08:58 2019 (r516996) +++ head/sysutils/mcollective/Makefile Thu Nov 7 18:18:17 2019 (r516997) @@ -32,7 +32,7 @@ SUB_LIST+= RUBY=${RUBY} OPTIONS_DEFINE= DOCS -do-patch: +post-patch: @${REINPLACE_CMD} -e "s|/etc/mcollective|${ETCDIR}|" \ ${WRKSRC}/bin/mcollectived \ ${WRKSRC}/etc/server.cfg.dist \ Modified: head/www/podcastamatic/Makefile ============================================================================== --- head/www/podcastamatic/Makefile Thu Nov 7 18:08:58 2019 (r516996) +++ head/www/podcastamatic/Makefile Thu Nov 7 18:18:17 2019 (r516997) @@ -28,7 +28,7 @@ SUB_LIST= PORTNAME="${PORTNAME}" OPTIONS_DEFINE= DOCS -do-patch: +post-patch: @${REINPLACE_CMD} -e "s|${PORTNAME}.conf|${PREFIX}/etc/${PORTNAME}.conf|"\ ${WRKSRC}/${PORTNAME}.pl @${REINPLACE_CMD} -e "s|../test/podcastamatic.log|/var/log/${PORTNAME}.log|"\ Modified: head/www/quark/Makefile ============================================================================== --- head/www/quark/Makefile Thu Nov 7 18:08:58 2019 (r516996) +++ head/www/quark/Makefile Thu Nov 7 18:18:17 2019 (r516997) @@ -33,10 +33,8 @@ pre-everything:: @${ECHO_MSG} "You can build quark with your own config.h using the QUARK_CONF knob:" @${ECHO_MSG} "make QUARK_CONF=/path/to/quark/config.h install clean" -do-patch: - ${REINPLACE_CMD} -e '/^include config.mk$$/d' ${WRKSRC}/Makefile - post-patch: + ${REINPLACE_CMD} -e '/^include config.mk$$/d' ${WRKSRC}/Makefile .if defined(QUARK_CONF) @${ECHO_MSG} "Creating config.h from ${QUARK_CONF}" @${LN} -sf ${QUARK_CONF} ${WRKSRC}/config.h Modified: head/www/yabb/Makefile ============================================================================== --- head/www/yabb/Makefile Thu Nov 7 18:08:58 2019 (r516996) +++ head/www/yabb/Makefile Thu Nov 7 18:18:17 2019 (r516997) @@ -45,12 +45,10 @@ PERLFILES= AdminIndex.pl BoardConvert.pl Convert.pl \ post-extract: @${RM} -r ${WCGI}/Convert ${WCGI}/Modules ${WCGI}/FixFile.pl -do-patch: +post-patch: .for _I in ${PERLFILES} @${SED} -i '' -e '1s|/usr/bin/perl|${perl_CMD}|' ${WCGI}/${_I} .endfor - -post-patch: @${CHMOD} -R a=,u+rwX ${WCGI}/* @${CHMOD} a=rx ${WCGI}/AdminIndex.pl ${WCGI}/Setup.pl ${WCGI}/YaBB.pl @${CHMOD} -R a-w ${WCGI}/Admin ${WCGI}/Languages ${WCGI}/Sources
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201911071818.xA7IIIMV070681>