7 files changed, 14 insertions, 27 deletions

diff --git a/java/jakarta-commons-collections/Makefile b/java/jakarta-commons-collections/Makefile
index b4e67d6272ea..04319eb9d51d 100644
--- a/java/jakarta-commons-collections/Makefile
+++ b/java/jakarta-commons-collections/Makefile
@@ -28,7 +28,7 @@ PLIST_FILES+=	%%JAVAJARDIR%%/${DESTJARFILE}
 
 .include <bsd.port.pre.mk>
 
-JDK_API!=	(${FIND} -s ${LOCALBASE}/share/doc/jdk1.? -maxdepth 1 -name api -type d 2>/dev/null || ${TRUE}) | ${TAIL} -n 1
+JDK_API!=	(${FIND} -s ${LOCALBASE}/share/doc/jdk1.? -maxdepth 1 -name api -type d 2>/dev/null || ${ECHO_CMD}) | ${TAIL} -n 1
 .if ${JDK_API} != ""
 MAKE_ARGS+=	-Djavadoc.links=${JDK_API}
 .endif
diff --git a/java/jakarta-commons-lang/Makefile b/java/jakarta-commons-lang/Makefile
index 8a6d07a0ae3a..bc7ef4c2bada 100644
--- a/java/jakarta-commons-lang/Makefile
+++ b/java/jakarta-commons-lang/Makefile
@@ -31,7 +31,7 @@ PLIST_FILES=	%%JAVAJARDIR%%/${DESTJARFILE}
 
 .include <bsd.port.pre.mk>
 
-JDK_API!=	(${FIND} -s ${LOCALBASE}/share/doc/jdk1.? -maxdepth 1 -name api -type d 2>/dev/null || ${TRUE}) | ${TAIL} -n 1
+JDK_API!=	(${FIND} -s ${LOCALBASE}/share/doc/jdk1.? -maxdepth 1 -name api -type d 2>/dev/null || ${ECHO_CMD}) | ${TAIL} -n 1
 
 .if ${JDK_API} != ""
 MAKE_ARGS+=	-Djdk.javadoc=${JDK_API}
diff --git a/lang/gnustep-guile/Makefile b/lang/gnustep-guile/Makefile
index 5e323de87d73..c422d0fd516f 100644
--- a/lang/gnustep-guile/Makefile
+++ b/lang/gnustep-guile/Makefile
@@ -46,7 +46,7 @@ CONFLICTS?=		gnustep-guile-nox11-1.*
 
 .include <bsd.port.pre.mk>
 
-GUILE_VER!=	(cd ${PORTSDIR}/lang/guile && make -V GUILE_VER)
+GUILE_VER!=	${MAKE} -C ${PORTSDIR}/lang/guile -V GUILE_VER
 
 post-patch:
 	${REINPLACE_CMD} -e 's|echo aout|echo elf|' \
diff --git a/net/cvsupchk/Makefile b/net/cvsupchk/Makefile
index 8c957f8403c2..57707a0b4ce0 100644
--- a/net/cvsupchk/Makefile
+++ b/net/cvsupchk/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	cvsupchk
-# Date created:				07 Nov 2005
-# Whom:					matthias.andree@gmx.de
-#
+# Created by: matthias.andree@gmx.de
 # $FreeBSD$
-#
 
 PORTNAME=	cvsupchk
 PORTVERSION=	19990209
@@ -25,7 +21,7 @@ NO_BUILD=	yes
 
 .include <bsd.port.pre.mk>
 
-src!=		cd ${PORTSDIR}/net/cvsup-without-gui && make -V WRKSRC
+src!=		${MAKE} -C ${PORTSDIR}/net/cvsup-without-gui -V WRKSRC
 
 do-extract:
 	${MKDIR} ${WRKSRC}
@@ -34,7 +30,7 @@ do-extract:
 do-install:
 	${MKDIR} ${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/cvsupchk ${PREFIX}/bin/
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${src}/contrib/cvsupchk/README ${DOCSDIR}/
 .endif
diff --git a/net/net-http/Makefile b/net/net-http/Makefile
index e44e402a62ab..8be451cdd013 100644
--- a/net/net-http/Makefile
+++ b/net/net-http/Makefile
@@ -1,10 +1,5 @@
-# ex:ts=8
-# New ports collection makefile for:	net-http
-# Date created:			May 15, 2001
-# Whom:				ijliao
-#
+# Created by: ijliao
 # $FreeBSD$
-#
 
 PORTNAME=	net-http
 PORTVERSION=	0.3.1
@@ -22,12 +17,12 @@ GNU_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
 NO_BUILD=	yes
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-GUILE_VER!=	(cd ${PORTSDIR}/lang/guile && make -V GUILE_VER)
+GUILE_VER!=	${MAKE} -C ${PORTSDIR}/lang/guile -V GUILE_VER
 PLIST_SUB=	GUILE_VER="${GUILE_VER}"
 
 do-install:
 	${CP} -R ${WRKSRC}/net/ ${LOCALBASE}/share/guile/${GUILE_VER}/net/
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/textproc/jaxup/Makefile b/textproc/jaxup/Makefile
index 93f4338b9296..ca9f739147ac 100644
--- a/textproc/jaxup/Makefile
+++ b/textproc/jaxup/Makefile
@@ -47,11 +47,11 @@ UTIL_CLASSPATH_JARS=	jaxen-full saxpath xercesImpl
 UTIL_CLASSPATH!=	${ECHO_CMD} ${UTIL_CLASSPATH_JARS:S,^,${JAVALIBDIR}/,:S,$,.jar,} | ${TR} " " ":"
 
 .if !defined(NOPORTDOCS)
-JDK_API!=	(${FIND} -s ${LOCALBASE}/share/doc/jdk1.[4-5] -maxdepth 1 -name api -type d 2>/dev/null || ${TRUE}) | ${TAIL} -n 1
+JDK_API!=	(${FIND} -s ${LOCALBASE}/share/doc/jdk1.[4-5] -maxdepth 1 -name api -type d 2>/dev/null || ${ECHO_CMD}) | ${TAIL} -n 1
 .if ${JDK_API} != ""
 MAKE_ARGS+=	-Dj2se.apidocs="${JDK_API}"
 .endif
-JAXEN_API!=	(${FIND} -s ${LOCALBASE}/share/doc/jaxen -maxdepth 1 -name javadoc -type d 2>/dev/null || ${TRUE}) | ${TAIL} -n 1
+JAXEN_API!=	(${FIND} -s ${LOCALBASE}/share/doc/jaxen -maxdepth 1 -name javadoc -type d 2>/dev/null || ${ECHO_CMD}) | ${TAIL} -n 1
 .if ${JAXEN_API} != ""
 MAKE_ARGS+=	-Djaxen.apidocs="${JAXEN_API}"
 .endif
diff --git a/textproc/xmlenc/Makefile b/textproc/xmlenc/Makefile
index 9269bda07021..c5497354862c 100644
--- a/textproc/xmlenc/Makefile
+++ b/textproc/xmlenc/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	JUMP Ultimate Math Package
-# Date created:				June 13, 2002
-# Whom:					Ernst de Haan <znerd@FreeBSD.org>
-#
+# Created by: Ernst de Haan <znerd@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	xmlenc
 PORTVERSION=	0.52
@@ -29,7 +25,7 @@ PLIST_FILES=	%%JAVAJARDIR%%/${JARFILE}
 
 .include <bsd.port.pre.mk>
 
-JDK_API!=	(${FIND} -s ${LOCALBASE}/share/doc/jdk1.? -maxdepth 1 -name api -type d 2>/dev/null || ${TRUE}) | ${TAIL} -n 1
+JDK_API!=	(${FIND} -s ${LOCALBASE}/share/doc/jdk1.? -maxdepth 1 -name api -type d 2>/dev/null || ${ECHO_CMD}) | ${TAIL} -n 1
 .if ${JDK_API} != ""
 MAKE_ARGS+=	-Djavadoc.srcdir.j2se=${JDK_API}