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.

17 files changed, 18 insertions, 22 deletions

diff --git a/databases/ora2pg/Makefile b/databases/ora2pg/Makefile
index 6d8827489c0a..3ab2709f489a 100644
--- a/databases/ora2pg/Makefile
+++ b/databases/ora2pg/Makefile
@@ -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
diff --git a/devel/pythontidy/Makefile b/devel/pythontidy/Makefile
index 2e8785d115fc..ca9b767fe1d6 100644
--- a/devel/pythontidy/Makefile
+++ b/devel/pythontidy/Makefile
@@ -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}
 
diff --git a/dns/autotrust/Makefile b/dns/autotrust/Makefile
index 8dd537192024..230539830c27 100644
--- a/dns/autotrust/Makefile
+++ b/dns/autotrust/Makefile
@@ -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!' \
diff --git a/dns/djbdns-tools/Makefile b/dns/djbdns-tools/Makefile
index 7fc8a3892513..cf9fe0bc9718 100644
--- a/dns/djbdns-tools/Makefile
+++ b/dns/djbdns-tools/Makefile
@@ -25,7 +25,7 @@ MANPAGES=	dnsfilter.1 dnsip.1 dnsipq.1 dnsmx.1 dnsname.1 \
 
 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
diff --git a/games/py-sgflib/Makefile b/games/py-sgflib/Makefile
index f9ccbc987a7a..9cea0247db90 100644
--- a/games/py-sgflib/Makefile
+++ b/games/py-sgflib/Makefile
@@ -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
diff --git a/japanese/skk-jisyo/Makefile b/japanese/skk-jisyo/Makefile
index 33ec081b8deb..9ae9e00e8983 100644
--- a/japanese/skk-jisyo/Makefile
+++ b/japanese/skk-jisyo/Makefile
@@ -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}
diff --git a/lang/clips/Makefile b/lang/clips/Makefile
index c08873e2c855..f10e837f96d3 100644
--- a/lang/clips/Makefile
+++ b/lang/clips/Makefile
@@ -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:
diff --git a/net-mgmt/py-pdagent/Makefile b/net-mgmt/py-pdagent/Makefile
index ed253f21e11f..56bfeb2aea10 100644
--- a/net-mgmt/py-pdagent/Makefile
+++ b/net-mgmt/py-pdagent/Makefile
@@ -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
 
diff --git a/sysutils/chyves/Makefile b/sysutils/chyves/Makefile
index 90b7314cee7e..81d517412f13 100644
--- a/sysutils/chyves/Makefile
+++ b/sysutils/chyves/Makefile
@@ -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>
diff --git a/sysutils/dirvish/Makefile b/sysutils/dirvish/Makefile
index bba13ff6f8bf..548ed79e7249 100644
--- a/sysutils/dirvish/Makefile
+++ b/sysutils/dirvish/Makefile
@@ -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}
diff --git a/sysutils/diskcheckd/Makefile b/sysutils/diskcheckd/Makefile
index 1519d2a25d4d..ec9d262ac785 100644
--- a/sysutils/diskcheckd/Makefile
+++ b/sysutils/diskcheckd/Makefile
@@ -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:
diff --git a/sysutils/hfm/Makefile b/sysutils/hfm/Makefile
index 0e91ce2d59d4..571c3bb8f7ff 100644
--- a/sysutils/hfm/Makefile
+++ b/sysutils/hfm/Makefile
@@ -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:
diff --git a/sysutils/iohyve/Makefile b/sysutils/iohyve/Makefile
index 31f57d19c80f..685c502069e6 100644
--- a/sysutils/iohyve/Makefile
+++ b/sysutils/iohyve/Makefile
@@ -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>
diff --git a/sysutils/mcollective/Makefile b/sysutils/mcollective/Makefile
index fd0e01e86214..76ab67ecfbcc 100644
--- a/sysutils/mcollective/Makefile
+++ b/sysutils/mcollective/Makefile
@@ -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 \
diff --git a/www/podcastamatic/Makefile b/www/podcastamatic/Makefile
index 208dca93f534..82817dbb2e2f 100644
--- a/www/podcastamatic/Makefile
+++ b/www/podcastamatic/Makefile
@@ -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|"\
diff --git a/www/quark/Makefile b/www/quark/Makefile
index a87947aa9fe7..5a665211b502 100644
--- a/www/quark/Makefile
+++ b/www/quark/Makefile
@@ -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
diff --git a/www/yabb/Makefile b/www/yabb/Makefile
index b904d99fc255..3c3bdd670dd4 100644
--- a/www/yabb/Makefile
+++ b/www/yabb/Makefile
@@ -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