Index: Makefile
===================================================================
--- Makefile	(revision 444378)
+++ Makefile	(working copy)
@@ -209,12 +209,22 @@
 CONFIGURE_ENV+=		SWIG="/nonexistent"
 .endif
 
+
+.include <bsd.port.pre.mk>
+
 .if ${PORT_OPTIONS:MPHP}
-IGNORE_WITH_PHP=	56 71
+# it will use -php7 if supported swig, which is always the case,
+# which # breaks build for php5, so override with option corresponding
+# to actual PHP version
+. if ${PHP_VER} >= 70
+MAKE_ARGS+=	SWIG_PHP_OPT=-php7
+. else
+MAKE_ARGS+=	SWIG_PHP_OPT=-php5
+. endif
 .endif
 
 post-patch:
-	${FIND} ${WRKSRC} -name Makefile.in | \
+	@${FIND} ${WRKSRC} -name Makefile.in | \
 		${XARGS} ${REINPLACE_CMD} \
 		-e "s|\([^:]*:.*\) install-pdfDATA\(.*\)|\1\2|g" \
 		-e "s|\([^:]*:.*\) install-htmlDATA\(.*\)|\1\2|g" \
@@ -224,18 +234,18 @@
 		-e "s|\([^:]*:.*\) install-pathplanexampleDATA\(.*\)|\1\2|g" \
 		-e 's|txtdir = $$(pkgdatadir)/doc|txtdir = ${DOCSDIR}|' \
 		-e 's|demodir = $$(pkgdatadir)/demo|demodir = ${EXAMPLESDIR}|';
-	${REINPLACE_CMD} \
+	@${REINPLACE_CMD} \
 		-e 's|^\.SUFFIXES: \(.*\)\.1\(.*\)|.SUFFIXES: \1 \2|' \
 		${WRKSRC}/cmd/tools/Makefile.in \
 		${WRKSRC}/cmd/gvpr/Makefile.in
-	${FIND} ${WRKSRC}/lib -name 'Makefile.in' | \
+	@${FIND} ${WRKSRC}/lib -name 'Makefile.in' | \
 		${XARGS} ${REINPLACE_CMD} \
 		-e 's|pkglibdir = $$(libdir)/@PACKAGE@|pkglibdir = $$(libdir)|g' \
 		-e 's|libdir = @libdir@|libdir = @libdir@/@PACKAGE@|g';
-	${FIND} ${WRKSRC}/lib -name '*.pc.in' | \
+	@${FIND} ${WRKSRC}/lib -name '*.pc.in' | \
 		${XARGS} ${REINPLACE_CMD} \
 		-e 's|libdir=@libdir@|libdir=@libdir@/@PACKAGE@|';
-	${REINPLACE_CMD} -e "s|/usr/include/php|${LOCALBASE}/include/php|g" \
+	@${REINPLACE_CMD} -e "s|/usr/include/php|${LOCALBASE}/include/php|g" \
 		-e "s|vendorarchdir|sitearchdir|g" \
 		-e "s|-lruby|-lruby${RUBY_SUFFIX}|g" \
 		-e "s|ruby-1[.]9|ruby-${RUBY_VER}|g" \
@@ -242,24 +252,22 @@
 		-e 's|PHP_INSTALL_DIR=.*|PHP_INSTALL_DIR="${PREFIX}/lib/php/${PHP_EXT_DIR}"|' \
 		-e 's|PHP_INSTALL_DATADIR=.*|PHP_INSTALL_DATADIR="${PREFIX}/share/php"|' \
 		-e '/if test/ s| == | = |g' ${WRKSRC}/configure
-	${REINPLACE_CMD} -e 's|#include "gui.h"|#include "gui/gui.h"|' \
+	@${REINPLACE_CMD} -e 's|#include "gui.h"|#include "gui/gui.h"|' \
 		${WRKSRC}/cmd/smyrna/tvnodes.h
-	${REINPLACE_CMD} -e 's|GTS_LIBS)|GTS_LIBS) $$(MATH_LIBS)|' \
+	@${REINPLACE_CMD} -e 's|GTS_LIBS)|GTS_LIBS) $$(MATH_LIBS)|' \
 		${WRKSRC}/cmd/smyrna/Makefile.in
-	${CP} ${WRKSRC}/lib/cgraph/cgraph.h ${WRKSRC}/plugin/ming/
+	@${CP} ${WRKSRC}/lib/cgraph/cgraph.h ${WRKSRC}/plugin/ming/
 .if ${OSVERSION} >= 1100093
-	${REINPLACE_CMD} -e 's|SF_FLAGS|SFIO_FLAGS|g' \
+	@${REINPLACE_CMD} -e 's|SF_FLAGS|SFIO_FLAGS|g' \
 		${WRKSRC}/lib/sfio/*.[ch]
 .endif
-.if ! ${PORT_OPTIONS:MDOCS}
-	${REINPLACE_CMD} -e 's| install-txtDATA$$||' \
+
+post-patch-DOCS-off:
+	@${REINPLACE_CMD} -e 's| install-txtDATA$$||' \
 		${WRKSRC}/Makefile.in
-.endif
 
-.if ${PORT_OPTIONS:MPHP}
-pre-install:
-	${MKDIR} "${STAGEDIR}/${PREFIX}/share/php"
-.endif
+pre-install-PHP-on:
+	@${MKDIR} "${STAGEDIR}/${PREFIX}/share/php"
 
 post-install: install-ldconfig-file
 	cd ${WRKSRC}/lib/expr && \
@@ -266,18 +274,19 @@
 		${MAKE_ENV} ${MAKE} ${MAKE_ARGS} ${INSTALL_TARGET}
 	cd ${WRKSRC} && \
 		${INSTALL_DATA} ${FIX_INCLUDE} ${STAGEDIR}${PREFIX}/include/graphviz/
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${MKDIR} ${STAGEDIR}${DOCSDIR}/html
-	${MKDIR} ${STAGEDIR}${DOCSDIR}/pdf
+
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}/html
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}/pdf
 	cd ${WRKSRC} && \
 		${INSTALL_DATA} ${PDOCS_TXT} ${STAGEDIR}${DOCSDIR}/ && \
 		${INSTALL_DATA} ${PDOCS_PDF} ${STAGEDIR}${DOCSDIR}/pdf/ && \
 		${INSTALL_DATA} ${PDOCS_HTML} ${STAGEDIR}${DOCSDIR}/html/
-.endif
-.if ${PORT_OPTIONS:MEXAMPLES}
+
+post-install-EXAMPLES-on:
 	@${ECHO_MSG} "Installing demo data..."
-	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_SCRIPT} \
 		${WRKSRC}/tclpkg/gdtclft/demo/entities.tcl \
 		${WRKSRC}/tclpkg/tcldot/demo/doted.tcl \
@@ -290,10 +299,9 @@
 		${WRKSRC}/tclpkg/tcldot/demo/gcat.tcl.README \
 		${WRKSRC}/tclpkg/tclpathplan/demo/pathplan.tcl.README \
 		${STAGEDIR}${EXAMPLESDIR}/
-	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/pathplan_data
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/pathplan_data
 	${INSTALL_DATA} \
 		${WRKSRC}/tclpkg/tclpathplan/demo/pathplan_data/*.dat \
 		${STAGEDIR}${EXAMPLESDIR}/pathplan_data/
-.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>