Index: head/math/cmlib/Makefile
===================================================================
--- head/math/cmlib/Makefile	(revision 491931)
+++ head/math/cmlib/Makefile	(revision 491932)
@@ -1,52 +1,53 @@
 # Created by: Anton Shterenlikht <mexas@bris.ac.uk>
 # $FreeBSD$
 
 PORTNAME=	cmlib
 PORTVERSION=	3.0
 PORTREVISION=	6
 CATEGORIES=	math
 MASTER_SITES=	NL/blas:blas ftp://ftp.nist.gov/pub/cmlib/
 # Get d1mach.f, i1mach.f, r1mach.f from BLAS, rather than from CMLIB.
 # See Netlib FAQ #2.17: http://netlib.org/misc/faq.html#2.17
 DISTFILES=	src.tar.Z d1mach.f:blas i1mach.f:blas r1mach.f:blas
 DIST_SUBDIR=	cmlib
 EXTRACT_ONLY=	src.tar.Z
 
 MAINTAINER=	fortran@FreeBSD.org
 COMMENT=	NIST Core math library (CMLIB)
 
 USES=		fortran uidfix
 USE_LDCONFIG=	yes
-WRKSRC=		${WRKDIR}
 SHLIB_MAJOR=	1
 
 LDFLAGS+=	${FFLAGS}
 LDADD ?=	-lgfortran -lm
 SRCCONF=	/dev/null
-MAKE_ENV+=	LDADD="${LDADD}" SHLIB_MAJOR="${SHLIB_MAJOR}" \
+MAKE_ENV=	LDADD="${LDADD}" SHLIB_MAJOR="${SHLIB_MAJOR}" \
 		SRCCONF="${SRCCONF}"
+
+NO_WRKSUBDIR=	yes
 
 OPTIONS_DEFINE=	DOCS
 
 post-extract:
 	${CP} ${_DISTDIR}/[dir]1mach.f ${WRKSRC}/src/machcon
 	${CP} ${FILESDIR}/make.inc ${WRKSRC}
 
 post-patch:
 	${REINPLACE_CMD} -e 's|../../src|src|g' ${WRKSRC}/Makefile
 	${REINPLACE_CMD} -e 's|../../utils|utils|g' ${WRKSRC}/Makefile
 	${REINPLACE_CMD} -e 's|testall :|testall : libcm|g' ${WRKSRC}/Makefile
 	${REINPLACE_CMD} -e 's|../../utils|utils|g' ${WRKSRC}/utils/Testall
 	${REINPLACE_CMD} -e 's|../../test|test|g' ${WRKSRC}/utils/Testall
 	${REINPLACE_CMD} -e 's|../../utils|utils|g' ${WRKSRC}/utils/Update
 	${REINPLACE_CMD} -e 's|../../src|src|g' ${WRKSRC}/utils/Upar
 	${REINPLACE_CMD} -e 's|../../utils|utils|g' ${WRKSRC}/utils/Upar
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/libcm.a ${STAGEDIR}${PREFIX}/lib
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
Index: head/math/xppaut/Makefile
===================================================================
--- head/math/xppaut/Makefile	(revision 491931)
+++ head/math/xppaut/Makefile	(revision 491932)
@@ -1,30 +1,31 @@
 # Created by: Stephen Montgomery-Smith <stephen@math.missouri.edu>
 # $FreeBSD$
 
 PORTNAME=	xppaut
 PORTVERSION=	7.0
 PORTREVISION=	3
 CATEGORIES=	math graphics
 MASTER_SITES=	http://www.math.pitt.edu/~bard/bardware/
 DISTNAME=	${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Graphical tool for solving differential equations, etc
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USE_XORG=	x11 xbitmaps xorgproto
 CFLAGS+=	-w -Wno-return-type
-WRKSRC=		${WRKDIR}
 ALL_TARGET=	xppaut
+
+NO_WRKSUBDIR=	yes
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 DOCS_MAKE_ENV_OFF=	NOPORTDOCS=yes
 EXAMPLES_MAKE_ENV_OFF=	NOPORTEXAMPLES=yes
 
 post-build:
 	${RM} ${WRKSRC}/ode/._*
 
 .include <bsd.port.mk>